From ee87bb2d72b3bf91add591141159bc222d957d0b Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Fri, 24 Sep 2021 17:57:48 +0300 Subject: [PATCH 001/198] Queued pipe implementation added --- packages/util/pipe/interface.go | 19 +++ packages/util/pipe/pipe.go | 104 ++++++++++++++ packages/util/pipe/queue.go | 247 ++++++++++++++++++++++++++++++++ 3 files changed, 370 insertions(+) create mode 100644 packages/util/pipe/interface.go create mode 100644 packages/util/pipe/pipe.go create mode 100644 packages/util/pipe/queue.go diff --git a/packages/util/pipe/interface.go b/packages/util/pipe/interface.go new file mode 100644 index 0000000000..b03c80a878 --- /dev/null +++ b/packages/util/pipe/interface.go @@ -0,0 +1,19 @@ +package pipe + +// minQueueLen is smallest capacity that queue may have. +const minQueueLen = 16 + +type Queue interface { + Length() int + Add(elem interface{}) bool + Peek() interface{} + Get(i int) interface{} + Remove() interface{} +} + +type Pipe interface { + In() chan<- interface{} + Out() <-chan interface{} + Len() int + Close() +} diff --git a/packages/util/pipe/pipe.go b/packages/util/pipe/pipe.go new file mode 100644 index 0000000000..59adaa85fe --- /dev/null +++ b/packages/util/pipe/pipe.go @@ -0,0 +1,104 @@ +package pipe + +// InfinitePipe provides deserialised sender and receiver: it queues messages +// sent by the sender and returns them to the receiver whenever it is ready, +// without blocking the sender process. Depending on the backing queue, the pipe +// might have other characteristics. +type InfinitePipe struct { + input chan interface{} + output chan interface{} + length chan int + buffer Queue +} + +var _ Pipe = &InfinitePipe{} + +func NewDefaultInfinitePipe() *InfinitePipe { + return newInfinitePipe(NewDefaultLimitedPriorityHashQueue()) +} + +func NewPriorityInfinitePipe(fun func(interface{}) bool) *InfinitePipe { + return newInfinitePipe(NewPriorityLimitedPriorityHashQueue(fun)) +} + +func NewLimitInfinitePipe(limit int) *InfinitePipe { + return newInfinitePipe(NewLimitLimitedPriorityHashQueue(limit)) +} + +func NewLimitPriorityInfinitePipe(fun func(interface{}) bool, limit int) *InfinitePipe { + return newInfinitePipe(NewLimitPriorityLimitedPriorityHashQueue(fun, limit)) +} + +func NewHashInfinitePipe() *InfinitePipe { + return newInfinitePipe(NewHashLimitedPriorityHashQueue(true)) +} + +func NewPriorityHashInfinitePipe(fun func(interface{}) bool) *InfinitePipe { + return newInfinitePipe(NewPriorityHashLimitedPriorityHashQueue(fun, true)) +} + +func NewLimitHashInfinitePipe(limit int) *InfinitePipe { + return newInfinitePipe(NewLimitHashLimitedPriorityHashQueue(limit, true)) +} + +func NewInfinitePipe(fun func(interface{}) bool, limit int) *InfinitePipe { + return newInfinitePipe(NewLimitedPriorityHashQueue(fun, limit, true)) +} + +func newInfinitePipe(queue Queue) *InfinitePipe { + ch := &InfinitePipe{ + input: make(chan interface{}), + output: make(chan interface{}), + length: make(chan int), + buffer: queue, + } + go ch.infiniteBuffer() + return ch +} + +func (ch *InfinitePipe) In() chan<- interface{} { + return ch.input +} + +func (ch *InfinitePipe) Out() <-chan interface{} { + return ch.output +} + +func (ch *InfinitePipe) Len() int { + return <-ch.length +} + +func (ch *InfinitePipe) Close() { + close(ch.input) +} + +func (ch *InfinitePipe) infiniteBuffer() { + var input, output chan interface{} + var next interface{} + input = ch.input + + for input != nil || output != nil { + select { + case elem, open := <-input: + if open { + ch.buffer.Add(elem) + } else { + input = nil + } + case output <- next: + ch.buffer.Remove() + case ch.length <- ch.buffer.Length(): + } + + if ch.buffer.Length() > 0 { + output = ch.output + next = ch.buffer.Peek() + } else { + output = nil + next = nil + } + } + + close(ch.output) + close(ch.length) +} diff --git a/packages/util/pipe/queue.go b/packages/util/pipe/queue.go new file mode 100644 index 0000000000..f04e8b8b82 --- /dev/null +++ b/packages/util/pipe/queue.go @@ -0,0 +1,247 @@ +package pipe + +// LimitedPriorityHashQueue is a queue, which can prioritize elements, +// limit its growth and reject already included elements. +type LimitedPriorityHashQueue struct { + buf []interface{} + head int + pend int + tail int + count int + priorityFun func(interface{}) bool + limit int + hash *map[interface{}]bool +} + +var _ Queue = &LimitedPriorityHashQueue{} + +const Infinity = 0 + +func NewDefaultLimitedPriorityHashQueue() *LimitedPriorityHashQueue { + return NewHashLimitedPriorityHashQueue(false) +} + +func NewPriorityLimitedPriorityHashQueue(fun func(interface{}) bool) *LimitedPriorityHashQueue { + return NewPriorityHashLimitedPriorityHashQueue(fun, false) +} + +func NewLimitLimitedPriorityHashQueue(limit int) *LimitedPriorityHashQueue { + return NewLimitHashLimitedPriorityHashQueue(limit, false) +} + +func NewLimitPriorityLimitedPriorityHashQueue(fun func(interface{}) bool, limit int) *LimitedPriorityHashQueue { + return NewLimitedPriorityHashQueue(fun, limit, false) +} + +func NewHashLimitedPriorityHashQueue(hashNeeded bool) *LimitedPriorityHashQueue { + return NewLimitHashLimitedPriorityHashQueue(Infinity, hashNeeded) +} + +func NewPriorityHashLimitedPriorityHashQueue(fun func(interface{}) bool, hashNeeded bool) *LimitedPriorityHashQueue { + return NewLimitedPriorityHashQueue(fun, Infinity, hashNeeded) +} + +func NewLimitHashLimitedPriorityHashQueue(limit int, hashNeeded bool) *LimitedPriorityHashQueue { + return NewLimitedPriorityHashQueue(func(interface{}) bool { return false }, limit, hashNeeded) +} + +func NewLimitedPriorityHashQueue(fun func(interface{}) bool, limit int, hashNeeded bool) *LimitedPriorityHashQueue { + var initBufSize int + if (limit != Infinity) && (limit < minQueueLen) { + initBufSize = limit + } else { + initBufSize = minQueueLen + } + var hash *map[interface{}]bool + if hashNeeded { + hashT := make(map[interface{}]bool) + hash = &hashT + } else { + hash = nil + } + return &LimitedPriorityHashQueue{ + head: 0, + pend: -1, + tail: 0, + count: 0, + buf: make([]interface{}, initBufSize), + priorityFun: fun, + limit: limit, + hash: hash, + } +} + +// Length returns the number of elements currently stored in the queue. +func (q *LimitedPriorityHashQueue) Length() int { + return q.count +} + +func (q *LimitedPriorityHashQueue) getIndex(rawIndex int) int { + index := rawIndex % len(q.buf) + if index < 0 { + return index + len(q.buf) + } + return index +} + +// resizes the queue to fit exactly twice its current contents +// this can result in shrinking if the queue is less than half-full +// the size of the resized queue is never smaller than minQueueLen, except +// when the limit is smaller. +func (q *LimitedPriorityHashQueue) resize() { + newSize := q.count << 1 + if newSize < minQueueLen { + newSize = minQueueLen + } + if (q.limit != Infinity) && (newSize > q.limit) { + newSize = q.limit + } + newBuf := make([]interface{}, newSize) + + if q.tail > q.head { + copy(newBuf, q.buf[q.head:q.tail]) + } else { + n := copy(newBuf, q.buf[q.head:]) + copy(newBuf[n:], q.buf[:q.tail]) + } + + if q.pend >= 0 { + q.pend = q.getIndex(q.pend - q.head) + } + q.head = 0 + q.tail = q.count + q.buf = newBuf +} + +// Add puts an element to the start or end of the queue, depending +// on the result of priorityFun. If the limited queue is full it adds a new element +// removing the previously added element, according to the following rules: +// * not prioritized element is chosen for deletion, if possible +// * the chosen for deletion element is always the oldest among its type +// * not prioritized element can not be added if there are no not prioritized +// element to delete +// If it is a hash queue, the element is not added, if it is already in the queue. +// If the add was successful, returns `true`. +func (q *LimitedPriorityHashQueue) Add(elem interface{}) bool { + if q.hash != nil { + _, exists := (*(q.hash))[elem] + if exists { + // duplicate element; ignoring + return false + } + } + limitReached := false + if q.count == len(q.buf) { + if (q.limit != Infinity) && (q.count >= q.limit) { + limitReached = true + } else { + q.resize() + } + } + priority := q.priorityFun(elem) + if limitReached && !priority && (q.pend == q.getIndex(q.tail-1)) { + // Not possible to add not priority element in queue full of priority elements + return false + } + if limitReached { + var deleteElem interface{} + if q.pend < 0 { + deleteElem = q.buf[q.head] + q.head = q.getIndex(q.head + 1) + } else { + ptail := q.getIndex(q.pend + 1) + if ptail == q.tail { + deleteElem = q.buf[q.pend] + q.tail = q.getIndex(q.tail - 1) + q.pend = q.getIndex(q.pend - 1) + } else { + deleteElem = q.buf[ptail] + if ptail > q.head { + copy(q.buf[q.head+1:ptail+1], q.buf[q.head:ptail]) + } else { + oldHead := q.buf[q.head] + if ptail > 0 { + copy(q.buf[1:ptail+1], q.buf[:ptail]) + } + lastIndex := len(q.buf) - 1 + q.buf[0] = q.buf[lastIndex] + if q.head < lastIndex { + copy(q.buf[q.head+1:], q.buf[q.head:lastIndex]) + } + q.buf[q.getIndex(q.head+1)] = oldHead + } + q.pend = q.getIndex(q.pend + 1) + q.head = q.getIndex(q.head + 1) + } + } + if q.hash != nil { + delete(*(q.hash), deleteElem) + } + } + if priority { + q.head = q.getIndex(q.head - 1) + q.buf[q.head] = elem + if q.pend < 0 { + q.pend = q.head + } + } else { + q.buf[q.tail] = elem + // bitwise modulus + q.tail = q.getIndex(q.tail + 1) + } + if !limitReached { + q.count++ + } + if q.hash != nil { + (*(q.hash))[elem] = true + } + return true +} + +// Peek returns the element at the head of the queue. This call panics +// if the queue is empty. +func (q *LimitedPriorityHashQueue) Peek() interface{} { + if q.count <= 0 { + panic("queue: Peek() called on empty queue") + } + return q.buf[q.head] +} + +// Get returns the element at index i in the queue. If the index is +// invalid, the call will panic. This method accepts both positive and +// negative index values. Index 0 refers to the first element, and +// index -1 refers to the last. +func (q *LimitedPriorityHashQueue) Get(i int) interface{} { + // If indexing backwards, convert to positive index. + if i < 0 { + i += q.count + } + if i < 0 || i >= q.count { + panic("queue: Get() called with index out of range") + } + // bitwise modulus + return q.buf[q.getIndex(q.head+i)] +} + +// Remove removes and returns the element from the front of the queue. If the +// queue is empty, the call will panic. +func (q *LimitedPriorityHashQueue) Remove() interface{} { + if q.count <= 0 { + panic("queue: Remove() called on empty queue") + } + ret := q.buf[q.head] + q.buf[q.head] = nil + if q.head == q.pend { + q.pend = -1 + } + q.head = q.getIndex(q.head + 1) + q.count-- + // Resize down if buffer 1/4 full. + if (len(q.buf) > minQueueLen) && ((q.count << 2) <= len(q.buf)) { + q.resize() + } + if q.hash != nil { + delete(*(q.hash), ret) + } + return ret +} From 1fa105ce6cdd21db9f1dcad0841c01e519111355 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Mon, 27 Sep 2021 16:53:24 +0300 Subject: [PATCH 002/198] Limited priority hash queue tests and related fixes --- packages/util/pipe/queue.go | 16 +- packages/util/pipe/queue_test.go | 1133 ++++++++++++++++++++++++++++++ 2 files changed, 1141 insertions(+), 8 deletions(-) create mode 100644 packages/util/pipe/queue_test.go diff --git a/packages/util/pipe/queue.go b/packages/util/pipe/queue.go index f04e8b8b82..35e334aa80 100644 --- a/packages/util/pipe/queue.go +++ b/packages/util/pipe/queue.go @@ -17,35 +17,35 @@ var _ Queue = &LimitedPriorityHashQueue{} const Infinity = 0 -func NewDefaultLimitedPriorityHashQueue() *LimitedPriorityHashQueue { +func NewDefaultLimitedPriorityHashQueue() Queue { return NewHashLimitedPriorityHashQueue(false) } -func NewPriorityLimitedPriorityHashQueue(fun func(interface{}) bool) *LimitedPriorityHashQueue { +func NewPriorityLimitedPriorityHashQueue(fun func(interface{}) bool) Queue { return NewPriorityHashLimitedPriorityHashQueue(fun, false) } -func NewLimitLimitedPriorityHashQueue(limit int) *LimitedPriorityHashQueue { +func NewLimitLimitedPriorityHashQueue(limit int) Queue { return NewLimitHashLimitedPriorityHashQueue(limit, false) } -func NewLimitPriorityLimitedPriorityHashQueue(fun func(interface{}) bool, limit int) *LimitedPriorityHashQueue { +func NewLimitPriorityLimitedPriorityHashQueue(fun func(interface{}) bool, limit int) Queue { return NewLimitedPriorityHashQueue(fun, limit, false) } -func NewHashLimitedPriorityHashQueue(hashNeeded bool) *LimitedPriorityHashQueue { +func NewHashLimitedPriorityHashQueue(hashNeeded bool) Queue { return NewLimitHashLimitedPriorityHashQueue(Infinity, hashNeeded) } -func NewPriorityHashLimitedPriorityHashQueue(fun func(interface{}) bool, hashNeeded bool) *LimitedPriorityHashQueue { +func NewPriorityHashLimitedPriorityHashQueue(fun func(interface{}) bool, hashNeeded bool) Queue { return NewLimitedPriorityHashQueue(fun, Infinity, hashNeeded) } -func NewLimitHashLimitedPriorityHashQueue(limit int, hashNeeded bool) *LimitedPriorityHashQueue { +func NewLimitHashLimitedPriorityHashQueue(limit int, hashNeeded bool) Queue { return NewLimitedPriorityHashQueue(func(interface{}) bool { return false }, limit, hashNeeded) } -func NewLimitedPriorityHashQueue(fun func(interface{}) bool, limit int, hashNeeded bool) *LimitedPriorityHashQueue { +func NewLimitedPriorityHashQueue(fun func(interface{}) bool, limit int, hashNeeded bool) Queue { var initBufSize int if (limit != Infinity) && (limit < minQueueLen) { initBufSize = limit diff --git a/packages/util/pipe/queue_test.go b/packages/util/pipe/queue_test.go new file mode 100644 index 0000000000..5931266f7c --- /dev/null +++ b/packages/util/pipe/queue_test.go @@ -0,0 +1,1133 @@ +package pipe + +import ( + "testing" +) + +func testQueueBasicAddLengthPeekRemove(q Queue, elementsToAdd int, add func(index int) int, addResult func(index int) bool, elementsToRemove int, result func(index int) int, t *testing.T) { + for i := 0; i < elementsToAdd; i++ { + value := add(i) + expected := addResult(i) + obtained := q.Add(value) + if obtained != expected { + t.Errorf("add result of element %d value %d expected %v obtained %v", i, value, expected, obtained) + } + } + obtained := q.Length() + if obtained != elementsToRemove { + t.Errorf("expected full queue length %d, obtained %d", elementsToAdd, obtained) + } + for i := 0; i < elementsToRemove; i++ { + expected := result(i) + obtained = q.Peek().(int) + if obtained != expected { + t.Errorf("peek %d obtained %d instead of %d", i, obtained, expected) + } + obtained = q.Remove().(int) + if obtained != expected { + t.Errorf("remove %d obtained %d instead of %d", i, obtained, expected) + } + } + obtained = q.Length() + if obtained != 0 { + t.Errorf("expected empty queue length 0, obtained %d", obtained) + } +} + +//-- + +func TestDefaultLimitedPriorityHashQueueSimple(t *testing.T) { + testDefaultQueueSimple(NewDefaultLimitedPriorityHashQueue(), t) +} + +func TestPriorityLimitedPriorityHashQueueSimple(t *testing.T) { + testPriorityQueueSimple(NewPriorityLimitedPriorityHashQueue, t) +} + +func TestLimitLimitedPriorityHashQueueNoLimitSimple(t *testing.T) { + testLimitedQueueNoLimitSimple(NewLimitLimitedPriorityHashQueue, t) +} + +func TestLimitLimitedPriorityHashQueueSimple(t *testing.T) { + testLimitedQueueSimple(NewLimitLimitedPriorityHashQueue, t) +} + +func TestLimitPriorityLimitedPriorityHashQueueNoLimitSimple(t *testing.T) { + testLimitedPriorityQueueNoLimitSimple(NewLimitPriorityLimitedPriorityHashQueue, t) +} + +func TestLimitPriorityLimitedPriorityHashQueueSimple(t *testing.T) { + testLimitedPriorityQueueSimple(NewLimitPriorityLimitedPriorityHashQueue, t) +} + +func TestHashLimitedPriorityHashQueueSimple(t *testing.T) { + testDefaultQueueSimple(NewHashLimitedPriorityHashQueue(true), t) +} + +func TestPriorityHashLimitedPriorityHashQueueSimple(t *testing.T) { + testPriorityQueueSimple(newPriorityHashLimitedPriorityHashQueue, t) +} + +func TestLimitHashLimitedPriorityHashQueueNoLimitSimple(t *testing.T) { + testLimitedQueueNoLimitSimple(newLimitHashLimitedPriorityHashQueue, t) +} + +func TestLimitHashLimitedPriorityHashQueueSimple(t *testing.T) { + testLimitedQueueSimple(newLimitHashLimitedPriorityHashQueue, t) +} + +func TestLimitedPriorityHashQueueNoLimitSimple(t *testing.T) { + testLimitedPriorityQueueNoLimitSimple(newLimitPriorityHashLimitedPriorityHashQueue, t) +} + +func TestLimitedPriorityHashQueueSimple(t *testing.T) { + testLimitedPriorityQueueSimple(newLimitPriorityHashLimitedPriorityHashQueue, t) +} + +func testLimitedPriorityQueueNoLimitSimple(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { + testPriorityQueueSimple(func(fun func(i interface{}) bool) Queue { return makeLimitedPriorityQueueFun(fun, 15) }, t) +} + +func testLimitedPriorityQueueSimple(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { + resultArray := []int{9, 6, 3, 0, 4, 5, 7, 8} + limit := len(resultArray) + q := makeLimitedPriorityQueueFun(func(i interface{}) bool { + return i.(int)%3 == 0 + }, limit) + result := func(index int) int { + return resultArray[index] + } + testQueueSimple(q, 10, limit, result, t) +} + +func testLimitedQueueNoLimitSimple(makeLimitedQueueFun func(limit int) Queue, t *testing.T) { + testDefaultQueueSimple(makeLimitedQueueFun(15), t) +} + +func testLimitedQueueSimple(makeLimitedQueueFun func(limit int) Queue, t *testing.T) { + limit := 8 + elementsToAdd := 10 + indexDiff := elementsToAdd - limit + q := makeLimitedQueueFun(limit) + result := func(index int) int { + return index + indexDiff + } + testQueueSimple(q, elementsToAdd, limit, result, t) +} + +func testPriorityQueueSimple(makePriorityQueueFun func(func(i interface{}) bool) Queue, t *testing.T) { + q := makePriorityQueueFun(func(i interface{}) bool { + return i.(int)%3 == 0 + }) + resultArray := []int{9, 6, 3, 0, 1, 2, 4, 5, 7, 8} + result := func(index int) int { + return resultArray[index] + } + elementsToAdd := len(resultArray) + testQueueSimple(q, elementsToAdd, elementsToAdd, result, t) +} + +func testDefaultQueueSimple(q Queue, t *testing.T) { + elementsToAdd := 10 + testQueueSimple(q, elementsToAdd, elementsToAdd, identityFun, t) +} + +func testQueueSimple(q Queue, elementsToAdd int, elementsToRemove int, result func(index int) int, t *testing.T) { + testQueueBasicAddLengthPeekRemove(q, elementsToAdd, identityFun, alwaysTrueFun, elementsToRemove, result, t) +} + +//-- + +func TestDefaultLimitedPriorityHashQueueTwice(t *testing.T) { + testDefaultQueueTwice(NewDefaultLimitedPriorityHashQueue(), t) +} + +func TestPriorityLimitedPriorityHashQueueTwice(t *testing.T) { + testPriorityQueueTwice(NewPriorityLimitedPriorityHashQueue, t) +} + +func TestLimitLimitedPriorityHashQueueNoLimitTwice(t *testing.T) { + testDefaultQueueTwice(NewLimitLimitedPriorityHashQueue(150), t) +} + +func TestLimitLimitedPriorityHashQueueTwice(t *testing.T) { + limit := 80 + elementsToAddSingle := 50 + indexDiff := 2*elementsToAddSingle - limit + q := NewLimitLimitedPriorityHashQueue(limit) + resultFun := func(index int) int { + return (index + indexDiff) % elementsToAddSingle + } + testQueueTwice(q, elementsToAddSingle, alwaysTrueFun, limit, resultFun, t) +} + +func TestLimitPriorityLimitedPriorityHashQueueNoLimitTwice(t *testing.T) { + testPriorityQueueTwice(func(fun func(i interface{}) bool) Queue { return NewLimitPriorityLimitedPriorityHashQueue(fun, 150) }, t) +} + +func TestLimitPriorityLimitedPriorityHashQueueTwice(t *testing.T) { + limit := 80 + elementsToAddSingle := 50 + q := NewLimitPriorityLimitedPriorityHashQueue(func(i interface{}) bool { + return i.(int)%3 == 0 + }, limit) + resultFun := func(index int) int { + if index <= 16 { + return 48 - 3*index + } else if index <= 33 { + return 99 - 3*index + } else if index <= 46 { + if index%2 == 0 { + return 3*index/2 - 20 + } else { + return (3*index - 41) / 2 + } + } else { + if index%2 == 1 { + return (3*index - 139) / 2 + } else { + return 3*index/2 - 70 + } + } + } + testQueueTwice(q, elementsToAddSingle, alwaysTrueFun, limit, resultFun, t) +} + +func TestHashLimitedPriorityHashQueueTwice(t *testing.T) { + testHashQueueTwice(NewHashLimitedPriorityHashQueue, t) +} + +func TestPriorityHashLimitedPriorityHashQueueTwice(t *testing.T) { + testPriorityHashQueueTwice(NewPriorityHashLimitedPriorityHashQueue, t) +} + +func TestLimitHashLimitedPriorityHashQueueNoLimitTwice(t *testing.T) { + testHashQueueTwice(func(hashNeeded bool) Queue { + return NewLimitHashLimitedPriorityHashQueue(80, hashNeeded) + }, t) +} + +func TestLimitHashLimitedPriorityHashQueueTwice(t *testing.T) { + limit := 30 + elementsToAddSingle := 50 + indexDiff := elementsToAddSingle - limit + resultFun := func(index int) int { return index + indexDiff } + q := NewLimitHashLimitedPriorityHashQueue(limit, true) + testQueueTwice(q, elementsToAddSingle, alwaysTrueFun, limit, resultFun, t) +} + +func TestLimitedPriorityHashQueueNoLimitTwice(t *testing.T) { + testPriorityHashQueueTwice(func(fun func(i interface{}) bool, hashNeeded bool) Queue { + return NewLimitedPriorityHashQueue(fun, 80, hashNeeded) + }, t) +} + +func TestLimitedPriorityHashQueueTwice(t *testing.T) { + limit := 30 + elementsToAddSingle := 50 + q := NewLimitedPriorityHashQueue(func(i interface{}) bool { + return i.(int)%3 == 0 + }, limit, true) + addResultFun := func(index int) bool { return (index < elementsToAddSingle) || ((index-elementsToAddSingle)%3 != 0) } + resultFun := func(index int) int { + if index <= 16 { + return 48 - 3*index + } else { + if index%2 == 1 { + return (3*index + 11) / 2 + } else { + return 3*index/2 + 5 + } + } + } + testQueueTwice(q, elementsToAddSingle, addResultFun, limit, resultFun, t) +} + +func testHashQueueTwice(makeHashQueueFun func(hashNeeded bool) Queue, t *testing.T) { + q := makeHashQueueFun(true) + elementsToAddSingle := 50 + addResultFun := func(index int) bool { return index < elementsToAddSingle } + testQueueTwice(q, elementsToAddSingle, addResultFun, elementsToAddSingle, identityFun, t) +} + +func testPriorityHashQueueTwice(makePriorityHashQueueFun func(fun func(i interface{}) bool, hashNeeded bool) Queue, t *testing.T) { + q := makePriorityHashQueueFun(func(i interface{}) bool { + return i.(int)%3 == 0 + }, true) + elementsToAddSingle := 50 + addResultFun := func(index int) bool { return index < elementsToAddSingle } + resultFun := func(index int) int { + if index <= 16 { + return 48 - 3*index + } else { + if index%2 == 1 { + return (3*index - 49) / 2 + } else { + return 3*index/2 - 25 + } + } + } + testQueueTwice(q, elementsToAddSingle, addResultFun, elementsToAddSingle, resultFun, t) +} + +func testPriorityQueueTwice(makePriorityQueueFun func(func(i interface{}) bool) Queue, t *testing.T) { + q := makePriorityQueueFun(func(i interface{}) bool { + return i.(int)%3 == 0 + }) + elementsToAddSingle := 50 + resultFun := func(index int) int { + if index <= 16 { + return 48 - 3*index + } else if index <= 33 { + return 99 - 3*index + } else if index <= 66 { + if index%2 == 0 { + return 3*index/2 - 50 + } else { + return (3*index - 101) / 2 + } + } else { + if index%2 == 1 { + return (3*index - 199) / 2 + } else { + return 3*index/2 - 100 + } + } + } + testQueueTwice(q, elementsToAddSingle, alwaysTrueFun, 2*elementsToAddSingle, resultFun, t) +} + +func testDefaultQueueTwice(q Queue, t *testing.T) { + elementsToAddSingle := 50 + resultFun := func(index int) int { return index % elementsToAddSingle } + testQueueTwice(q, elementsToAddSingle, alwaysTrueFun, 2*elementsToAddSingle, resultFun, t) +} + +func testQueueTwice(q Queue, elementsToAddSingle int, addResult func(index int) bool, elementsToRemove int, result func(index int) int, t *testing.T) { + addFun := func(index int) int { + return index % elementsToAddSingle + } + testQueueBasicAddLengthPeekRemove(q, 2*elementsToAddSingle, addFun, addResult, elementsToRemove, result, t) +} + +//-- + +func TestLimitPriorityLimitedPriorityHashQueueOverflow(t *testing.T) { + limit := 30 + elementsToAddSingle := 50 + cutOff := elementsToAddSingle / 2 + q := NewLimitPriorityLimitedPriorityHashQueue(func(i interface{}) bool { + return i.(int) < cutOff + }, limit) + addResultFun := func(index int) bool { + return index < elementsToAddSingle+cutOff + } + resultFun := func(index int) int { + if index < 25 { + return 24 - index + } else { + return 49 - index + } + } + testQueueTwice(q, elementsToAddSingle, addResultFun, limit, resultFun, t) +} + +func TestLimitedPriorityHashQueueOverflow(t *testing.T) { + limit := 30 + elementsToAddSingle := 50 + cutOffLow := 20 + cutOffHigh := 40 + q := NewLimitedPriorityHashQueue(func(i interface{}) bool { + value := i.(int) + return value < cutOffLow || cutOffHigh <= value + }, limit, true) + addResultFun := func(index int) bool { + return index < elementsToAddSingle + } + resultFun := func(index int) int { + if index < 10 { + return 49 - index + } else { + return 29 - index + } + } + testQueueTwice(q, elementsToAddSingle, addResultFun, limit, resultFun, t) +} + +//-- + +func TestLimitedPriorityHashQueueDuplicates(t *testing.T) { + limit := 80 + elementsToAddFirstIteration := 50 + q := NewLimitedPriorityHashQueue(func(i interface{}) bool { + return i.(int)%3 == 0 + }, limit, true) + addFun := func(index int) int { + if index < elementsToAddFirstIteration { + return 2 * index + } else { + return index - elementsToAddFirstIteration + } + } + addResultFun := func(index int) bool { + return (index < elementsToAddFirstIteration) || ((index-elementsToAddFirstIteration)%2 == 1) + } + resultFun := func(index int) int { + if index <= 16 { + return 99 - 6*index + } else if index <= 33 { + return 198 - 6*index + } else if index <= 46 { + if index%2 == 0 { + return 3*index - 40 + } else { + return 3*index - 41 + } + } else { + if index%2 == 0 { + return 3*index - 139 + } else { + return 3*index - 140 + } + } + } + testQueueBasicAddLengthPeekRemove(q, 3*elementsToAddFirstIteration, addFun, addResultFun, limit, resultFun, t) +} + +//-- + +func TestDefaultLimitedPriorityHashQueueAddRemove(t *testing.T) { + testDefaultQueueAddRemove(NewDefaultLimitedPriorityHashQueue(), t) +} + +func TestPriorityLimitedPriorityHashQueueAddRemove(t *testing.T) { + testPriorityQueueAddRemove(NewPriorityLimitedPriorityHashQueue, t) +} + +func TestLimitLimitedPriorityHashQueueNoLimitAddRemove(t *testing.T) { + testLimitedQueueNoLimitAddRemove(NewLimitLimitedPriorityHashQueue, t) +} + +func TestLimitLimitedPriorityHashQueueAddRemove(t *testing.T) { + testLimitedQueueAddRemove(NewLimitLimitedPriorityHashQueue, t) +} + +func TestLimitPriorityLimitedPriorityHashQueueNoLimitAddRemove(t *testing.T) { + testLimitedPriorityQueueNoLimitAddRemove(NewLimitPriorityLimitedPriorityHashQueue, t) +} + +func TestLimitPriorityLimitedPriorityHashQueueAddRemove(t *testing.T) { + testLimitedPriorityQueueAddRemove(NewLimitPriorityLimitedPriorityHashQueue, t) +} + +func TestHashLimitedPriorityHashQueueAddRemove(t *testing.T) { + testDefaultQueueAddRemove(NewHashLimitedPriorityHashQueue(true), t) +} + +func TestPriorityHashLimitedPriorityHashQueueAddRemove(t *testing.T) { + testPriorityQueueAddRemove(newPriorityHashLimitedPriorityHashQueue, t) +} + +func TestLimitHashLimitedPriorityHashQueueNoLimitAddRemove(t *testing.T) { + testLimitedQueueNoLimitAddRemove(newLimitHashLimitedPriorityHashQueue, t) +} + +func TestLimitHashLimitedPriorityHashQueueAddRemove(t *testing.T) { + testLimitedQueueAddRemove(newLimitHashLimitedPriorityHashQueue, t) +} + +func TestLimitedPriorityHashQueueNoLimitAddRemove(t *testing.T) { + testLimitedPriorityQueueNoLimitAddRemove(newLimitPriorityHashLimitedPriorityHashQueue, t) +} + +func TestLimitedPriorityHashQueueAddRemove(t *testing.T) { + testLimitedPriorityQueueAddRemove(newLimitPriorityHashLimitedPriorityHashQueue, t) +} + +func testLimitedPriorityQueueNoLimitAddRemove(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { + testPriorityQueueAddRemove(func(fun func(i interface{}) bool) Queue { return makeLimitedPriorityQueueFun(fun, 150) }, t) +} + +func testLimitedPriorityQueueAddRemove(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { + limit := 80 + q := makeLimitedPriorityQueueFun(func(i interface{}) bool { + return i.(int)%3 == 0 + }, limit) + result := func(index int) int { + if index%2 == 0 { + return 3*index/2 + 31 + } else { + return (3*index + 61) / 2 + } + } + testQueueAddRemove(q, 100, 50, limit, result, t) +} + +func testLimitedQueueNoLimitAddRemove(makeLimitedQueueFun func(limit int) Queue, t *testing.T) { + testDefaultQueueAddRemove(makeLimitedQueueFun(150), t) +} + +func testLimitedQueueAddRemove(makeLimitedQueueFun func(limit int) Queue, t *testing.T) { + limit := 80 + elementsToAdd := 100 + elementsToRemoveAdd := 50 + indexDiff := elementsToAdd - limit + elementsToRemoveAdd + q := makeLimitedQueueFun(limit) + result := func(index int) int { + return index + indexDiff + } + testQueueAddRemove(q, elementsToAdd, elementsToRemoveAdd, limit, result, t) +} + +func testPriorityQueueAddRemove(makePriorityQueueFun func(func(i interface{}) bool) Queue, t *testing.T) { + q := makePriorityQueueFun(func(i interface{}) bool { + return i.(int)%3 == 0 + }) + result := func(index int) int { + if index%2 == 0 { + return 3*index/2 + 1 + } else { + return (3*index + 1) / 2 + } + } + elementsToAdd := 100 + testQueueAddRemove(q, elementsToAdd, 50, elementsToAdd, result, t) +} + +func testDefaultQueueAddRemove(q Queue, t *testing.T) { + elementsToAdd := 100 + elementsToRemoveAdd := 50 + testQueueAddRemove(q, elementsToAdd, elementsToRemoveAdd, elementsToAdd, func(index int) int { return index + elementsToRemoveAdd }, t) +} + +func testQueueAddRemove(q Queue, elementsToAdd int, elementsToRemoveAdd int, elementsToRemove int, result func(index int) int, t *testing.T) { + for i := 0; i < elementsToAdd; i++ { + if !q.Add(i) { + t.Errorf("failed to add element %d", i) + } + } + for i := 0; i < elementsToRemoveAdd; i++ { + q.Remove() + add := elementsToAdd + i + if !q.Add(add) { + t.Errorf("failed to add element %d", add) + } + } + obtained := q.Length() + if obtained != elementsToRemove { + t.Errorf("expected full queue length %d, obtained %d", elementsToAdd, obtained) + } + + for i := 0; i < elementsToRemove; i++ { + expected := result(i) + obtained = q.Peek().(int) + if obtained != expected { + t.Errorf("peek %d obtained %d instead of %d", i, obtained, expected) + } + obtained = q.Remove().(int) + if obtained != expected { + t.Errorf("remove %d obtained %d instead of %d", i, obtained, expected) + } + } + obtained = q.Length() + if obtained != 0 { + t.Errorf("expected empty queue length 0, obtained %d", obtained) + } +} + +//-- + +func TesDefaultLimitedPriorityHashQueueLength(t *testing.T) { + testDefaultQueueLength(NewDefaultLimitedPriorityHashQueue(), t) +} + +func TestPriorityLimitedPriorityHashQueueLength(t *testing.T) { + testPriorityQueueLength(NewPriorityLimitedPriorityHashQueue, t) +} + +func TestLimitLimitedPriorityHashQueueNoLimitLength(t *testing.T) { + testLimitedQueueNoLimitLength(NewLimitLimitedPriorityHashQueue, t) +} + +func TestLimitLimitedPriorityHashQueueLength(t *testing.T) { + testLimitedQueueLength(NewLimitLimitedPriorityHashQueue, t) +} + +func TestLimitPriorityLimitedPriorityHashQueueNoLimitLength(t *testing.T) { + testLimitedPriorityQueueNoLimitLength(NewLimitPriorityLimitedPriorityHashQueue, t) +} + +func TestLimitPriorityLimitedPriorityHashQueueLength(t *testing.T) { + testLimitedPriorityQueueLength(NewLimitPriorityLimitedPriorityHashQueue, t) +} + +func TesHashLimitedPriorityHashQueueLength(t *testing.T) { + testDefaultQueueLength(NewHashLimitedPriorityHashQueue(true), t) +} + +func TestPriorityHashLimitedPriorityHashQueueLength(t *testing.T) { + testPriorityQueueLength(newPriorityHashLimitedPriorityHashQueue, t) +} + +func TestLimitHashLimitedPriorityHashQueueNoLimitLength(t *testing.T) { + testLimitedQueueNoLimitLength(newLimitHashLimitedPriorityHashQueue, t) +} + +func TestLimitHashLimitedPriorityHashQueueLength(t *testing.T) { + testLimitedQueueLength(newLimitHashLimitedPriorityHashQueue, t) +} + +func TestLimitedPriorityHashQueueNoLimitLength(t *testing.T) { + testLimitedPriorityQueueNoLimitLength(newLimitPriorityHashLimitedPriorityHashQueue, t) +} + +func TestLimitedPriorityHashQueueLength(t *testing.T) { + testLimitedPriorityQueueLength(newLimitPriorityHashLimitedPriorityHashQueue, t) +} + +func testLimitedPriorityQueueNoLimitLength(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { + testPriorityQueueLength(func(fun func(i interface{}) bool) Queue { return makeLimitedPriorityQueueFun(fun, 1500) }, t) +} + +func testLimitedPriorityQueueLength(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { + limit := 800 + q := makeLimitedPriorityQueueFun(func(i interface{}) bool { + return i.(int)%3 == 0 + }, limit) + testQueueLength(q, 1000, limit, t) +} + +func testLimitedQueueNoLimitLength(makeLimitedQueueFun func(limit int) Queue, t *testing.T) { + testDefaultQueueLength(makeLimitedQueueFun(1500), t) +} + +func testLimitedQueueLength(makeLimitedQueueFun func(limit int) Queue, t *testing.T) { + limit := 800 + q := makeLimitedQueueFun(limit) + testQueueLength(q, 1000, limit, t) +} + +func testPriorityQueueLength(makePriorityQueueFun func(func(i interface{}) bool) Queue, t *testing.T) { + q := makePriorityQueueFun(func(i interface{}) bool { + return i.(int)%3 == 0 + }) + elementsToAdd := 1000 + testQueueLength(q, elementsToAdd, elementsToAdd, t) +} + +func testDefaultQueueLength(q Queue, t *testing.T) { + elementsToAdd := 1000 + testQueueLength(q, elementsToAdd, elementsToAdd, t) +} + +func testQueueLength(q Queue, elementsToRemoveAdd int, elementsToRemove int, t *testing.T) { + obtained := q.Length() + if obtained != 0 { + t.Errorf("empty queue length is %d", obtained) + } + + for i := 0; i < elementsToRemoveAdd; i++ { + if !q.Add(i) { + t.Errorf("failed to add element %d", i) + } + var expected int + if i >= elementsToRemove { + expected = elementsToRemove + } else { + expected = i + 1 + } + obtained := q.Length() + if obtained != expected { + t.Errorf("adding: expected queue length %d, obtained %d", expected, obtained) + } + } + for i := 0; i < elementsToRemove; i++ { + q.Remove() + expected := elementsToRemove - i - 1 + obtained := q.Length() + if obtained != expected { + t.Errorf("removing: expected queue length %d, obtained %d", expected, obtained) + } + } +} + +//-- + +func TestDefaultLimitedPriorityHashQueueGet(t *testing.T) { + testDefaultQueueGet(NewDefaultLimitedPriorityHashQueue(), t) +} + +func TestPriorityLimitedPriorityHashQueueGet(t *testing.T) { + testPriorityQueueGet(NewPriorityLimitedPriorityHashQueue, t) +} + +func TestLimitLimitedPriorityHashQueueNoLimitGet(t *testing.T) { + testLimitedQueueNoLimitGet(NewLimitLimitedPriorityHashQueue, t) +} + +func TestLimitLimitedPriorityHashQueueGet(t *testing.T) { + testLimitedQueueGet(NewLimitLimitedPriorityHashQueue, t) +} + +func TestLimitPriorityLimitedPriorityHashQueueNoLimitGet(t *testing.T) { + testLimitedPriorityQueueNoLimitGet(NewLimitPriorityLimitedPriorityHashQueue, t) +} + +func TestLimitPriorityLimitedPriorityHashQueueGet(t *testing.T) { + testLimitedPriorityQueueGet(NewLimitPriorityLimitedPriorityHashQueue, t) +} + +func TestHashLimitedPriorityHashQueueGet(t *testing.T) { + testDefaultQueueGet(NewHashLimitedPriorityHashQueue(true), t) +} + +func TestPriorityHashLimitedPriorityHashQueueGet(t *testing.T) { + testPriorityQueueGet(newPriorityHashLimitedPriorityHashQueue, t) +} + +func TestLimitHashLimitedPriorityHashQueueNoLimitGet(t *testing.T) { + testLimitedQueueNoLimitGet(newLimitHashLimitedPriorityHashQueue, t) +} + +func TestLimitHashLimitedPriorityHashQueueGet(t *testing.T) { + testLimitedQueueGet(newLimitHashLimitedPriorityHashQueue, t) +} + +func TestLimitedPriorityHashQueueNoLimitGet(t *testing.T) { + testLimitedPriorityQueueNoLimitGet(newLimitPriorityHashLimitedPriorityHashQueue, t) +} + +func TestLimitedPriorityHashQueueGet(t *testing.T) { + testLimitedPriorityQueueGet(newLimitPriorityHashLimitedPriorityHashQueue, t) +} + +func testLimitedPriorityQueueNoLimitGet(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { + testPriorityQueueGet(func(fun func(i interface{}) bool) Queue { return makeLimitedPriorityQueueFun(fun, 1500) }, t) +} + +func testLimitedPriorityQueueGet(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { + limit := 800 + q := makeLimitedPriorityQueueFun(func(i interface{}) bool { + return i.(int)%2 == 0 + }, limit) + result := func(iteration int, index int) int { + if index <= iteration/2 { + return iteration - iteration%2 - 2*index + } else { + if iteration < limit { + return -iteration + iteration%2 + 2*index - 1 + } else { + return iteration + iteration%2 + 2*index - 2*limit + 1 + } + } + } + testQueueGet(q, 1000, result, t) +} + +func testLimitedQueueNoLimitGet(makeLimitedQueueFun func(limit int) Queue, t *testing.T) { + testDefaultQueueGet(makeLimitedQueueFun(1500), t) +} + +func testLimitedQueueGet(makeLimitedQueueFun func(limit int) Queue, t *testing.T) { + limit := 800 + q := makeLimitedQueueFun(limit) + result := func(iteration int, index int) int { + if iteration < limit { + return index + } else { + return index + iteration - limit + 1 + } + } + testQueueGet(q, 1000, result, t) +} + +func testPriorityQueueGet(makePriorityQueueFun func(func(i interface{}) bool) Queue, t *testing.T) { + q := makePriorityQueueFun(func(i interface{}) bool { + return i.(int)%2 == 0 + }) + result := func(iteration int, index int) int { + if index <= iteration/2 { + return iteration - iteration%2 - 2*index + } else { + return -iteration + iteration%2 + 2*index - 1 + } + } + testQueueGet(q, 1000, result, t) +} + +func testDefaultQueueGet(q Queue, t *testing.T) { + testQueueGet(q, 1000, func(iteration int, index int) int { return index }, t) +} + +func testQueueGet(q Queue, elementsToAdd int, result func(iteration int, index int) int, t *testing.T) { + if testing.Short() { + t.Skip("skipping Get test in short mode") + } + for i := 0; i < elementsToAdd; i++ { + if !q.Add(i) { + t.Errorf("failed to add element %d", i) + } + for j := 0; j < q.Length(); j++ { + expected := result(i, j) + obtained := q.Get(j).(int) + if obtained != expected { + t.Errorf("iteration %d index %d contains %d instead of %d", i, j, obtained, expected) + } + } + } +} + +//-- + +func TestDefaultLimitedPriorityHashQueueGetNegative(t *testing.T) { + testDefaultQueueGetNegative(NewDefaultLimitedPriorityHashQueue(), t) +} + +func TestPriorityLimitedPriorityHashQueueGetNegative(t *testing.T) { + testPriorityQueueGetNegative(NewPriorityLimitedPriorityHashQueue, t) +} + +func TestLimitLimitedPriorityHashQueueNoLimitGetNegative(t *testing.T) { + testLimitedQueueNoLimitGetNegative(NewLimitLimitedPriorityHashQueue, t) +} + +func TestLimitLimitedPriorityHashQueueGetNegative(t *testing.T) { + testLimitedQueueGetNegative(NewLimitLimitedPriorityHashQueue, t) +} + +func TestLimitPriorityLimitedPriorityHashQueueNoLimitGetNegative(t *testing.T) { + testLimitedPriorityQueueNoLimitGetNegative(NewLimitPriorityLimitedPriorityHashQueue, t) +} + +func TestLimitPriorityLimitedPriorityHashQueueGetNegative(t *testing.T) { + testLimitedPriorityQueueGetNegative(NewLimitPriorityLimitedPriorityHashQueue, t) +} + +func TestHashLimitedPriorityHashQueueGetNegative(t *testing.T) { + testDefaultQueueGetNegative(NewHashLimitedPriorityHashQueue(true), t) +} + +func TestPriorityHashLimitedPriorityHashQueueGetNegative(t *testing.T) { + testPriorityQueueGetNegative(newPriorityHashLimitedPriorityHashQueue, t) +} + +func TestLimitHashLimitedPriorityHashQueueNoLimitGetNegative(t *testing.T) { + testLimitedQueueNoLimitGetNegative(newLimitHashLimitedPriorityHashQueue, t) +} + +func TestLimitHashLimitedPriorityHashQueueGetNegative(t *testing.T) { + testLimitedQueueGetNegative(newLimitHashLimitedPriorityHashQueue, t) +} + +func TestLimitedPriorityHashQueueNoLimitGetNegative(t *testing.T) { + testLimitedPriorityQueueNoLimitGetNegative(newLimitPriorityHashLimitedPriorityHashQueue, t) +} + +func TestLimitedPriorityHashQueueGetNegative(t *testing.T) { + testLimitedPriorityQueueGetNegative(newLimitPriorityHashLimitedPriorityHashQueue, t) +} + +func testLimitedPriorityQueueNoLimitGetNegative(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { + testPriorityQueueGetNegative(func(fun func(i interface{}) bool) Queue { return makeLimitedPriorityQueueFun(fun, 1500) }, t) +} + +func testLimitedPriorityQueueGetNegative(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { + limit := 800 + q := makeLimitedPriorityQueueFun(func(i interface{}) bool { + return i.(int)%2 == 0 + }, limit) + result := func(iteration int, index int) int { + if iteration < limit { + if index >= -(iteration+iteration%2)/2 { + return iteration + iteration%2 + 2*index + 1 + } else { + return -iteration - iteration%2 - 2*index - 2 + } + } else { + if index <= (iteration-iteration%2)/2-limit { + return iteration - iteration%2 - 2*index - 2*limit + } else { + return iteration + iteration%2 + 2*index + 1 + } + } + } + testQueueGetNegative(q, 1000, result, t) +} + +func testLimitedQueueNoLimitGetNegative(makeLimitedQueueFun func(limit int) Queue, t *testing.T) { + testDefaultQueueGetNegative(makeLimitedQueueFun(1500), t) +} + +func testLimitedQueueGetNegative(makeLimitedQueueFun func(limit int) Queue, t *testing.T) { + testDefaultQueueGetNegative(makeLimitedQueueFun(800), t) +} + +func testPriorityQueueGetNegative(makePriorityQueueFun func(func(i interface{}) bool) Queue, t *testing.T) { + q := makePriorityQueueFun(func(i interface{}) bool { + return i.(int)%2 == 0 + }) + result := func(iteration int, index int) int { + if index >= -(iteration+iteration%2)/2 { + return iteration + iteration%2 + 2*index + 1 + } else { + return -iteration - iteration%2 - 2*index - 2 + } + } + testQueueGetNegative(q, 1000, result, t) +} + +func testDefaultQueueGetNegative(q Queue, t *testing.T) { + testQueueGetNegative(q, 1000, func(iteration int, index int) int { return iteration + index + 1 }, t) +} + +func testQueueGetNegative(q Queue, elementsToAdd int, result func(iteration int, index int) int, t *testing.T) { + if testing.Short() { + t.Skip("skipping GetNegative test in short mode") + } + for i := 0; i < elementsToAdd; i++ { + if !q.Add(i) { + t.Errorf("failed to add element %d", i) + } + for j := -1; j >= -q.Length(); j-- { + expected := result(i, j) + obtained := q.Get(j).(int) + if obtained != expected { + t.Errorf("iteration %d index %d contains %d instead of %d", i, j, obtained, expected) + } + } + } +} + +//-- + +func TestDefaultLimitedPriorityHashQueueGetOutOfRangePanics(t *testing.T) { + testQueueGetOutOfRangePanics(NewDefaultLimitedPriorityHashQueue(), t) +} + +func TestPriorityLimitedPriorityHashQueueGetOutOfRangePanics(t *testing.T) { + testPriorityQueueGetOutOfRangePanics(NewPriorityLimitedPriorityHashQueue, t) +} + +func TestLimitLimitedPriorityHashQueueGetOutOfRangePanics(t *testing.T) { + testLimitedQueueGetOutOfRangePanics(NewLimitLimitedPriorityHashQueue, t) +} + +func TestLimitPriorityLimitedPriorityHashQueueGetOutOfRangePanics(t *testing.T) { + testLimitedPriorityQueueGetOutOfRangePanics(NewLimitPriorityLimitedPriorityHashQueue, t) +} + +func TestHashLimitedPriorityHashQueueGetOutOfRangePanics(t *testing.T) { + testQueueGetOutOfRangePanics(NewHashLimitedPriorityHashQueue(true), t) +} + +func TestPriorityHashLimitedPriorityHashQueueGetOutOfRangePanics(t *testing.T) { + testPriorityQueueGetOutOfRangePanics(newPriorityHashLimitedPriorityHashQueue, t) +} + +func TestLimitHashLimitedPriorityHashQueueGetOutOfRangePanics(t *testing.T) { + testLimitedQueueGetOutOfRangePanics(newLimitHashLimitedPriorityHashQueue, t) +} + +func TestLimitedPriorityHashQueueGetOutOfRangePanics(t *testing.T) { + testLimitedPriorityQueueGetOutOfRangePanics(newLimitPriorityHashLimitedPriorityHashQueue, t) +} + +func testLimitedPriorityQueueGetOutOfRangePanics(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { + q := makeLimitedPriorityQueueFun(func(i interface{}) bool { + return i.(int)%2 == 0 + }, 800) + testQueueGetOutOfRangePanics(q, t) +} + +func testLimitedQueueGetOutOfRangePanics(makeLimitedQueueFun func(limit int) Queue, t *testing.T) { + testQueueGetOutOfRangePanics(makeLimitedQueueFun(800), t) +} + +func testPriorityQueueGetOutOfRangePanics(makePriorityQueueFun func(func(i interface{}) bool) Queue, t *testing.T) { + q := makePriorityQueueFun(func(i interface{}) bool { + return i.(int)%2 == 0 + }) + testQueueGetOutOfRangePanics(q, t) +} + +func testQueueGetOutOfRangePanics(q Queue, t *testing.T) { + for i := 0; i < 3; i++ { + if !q.Add(i) { + t.Errorf("failed to add element %d", i) + } + } + + assertPanics(t, "should panic when negative index", func() { + q.Get(-4) + }) + + assertPanics(t, "should panic when index greater than length", func() { + q.Get(4) + }) +} + +//-- + +func TestDefaultLimitedPriorityHashQueuePeekOutOfRangePanics(t *testing.T) { + testQueuePeekOutOfRangePanics(NewDefaultLimitedPriorityHashQueue(), t) +} + +func TestPriorityLimitedPriorityHashQueuePeekOutOfRangePanics(t *testing.T) { + testPriorityQueuePeekOutOfRangePanics(NewPriorityLimitedPriorityHashQueue, t) +} + +func TestLimitLimitedPriorityHashQueuePeekOutOfRangePanics(t *testing.T) { + testLimitedQueuePeekOutOfRangePanics(NewLimitLimitedPriorityHashQueue, t) +} + +func TestLimitPriorityLimitedPriorityHashQueuePeekOutOfRangePanics(t *testing.T) { + testLimitedPriorityQueuePeekOutOfRangePanics(NewLimitPriorityLimitedPriorityHashQueue, t) +} + +func TestHashtLimitedPriorityHashQueuePeekOutOfRangePanics(t *testing.T) { + testQueuePeekOutOfRangePanics(NewHashLimitedPriorityHashQueue(true), t) +} + +func TestPriorityHashLimitedPriorityHashQueuePeekOutOfRangePanics(t *testing.T) { + testPriorityQueuePeekOutOfRangePanics(newPriorityHashLimitedPriorityHashQueue, t) +} + +func TestLimitHashLimitedPriorityHashQueuePeekOutOfRangePanics(t *testing.T) { + testLimitedQueuePeekOutOfRangePanics(newLimitHashLimitedPriorityHashQueue, t) +} + +func TestLimitedPriorityHashQueuePeekOutOfRangePanics(t *testing.T) { + testLimitedPriorityQueuePeekOutOfRangePanics(newLimitPriorityHashLimitedPriorityHashQueue, t) +} + +func testLimitedPriorityQueuePeekOutOfRangePanics(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { + q := makeLimitedPriorityQueueFun(func(i interface{}) bool { + return i.(int)%2 == 0 + }, 800) + testQueuePeekOutOfRangePanics(q, t) +} + +func testLimitedQueuePeekOutOfRangePanics(makeLimitedQueueFun func(limit int) Queue, t *testing.T) { + testQueuePeekOutOfRangePanics(makeLimitedQueueFun(800), t) +} + +func testPriorityQueuePeekOutOfRangePanics(makePriorityQueueFun func(func(i interface{}) bool) Queue, t *testing.T) { + q := makePriorityQueueFun(func(i interface{}) bool { + return i.(int)%2 == 0 + }) + testQueuePeekOutOfRangePanics(q, t) +} + +func testQueuePeekOutOfRangePanics(q Queue, t *testing.T) { + assertPanics(t, "should panic when peeking empty queue", func() { + q.Peek() + }) + + if !q.Add(0) { + t.Errorf("failed to add element 0") + } + q.Remove() + + assertPanics(t, "should panic when peeking emptied queue", func() { + q.Peek() + }) +} + +//-- + +func TestDefaultLimitedPriorityHashQueueRemoveOutOfRangePanics(t *testing.T) { + testQueueRemoveOutOfRangePanics(NewDefaultLimitedPriorityHashQueue(), t) +} + +func TestPriorityLimitedPriorityHashQueueRemoveOutOfRangePanics(t *testing.T) { + testPriorityQueueRemoveOutOfRangePanics(NewPriorityLimitedPriorityHashQueue, t) +} + +func TestLimitLimitedPriorityHashQueueRemoveOutOfRangePanics(t *testing.T) { + testLimitedQueueRemoveOutOfRangePanics(NewLimitLimitedPriorityHashQueue, t) +} + +func TestLimitPriorityLimitedPriorityHashQueueRemoveOutOfRangePanics(t *testing.T) { + testLimitedPriorityQueueRemoveOutOfRangePanics(NewLimitPriorityLimitedPriorityHashQueue, t) +} + +func TestHashLimitedPriorityHashQueueRemoveOutOfRangePanics(t *testing.T) { + testQueueRemoveOutOfRangePanics(NewHashLimitedPriorityHashQueue(true), t) +} + +func TestPriorityHashLimitedPriorityHashQueueRemoveOutOfRangePanics(t *testing.T) { + testPriorityQueueRemoveOutOfRangePanics(newPriorityHashLimitedPriorityHashQueue, t) +} + +func TestLimitHashLimitedPriorityHashQueueRemoveOutOfRangePanics(t *testing.T) { + testLimitedQueueRemoveOutOfRangePanics(newLimitHashLimitedPriorityHashQueue, t) +} + +func TestLimitedPriorityHashQueueRemoveOutOfRangePanics(t *testing.T) { + testLimitedPriorityQueueRemoveOutOfRangePanics(newLimitPriorityHashLimitedPriorityHashQueue, t) +} + +func testLimitedPriorityQueueRemoveOutOfRangePanics(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { + q := makeLimitedPriorityQueueFun(func(i interface{}) bool { + return i.(int)%2 == 0 + }, 800) + testQueueRemoveOutOfRangePanics(q, t) +} + +func testLimitedQueueRemoveOutOfRangePanics(makeLimitedQueueFun func(limit int) Queue, t *testing.T) { + testQueueRemoveOutOfRangePanics(makeLimitedQueueFun(800), t) +} + +func testPriorityQueueRemoveOutOfRangePanics(makePriorityQueueFun func(func(i interface{}) bool) Queue, t *testing.T) { + q := makePriorityQueueFun(func(i interface{}) bool { + return i.(int)%2 == 0 + }) + testQueueRemoveOutOfRangePanics(q, t) +} + +func testQueueRemoveOutOfRangePanics(q Queue, t *testing.T) { + assertPanics(t, "should panic when removing empty queue", func() { + q.Remove() + }) + + if !q.Add(0) { + t.Errorf("failed to add element 0") + } + q.Remove() + + assertPanics(t, "should panic when removing emptied queue", func() { + q.Remove() + }) +} + +//-- + +func identityFun(index int) int { + return index +} + +func alwaysTrueFun(index int) bool { + return true +} + +func newPriorityHashLimitedPriorityHashQueue(fun func(i interface{}) bool) Queue { + return NewPriorityHashLimitedPriorityHashQueue(fun, true) +} + +func newLimitHashLimitedPriorityHashQueue(limit int) Queue { + return NewLimitHashLimitedPriorityHashQueue(limit, true) +} + +func newLimitPriorityHashLimitedPriorityHashQueue(fun func(i interface{}) bool, limit int) Queue { + return NewLimitedPriorityHashQueue(fun, limit, true) +} + +func assertPanics(t *testing.T, name string, f func()) { + defer func() { + if r := recover(); r == nil { + t.Errorf("%s: didn't panic as expected", name) + } + }() + + f() +} From 37cb149907ba7a426d4df30c9a5763ea31baabb3 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 28 Sep 2021 09:40:04 +0300 Subject: [PATCH 003/198] Use require module instead of ifs --- packages/util/pipe/queue_test.go | 166 +++++++++---------------------- 1 file changed, 46 insertions(+), 120 deletions(-) diff --git a/packages/util/pipe/queue_test.go b/packages/util/pipe/queue_test.go index 5931266f7c..8e6dc24d59 100644 --- a/packages/util/pipe/queue_test.go +++ b/packages/util/pipe/queue_test.go @@ -2,36 +2,27 @@ package pipe import ( "testing" + + "github.com/stretchr/testify/require" ) func testQueueBasicAddLengthPeekRemove(q Queue, elementsToAdd int, add func(index int) int, addResult func(index int) bool, elementsToRemove int, result func(index int) int, t *testing.T) { for i := 0; i < elementsToAdd; i++ { value := add(i) - expected := addResult(i) - obtained := q.Add(value) - if obtained != expected { - t.Errorf("add result of element %d value %d expected %v obtained %v", i, value, expected, obtained) - } - } - obtained := q.Length() - if obtained != elementsToRemove { - t.Errorf("expected full queue length %d, obtained %d", elementsToAdd, obtained) + actualAddResult := q.Add(value) + require.Equalf(t, addResult(i), actualAddResult, "add result of element %d value %d missmatch", i, value) } + fullLength := q.Length() + require.Equalf(t, elementsToRemove, fullLength, "full queue length missmatch") for i := 0; i < elementsToRemove; i++ { expected := result(i) - obtained = q.Peek().(int) - if obtained != expected { - t.Errorf("peek %d obtained %d instead of %d", i, obtained, expected) - } - obtained = q.Remove().(int) - if obtained != expected { - t.Errorf("remove %d obtained %d instead of %d", i, obtained, expected) - } - } - obtained = q.Length() - if obtained != 0 { - t.Errorf("expected empty queue length 0, obtained %d", obtained) + peekResult := q.Peek().(int) + require.Equalf(t, expected, peekResult, "peek %d missmatch", i) + removeResult := q.Remove().(int) + require.Equalf(t, expected, removeResult, "remove %d missmatch", i) } + emptyLength := q.Length() + require.Equalf(t, 0, emptyLength, "empty queue length missmatch") } //-- @@ -502,37 +493,25 @@ func testDefaultQueueAddRemove(q Queue, t *testing.T) { func testQueueAddRemove(q Queue, elementsToAdd int, elementsToRemoveAdd int, elementsToRemove int, result func(index int) int, t *testing.T) { for i := 0; i < elementsToAdd; i++ { - if !q.Add(i) { - t.Errorf("failed to add element %d", i) - } + require.Truef(t, q.Add(i), "failed to add element %d", i) } for i := 0; i < elementsToRemoveAdd; i++ { q.Remove() add := elementsToAdd + i - if !q.Add(add) { - t.Errorf("failed to add element %d", add) - } - } - obtained := q.Length() - if obtained != elementsToRemove { - t.Errorf("expected full queue length %d, obtained %d", elementsToAdd, obtained) + require.Truef(t, q.Add(add), "failed to add element %d", add) } + fullLength := q.Length() + require.Equalf(t, elementsToRemove, fullLength, "full queue length missmatch") for i := 0; i < elementsToRemove; i++ { expected := result(i) - obtained = q.Peek().(int) - if obtained != expected { - t.Errorf("peek %d obtained %d instead of %d", i, obtained, expected) - } - obtained = q.Remove().(int) - if obtained != expected { - t.Errorf("remove %d obtained %d instead of %d", i, obtained, expected) - } - } - obtained = q.Length() - if obtained != 0 { - t.Errorf("expected empty queue length 0, obtained %d", obtained) + peekResult := q.Peek().(int) + require.Equalf(t, expected, peekResult, "peek %d missmatch", i) + removeResult := q.Remove().(int) + require.Equalf(t, expected, removeResult, "remove %d missmatch", i) } + emptyLength := q.Length() + require.Equalf(t, 0, emptyLength, "empty queue length missmatch") } //-- @@ -621,33 +600,24 @@ func testDefaultQueueLength(q Queue, t *testing.T) { } func testQueueLength(q Queue, elementsToRemoveAdd int, elementsToRemove int, t *testing.T) { - obtained := q.Length() - if obtained != 0 { - t.Errorf("empty queue length is %d", obtained) - } + emptyLength := q.Length() + require.Equalf(t, 0, emptyLength, "empty queue length missmatch") for i := 0; i < elementsToRemoveAdd; i++ { - if !q.Add(i) { - t.Errorf("failed to add element %d", i) - } + require.Truef(t, q.Add(i), "failed to add element %d", i) var expected int if i >= elementsToRemove { expected = elementsToRemove } else { expected = i + 1 } - obtained := q.Length() - if obtained != expected { - t.Errorf("adding: expected queue length %d, obtained %d", expected, obtained) - } + currLength := q.Length() + require.Equalf(t, expected, currLength, "adding %d: expected queue length missmatch", i) } for i := 0; i < elementsToRemove; i++ { q.Remove() - expected := elementsToRemove - i - 1 - obtained := q.Length() - if obtained != expected { - t.Errorf("removing: expected queue length %d, obtained %d", expected, obtained) - } + currLength := q.Length() + require.Equalf(t, elementsToRemove-i-1, currLength, "removing %d: expected queue length missmatch", i) } } @@ -761,18 +731,13 @@ func testDefaultQueueGet(q Queue, t *testing.T) { func testQueueGet(q Queue, elementsToAdd int, result func(iteration int, index int) int, t *testing.T) { if testing.Short() { - t.Skip("skipping Get test in short mode") + t.Skip("skipping Get test in short mode") // although it is not clear, why. Replacing require.Equalf in this code with `if a != b {t.Errorf(...)}` increases this test's performance significantly } for i := 0; i < elementsToAdd; i++ { - if !q.Add(i) { - t.Errorf("failed to add element %d", i) - } + require.Truef(t, q.Add(i), "failed to add element %d", i) for j := 0; j < q.Length(); j++ { - expected := result(i, j) - obtained := q.Get(j).(int) - if obtained != expected { - t.Errorf("iteration %d index %d contains %d instead of %d", i, j, obtained, expected) - } + getResult := q.Get(j).(int) + require.Equalf(t, result(i, j), getResult, "iteration %d index %d missmatch", i, j) } } } @@ -882,18 +847,13 @@ func testDefaultQueueGetNegative(q Queue, t *testing.T) { func testQueueGetNegative(q Queue, elementsToAdd int, result func(iteration int, index int) int, t *testing.T) { if testing.Short() { - t.Skip("skipping GetNegative test in short mode") + t.Skip("skipping GetNegative test in short mode") // although it is not clear, why. Replacing require.Equalf in this code with `if a != b {t.Errorf(...)}` increases this test's performance significantly } for i := 0; i < elementsToAdd; i++ { - if !q.Add(i) { - t.Errorf("failed to add element %d", i) - } + require.Truef(t, q.Add(i), "failed to add element %d", i) for j := -1; j >= -q.Length(); j-- { - expected := result(i, j) - obtained := q.Get(j).(int) - if obtained != expected { - t.Errorf("iteration %d index %d contains %d instead of %d", i, j, obtained, expected) - } + getResult := q.Get(j).(int) + require.Equalf(t, result(i, j), getResult, "iteration %d index %d missmatch", i, j) } } } @@ -952,18 +912,10 @@ func testPriorityQueueGetOutOfRangePanics(makePriorityQueueFun func(func(i inter func testQueueGetOutOfRangePanics(q Queue, t *testing.T) { for i := 0; i < 3; i++ { - if !q.Add(i) { - t.Errorf("failed to add element %d", i) - } + require.Truef(t, q.Add(i), "failed to add element %d", i) } - - assertPanics(t, "should panic when negative index", func() { - q.Get(-4) - }) - - assertPanics(t, "should panic when index greater than length", func() { - q.Get(4) - }) + require.Panicsf(t, func() { q.Get(-4) }, "should panic when too negative index") + require.Panicsf(t, func() { q.Get(4) }, "should panic when index greater than length") } //-- @@ -1019,18 +971,10 @@ func testPriorityQueuePeekOutOfRangePanics(makePriorityQueueFun func(func(i inte } func testQueuePeekOutOfRangePanics(q Queue, t *testing.T) { - assertPanics(t, "should panic when peeking empty queue", func() { - q.Peek() - }) - - if !q.Add(0) { - t.Errorf("failed to add element 0") - } + require.Panicsf(t, func() { q.Peek() }, "should panic when peeking empty queue") + require.Truef(t, q.Add(0), "failed to add element 0") q.Remove() - - assertPanics(t, "should panic when peeking emptied queue", func() { - q.Peek() - }) + require.Panicsf(t, func() { q.Peek() }, "should panic when peeking emptied queue") } //-- @@ -1086,18 +1030,10 @@ func testPriorityQueueRemoveOutOfRangePanics(makePriorityQueueFun func(func(i in } func testQueueRemoveOutOfRangePanics(q Queue, t *testing.T) { - assertPanics(t, "should panic when removing empty queue", func() { - q.Remove() - }) - - if !q.Add(0) { - t.Errorf("failed to add element 0") - } + require.Panicsf(t, func() { q.Remove() }, "should panic when removing empty queue") + require.Truef(t, q.Add(0), "failed to add element 0") q.Remove() - - assertPanics(t, "should panic when removing emptied queue", func() { - q.Remove() - }) + require.Panicsf(t, func() { q.Remove() }, "should panic when removing emptied queue") } //-- @@ -1121,13 +1057,3 @@ func newLimitHashLimitedPriorityHashQueue(limit int) Queue { func newLimitPriorityHashLimitedPriorityHashQueue(fun func(i interface{}) bool, limit int) Queue { return NewLimitedPriorityHashQueue(fun, limit, true) } - -func assertPanics(t *testing.T, name string, f func()) { - defer func() { - if r := recover(); r == nil { - t.Errorf("%s: didn't panic as expected", name) - } - }() - - f() -} From 42c3e06741efd0eb0d9843febe475ccc20425a73 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 28 Sep 2021 12:38:26 +0300 Subject: [PATCH 004/198] Infinite pipe tests and related fixes --- packages/util/pipe/pipe.go | 16 +- packages/util/pipe/pipe_test.go | 275 ++++++++++++++++++++++++++++++++ 2 files changed, 283 insertions(+), 8 deletions(-) create mode 100644 packages/util/pipe/pipe_test.go diff --git a/packages/util/pipe/pipe.go b/packages/util/pipe/pipe.go index 59adaa85fe..2760d78772 100644 --- a/packages/util/pipe/pipe.go +++ b/packages/util/pipe/pipe.go @@ -13,35 +13,35 @@ type InfinitePipe struct { var _ Pipe = &InfinitePipe{} -func NewDefaultInfinitePipe() *InfinitePipe { +func NewDefaultInfinitePipe() Pipe { return newInfinitePipe(NewDefaultLimitedPriorityHashQueue()) } -func NewPriorityInfinitePipe(fun func(interface{}) bool) *InfinitePipe { +func NewPriorityInfinitePipe(fun func(interface{}) bool) Pipe { return newInfinitePipe(NewPriorityLimitedPriorityHashQueue(fun)) } -func NewLimitInfinitePipe(limit int) *InfinitePipe { +func NewLimitInfinitePipe(limit int) Pipe { return newInfinitePipe(NewLimitLimitedPriorityHashQueue(limit)) } -func NewLimitPriorityInfinitePipe(fun func(interface{}) bool, limit int) *InfinitePipe { +func NewLimitPriorityInfinitePipe(fun func(interface{}) bool, limit int) Pipe { return newInfinitePipe(NewLimitPriorityLimitedPriorityHashQueue(fun, limit)) } -func NewHashInfinitePipe() *InfinitePipe { +func NewHashInfinitePipe() Pipe { return newInfinitePipe(NewHashLimitedPriorityHashQueue(true)) } -func NewPriorityHashInfinitePipe(fun func(interface{}) bool) *InfinitePipe { +func NewPriorityHashInfinitePipe(fun func(interface{}) bool) Pipe { return newInfinitePipe(NewPriorityHashLimitedPriorityHashQueue(fun, true)) } -func NewLimitHashInfinitePipe(limit int) *InfinitePipe { +func NewLimitHashInfinitePipe(limit int) Pipe { return newInfinitePipe(NewLimitHashLimitedPriorityHashQueue(limit, true)) } -func NewInfinitePipe(fun func(interface{}) bool, limit int) *InfinitePipe { +func NewInfinitePipe(fun func(interface{}) bool, limit int) Pipe { return newInfinitePipe(NewLimitedPriorityHashQueue(fun, limit, true)) } diff --git a/packages/util/pipe/pipe_test.go b/packages/util/pipe/pipe_test.go new file mode 100644 index 0000000000..e0f3501ba9 --- /dev/null +++ b/packages/util/pipe/pipe_test.go @@ -0,0 +1,275 @@ +package pipe + +import ( + "sync" + "testing" + "time" +) + +func TestDefaultInfinitePipeWriteReadLen(t *testing.T) { + testDefaultPipeWriteReadLen(NewDefaultInfinitePipe(), 1000, identityFun, t) +} + +func TestPriorityInfinitePipeWriteReadLen(t *testing.T) { + testPriorityPipeWriteReadLen(NewPriorityInfinitePipe, t) +} + +func TestLimitInfinitePipeNoLimitWriteReadLen(t *testing.T) { + testLimitedPipeNoLimitWriteReadLen(NewLimitInfinitePipe, t) +} + +func TestLimitInfinitePipeWriteReadLen(t *testing.T) { + testLimitedPipeWriteReadLen(NewLimitInfinitePipe, t) +} + +func TestLimitPriorityInfinitePipeNoLimitWriteReadLen(t *testing.T) { + testLimitedPriorityPipeNoLimitWriteReadLen(NewLimitPriorityInfinitePipe, t) +} + +func TestLimitPriorityInfinitePipeWriteReadLen(t *testing.T) { + testLimitedPriorityPipeWriteReadLen(NewLimitPriorityInfinitePipe, t) +} + +func TestHashInfinitePipeWriteReadLen(t *testing.T) { + testDefaultPipeWriteReadLen(NewHashInfinitePipe(), 1000, identityFun, t) +} + +func TestPriorityHashInfinitePipeWriteReadLen(t *testing.T) { + testPriorityPipeWriteReadLen(NewPriorityHashInfinitePipe, t) +} + +func TestLimitHashInfinitePipeNoLimitWriteReadLen(t *testing.T) { + testLimitedPipeNoLimitWriteReadLen(NewLimitHashInfinitePipe, t) +} + +func TestLimitHashInfinitePipeWriteReadLen(t *testing.T) { + testLimitedPipeWriteReadLen(NewLimitHashInfinitePipe, t) +} + +func TestInfinitePipeNoLimitWriteReadLen(t *testing.T) { + testLimitedPriorityPipeNoLimitWriteReadLen(NewInfinitePipe, t) +} + +func TestInfinitePipeWriteReadLen(t *testing.T) { + testLimitedPriorityPipeWriteReadLen(NewInfinitePipe, t) +} + +func testLimitedPriorityPipeNoLimitWriteReadLen(makeLimitedPriorityPipeFun func(fun func(i interface{}) bool, limit int) Pipe, t *testing.T) { + testPriorityPipeWriteReadLen(func(fun func(i interface{}) bool) Pipe { return makeLimitedPriorityPipeFun(fun, 1200) }, t) +} + +func testLimitedPriorityPipeWriteReadLen(makeLimitedPriorityPipeFun func(fun func(i interface{}) bool, limit int) Pipe, t *testing.T) { + limit := 800 + p := makeLimitedPriorityPipeFun(func(i interface{}) bool { + return i.(int)%3 == 0 + }, limit) + result := func(index int) int { + if index <= 333 { + return -3*index + 999 + } else { + if index%2 == 0 { + return 3*index/2 - 200 + } else { + return (3*index - 401) / 2 + } + } + } + testPipeWriteReadLen(p, 1000, limit, result, t) +} + +func testLimitedPipeNoLimitWriteReadLen(makeLimitedPipeFun func(limit int) Pipe, t *testing.T) { + testDefaultPipeWriteReadLen(makeLimitedPipeFun(1200), 1000, identityFun, t) +} + +func testLimitedPipeWriteReadLen(makeLimitedPipeFun func(limit int) Pipe, t *testing.T) { + limit := 800 + elementsToAdd := 1000 + indexDiff := elementsToAdd - limit + result := func(index int) int { + return index + indexDiff + } + testPipeWriteReadLen(makeLimitedPipeFun(limit), elementsToAdd, limit, result, t) +} + +func testPriorityPipeWriteReadLen(makePriorityPipeFun func(func(i interface{}) bool) Pipe, t *testing.T) { + p := makePriorityPipeFun(func(i interface{}) bool { + return i.(int)%3 == 0 + }) + result := func(index int) int { + if index <= 333 { + return -3*index + 999 + } else { + if index%2 == 0 { + return 3*index/2 - 500 + } else { + return (3*index - 1001) / 2 + } + } + } + testDefaultPipeWriteReadLen(p, 1000, result, t) +} + +func testDefaultPipeWriteReadLen(p Pipe, elementsToWrite int, result func(index int) int, t *testing.T) { + testPipeWriteReadLen(p, elementsToWrite, elementsToWrite, result, t) +} + +func testPipeWriteReadLen(p Pipe, elementsToWrite int, elementsToRead int, result func(index int) int, t *testing.T) { + for i := 0; i < elementsToWrite; i++ { + p.In() <- i + } + obtained := p.Len() + if obtained != elementsToRead { + t.Errorf("expected full channel length %d, obtained %d", elementsToWrite, obtained) + } + p.Close() + obtained = p.Len() + if obtained != elementsToRead { + t.Errorf("expected closed channel length %d, obtained %d", elementsToWrite, obtained) + } + for i := 0; i < elementsToRead; i++ { + val := <-p.Out() + expected := result(i) + obtained := val.(int) + if obtained != expected { + t.Errorf("read %d obtained %d instead of %d", i, obtained, expected) + } + } +} + +//-- + +func TestDefaultInfinitePipeConcurrentWriteReadLen(t *testing.T) { + result := identityFun + testDefaultPipeConcurrentWriteReadLen(NewDefaultInfinitePipe(), 1000, &result, t) +} + +func TestPriorityInfinitePipeConcurrentWriteReadLen(t *testing.T) { + testPriorityPipeConcurrentWriteReadLen(NewPriorityInfinitePipe, t) +} + +func TestLimitInfinitePipeNoLimitConcurrentWriteReadLen(t *testing.T) { + testLimitedPipeNoLimitConcurrentWriteReadLen(NewLimitInfinitePipe, t) +} + +func TestLimitInfinitePipeConcurrentWriteReadLen(t *testing.T) { + testLimitedPipeConcurrentWriteReadLen(NewLimitInfinitePipe, t) +} + +func TestLimitPriorityInfinitePipeNoLimitConcurrentWriteReadLen(t *testing.T) { + testLimitedPriorityPipeNoLimitConcurrentWriteReadLen(NewLimitPriorityInfinitePipe, t) +} + +func TestLimitPriorityInfinitePipeConcurrentWriteReadLen(t *testing.T) { + testLimitedPriorityPipeConcurrentWriteReadLen(NewLimitPriorityInfinitePipe, t) +} + +func TestHashInfinitePipeConcurrentWriteReadLen(t *testing.T) { + result := identityFun + testDefaultPipeConcurrentWriteReadLen(NewHashInfinitePipe(), 1000, &result, t) +} + +func TestPriorityHashInfinitePipeConcurrentWriteReadLen(t *testing.T) { + testPriorityPipeConcurrentWriteReadLen(NewPriorityHashInfinitePipe, t) +} + +func TestLimitHashInfinitePipeNoLimitConcurrentWriteReadLen(t *testing.T) { + testLimitedPipeNoLimitConcurrentWriteReadLen(NewLimitHashInfinitePipe, t) +} + +func TestLimitHashInfinitePipeConcurrentWriteReadLen(t *testing.T) { + testLimitedPipeConcurrentWriteReadLen(NewLimitHashInfinitePipe, t) +} + +func TestInfinitePipeNoLimitConcurrentWriteReadLen(t *testing.T) { + testLimitedPriorityPipeNoLimitConcurrentWriteReadLen(NewInfinitePipe, t) +} + +func TestInfinitePipeConcurrentWriteReadLen(t *testing.T) { + testLimitedPriorityPipeConcurrentWriteReadLen(NewInfinitePipe, t) +} + +func testLimitedPriorityPipeNoLimitConcurrentWriteReadLen(makeLimitedPriorityPipeFun func(fun func(i interface{}) bool, limit int) Pipe, t *testing.T) { + testPriorityPipeConcurrentWriteReadLen(func(fun func(i interface{}) bool) Pipe { return makeLimitedPriorityPipeFun(fun, 1200) }, t) +} + +func testLimitedPriorityPipeConcurrentWriteReadLen(makeLimitedPriorityPipeFun func(fun func(i interface{}) bool, limit int) Pipe, t *testing.T) { + limit := 800 + ch := makeLimitedPriorityPipeFun(func(i interface{}) bool { + return i.(int)%3 == 0 + }, limit) + testPipeConcurrentWriteReadLen(ch, 1000, limit, nil, t) +} + +func testLimitedPipeNoLimitConcurrentWriteReadLen(makeLimitedPipeFun func(limit int) Pipe, t *testing.T) { + result := identityFun + testDefaultPipeConcurrentWriteReadLen(makeLimitedPipeFun(1200), 1000, &result, t) +} + +func testLimitedPipeConcurrentWriteReadLen(makeLimitedPipeFun func(limit int) Pipe, t *testing.T) { + testPipeConcurrentWriteReadLen(makeLimitedPipeFun(800), 1000, 800, nil, t) +} + +func testPriorityPipeConcurrentWriteReadLen(makePriorityPipeFun func(func(i interface{}) bool) Pipe, t *testing.T) { + ch := makePriorityPipeFun(func(i interface{}) bool { + return i.(int)%3 == 0 + }) + testDefaultPipeConcurrentWriteReadLen(ch, 1000, nil, t) +} + +func testDefaultPipeConcurrentWriteReadLen(p Pipe, elementsToWrite int, result *func(index int) int, t *testing.T) { + testPipeConcurrentWriteReadLen(p, elementsToWrite, elementsToWrite, result, t) +} + +func testPipeConcurrentWriteReadLen(p Pipe, elementsToWrite int, elementsToRead int, result *func(index int) int, t *testing.T) { + var wg sync.WaitGroup + written := 0 + read := 0 + stop := make(chan bool) + wg.Add(2) + + go func() { + for i := 0; i < elementsToWrite; i++ { + p.In() <- i + written++ + } + wg.Done() + }() + + go func() { + for i := 0; i < elementsToRead; i++ { + val := <-p.Out() + if result != nil { + expected := (*result)(i) + obtained := val.(int) + if obtained != expected { + t.Errorf("concurent read %d obtained %d instead of %d", i, obtained, expected) + } + } + read++ + } + wg.Done() + }() + + go func() { + for { + select { + case <-stop: + return + default: + length := p.Len() + t.Logf("current channel length is %d", length) + // no asserts here - the read/write process is asynchronious + time.Sleep(10 * time.Millisecond) + } + } + }() + + wg.Wait() + stop <- true + if written != elementsToWrite { + t.Errorf("concurent write written %d should have %d", written, elementsToWrite) + } + if read != elementsToRead { + t.Errorf("concurent read read %d should have %d", read, elementsToRead) + } +} From 6258ddff3add89ae1170b2166b7e24edf4fea6d7 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 28 Sep 2021 12:40:47 +0300 Subject: [PATCH 005/198] Common pipe test functions moved to utils --- packages/util/pipe/queue_test.go | 8 -------- packages/util/pipe/test_util.go | 9 +++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 packages/util/pipe/test_util.go diff --git a/packages/util/pipe/queue_test.go b/packages/util/pipe/queue_test.go index 8e6dc24d59..c4752fb0ea 100644 --- a/packages/util/pipe/queue_test.go +++ b/packages/util/pipe/queue_test.go @@ -1038,14 +1038,6 @@ func testQueueRemoveOutOfRangePanics(q Queue, t *testing.T) { //-- -func identityFun(index int) int { - return index -} - -func alwaysTrueFun(index int) bool { - return true -} - func newPriorityHashLimitedPriorityHashQueue(fun func(i interface{}) bool) Queue { return NewPriorityHashLimitedPriorityHashQueue(fun, true) } diff --git a/packages/util/pipe/test_util.go b/packages/util/pipe/test_util.go new file mode 100644 index 0000000000..f5ccc6915e --- /dev/null +++ b/packages/util/pipe/test_util.go @@ -0,0 +1,9 @@ +package pipe + +func identityFun(index int) int { + return index +} + +func alwaysTrueFun(index int) bool { + return true +} From 712d9d5ef1ea3012b4942f320156b2f37c818bbd Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 28 Sep 2021 12:50:33 +0300 Subject: [PATCH 006/198] Use require module instead of ifs --- packages/util/pipe/pipe_test.go | 34 ++++++++++----------------------- 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/packages/util/pipe/pipe_test.go b/packages/util/pipe/pipe_test.go index e0f3501ba9..20ec0e8610 100644 --- a/packages/util/pipe/pipe_test.go +++ b/packages/util/pipe/pipe_test.go @@ -4,6 +4,8 @@ import ( "sync" "testing" "time" + + "github.com/stretchr/testify/require" ) func TestDefaultInfinitePipeWriteReadLen(t *testing.T) { @@ -117,22 +119,14 @@ func testPipeWriteReadLen(p Pipe, elementsToWrite int, elementsToRead int, resul for i := 0; i < elementsToWrite; i++ { p.In() <- i } - obtained := p.Len() - if obtained != elementsToRead { - t.Errorf("expected full channel length %d, obtained %d", elementsToWrite, obtained) - } + fullLength := p.Len() + require.Equalf(t, elementsToRead, fullLength, "full channel length missmatch") p.Close() - obtained = p.Len() - if obtained != elementsToRead { - t.Errorf("expected closed channel length %d, obtained %d", elementsToWrite, obtained) - } + closedLength := p.Len() + require.Equalf(t, elementsToRead, closedLength, "closed channel length missmatch") for i := 0; i < elementsToRead; i++ { val := <-p.Out() - expected := result(i) - obtained := val.(int) - if obtained != expected { - t.Errorf("read %d obtained %d instead of %d", i, obtained, expected) - } + require.Equalf(t, result(i), val.(int), "read %d missmatch", i) } } @@ -239,11 +233,7 @@ func testPipeConcurrentWriteReadLen(p Pipe, elementsToWrite int, elementsToRead for i := 0; i < elementsToRead; i++ { val := <-p.Out() if result != nil { - expected := (*result)(i) - obtained := val.(int) - if obtained != expected { - t.Errorf("concurent read %d obtained %d instead of %d", i, obtained, expected) - } + require.Equalf(t, (*result)(i), val.(int), "concurent read %d missmatch", i) } read++ } @@ -266,10 +256,6 @@ func testPipeConcurrentWriteReadLen(p Pipe, elementsToWrite int, elementsToRead wg.Wait() stop <- true - if written != elementsToWrite { - t.Errorf("concurent write written %d should have %d", written, elementsToWrite) - } - if read != elementsToRead { - t.Errorf("concurent read read %d should have %d", read, elementsToRead) - } + require.Equalf(t, elementsToWrite, written, "concurent write elements written missmatch") + require.Equalf(t, elementsToRead, read, "concurent read elements read missmatch") } From 39a6867eec7220aa5978a0f1ba7798a27218392b Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 28 Sep 2021 13:16:00 +0300 Subject: [PATCH 007/198] Appeasing linter --- packages/util/pipe/pipe_test.go | 24 ++++----- packages/util/pipe/queue_test.go | 91 ++++++++++++-------------------- 2 files changed, 44 insertions(+), 71 deletions(-) diff --git a/packages/util/pipe/pipe_test.go b/packages/util/pipe/pipe_test.go index 20ec0e8610..3f4fc8a698 100644 --- a/packages/util/pipe/pipe_test.go +++ b/packages/util/pipe/pipe_test.go @@ -68,13 +68,11 @@ func testLimitedPriorityPipeWriteReadLen(makeLimitedPriorityPipeFun func(fun fun result := func(index int) int { if index <= 333 { return -3*index + 999 - } else { - if index%2 == 0 { - return 3*index/2 - 200 - } else { - return (3*index - 401) / 2 - } } + if index%2 == 0 { + return 3*index/2 - 200 + } + return (3*index - 401) / 2 } testPipeWriteReadLen(p, 1000, limit, result, t) } @@ -100,13 +98,11 @@ func testPriorityPipeWriteReadLen(makePriorityPipeFun func(func(i interface{}) b result := func(index int) int { if index <= 333 { return -3*index + 999 - } else { - if index%2 == 0 { - return 3*index/2 - 500 - } else { - return (3*index - 1001) / 2 - } } + if index%2 == 0 { + return 3*index/2 - 500 + } + return (3*index - 1001) / 2 } testDefaultPipeWriteReadLen(p, 1000, result, t) } @@ -115,7 +111,7 @@ func testDefaultPipeWriteReadLen(p Pipe, elementsToWrite int, result func(index testPipeWriteReadLen(p, elementsToWrite, elementsToWrite, result, t) } -func testPipeWriteReadLen(p Pipe, elementsToWrite int, elementsToRead int, result func(index int) int, t *testing.T) { +func testPipeWriteReadLen(p Pipe, elementsToWrite, elementsToRead int, result func(index int) int, t *testing.T) { for i := 0; i < elementsToWrite; i++ { p.In() <- i } @@ -214,7 +210,7 @@ func testDefaultPipeConcurrentWriteReadLen(p Pipe, elementsToWrite int, result * testPipeConcurrentWriteReadLen(p, elementsToWrite, elementsToWrite, result, t) } -func testPipeConcurrentWriteReadLen(p Pipe, elementsToWrite int, elementsToRead int, result *func(index int) int, t *testing.T) { +func testPipeConcurrentWriteReadLen(p Pipe, elementsToWrite, elementsToRead int, result *func(index int) int, t *testing.T) { var wg sync.WaitGroup written := 0 read := 0 diff --git a/packages/util/pipe/queue_test.go b/packages/util/pipe/queue_test.go index c4752fb0ea..349ec3163c 100644 --- a/packages/util/pipe/queue_test.go +++ b/packages/util/pipe/queue_test.go @@ -123,7 +123,7 @@ func testDefaultQueueSimple(q Queue, t *testing.T) { testQueueSimple(q, elementsToAdd, elementsToAdd, identityFun, t) } -func testQueueSimple(q Queue, elementsToAdd int, elementsToRemove int, result func(index int) int, t *testing.T) { +func testQueueSimple(q Queue, elementsToAdd, elementsToRemove int, result func(index int) int, t *testing.T) { testQueueBasicAddLengthPeekRemove(q, elementsToAdd, identityFun, alwaysTrueFun, elementsToRemove, result, t) } @@ -170,15 +170,13 @@ func TestLimitPriorityLimitedPriorityHashQueueTwice(t *testing.T) { } else if index <= 46 { if index%2 == 0 { return 3*index/2 - 20 - } else { - return (3*index - 41) / 2 } + return (3*index - 41) / 2 } else { if index%2 == 1 { return (3*index - 139) / 2 - } else { - return 3*index/2 - 70 } + return 3*index/2 - 70 } } testQueueTwice(q, elementsToAddSingle, alwaysTrueFun, limit, resultFun, t) @@ -223,13 +221,11 @@ func TestLimitedPriorityHashQueueTwice(t *testing.T) { resultFun := func(index int) int { if index <= 16 { return 48 - 3*index - } else { - if index%2 == 1 { - return (3*index + 11) / 2 - } else { - return 3*index/2 + 5 - } } + if index%2 == 1 { + return (3*index + 11) / 2 + } + return 3*index/2 + 5 } testQueueTwice(q, elementsToAddSingle, addResultFun, limit, resultFun, t) } @@ -250,13 +246,11 @@ func testPriorityHashQueueTwice(makePriorityHashQueueFun func(fun func(i interfa resultFun := func(index int) int { if index <= 16 { return 48 - 3*index - } else { - if index%2 == 1 { - return (3*index - 49) / 2 - } else { - return 3*index/2 - 25 - } } + if index%2 == 1 { + return (3*index - 49) / 2 + } + return 3*index/2 - 25 } testQueueTwice(q, elementsToAddSingle, addResultFun, elementsToAddSingle, resultFun, t) } @@ -274,15 +268,13 @@ func testPriorityQueueTwice(makePriorityQueueFun func(func(i interface{}) bool) } else if index <= 66 { if index%2 == 0 { return 3*index/2 - 50 - } else { - return (3*index - 101) / 2 } + return (3*index - 101) / 2 } else { if index%2 == 1 { return (3*index - 199) / 2 - } else { - return 3*index/2 - 100 } + return 3*index/2 - 100 } } testQueueTwice(q, elementsToAddSingle, alwaysTrueFun, 2*elementsToAddSingle, resultFun, t) @@ -316,9 +308,8 @@ func TestLimitPriorityLimitedPriorityHashQueueOverflow(t *testing.T) { resultFun := func(index int) int { if index < 25 { return 24 - index - } else { - return 49 - index } + return 49 - index } testQueueTwice(q, elementsToAddSingle, addResultFun, limit, resultFun, t) } @@ -338,9 +329,8 @@ func TestLimitedPriorityHashQueueOverflow(t *testing.T) { resultFun := func(index int) int { if index < 10 { return 49 - index - } else { - return 29 - index } + return 29 - index } testQueueTwice(q, elementsToAddSingle, addResultFun, limit, resultFun, t) } @@ -356,9 +346,8 @@ func TestLimitedPriorityHashQueueDuplicates(t *testing.T) { addFun := func(index int) int { if index < elementsToAddFirstIteration { return 2 * index - } else { - return index - elementsToAddFirstIteration } + return index - elementsToAddFirstIteration } addResultFun := func(index int) bool { return (index < elementsToAddFirstIteration) || ((index-elementsToAddFirstIteration)%2 == 1) @@ -371,15 +360,13 @@ func TestLimitedPriorityHashQueueDuplicates(t *testing.T) { } else if index <= 46 { if index%2 == 0 { return 3*index - 40 - } else { - return 3*index - 41 } + return 3*index - 41 } else { if index%2 == 0 { return 3*index - 139 - } else { - return 3*index - 140 } + return 3*index - 140 } } testQueueBasicAddLengthPeekRemove(q, 3*elementsToAddFirstIteration, addFun, addResultFun, limit, resultFun, t) @@ -447,9 +434,8 @@ func testLimitedPriorityQueueAddRemove(makeLimitedPriorityQueueFun func(fun func result := func(index int) int { if index%2 == 0 { return 3*index/2 + 31 - } else { - return (3*index + 61) / 2 } + return (3*index + 61) / 2 } testQueueAddRemove(q, 100, 50, limit, result, t) } @@ -477,9 +463,8 @@ func testPriorityQueueAddRemove(makePriorityQueueFun func(func(i interface{}) bo result := func(index int) int { if index%2 == 0 { return 3*index/2 + 1 - } else { - return (3*index + 1) / 2 } + return (3*index + 1) / 2 } elementsToAdd := 100 testQueueAddRemove(q, elementsToAdd, 50, elementsToAdd, result, t) @@ -491,7 +476,7 @@ func testDefaultQueueAddRemove(q Queue, t *testing.T) { testQueueAddRemove(q, elementsToAdd, elementsToRemoveAdd, elementsToAdd, func(index int) int { return index + elementsToRemoveAdd }, t) } -func testQueueAddRemove(q Queue, elementsToAdd int, elementsToRemoveAdd int, elementsToRemove int, result func(index int) int, t *testing.T) { +func testQueueAddRemove(q Queue, elementsToAdd, elementsToRemoveAdd, elementsToRemove int, result func(index int) int, t *testing.T) { for i := 0; i < elementsToAdd; i++ { require.Truef(t, q.Add(i), "failed to add element %d", i) } @@ -599,7 +584,7 @@ func testDefaultQueueLength(q Queue, t *testing.T) { testQueueLength(q, elementsToAdd, elementsToAdd, t) } -func testQueueLength(q Queue, elementsToRemoveAdd int, elementsToRemove int, t *testing.T) { +func testQueueLength(q Queue, elementsToRemoveAdd, elementsToRemove int, t *testing.T) { emptyLength := q.Length() require.Equalf(t, 0, emptyLength, "empty queue length missmatch") @@ -683,13 +668,11 @@ func testLimitedPriorityQueueGet(makeLimitedPriorityQueueFun func(fun func(i int result := func(iteration int, index int) int { if index <= iteration/2 { return iteration - iteration%2 - 2*index - } else { - if iteration < limit { - return -iteration + iteration%2 + 2*index - 1 - } else { - return iteration + iteration%2 + 2*index - 2*limit + 1 - } } + if iteration < limit { + return -iteration + iteration%2 + 2*index - 1 + } + return iteration + iteration%2 + 2*index - 2*limit + 1 } testQueueGet(q, 1000, result, t) } @@ -704,9 +687,8 @@ func testLimitedQueueGet(makeLimitedQueueFun func(limit int) Queue, t *testing.T result := func(iteration int, index int) int { if iteration < limit { return index - } else { - return index + iteration - limit + 1 } + return index + iteration - limit + 1 } testQueueGet(q, 1000, result, t) } @@ -718,9 +700,8 @@ func testPriorityQueueGet(makePriorityQueueFun func(func(i interface{}) bool) Qu result := func(iteration int, index int) int { if index <= iteration/2 { return iteration - iteration%2 - 2*index - } else { - return -iteration + iteration%2 + 2*index - 1 } + return -iteration + iteration%2 + 2*index - 1 } testQueueGet(q, 1000, result, t) } @@ -805,16 +786,13 @@ func testLimitedPriorityQueueGetNegative(makeLimitedPriorityQueueFun func(fun fu if iteration < limit { if index >= -(iteration+iteration%2)/2 { return iteration + iteration%2 + 2*index + 1 - } else { - return -iteration - iteration%2 - 2*index - 2 - } - } else { - if index <= (iteration-iteration%2)/2-limit { - return iteration - iteration%2 - 2*index - 2*limit - } else { - return iteration + iteration%2 + 2*index + 1 } + return -iteration - iteration%2 - 2*index - 2 } + if index <= (iteration-iteration%2)/2-limit { + return iteration - iteration%2 - 2*index - 2*limit + } + return iteration + iteration%2 + 2*index + 1 } testQueueGetNegative(q, 1000, result, t) } @@ -834,9 +812,8 @@ func testPriorityQueueGetNegative(makePriorityQueueFun func(func(i interface{}) result := func(iteration int, index int) int { if index >= -(iteration+iteration%2)/2 { return iteration + iteration%2 + 2*index + 1 - } else { - return -iteration - iteration%2 - 2*index - 2 } + return -iteration - iteration%2 - 2*index - 2 } testQueueGetNegative(q, 1000, result, t) } From 8b45331d0b9b11e9c0e8cd8e315a0d7d94522c89 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 28 Sep 2021 17:36:54 +0300 Subject: [PATCH 008/198] eapache infinite channel changed by improved infinite channel (renamed to pipe) --- go.mod | 1 - go.sum | 3 --- packages/chain/chainimpl/chainimpl.go | 26 +++++++++++++++++++++---- packages/chain/chainimpl/interface.go | 4 ++-- packages/peering/lpp/lppPeer.go | 28 +++++++++++++++++++++------ 5 files changed, 46 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index ba9434d3fc..d489e6df02 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,6 @@ require ( go.uber.org/zap v1.16.0 golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 - gopkg.in/eapache/channels.v1 v1.1.0 nhooyr.io/websocket v1.8.7 ) diff --git a/go.sum b/go.sum index f8859de265..110539894c 100644 --- a/go.sum +++ b/go.sum @@ -255,7 +255,6 @@ github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw= @@ -1911,8 +1910,6 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= -gopkg.in/eapache/channels.v1 v1.1.0 h1:5bGAyKKvyCTWjSj7mhefG6Lc68VyN4MH1v8/7OoeeB4= -gopkg.in/eapache/channels.v1 v1.1.0/go.mod h1:BHIBujSvu9yMTrTYbTCjDD43gUhtmaOtTWDe7sTv1js= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index eaebedb3dc..581eaa3d8f 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -31,13 +31,15 @@ import ( "github.com/iotaledger/wasp/packages/registry" "github.com/iotaledger/wasp/packages/state" "github.com/iotaledger/wasp/packages/util" + "github.com/iotaledger/wasp/packages/util/pipe" "github.com/iotaledger/wasp/packages/vm/core/blocklog" "github.com/iotaledger/wasp/packages/vm/processors" "go.uber.org/atomic" "golang.org/x/xerrors" - "gopkg.in/eapache/channels.v1" ) +const maxMsgBuffer = 10000 + var ( _ chain.Chain = &chainObj{} _ chain.ChainCore = &chainObj{} @@ -56,7 +58,7 @@ type chainObj struct { chainStateSync coreutil.ChainStateSync stateReader state.OptimisticStateReader procset *processors.Cache - chMsg *channels.InfiniteChannel + msgPipe pipe.Pipe stateMgr chain.StateManager consensus chain.Consensus log *logger.Logger @@ -102,10 +104,26 @@ func NewChain( chainLog := log.Named(chainID.Base58()[:6] + ".") chainStateSync := coreutil.NewChainStateSync() + messagePriorityFun := func(msg interface{}) bool { + switch msgt := msg.(type) { + case *peering.PeerMessage: + switch msgt.MsgType { + case messages.MsgGetBlock, + messages.MsgBlock, + messages.MsgSignedResult, + messages.MsgSignedResultAck: + return true + default: + return false + } + default: + return true + } + } ret := &chainObj{ mempool: mempool.New(state.NewOptimisticStateReader(db, chainStateSync), blobProvider, chainLog, chainMetrics), procset: processors.MustNew(processorConfig), - chMsg: channels.NewInfiniteChannel(), + msgPipe: pipe.NewInfinitePipe(messagePriorityFun, maxMsgBuffer), chainID: *chainID, log: chainLog, nodeConn: nodeconnimpl.New(txstreamClient, chainLog), @@ -143,7 +161,7 @@ func NewChain( ret.ReceiveMessage(recv.Msg) }) go func() { - for msg := range ret.chMsg.Out() { + for msg := range ret.msgPipe.Out() { ret.dispatchMessage(msg) } }() diff --git a/packages/chain/chainimpl/interface.go b/packages/chain/chainimpl/interface.go index d1eb24f3a3..803c295352 100644 --- a/packages/chain/chainimpl/interface.go +++ b/packages/chain/chainimpl/interface.go @@ -62,7 +62,7 @@ func (c *chainObj) Dismiss(reason string) { c.dismissOnce.Do(func() { c.dismissed.Store(true) - c.chMsg.Close() + c.msgPipe.Close() c.mempool.Close() c.stateMgr.Close() @@ -93,7 +93,7 @@ func (c *chainObj) receiveMessage(msg interface{}) { if c.IsDismissed() { return } - c.chMsg.In() <- msg + c.msgPipe.In() <- msg } func shouldSendToPeer(peerID string, ackPeers []string) bool { diff --git a/packages/peering/lpp/lppPeer.go b/packages/peering/lpp/lppPeer.go index 7d2a36ffda..e44d4da180 100644 --- a/packages/peering/lpp/lppPeer.go +++ b/packages/peering/lpp/lppPeer.go @@ -9,15 +9,17 @@ import ( "github.com/iotaledger/hive.go/crypto/ed25519" "github.com/iotaledger/hive.go/logger" + "github.com/iotaledger/wasp/packages/chain/messages" "github.com/iotaledger/wasp/packages/peering" + "github.com/iotaledger/wasp/packages/util/pipe" libp2ppeer "github.com/libp2p/go-libp2p-core/peer" "golang.org/x/xerrors" - "gopkg.in/eapache/channels.v1" ) const ( inactiveDeadline = 1 * time.Minute inactivePingTime = 30 * time.Second + maxPeerMsgBuffer = 10000 ) type peer struct { @@ -25,7 +27,7 @@ type peer struct { remotePubKey *ed25519.PublicKey remoteLppID libp2ppeer.ID accessLock *sync.RWMutex - sendCh *channels.InfiniteChannel + sendPipe pipe.Pipe lastMsgSent time.Time lastMsgRecv time.Time numUsers int @@ -36,12 +38,26 @@ type peer struct { func newPeer(remoteNetID string, remotePubKey *ed25519.PublicKey, remoteLppID libp2ppeer.ID, n *netImpl) *peer { log := n.log.Named("peer:" + remoteNetID) + messagePriorityFun := func(msg interface{}) bool { + peerMsg, ok := msg.(*peering.PeerMessage) + if ok { + switch peerMsg.MsgType { + case messages.MsgGetBlock, + messages.MsgBlock, + messages.MsgSignedResult, + messages.MsgSignedResultAck: + return true + default: + } + } + return false + } p := &peer{ remoteNetID: remoteNetID, remotePubKey: remotePubKey, remoteLppID: remoteLppID, accessLock: &sync.RWMutex{}, - sendCh: channels.NewInfiniteChannel(), + sendPipe: pipe.NewInfinitePipe(messagePriorityFun, maxPeerMsgBuffer), lastMsgSent: time.Time{}, lastMsgRecv: time.Time{}, numUsers: 0, @@ -81,7 +97,7 @@ func (p *peer) maintenanceCheck() { } if numUsers == 0 && !trusted && lastMsgOld { p.net.delPeer(p) - p.sendCh.Close() + p.sendPipe.Close() } } @@ -112,11 +128,11 @@ func (p *peer) SendMsg(msg *peering.PeerMessage) { return } p.accessLock.RUnlock() - p.sendCh.In() <- msg + p.sendPipe.In() <- msg } func (p *peer) sendLoop() { - for msg := range p.sendCh.Out() { + for msg := range p.sendPipe.Out() { p.sendMsgDirect(msg.(*peering.PeerMessage)) } } From 162dd973f52556fe9847660015f98535b718b6c4 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 12 Oct 2021 12:47:10 +0300 Subject: [PATCH 009/198] Queue of the pipe may hash values for identity checking --- packages/chain/chainimpl/chainimpl.go | 5 +- packages/peering/lpp/lppPeer.go | 5 +- packages/util/pipe/pipe.go | 24 +++--- packages/util/pipe/pipe_test.go | 60 ++++++++----- packages/util/pipe/queue.go | 51 ++++++----- packages/util/pipe/queue_test.go | 119 ++++++++++++++++---------- packages/util/pipe/test_util.go | 6 +- 7 files changed, 163 insertions(+), 107 deletions(-) diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index e8e798dba9..18b5ec435d 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -121,10 +121,13 @@ func NewChain( return true } } + messageHashFun := func(msg interface{}) interface{} { // TODO + return msg + } ret := &chainObj{ mempool: mempool.New(state.NewOptimisticStateReader(db, chainStateSync), blobProvider, chainLog, chainMetrics), procset: processors.MustNew(processorConfig), - msgPipe: pipe.NewInfinitePipe(messagePriorityFun, maxMsgBuffer), + msgPipe: pipe.NewInfinitePipe(messagePriorityFun, maxMsgBuffer, messageHashFun), chainID: chainID, log: chainLog, nodeConn: nodeconnimpl.New(txstreamClient, chainLog), diff --git a/packages/peering/lpp/lppPeer.go b/packages/peering/lpp/lppPeer.go index 24863cb09f..eb2ba7849a 100644 --- a/packages/peering/lpp/lppPeer.go +++ b/packages/peering/lpp/lppPeer.go @@ -52,12 +52,15 @@ func newPeer(remoteNetID string, remotePubKey *ed25519.PublicKey, remoteLppID li } return false } + messageHashFun := func(msg interface{}) interface{} { // TODO + return msg + } p := &peer{ remoteNetID: remoteNetID, remotePubKey: remotePubKey, remoteLppID: remoteLppID, accessLock: &sync.RWMutex{}, - sendPipe: pipe.NewInfinitePipe(messagePriorityFun, maxPeerMsgBuffer), + sendPipe: pipe.NewInfinitePipe(messagePriorityFun, maxPeerMsgBuffer, messageHashFun), lastMsgSent: time.Time{}, lastMsgRecv: time.Time{}, numUsers: 0, diff --git a/packages/util/pipe/pipe.go b/packages/util/pipe/pipe.go index 2760d78772..d23776aef9 100644 --- a/packages/util/pipe/pipe.go +++ b/packages/util/pipe/pipe.go @@ -17,32 +17,32 @@ func NewDefaultInfinitePipe() Pipe { return newInfinitePipe(NewDefaultLimitedPriorityHashQueue()) } -func NewPriorityInfinitePipe(fun func(interface{}) bool) Pipe { - return newInfinitePipe(NewPriorityLimitedPriorityHashQueue(fun)) +func NewPriorityInfinitePipe(priorityFun func(interface{}) bool) Pipe { + return newInfinitePipe(NewPriorityLimitedPriorityHashQueue(priorityFun)) } func NewLimitInfinitePipe(limit int) Pipe { return newInfinitePipe(NewLimitLimitedPriorityHashQueue(limit)) } -func NewLimitPriorityInfinitePipe(fun func(interface{}) bool, limit int) Pipe { - return newInfinitePipe(NewLimitPriorityLimitedPriorityHashQueue(fun, limit)) +func NewLimitPriorityInfinitePipe(priorityFun func(interface{}) bool, limit int) Pipe { + return newInfinitePipe(NewLimitPriorityLimitedPriorityHashQueue(priorityFun, limit)) } -func NewHashInfinitePipe() Pipe { - return newInfinitePipe(NewHashLimitedPriorityHashQueue(true)) +func NewHashInfinitePipe(hashFun func(interface{}) interface{}) Pipe { + return newInfinitePipe(NewHashLimitedPriorityHashQueue(&hashFun)) } -func NewPriorityHashInfinitePipe(fun func(interface{}) bool) Pipe { - return newInfinitePipe(NewPriorityHashLimitedPriorityHashQueue(fun, true)) +func NewPriorityHashInfinitePipe(priorityFun func(interface{}) bool, hashFun func(interface{}) interface{}) Pipe { + return newInfinitePipe(NewPriorityHashLimitedPriorityHashQueue(priorityFun, &hashFun)) } -func NewLimitHashInfinitePipe(limit int) Pipe { - return newInfinitePipe(NewLimitHashLimitedPriorityHashQueue(limit, true)) +func NewLimitHashInfinitePipe(limit int, hashFun func(interface{}) interface{}) Pipe { + return newInfinitePipe(NewLimitHashLimitedPriorityHashQueue(limit, &hashFun)) } -func NewInfinitePipe(fun func(interface{}) bool, limit int) Pipe { - return newInfinitePipe(NewLimitedPriorityHashQueue(fun, limit, true)) +func NewInfinitePipe(priorityFun func(interface{}) bool, limit int, hashFun func(interface{}) interface{}) Pipe { + return newInfinitePipe(NewLimitedPriorityHashQueue(priorityFun, limit, &hashFun)) } func newInfinitePipe(queue Queue) *InfinitePipe { diff --git a/packages/util/pipe/pipe_test.go b/packages/util/pipe/pipe_test.go index 3f4fc8a698..3b4f34b680 100644 --- a/packages/util/pipe/pipe_test.go +++ b/packages/util/pipe/pipe_test.go @@ -9,7 +9,7 @@ import ( ) func TestDefaultInfinitePipeWriteReadLen(t *testing.T) { - testDefaultPipeWriteReadLen(NewDefaultInfinitePipe(), 1000, identityFun, t) + testDefaultPipeWriteReadLen(NewDefaultInfinitePipe(), 1000, identityFunInt, t) } func TestPriorityInfinitePipeWriteReadLen(t *testing.T) { @@ -33,34 +33,34 @@ func TestLimitPriorityInfinitePipeWriteReadLen(t *testing.T) { } func TestHashInfinitePipeWriteReadLen(t *testing.T) { - testDefaultPipeWriteReadLen(NewHashInfinitePipe(), 1000, identityFun, t) + testDefaultPipeWriteReadLen(NewHashInfinitePipe(identityFunInterface), 1000, identityFunInt, t) } func TestPriorityHashInfinitePipeWriteReadLen(t *testing.T) { - testPriorityPipeWriteReadLen(NewPriorityHashInfinitePipe, t) + testPriorityPipeWriteReadLen(newPriorityHashInfinitePipe, t) } func TestLimitHashInfinitePipeNoLimitWriteReadLen(t *testing.T) { - testLimitedPipeNoLimitWriteReadLen(NewLimitHashInfinitePipe, t) + testLimitedPipeNoLimitWriteReadLen(newLimitHashInfinitePipe, t) } func TestLimitHashInfinitePipeWriteReadLen(t *testing.T) { - testLimitedPipeWriteReadLen(NewLimitHashInfinitePipe, t) + testLimitedPipeWriteReadLen(newLimitHashInfinitePipe, t) } func TestInfinitePipeNoLimitWriteReadLen(t *testing.T) { - testLimitedPriorityPipeNoLimitWriteReadLen(NewInfinitePipe, t) + testLimitedPriorityPipeNoLimitWriteReadLen(newLimitPriorityHashInfinitePipe, t) } func TestInfinitePipeWriteReadLen(t *testing.T) { - testLimitedPriorityPipeWriteReadLen(NewInfinitePipe, t) + testLimitedPriorityPipeWriteReadLen(newLimitPriorityHashInfinitePipe, t) } -func testLimitedPriorityPipeNoLimitWriteReadLen(makeLimitedPriorityPipeFun func(fun func(i interface{}) bool, limit int) Pipe, t *testing.T) { - testPriorityPipeWriteReadLen(func(fun func(i interface{}) bool) Pipe { return makeLimitedPriorityPipeFun(fun, 1200) }, t) +func testLimitedPriorityPipeNoLimitWriteReadLen(makeLimitedPriorityPipeFun func(priorityFun func(i interface{}) bool, limit int) Pipe, t *testing.T) { + testPriorityPipeWriteReadLen(func(priorityFun func(i interface{}) bool) Pipe { return makeLimitedPriorityPipeFun(priorityFun, 1200) }, t) } -func testLimitedPriorityPipeWriteReadLen(makeLimitedPriorityPipeFun func(fun func(i interface{}) bool, limit int) Pipe, t *testing.T) { +func testLimitedPriorityPipeWriteReadLen(makeLimitedPriorityPipeFun func(priorityFun func(i interface{}) bool, limit int) Pipe, t *testing.T) { limit := 800 p := makeLimitedPriorityPipeFun(func(i interface{}) bool { return i.(int)%3 == 0 @@ -78,7 +78,7 @@ func testLimitedPriorityPipeWriteReadLen(makeLimitedPriorityPipeFun func(fun fun } func testLimitedPipeNoLimitWriteReadLen(makeLimitedPipeFun func(limit int) Pipe, t *testing.T) { - testDefaultPipeWriteReadLen(makeLimitedPipeFun(1200), 1000, identityFun, t) + testDefaultPipeWriteReadLen(makeLimitedPipeFun(1200), 1000, identityFunInt, t) } func testLimitedPipeWriteReadLen(makeLimitedPipeFun func(limit int) Pipe, t *testing.T) { @@ -129,7 +129,7 @@ func testPipeWriteReadLen(p Pipe, elementsToWrite, elementsToRead int, result fu //-- func TestDefaultInfinitePipeConcurrentWriteReadLen(t *testing.T) { - result := identityFun + result := identityFunInt testDefaultPipeConcurrentWriteReadLen(NewDefaultInfinitePipe(), 1000, &result, t) } @@ -154,35 +154,35 @@ func TestLimitPriorityInfinitePipeConcurrentWriteReadLen(t *testing.T) { } func TestHashInfinitePipeConcurrentWriteReadLen(t *testing.T) { - result := identityFun - testDefaultPipeConcurrentWriteReadLen(NewHashInfinitePipe(), 1000, &result, t) + result := identityFunInt + testDefaultPipeConcurrentWriteReadLen(NewHashInfinitePipe(identityFunInterface), 1000, &result, t) } func TestPriorityHashInfinitePipeConcurrentWriteReadLen(t *testing.T) { - testPriorityPipeConcurrentWriteReadLen(NewPriorityHashInfinitePipe, t) + testPriorityPipeConcurrentWriteReadLen(newPriorityHashInfinitePipe, t) } func TestLimitHashInfinitePipeNoLimitConcurrentWriteReadLen(t *testing.T) { - testLimitedPipeNoLimitConcurrentWriteReadLen(NewLimitHashInfinitePipe, t) + testLimitedPipeNoLimitConcurrentWriteReadLen(newLimitHashInfinitePipe, t) } func TestLimitHashInfinitePipeConcurrentWriteReadLen(t *testing.T) { - testLimitedPipeConcurrentWriteReadLen(NewLimitHashInfinitePipe, t) + testLimitedPipeConcurrentWriteReadLen(newLimitHashInfinitePipe, t) } func TestInfinitePipeNoLimitConcurrentWriteReadLen(t *testing.T) { - testLimitedPriorityPipeNoLimitConcurrentWriteReadLen(NewInfinitePipe, t) + testLimitedPriorityPipeNoLimitConcurrentWriteReadLen(newLimitPriorityHashInfinitePipe, t) } func TestInfinitePipeConcurrentWriteReadLen(t *testing.T) { - testLimitedPriorityPipeConcurrentWriteReadLen(NewInfinitePipe, t) + testLimitedPriorityPipeConcurrentWriteReadLen(newLimitPriorityHashInfinitePipe, t) } -func testLimitedPriorityPipeNoLimitConcurrentWriteReadLen(makeLimitedPriorityPipeFun func(fun func(i interface{}) bool, limit int) Pipe, t *testing.T) { - testPriorityPipeConcurrentWriteReadLen(func(fun func(i interface{}) bool) Pipe { return makeLimitedPriorityPipeFun(fun, 1200) }, t) +func testLimitedPriorityPipeNoLimitConcurrentWriteReadLen(makeLimitedPriorityPipeFun func(priorityFun func(i interface{}) bool, limit int) Pipe, t *testing.T) { + testPriorityPipeConcurrentWriteReadLen(func(priorityFun func(i interface{}) bool) Pipe { return makeLimitedPriorityPipeFun(priorityFun, 1200) }, t) } -func testLimitedPriorityPipeConcurrentWriteReadLen(makeLimitedPriorityPipeFun func(fun func(i interface{}) bool, limit int) Pipe, t *testing.T) { +func testLimitedPriorityPipeConcurrentWriteReadLen(makeLimitedPriorityPipeFun func(priorityFun func(i interface{}) bool, limit int) Pipe, t *testing.T) { limit := 800 ch := makeLimitedPriorityPipeFun(func(i interface{}) bool { return i.(int)%3 == 0 @@ -191,7 +191,7 @@ func testLimitedPriorityPipeConcurrentWriteReadLen(makeLimitedPriorityPipeFun fu } func testLimitedPipeNoLimitConcurrentWriteReadLen(makeLimitedPipeFun func(limit int) Pipe, t *testing.T) { - result := identityFun + result := identityFunInt testDefaultPipeConcurrentWriteReadLen(makeLimitedPipeFun(1200), 1000, &result, t) } @@ -255,3 +255,17 @@ func testPipeConcurrentWriteReadLen(p Pipe, elementsToWrite, elementsToRead int, require.Equalf(t, elementsToWrite, written, "concurent write elements written missmatch") require.Equalf(t, elementsToRead, read, "concurent read elements read missmatch") } + +//-- + +func newPriorityHashInfinitePipe(priorityFun func(i interface{}) bool) Pipe { + return NewPriorityHashInfinitePipe(priorityFun, identityFunInterface) +} + +func newLimitHashInfinitePipe(limit int) Pipe { + return NewLimitHashInfinitePipe(limit, identityFunInterface) +} + +func newLimitPriorityHashInfinitePipe(priorityFun func(i interface{}) bool, limit int) Pipe { + return NewInfinitePipe(priorityFun, limit, identityFunInterface) +} diff --git a/packages/util/pipe/queue.go b/packages/util/pipe/queue.go index 35e334aa80..5ab042678e 100644 --- a/packages/util/pipe/queue.go +++ b/packages/util/pipe/queue.go @@ -11,6 +11,7 @@ type LimitedPriorityHashQueue struct { priorityFun func(interface{}) bool limit int hash *map[interface{}]bool + hashFun func(interface{}) interface{} } var _ Queue = &LimitedPriorityHashQueue{} @@ -18,34 +19,34 @@ var _ Queue = &LimitedPriorityHashQueue{} const Infinity = 0 func NewDefaultLimitedPriorityHashQueue() Queue { - return NewHashLimitedPriorityHashQueue(false) + return NewHashLimitedPriorityHashQueue(nil) } -func NewPriorityLimitedPriorityHashQueue(fun func(interface{}) bool) Queue { - return NewPriorityHashLimitedPriorityHashQueue(fun, false) +func NewPriorityLimitedPriorityHashQueue(priorityFun func(interface{}) bool) Queue { + return NewPriorityHashLimitedPriorityHashQueue(priorityFun, nil) } func NewLimitLimitedPriorityHashQueue(limit int) Queue { - return NewLimitHashLimitedPriorityHashQueue(limit, false) + return NewLimitHashLimitedPriorityHashQueue(limit, nil) } -func NewLimitPriorityLimitedPriorityHashQueue(fun func(interface{}) bool, limit int) Queue { - return NewLimitedPriorityHashQueue(fun, limit, false) +func NewLimitPriorityLimitedPriorityHashQueue(priorityFun func(interface{}) bool, limit int) Queue { + return NewLimitedPriorityHashQueue(priorityFun, limit, nil) } -func NewHashLimitedPriorityHashQueue(hashNeeded bool) Queue { - return NewLimitHashLimitedPriorityHashQueue(Infinity, hashNeeded) +func NewHashLimitedPriorityHashQueue(hashNeededFun *func(interface{}) interface{}) Queue { + return NewLimitHashLimitedPriorityHashQueue(Infinity, hashNeededFun) } -func NewPriorityHashLimitedPriorityHashQueue(fun func(interface{}) bool, hashNeeded bool) Queue { - return NewLimitedPriorityHashQueue(fun, Infinity, hashNeeded) +func NewPriorityHashLimitedPriorityHashQueue(priorityFun func(interface{}) bool, hashNeededFun *func(interface{}) interface{}) Queue { + return NewLimitedPriorityHashQueue(priorityFun, Infinity, hashNeededFun) } -func NewLimitHashLimitedPriorityHashQueue(limit int, hashNeeded bool) Queue { - return NewLimitedPriorityHashQueue(func(interface{}) bool { return false }, limit, hashNeeded) +func NewLimitHashLimitedPriorityHashQueue(limit int, hashNeededFun *func(interface{}) interface{}) Queue { + return NewLimitedPriorityHashQueue(func(interface{}) bool { return false }, limit, hashNeededFun) } -func NewLimitedPriorityHashQueue(fun func(interface{}) bool, limit int, hashNeeded bool) Queue { +func NewLimitedPriorityHashQueue(priorityFun func(interface{}) bool, limit int, hashNeededFun *func(interface{}) interface{}) Queue { var initBufSize int if (limit != Infinity) && (limit < minQueueLen) { initBufSize = limit @@ -53,11 +54,14 @@ func NewLimitedPriorityHashQueue(fun func(interface{}) bool, limit int, hashNeed initBufSize = minQueueLen } var hash *map[interface{}]bool - if hashNeeded { + var hashFun func(interface{}) interface{} + if hashNeededFun == nil { + hash = nil + hashFun = func(elem interface{}) interface{} { return elem } + } else { hashT := make(map[interface{}]bool) hash = &hashT - } else { - hash = nil + hashFun = *hashNeededFun } return &LimitedPriorityHashQueue{ head: 0, @@ -65,9 +69,10 @@ func NewLimitedPriorityHashQueue(fun func(interface{}) bool, limit int, hashNeed tail: 0, count: 0, buf: make([]interface{}, initBufSize), - priorityFun: fun, + priorityFun: priorityFun, limit: limit, hash: hash, + hashFun: hashFun, } } @@ -116,15 +121,17 @@ func (q *LimitedPriorityHashQueue) resize() { // Add puts an element to the start or end of the queue, depending // on the result of priorityFun. If the limited queue is full it adds a new element // removing the previously added element, according to the following rules: -// * not prioritized element is chosen for deletion, if possible +// * not prioritized element is chosen for deletion, if possible // * the chosen for deletion element is always the oldest among its type // * not prioritized element can not be added if there are no not prioritized // element to delete // If it is a hash queue, the element is not added, if it is already in the queue. // If the add was successful, returns `true`. func (q *LimitedPriorityHashQueue) Add(elem interface{}) bool { + elemHash := elem if q.hash != nil { - _, exists := (*(q.hash))[elem] + elemHash = q.hashFun(elem) + _, exists := (*(q.hash))[elemHash] if exists { // duplicate element; ignoring return false @@ -175,7 +182,7 @@ func (q *LimitedPriorityHashQueue) Add(elem interface{}) bool { } } if q.hash != nil { - delete(*(q.hash), deleteElem) + delete(*(q.hash), q.hashFun(deleteElem)) } } if priority { @@ -193,7 +200,7 @@ func (q *LimitedPriorityHashQueue) Add(elem interface{}) bool { q.count++ } if q.hash != nil { - (*(q.hash))[elem] = true + (*(q.hash))[elemHash] = true } return true } @@ -241,7 +248,7 @@ func (q *LimitedPriorityHashQueue) Remove() interface{} { q.resize() } if q.hash != nil { - delete(*(q.hash), ret) + delete(*(q.hash), q.hashFun(ret)) } return ret } diff --git a/packages/util/pipe/queue_test.go b/packages/util/pipe/queue_test.go index 349ec3163c..02e0227182 100644 --- a/packages/util/pipe/queue_test.go +++ b/packages/util/pipe/queue_test.go @@ -52,7 +52,8 @@ func TestLimitPriorityLimitedPriorityHashQueueSimple(t *testing.T) { } func TestHashLimitedPriorityHashQueueSimple(t *testing.T) { - testDefaultQueueSimple(NewHashLimitedPriorityHashQueue(true), t) + hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } + testDefaultQueueSimple(NewHashLimitedPriorityHashQueue(&hashFun), t) } func TestPriorityHashLimitedPriorityHashQueueSimple(t *testing.T) { @@ -75,11 +76,11 @@ func TestLimitedPriorityHashQueueSimple(t *testing.T) { testLimitedPriorityQueueSimple(newLimitPriorityHashLimitedPriorityHashQueue, t) } -func testLimitedPriorityQueueNoLimitSimple(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { - testPriorityQueueSimple(func(fun func(i interface{}) bool) Queue { return makeLimitedPriorityQueueFun(fun, 15) }, t) +func testLimitedPriorityQueueNoLimitSimple(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { + testPriorityQueueSimple(func(priorityFun func(i interface{}) bool) Queue { return makeLimitedPriorityQueueFun(priorityFun, 15) }, t) } -func testLimitedPriorityQueueSimple(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { +func testLimitedPriorityQueueSimple(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { resultArray := []int{9, 6, 3, 0, 4, 5, 7, 8} limit := len(resultArray) q := makeLimitedPriorityQueueFun(func(i interface{}) bool { @@ -120,11 +121,11 @@ func testPriorityQueueSimple(makePriorityQueueFun func(func(i interface{}) bool) func testDefaultQueueSimple(q Queue, t *testing.T) { elementsToAdd := 10 - testQueueSimple(q, elementsToAdd, elementsToAdd, identityFun, t) + testQueueSimple(q, elementsToAdd, elementsToAdd, identityFunInt, t) } func testQueueSimple(q Queue, elementsToAdd, elementsToRemove int, result func(index int) int, t *testing.T) { - testQueueBasicAddLengthPeekRemove(q, elementsToAdd, identityFun, alwaysTrueFun, elementsToRemove, result, t) + testQueueBasicAddLengthPeekRemove(q, elementsToAdd, identityFunInt, alwaysTrueFun, elementsToRemove, result, t) } //-- @@ -153,7 +154,9 @@ func TestLimitLimitedPriorityHashQueueTwice(t *testing.T) { } func TestLimitPriorityLimitedPriorityHashQueueNoLimitTwice(t *testing.T) { - testPriorityQueueTwice(func(fun func(i interface{}) bool) Queue { return NewLimitPriorityLimitedPriorityHashQueue(fun, 150) }, t) + testPriorityQueueTwice(func(priorityFun func(i interface{}) bool) Queue { + return NewLimitPriorityLimitedPriorityHashQueue(priorityFun, 150) + }, t) } func TestLimitPriorityLimitedPriorityHashQueueTwice(t *testing.T) { @@ -191,32 +194,34 @@ func TestPriorityHashLimitedPriorityHashQueueTwice(t *testing.T) { } func TestLimitHashLimitedPriorityHashQueueNoLimitTwice(t *testing.T) { - testHashQueueTwice(func(hashNeeded bool) Queue { - return NewLimitHashLimitedPriorityHashQueue(80, hashNeeded) + testHashQueueTwice(func(hashNeededFun *func(interface{}) interface{}) Queue { + return NewLimitHashLimitedPriorityHashQueue(80, hashNeededFun) }, t) } func TestLimitHashLimitedPriorityHashQueueTwice(t *testing.T) { limit := 30 + hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } elementsToAddSingle := 50 indexDiff := elementsToAddSingle - limit resultFun := func(index int) int { return index + indexDiff } - q := NewLimitHashLimitedPriorityHashQueue(limit, true) + q := NewLimitHashLimitedPriorityHashQueue(limit, &hashFun) testQueueTwice(q, elementsToAddSingle, alwaysTrueFun, limit, resultFun, t) } func TestLimitedPriorityHashQueueNoLimitTwice(t *testing.T) { - testPriorityHashQueueTwice(func(fun func(i interface{}) bool, hashNeeded bool) Queue { - return NewLimitedPriorityHashQueue(fun, 80, hashNeeded) + testPriorityHashQueueTwice(func(priorityFun func(i interface{}) bool, hashNeededFun *func(interface{}) interface{}) Queue { + return NewLimitedPriorityHashQueue(priorityFun, 80, hashNeededFun) }, t) } func TestLimitedPriorityHashQueueTwice(t *testing.T) { limit := 30 + hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } elementsToAddSingle := 50 q := NewLimitedPriorityHashQueue(func(i interface{}) bool { return i.(int)%3 == 0 - }, limit, true) + }, limit, &hashFun) addResultFun := func(index int) bool { return (index < elementsToAddSingle) || ((index-elementsToAddSingle)%3 != 0) } resultFun := func(index int) int { if index <= 16 { @@ -230,17 +235,19 @@ func TestLimitedPriorityHashQueueTwice(t *testing.T) { testQueueTwice(q, elementsToAddSingle, addResultFun, limit, resultFun, t) } -func testHashQueueTwice(makeHashQueueFun func(hashNeeded bool) Queue, t *testing.T) { - q := makeHashQueueFun(true) +func testHashQueueTwice(makeHashQueueFun func(hashNeededFun *func(interface{}) interface{}) Queue, t *testing.T) { + hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } + q := makeHashQueueFun(&hashFun) elementsToAddSingle := 50 addResultFun := func(index int) bool { return index < elementsToAddSingle } - testQueueTwice(q, elementsToAddSingle, addResultFun, elementsToAddSingle, identityFun, t) + testQueueTwice(q, elementsToAddSingle, addResultFun, elementsToAddSingle, identityFunInt, t) } -func testPriorityHashQueueTwice(makePriorityHashQueueFun func(fun func(i interface{}) bool, hashNeeded bool) Queue, t *testing.T) { +func testPriorityHashQueueTwice(makePriorityHashQueueFun func(priorityFun func(i interface{}) bool, hashNeededFun *func(interface{}) interface{}) Queue, t *testing.T) { + hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } q := makePriorityHashQueueFun(func(i interface{}) bool { return i.(int)%3 == 0 - }, true) + }, &hashFun) elementsToAddSingle := 50 addResultFun := func(index int) bool { return index < elementsToAddSingle } resultFun := func(index int) int { @@ -316,13 +323,14 @@ func TestLimitPriorityLimitedPriorityHashQueueOverflow(t *testing.T) { func TestLimitedPriorityHashQueueOverflow(t *testing.T) { limit := 30 + hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } elementsToAddSingle := 50 cutOffLow := 20 cutOffHigh := 40 q := NewLimitedPriorityHashQueue(func(i interface{}) bool { value := i.(int) return value < cutOffLow || cutOffHigh <= value - }, limit, true) + }, limit, &hashFun) addResultFun := func(index int) bool { return index < elementsToAddSingle } @@ -339,10 +347,11 @@ func TestLimitedPriorityHashQueueOverflow(t *testing.T) { func TestLimitedPriorityHashQueueDuplicates(t *testing.T) { limit := 80 + hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } elementsToAddFirstIteration := 50 q := NewLimitedPriorityHashQueue(func(i interface{}) bool { return i.(int)%3 == 0 - }, limit, true) + }, limit, &hashFun) addFun := func(index int) int { if index < elementsToAddFirstIteration { return 2 * index @@ -399,7 +408,8 @@ func TestLimitPriorityLimitedPriorityHashQueueAddRemove(t *testing.T) { } func TestHashLimitedPriorityHashQueueAddRemove(t *testing.T) { - testDefaultQueueAddRemove(NewHashLimitedPriorityHashQueue(true), t) + hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } + testDefaultQueueAddRemove(NewHashLimitedPriorityHashQueue(&hashFun), t) } func TestPriorityHashLimitedPriorityHashQueueAddRemove(t *testing.T) { @@ -422,11 +432,11 @@ func TestLimitedPriorityHashQueueAddRemove(t *testing.T) { testLimitedPriorityQueueAddRemove(newLimitPriorityHashLimitedPriorityHashQueue, t) } -func testLimitedPriorityQueueNoLimitAddRemove(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { - testPriorityQueueAddRemove(func(fun func(i interface{}) bool) Queue { return makeLimitedPriorityQueueFun(fun, 150) }, t) +func testLimitedPriorityQueueNoLimitAddRemove(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { + testPriorityQueueAddRemove(func(priorityFun func(i interface{}) bool) Queue { return makeLimitedPriorityQueueFun(priorityFun, 150) }, t) } -func testLimitedPriorityQueueAddRemove(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { +func testLimitedPriorityQueueAddRemove(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { limit := 80 q := makeLimitedPriorityQueueFun(func(i interface{}) bool { return i.(int)%3 == 0 @@ -526,7 +536,8 @@ func TestLimitPriorityLimitedPriorityHashQueueLength(t *testing.T) { } func TesHashLimitedPriorityHashQueueLength(t *testing.T) { - testDefaultQueueLength(NewHashLimitedPriorityHashQueue(true), t) + hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } + testDefaultQueueLength(NewHashLimitedPriorityHashQueue(&hashFun), t) } func TestPriorityHashLimitedPriorityHashQueueLength(t *testing.T) { @@ -549,11 +560,13 @@ func TestLimitedPriorityHashQueueLength(t *testing.T) { testLimitedPriorityQueueLength(newLimitPriorityHashLimitedPriorityHashQueue, t) } -func testLimitedPriorityQueueNoLimitLength(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { - testPriorityQueueLength(func(fun func(i interface{}) bool) Queue { return makeLimitedPriorityQueueFun(fun, 1500) }, t) +func testLimitedPriorityQueueNoLimitLength(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { + testPriorityQueueLength(func(priorityFun func(i interface{}) bool) Queue { + return makeLimitedPriorityQueueFun(priorityFun, 1500) + }, t) } -func testLimitedPriorityQueueLength(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { +func testLimitedPriorityQueueLength(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { limit := 800 q := makeLimitedPriorityQueueFun(func(i interface{}) bool { return i.(int)%3 == 0 @@ -633,7 +646,8 @@ func TestLimitPriorityLimitedPriorityHashQueueGet(t *testing.T) { } func TestHashLimitedPriorityHashQueueGet(t *testing.T) { - testDefaultQueueGet(NewHashLimitedPriorityHashQueue(true), t) + hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } + testDefaultQueueGet(NewHashLimitedPriorityHashQueue(&hashFun), t) } func TestPriorityHashLimitedPriorityHashQueueGet(t *testing.T) { @@ -656,11 +670,13 @@ func TestLimitedPriorityHashQueueGet(t *testing.T) { testLimitedPriorityQueueGet(newLimitPriorityHashLimitedPriorityHashQueue, t) } -func testLimitedPriorityQueueNoLimitGet(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { - testPriorityQueueGet(func(fun func(i interface{}) bool) Queue { return makeLimitedPriorityQueueFun(fun, 1500) }, t) +func testLimitedPriorityQueueNoLimitGet(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { + testPriorityQueueGet(func(priorityFun func(i interface{}) bool) Queue { + return makeLimitedPriorityQueueFun(priorityFun, 1500) + }, t) } -func testLimitedPriorityQueueGet(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { +func testLimitedPriorityQueueGet(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { limit := 800 q := makeLimitedPriorityQueueFun(func(i interface{}) bool { return i.(int)%2 == 0 @@ -750,7 +766,8 @@ func TestLimitPriorityLimitedPriorityHashQueueGetNegative(t *testing.T) { } func TestHashLimitedPriorityHashQueueGetNegative(t *testing.T) { - testDefaultQueueGetNegative(NewHashLimitedPriorityHashQueue(true), t) + hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } + testDefaultQueueGetNegative(NewHashLimitedPriorityHashQueue(&hashFun), t) } func TestPriorityHashLimitedPriorityHashQueueGetNegative(t *testing.T) { @@ -773,11 +790,13 @@ func TestLimitedPriorityHashQueueGetNegative(t *testing.T) { testLimitedPriorityQueueGetNegative(newLimitPriorityHashLimitedPriorityHashQueue, t) } -func testLimitedPriorityQueueNoLimitGetNegative(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { - testPriorityQueueGetNegative(func(fun func(i interface{}) bool) Queue { return makeLimitedPriorityQueueFun(fun, 1500) }, t) +func testLimitedPriorityQueueNoLimitGetNegative(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { + testPriorityQueueGetNegative(func(priorityFun func(i interface{}) bool) Queue { + return makeLimitedPriorityQueueFun(priorityFun, 1500) + }, t) } -func testLimitedPriorityQueueGetNegative(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { +func testLimitedPriorityQueueGetNegative(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { limit := 800 q := makeLimitedPriorityQueueFun(func(i interface{}) bool { return i.(int)%2 == 0 @@ -854,7 +873,8 @@ func TestLimitPriorityLimitedPriorityHashQueueGetOutOfRangePanics(t *testing.T) } func TestHashLimitedPriorityHashQueueGetOutOfRangePanics(t *testing.T) { - testQueueGetOutOfRangePanics(NewHashLimitedPriorityHashQueue(true), t) + hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } + testQueueGetOutOfRangePanics(NewHashLimitedPriorityHashQueue(&hashFun), t) } func TestPriorityHashLimitedPriorityHashQueueGetOutOfRangePanics(t *testing.T) { @@ -869,7 +889,7 @@ func TestLimitedPriorityHashQueueGetOutOfRangePanics(t *testing.T) { testLimitedPriorityQueueGetOutOfRangePanics(newLimitPriorityHashLimitedPriorityHashQueue, t) } -func testLimitedPriorityQueueGetOutOfRangePanics(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { +func testLimitedPriorityQueueGetOutOfRangePanics(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { q := makeLimitedPriorityQueueFun(func(i interface{}) bool { return i.(int)%2 == 0 }, 800) @@ -914,7 +934,8 @@ func TestLimitPriorityLimitedPriorityHashQueuePeekOutOfRangePanics(t *testing.T) } func TestHashtLimitedPriorityHashQueuePeekOutOfRangePanics(t *testing.T) { - testQueuePeekOutOfRangePanics(NewHashLimitedPriorityHashQueue(true), t) + hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } + testQueuePeekOutOfRangePanics(NewHashLimitedPriorityHashQueue(&hashFun), t) } func TestPriorityHashLimitedPriorityHashQueuePeekOutOfRangePanics(t *testing.T) { @@ -929,7 +950,7 @@ func TestLimitedPriorityHashQueuePeekOutOfRangePanics(t *testing.T) { testLimitedPriorityQueuePeekOutOfRangePanics(newLimitPriorityHashLimitedPriorityHashQueue, t) } -func testLimitedPriorityQueuePeekOutOfRangePanics(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { +func testLimitedPriorityQueuePeekOutOfRangePanics(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { q := makeLimitedPriorityQueueFun(func(i interface{}) bool { return i.(int)%2 == 0 }, 800) @@ -973,7 +994,8 @@ func TestLimitPriorityLimitedPriorityHashQueueRemoveOutOfRangePanics(t *testing. } func TestHashLimitedPriorityHashQueueRemoveOutOfRangePanics(t *testing.T) { - testQueueRemoveOutOfRangePanics(NewHashLimitedPriorityHashQueue(true), t) + hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } + testQueueRemoveOutOfRangePanics(NewHashLimitedPriorityHashQueue(&hashFun), t) } func TestPriorityHashLimitedPriorityHashQueueRemoveOutOfRangePanics(t *testing.T) { @@ -988,7 +1010,7 @@ func TestLimitedPriorityHashQueueRemoveOutOfRangePanics(t *testing.T) { testLimitedPriorityQueueRemoveOutOfRangePanics(newLimitPriorityHashLimitedPriorityHashQueue, t) } -func testLimitedPriorityQueueRemoveOutOfRangePanics(makeLimitedPriorityQueueFun func(fun func(i interface{}) bool, limit int) Queue, t *testing.T) { +func testLimitedPriorityQueueRemoveOutOfRangePanics(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { q := makeLimitedPriorityQueueFun(func(i interface{}) bool { return i.(int)%2 == 0 }, 800) @@ -1015,14 +1037,17 @@ func testQueueRemoveOutOfRangePanics(q Queue, t *testing.T) { //-- -func newPriorityHashLimitedPriorityHashQueue(fun func(i interface{}) bool) Queue { - return NewPriorityHashLimitedPriorityHashQueue(fun, true) +func newPriorityHashLimitedPriorityHashQueue(priorityFun func(i interface{}) bool) Queue { + hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } + return NewPriorityHashLimitedPriorityHashQueue(priorityFun, &hashFun) } func newLimitHashLimitedPriorityHashQueue(limit int) Queue { - return NewLimitHashLimitedPriorityHashQueue(limit, true) + hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } + return NewLimitHashLimitedPriorityHashQueue(limit, &hashFun) } -func newLimitPriorityHashLimitedPriorityHashQueue(fun func(i interface{}) bool, limit int) Queue { - return NewLimitedPriorityHashQueue(fun, limit, true) +func newLimitPriorityHashLimitedPriorityHashQueue(priorityFun func(i interface{}) bool, limit int) Queue { + hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } + return NewLimitedPriorityHashQueue(priorityFun, limit, &hashFun) } diff --git a/packages/util/pipe/test_util.go b/packages/util/pipe/test_util.go index f5ccc6915e..55cffac172 100644 --- a/packages/util/pipe/test_util.go +++ b/packages/util/pipe/test_util.go @@ -1,9 +1,13 @@ package pipe -func identityFun(index int) int { +func identityFunInt(index int) int { return index } +func identityFunInterface(elem interface{}) interface{} { + return elem +} + func alwaysTrueFun(index int) bool { return true } From 708b45ae77321c198fcbee45eb4f0b5c678c50a2 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Fri, 15 Oct 2021 11:39:02 +0300 Subject: [PATCH 010/198] Appeasing linter --- packages/evm/jsonrpc/service.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/evm/jsonrpc/service.go b/packages/evm/jsonrpc/service.go index 4c169431ba..cfbb8a151b 100644 --- a/packages/evm/jsonrpc/service.go +++ b/packages/evm/jsonrpc/service.go @@ -270,7 +270,8 @@ func (e *EthService) GetLogs(q *RPCFilterQuery) ([]*types.Log, error) { } // ChainID implements the eth_chainId method according to https://eips.ethereum.org/EIPS/eip-695 -func (e *EthService) ChainId() hexutil.Uint { //nolint:revive // method name has to be ChainId instead of ChainID +// method name has to be ChainId instead of ChainID +func (e *EthService) ChainId() hexutil.Uint { //nolint:revive return hexutil.Uint(e.evmChain.chainID) } From 41a66b62eebf0d0b842880d345faa9e96caea118 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Fri, 15 Oct 2021 14:00:12 +0300 Subject: [PATCH 011/198] Duplication check in pipe queue altered; real hashing functions implemented --- packages/chain/chainimpl/chainimpl.go | 5 +- packages/chain/messages/peermsg.go | 182 +++++++++++++++++++++++++ packages/peering/lpp/lppPeer.go | 5 +- packages/peering/peering.go | 25 ++++ packages/util/pipe/hash_set.go | 97 ++++++++++++++ packages/util/pipe/interface.go | 16 +++ packages/util/pipe/pipe.go | 16 +-- packages/util/pipe/pipe_test.go | 62 +++------ packages/util/pipe/queue.go | 63 ++++----- packages/util/pipe/queue_test.go | 186 +++++++++----------------- packages/util/pipe/test_util.go | 34 ++++- 11 files changed, 468 insertions(+), 223 deletions(-) create mode 100644 packages/util/pipe/hash_set.go diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index 18b5ec435d..e8e798dba9 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -121,13 +121,10 @@ func NewChain( return true } } - messageHashFun := func(msg interface{}) interface{} { // TODO - return msg - } ret := &chainObj{ mempool: mempool.New(state.NewOptimisticStateReader(db, chainStateSync), blobProvider, chainLog, chainMetrics), procset: processors.MustNew(processorConfig), - msgPipe: pipe.NewInfinitePipe(messagePriorityFun, maxMsgBuffer, messageHashFun), + msgPipe: pipe.NewInfinitePipe(messagePriorityFun, maxMsgBuffer), chainID: chainID, log: chainLog, nodeConn: nodeconnimpl.New(txstreamClient, chainLog), diff --git a/packages/chain/messages/peermsg.go b/packages/chain/messages/peermsg.go index fcf816517d..7c5e93729c 100644 --- a/packages/chain/messages/peermsg.go +++ b/packages/chain/messages/peermsg.go @@ -4,6 +4,7 @@ package messages import ( + "bytes" "io" "time" @@ -12,6 +13,7 @@ import ( "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/state" "github.com/iotaledger/wasp/packages/util" + "github.com/iotaledger/wasp/packages/util/pipe" "github.com/iotaledger/wasp/packages/vm" "go.dedis.ch/kyber/v3/sign/tbls" ) @@ -30,6 +32,20 @@ const ( type TimerTick int +var _ pipe.Hashable = TimerTick(0) + +func (ttT TimerTick) GetHash() interface{} { + return ttT +} + +func (ttT TimerTick) Equals(elem interface{}) bool { + other, ok := elem.(TimerTick) + if !ok { + return false + } + return ttT == other +} + type SignedResultMsg struct { SenderIndex uint16 ChainInputID ledgerstate.OutputID @@ -60,6 +76,20 @@ type DismissChainMsg struct { Reason string } +var _ pipe.Hashable = &DismissChainMsg{} + +func (dcmT *DismissChainMsg) GetHash() interface{} { + return dcmT.Reason +} + +func (dcmT *DismissChainMsg) Equals(elem interface{}) bool { + other, ok := elem.(*DismissChainMsg) + if !ok { + return false + } + return dcmT.Reason == other.Reason +} + // StateTransitionMsg Notifies chain about changed state type StateTransitionMsg struct { // new variable state @@ -70,35 +100,187 @@ type StateTransitionMsg struct { StateTimestamp time.Time } +var _ pipe.Hashable = &StateTransitionMsg{} + +func (stmT *StateTransitionMsg) GetHash() interface{} { + return struct { + // TODO: move state fields to state.VirtualStateAccess? + stateBlockIndex uint32 + statePreviousHash hashing.HashValue + stateCommitment hashing.HashValue + outputID ledgerstate.OutputID + }{ + stateBlockIndex: stmT.State.BlockIndex(), + statePreviousHash: stmT.State.PreviousStateHash(), + stateCommitment: stmT.State.StateCommitment(), + outputID: stmT.StateOutput.ID(), + } +} + +func (stmT *StateTransitionMsg) Equals(elem interface{}) bool { + other, ok := elem.(*StateTransitionMsg) + if !ok { + return false + } + // TODO: move state fields to state.VirtualStateAccess? + if stmT.State.BlockIndex() != other.State.BlockIndex() { + return false + } + if stmT.State.PreviousStateHash() != other.State.PreviousStateHash() { + return false + } + if stmT.State.StateCommitment() != other.State.StateCommitment() { + return false + } + return stmT.StateOutput.ID() == other.StateOutput.ID() +} + // StateCandidateMsg Consensus sends the finalized next state to StateManager type StateCandidateMsg struct { State state.VirtualStateAccess ApprovingOutputID ledgerstate.OutputID } +var _ pipe.Hashable = &StateCandidateMsg{} + +func (scmT *StateCandidateMsg) GetHash() interface{} { + return struct { + stateBlockIndex uint32 + statePreviousHash hashing.HashValue + stateCommitment hashing.HashValue + outputID ledgerstate.OutputID + }{ + stateBlockIndex: scmT.State.BlockIndex(), + statePreviousHash: scmT.State.PreviousStateHash(), + stateCommitment: scmT.State.StateCommitment(), + outputID: scmT.ApprovingOutputID, + } +} + +func (scmT *StateCandidateMsg) Equals(elem interface{}) bool { + other, ok := elem.(*StateCandidateMsg) + if !ok { + return false + } + if scmT.State.BlockIndex() != other.State.BlockIndex() { + return false + } + if scmT.State.PreviousStateHash() != other.State.PreviousStateHash() { + return false + } + if scmT.State.StateCommitment() != other.State.StateCommitment() { + return false + } + return scmT.ApprovingOutputID == other.ApprovingOutputID +} + // VMResultMsg Consensus -> Consensus. VM sends result of async task started by Consensus to itself type VMResultMsg struct { Task *vm.VMTask } +var _ pipe.Hashable = &VMResultMsg{} + +func (vrmT *VMResultMsg) GetHash() interface{} { + return vrmT.Task.ACSSessionID +} + +func (vrmT *VMResultMsg) Equals(elem interface{}) bool { + other, ok := elem.(*VMResultMsg) + if !ok { + return false + } + // NOTE: is it enough??? + return vrmT.Task.ACSSessionID == other.Task.ACSSessionID +} + // AsynchronousCommonSubsetMsg type AsynchronousCommonSubsetMsg struct { ProposedBatchesBin [][]byte SessionID uint64 } +var _ pipe.Hashable = &AsynchronousCommonSubsetMsg{} + +func (acsmT *AsynchronousCommonSubsetMsg) GetHash() interface{} { + var batchesHash hashing.HashValue + for i := 0; i < len(acsmT.ProposedBatchesBin); i++ { + batchHash := hashing.HashData(acsmT.ProposedBatchesBin[i]) + for j := 0; j < len(batchesHash); j++ { + batchesHash[j] += batchHash[j] + } + } + return struct { + batchesHash hashing.HashValue + sessionID uint64 + }{ + batchesHash: batchesHash, + sessionID: acsmT.SessionID, + } +} + +func (acsmT *AsynchronousCommonSubsetMsg) Equals(elem interface{}) bool { + other, ok := elem.(*AsynchronousCommonSubsetMsg) + if !ok { + return false + } + if acsmT.SessionID != other.SessionID { + return false + } + if len(acsmT.ProposedBatchesBin) != len(other.ProposedBatchesBin) { + return false + } + for i := 0; i < len(acsmT.ProposedBatchesBin); i++ { + if bytes.Equal(acsmT.ProposedBatchesBin[i], other.ProposedBatchesBin[i]) { + return false + } + } + return true +} + // InclusionStateMsg txstream plugin sends inclusions state of the transaction to ConsensusOld type InclusionStateMsg struct { TxID ledgerstate.TransactionID State ledgerstate.InclusionState } +var _ pipe.Hashable = &InclusionStateMsg{} + +func (ismT *InclusionStateMsg) GetHash() interface{} { + return *ismT +} + +func (ismT *InclusionStateMsg) Equals(elem interface{}) bool { + other, ok := elem.(*InclusionStateMsg) + if !ok { + return false + } + if ismT.TxID != other.TxID { + return false + } + return ismT.State == other.State +} + // StateMsg txstream plugin sends the only existing AliasOutput in the chain's address to StateManager type StateMsg struct { ChainOutput *ledgerstate.AliasOutput Timestamp time.Time } +var _ pipe.Hashable = &StateMsg{} + +func (smT *StateMsg) GetHash() interface{} { + return smT.ChainOutput.ID() +} + +func (smT *StateMsg) Equals(elem interface{}) bool { + other, ok := elem.(*StateMsg) + if !ok { + return false + } + return smT.ChainOutput.ID() == other.ChainOutput.ID() +} + func (msg *GetBlockMsg) Write(w io.Writer) error { return util.WriteUint32(w, msg.BlockIndex) } diff --git a/packages/peering/lpp/lppPeer.go b/packages/peering/lpp/lppPeer.go index eb2ba7849a..24863cb09f 100644 --- a/packages/peering/lpp/lppPeer.go +++ b/packages/peering/lpp/lppPeer.go @@ -52,15 +52,12 @@ func newPeer(remoteNetID string, remotePubKey *ed25519.PublicKey, remoteLppID li } return false } - messageHashFun := func(msg interface{}) interface{} { // TODO - return msg - } p := &peer{ remoteNetID: remoteNetID, remotePubKey: remotePubKey, remoteLppID: remoteLppID, accessLock: &sync.RWMutex{}, - sendPipe: pipe.NewInfinitePipe(messagePriorityFun, maxPeerMsgBuffer, messageHashFun), + sendPipe: pipe.NewInfinitePipe(messagePriorityFun, maxPeerMsgBuffer), lastMsgSent: time.Time{}, lastMsgRecv: time.Time{}, numUsers: 0, diff --git a/packages/peering/peering.go b/packages/peering/peering.go index 655e50bb31..72267712a6 100644 --- a/packages/peering/peering.go +++ b/packages/peering/peering.go @@ -21,7 +21,9 @@ import ( "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/goshimmer/packages/txstream/chopper" "github.com/iotaledger/hive.go/crypto/ed25519" + "github.com/iotaledger/wasp/packages/hashing" "github.com/iotaledger/wasp/packages/util" + "github.com/iotaledger/wasp/packages/util/pipe" "github.com/mr-tron/base58" "golang.org/x/xerrors" ) @@ -234,6 +236,8 @@ type PeerMessage struct { MsgData []byte } +var _ pipe.Hashable = &PeerMessage{} + //nolint:gocritic func NewPeerMessageFromBytes(buf []byte, peerPubKey *ed25519.PublicKey) (*PeerMessage, error) { var err error @@ -370,6 +374,27 @@ func (m *PeerMessage) IsUserMessage() bool { return m.MsgType >= FirstUserMsgCode } +func (m *PeerMessage) GetHash() interface{} { + return struct { + msgType byte + msgDataHash hashing.HashValue + }{ + msgType: m.MsgType, + msgDataHash: hashing.HashData(m.MsgData), + } +} + +func (m *PeerMessage) Equals(elem interface{}) bool { + other, ok := elem.(*PeerMessage) + if !ok { + return false + } + if m.MsgType != other.MsgType { + return false + } + return bytes.Equal(m.MsgData, other.MsgData) +} + // ParseNetID parses the NetID and returns the corresponding host and port. func ParseNetID(netID string) (string, int, error) { parts := strings.Split(netID, ":") diff --git a/packages/util/pipe/hash_set.go b/packages/util/pipe/hash_set.go new file mode 100644 index 0000000000..a1729ffc08 --- /dev/null +++ b/packages/util/pipe/hash_set.go @@ -0,0 +1,97 @@ +package pipe + +type HashSet struct { + hashTable map[interface{}][]Hashable + count int +} + +var _ Set = &HashSet{} + +// New constructs and returns a new Queue. Code duplication needed for benchmarks. +func NewHashSet() *HashSet { + return &HashSet{ + hashTable: make(map[interface{}][]Hashable), + count: 0, + } +} + +// Length returns the number of elements currently stored in the queue. +func (s *HashSet) Size() int { + return s.count +} + +func (s *HashSet) Add(elem interface{}) bool { + hashable, ok := elem.(Hashable) + if !ok { + panic("Adding not hashable element to hash set") + } + hash := hashable.GetHash() + hashEntry, ok := s.hashTable[hash] + if ok { + for i := 0; i < len(hashEntry); i++ { + if hashEntry[i].Equals(hashable) { + return false + } + } + s.hashTable[hash] = append(hashEntry, hashable) + } else { + s.hashTable[hash] = []Hashable{hashable} + } + s.count++ + return true +} + +func (s *HashSet) Clear() { + s.hashTable = make(map[interface{}][]Hashable) + s.count = 0 +} + +func (s *HashSet) Contains(elem interface{}) bool { + hashable, ok := elem.(Hashable) + if !ok { + return false + } + hash := hashable.GetHash() + hashEntry, ok := s.hashTable[hash] + if !ok { + return false + } + for i := 0; i < len(hashEntry); i++ { + if hashEntry[i].Equals(hashable) { + return true + } + } + return false +} + +func (s *HashSet) Remove(elem interface{}) bool { + hashable, ok := elem.(Hashable) + if !ok { + return false + } + hash := hashable.GetHash() + hashEntry, ok := s.hashTable[hash] + if !ok { + return false + } + length := len(hashEntry) + for i := 0; i < length; i++ { + if hashEntry[i].Equals(hashable) { + if length == 1 { + delete(s.hashTable, hash) + } else { + var newHashEntry []Hashable + if i == length-1 { + newHashEntry = hashEntry[0 : length-1] + } else { + newHashEntry = hashEntry[0:i] + newHashEntry = append(newHashEntry, hashEntry[i+1:length]...) + } + s.hashTable[hash] = newHashEntry + } + s.count-- + return true + } + } + return false +} diff --git a/packages/util/pipe/interface.go b/packages/util/pipe/interface.go index b03c80a878..bcd9a23a22 100644 --- a/packages/util/pipe/interface.go +++ b/packages/util/pipe/interface.go @@ -3,6 +3,22 @@ package pipe // minQueueLen is smallest capacity that queue may have. const minQueueLen = 16 +type Hashable interface { + // For requirements of this function see https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#hashCode-- + // Additional requirement: the returned value must be valid as a map key + GetHash() interface{} + // For requirements of this function see https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#equals-java.lang.Object- + Equals(elem interface{}) bool +} + +type Set interface { + Size() int + Add(elem interface{}) bool + Clear() + Contains(elem interface{}) bool + Remove(elem interface{}) bool +} + type Queue interface { Length() int Add(elem interface{}) bool diff --git a/packages/util/pipe/pipe.go b/packages/util/pipe/pipe.go index d23776aef9..8ddac609a3 100644 --- a/packages/util/pipe/pipe.go +++ b/packages/util/pipe/pipe.go @@ -29,20 +29,20 @@ func NewLimitPriorityInfinitePipe(priorityFun func(interface{}) bool, limit int) return newInfinitePipe(NewLimitPriorityLimitedPriorityHashQueue(priorityFun, limit)) } -func NewHashInfinitePipe(hashFun func(interface{}) interface{}) Pipe { - return newInfinitePipe(NewHashLimitedPriorityHashQueue(&hashFun)) +func NewHashInfinitePipe() Pipe { + return newInfinitePipe(NewHashLimitedPriorityHashQueue(true)) } -func NewPriorityHashInfinitePipe(priorityFun func(interface{}) bool, hashFun func(interface{}) interface{}) Pipe { - return newInfinitePipe(NewPriorityHashLimitedPriorityHashQueue(priorityFun, &hashFun)) +func NewPriorityHashInfinitePipe(priorityFun func(interface{}) bool) Pipe { + return newInfinitePipe(NewPriorityHashLimitedPriorityHashQueue(priorityFun, true)) } -func NewLimitHashInfinitePipe(limit int, hashFun func(interface{}) interface{}) Pipe { - return newInfinitePipe(NewLimitHashLimitedPriorityHashQueue(limit, &hashFun)) +func NewLimitHashInfinitePipe(limit int) Pipe { + return newInfinitePipe(NewLimitHashLimitedPriorityHashQueue(limit, true)) } -func NewInfinitePipe(priorityFun func(interface{}) bool, limit int, hashFun func(interface{}) interface{}) Pipe { - return newInfinitePipe(NewLimitedPriorityHashQueue(priorityFun, limit, &hashFun)) +func NewInfinitePipe(priorityFun func(interface{}) bool, limit int) Pipe { + return newInfinitePipe(NewLimitedPriorityHashQueue(priorityFun, limit, true)) } func newInfinitePipe(queue Queue) *InfinitePipe { diff --git a/packages/util/pipe/pipe_test.go b/packages/util/pipe/pipe_test.go index 3b4f34b680..9d1fd10255 100644 --- a/packages/util/pipe/pipe_test.go +++ b/packages/util/pipe/pipe_test.go @@ -33,27 +33,27 @@ func TestLimitPriorityInfinitePipeWriteReadLen(t *testing.T) { } func TestHashInfinitePipeWriteReadLen(t *testing.T) { - testDefaultPipeWriteReadLen(NewHashInfinitePipe(identityFunInterface), 1000, identityFunInt, t) + testDefaultPipeWriteReadLen(NewHashInfinitePipe(), 1000, identityFunInt, t) } func TestPriorityHashInfinitePipeWriteReadLen(t *testing.T) { - testPriorityPipeWriteReadLen(newPriorityHashInfinitePipe, t) + testPriorityPipeWriteReadLen(NewPriorityHashInfinitePipe, t) } func TestLimitHashInfinitePipeNoLimitWriteReadLen(t *testing.T) { - testLimitedPipeNoLimitWriteReadLen(newLimitHashInfinitePipe, t) + testLimitedPipeNoLimitWriteReadLen(NewLimitHashInfinitePipe, t) } func TestLimitHashInfinitePipeWriteReadLen(t *testing.T) { - testLimitedPipeWriteReadLen(newLimitHashInfinitePipe, t) + testLimitedPipeWriteReadLen(NewLimitHashInfinitePipe, t) } func TestInfinitePipeNoLimitWriteReadLen(t *testing.T) { - testLimitedPriorityPipeNoLimitWriteReadLen(newLimitPriorityHashInfinitePipe, t) + testLimitedPriorityPipeNoLimitWriteReadLen(NewInfinitePipe, t) } func TestInfinitePipeWriteReadLen(t *testing.T) { - testLimitedPriorityPipeWriteReadLen(newLimitPriorityHashInfinitePipe, t) + testLimitedPriorityPipeWriteReadLen(NewInfinitePipe, t) } func testLimitedPriorityPipeNoLimitWriteReadLen(makeLimitedPriorityPipeFun func(priorityFun func(i interface{}) bool, limit int) Pipe, t *testing.T) { @@ -62,9 +62,7 @@ func testLimitedPriorityPipeNoLimitWriteReadLen(makeLimitedPriorityPipeFun func( func testLimitedPriorityPipeWriteReadLen(makeLimitedPriorityPipeFun func(priorityFun func(i interface{}) bool, limit int) Pipe, t *testing.T) { limit := 800 - p := makeLimitedPriorityPipeFun(func(i interface{}) bool { - return i.(int)%3 == 0 - }, limit) + p := makeLimitedPriorityPipeFun(priorityFunMod3, limit) result := func(index int) int { if index <= 333 { return -3*index + 999 @@ -92,9 +90,7 @@ func testLimitedPipeWriteReadLen(makeLimitedPipeFun func(limit int) Pipe, t *tes } func testPriorityPipeWriteReadLen(makePriorityPipeFun func(func(i interface{}) bool) Pipe, t *testing.T) { - p := makePriorityPipeFun(func(i interface{}) bool { - return i.(int)%3 == 0 - }) + p := makePriorityPipeFun(priorityFunMod3) result := func(index int) int { if index <= 333 { return -3*index + 999 @@ -113,7 +109,7 @@ func testDefaultPipeWriteReadLen(p Pipe, elementsToWrite int, result func(index func testPipeWriteReadLen(p Pipe, elementsToWrite, elementsToRead int, result func(index int) int, t *testing.T) { for i := 0; i < elementsToWrite; i++ { - p.In() <- i + p.In() <- SimpleHashable(i) } fullLength := p.Len() require.Equalf(t, elementsToRead, fullLength, "full channel length missmatch") @@ -122,7 +118,7 @@ func testPipeWriteReadLen(p Pipe, elementsToWrite, elementsToRead int, result fu require.Equalf(t, elementsToRead, closedLength, "closed channel length missmatch") for i := 0; i < elementsToRead; i++ { val := <-p.Out() - require.Equalf(t, result(i), val.(int), "read %d missmatch", i) + require.Equalf(t, SimpleHashable(result(i)), val.(SimpleHashable), "read %d missmatch", i) } } @@ -155,27 +151,27 @@ func TestLimitPriorityInfinitePipeConcurrentWriteReadLen(t *testing.T) { func TestHashInfinitePipeConcurrentWriteReadLen(t *testing.T) { result := identityFunInt - testDefaultPipeConcurrentWriteReadLen(NewHashInfinitePipe(identityFunInterface), 1000, &result, t) + testDefaultPipeConcurrentWriteReadLen(NewHashInfinitePipe(), 1000, &result, t) } func TestPriorityHashInfinitePipeConcurrentWriteReadLen(t *testing.T) { - testPriorityPipeConcurrentWriteReadLen(newPriorityHashInfinitePipe, t) + testPriorityPipeConcurrentWriteReadLen(NewPriorityHashInfinitePipe, t) } func TestLimitHashInfinitePipeNoLimitConcurrentWriteReadLen(t *testing.T) { - testLimitedPipeNoLimitConcurrentWriteReadLen(newLimitHashInfinitePipe, t) + testLimitedPipeNoLimitConcurrentWriteReadLen(NewLimitHashInfinitePipe, t) } func TestLimitHashInfinitePipeConcurrentWriteReadLen(t *testing.T) { - testLimitedPipeConcurrentWriteReadLen(newLimitHashInfinitePipe, t) + testLimitedPipeConcurrentWriteReadLen(NewLimitHashInfinitePipe, t) } func TestInfinitePipeNoLimitConcurrentWriteReadLen(t *testing.T) { - testLimitedPriorityPipeNoLimitConcurrentWriteReadLen(newLimitPriorityHashInfinitePipe, t) + testLimitedPriorityPipeNoLimitConcurrentWriteReadLen(NewInfinitePipe, t) } func TestInfinitePipeConcurrentWriteReadLen(t *testing.T) { - testLimitedPriorityPipeConcurrentWriteReadLen(newLimitPriorityHashInfinitePipe, t) + testLimitedPriorityPipeConcurrentWriteReadLen(NewInfinitePipe, t) } func testLimitedPriorityPipeNoLimitConcurrentWriteReadLen(makeLimitedPriorityPipeFun func(priorityFun func(i interface{}) bool, limit int) Pipe, t *testing.T) { @@ -184,9 +180,7 @@ func testLimitedPriorityPipeNoLimitConcurrentWriteReadLen(makeLimitedPriorityPip func testLimitedPriorityPipeConcurrentWriteReadLen(makeLimitedPriorityPipeFun func(priorityFun func(i interface{}) bool, limit int) Pipe, t *testing.T) { limit := 800 - ch := makeLimitedPriorityPipeFun(func(i interface{}) bool { - return i.(int)%3 == 0 - }, limit) + ch := makeLimitedPriorityPipeFun(priorityFunMod3, limit) testPipeConcurrentWriteReadLen(ch, 1000, limit, nil, t) } @@ -200,9 +194,7 @@ func testLimitedPipeConcurrentWriteReadLen(makeLimitedPipeFun func(limit int) Pi } func testPriorityPipeConcurrentWriteReadLen(makePriorityPipeFun func(func(i interface{}) bool) Pipe, t *testing.T) { - ch := makePriorityPipeFun(func(i interface{}) bool { - return i.(int)%3 == 0 - }) + ch := makePriorityPipeFun(priorityFunMod3) testDefaultPipeConcurrentWriteReadLen(ch, 1000, nil, t) } @@ -219,7 +211,7 @@ func testPipeConcurrentWriteReadLen(p Pipe, elementsToWrite, elementsToRead int, go func() { for i := 0; i < elementsToWrite; i++ { - p.In() <- i + p.In() <- SimpleHashable(i) written++ } wg.Done() @@ -229,7 +221,7 @@ func testPipeConcurrentWriteReadLen(p Pipe, elementsToWrite, elementsToRead int, for i := 0; i < elementsToRead; i++ { val := <-p.Out() if result != nil { - require.Equalf(t, (*result)(i), val.(int), "concurent read %d missmatch", i) + require.Equalf(t, SimpleHashable((*result)(i)), val.(SimpleHashable), "concurent read %d missmatch", i) } read++ } @@ -255,17 +247,3 @@ func testPipeConcurrentWriteReadLen(p Pipe, elementsToWrite, elementsToRead int, require.Equalf(t, elementsToWrite, written, "concurent write elements written missmatch") require.Equalf(t, elementsToRead, read, "concurent read elements read missmatch") } - -//-- - -func newPriorityHashInfinitePipe(priorityFun func(i interface{}) bool) Pipe { - return NewPriorityHashInfinitePipe(priorityFun, identityFunInterface) -} - -func newLimitHashInfinitePipe(limit int) Pipe { - return NewLimitHashInfinitePipe(limit, identityFunInterface) -} - -func newLimitPriorityHashInfinitePipe(priorityFun func(i interface{}) bool, limit int) Pipe { - return NewInfinitePipe(priorityFun, limit, identityFunInterface) -} diff --git a/packages/util/pipe/queue.go b/packages/util/pipe/queue.go index 5ab042678e..6d734c6b72 100644 --- a/packages/util/pipe/queue.go +++ b/packages/util/pipe/queue.go @@ -10,8 +10,7 @@ type LimitedPriorityHashQueue struct { count int priorityFun func(interface{}) bool limit int - hash *map[interface{}]bool - hashFun func(interface{}) interface{} + hashTable Set } var _ Queue = &LimitedPriorityHashQueue{} @@ -19,49 +18,45 @@ var _ Queue = &LimitedPriorityHashQueue{} const Infinity = 0 func NewDefaultLimitedPriorityHashQueue() Queue { - return NewHashLimitedPriorityHashQueue(nil) + return NewHashLimitedPriorityHashQueue(false) } func NewPriorityLimitedPriorityHashQueue(priorityFun func(interface{}) bool) Queue { - return NewPriorityHashLimitedPriorityHashQueue(priorityFun, nil) + return NewPriorityHashLimitedPriorityHashQueue(priorityFun, false) } func NewLimitLimitedPriorityHashQueue(limit int) Queue { - return NewLimitHashLimitedPriorityHashQueue(limit, nil) + return NewLimitHashLimitedPriorityHashQueue(limit, false) } func NewLimitPriorityLimitedPriorityHashQueue(priorityFun func(interface{}) bool, limit int) Queue { - return NewLimitedPriorityHashQueue(priorityFun, limit, nil) + return NewLimitedPriorityHashQueue(priorityFun, limit, false) } -func NewHashLimitedPriorityHashQueue(hashNeededFun *func(interface{}) interface{}) Queue { - return NewLimitHashLimitedPriorityHashQueue(Infinity, hashNeededFun) +func NewHashLimitedPriorityHashQueue(hashNeeded bool) Queue { + return NewLimitHashLimitedPriorityHashQueue(Infinity, hashNeeded) } -func NewPriorityHashLimitedPriorityHashQueue(priorityFun func(interface{}) bool, hashNeededFun *func(interface{}) interface{}) Queue { - return NewLimitedPriorityHashQueue(priorityFun, Infinity, hashNeededFun) +func NewPriorityHashLimitedPriorityHashQueue(priorityFun func(interface{}) bool, hashNeeded bool) Queue { + return NewLimitedPriorityHashQueue(priorityFun, Infinity, hashNeeded) } -func NewLimitHashLimitedPriorityHashQueue(limit int, hashNeededFun *func(interface{}) interface{}) Queue { - return NewLimitedPriorityHashQueue(func(interface{}) bool { return false }, limit, hashNeededFun) +func NewLimitHashLimitedPriorityHashQueue(limit int, hashNeeded bool) Queue { + return NewLimitedPriorityHashQueue(func(interface{}) bool { return false }, limit, hashNeeded) } -func NewLimitedPriorityHashQueue(priorityFun func(interface{}) bool, limit int, hashNeededFun *func(interface{}) interface{}) Queue { +func NewLimitedPriorityHashQueue(priorityFun func(interface{}) bool, limit int, hashNeeded bool) Queue { var initBufSize int if (limit != Infinity) && (limit < minQueueLen) { initBufSize = limit } else { initBufSize = minQueueLen } - var hash *map[interface{}]bool - var hashFun func(interface{}) interface{} - if hashNeededFun == nil { - hash = nil - hashFun = func(elem interface{}) interface{} { return elem } + var hashTable Set + if hashNeeded { + hashTable = NewHashSet() } else { - hashT := make(map[interface{}]bool) - hash = &hashT - hashFun = *hashNeededFun + hashTable = nil } return &LimitedPriorityHashQueue{ head: 0, @@ -71,8 +66,7 @@ func NewLimitedPriorityHashQueue(priorityFun func(interface{}) bool, limit int, buf: make([]interface{}, initBufSize), priorityFun: priorityFun, limit: limit, - hash: hash, - hashFun: hashFun, + hashTable: hashTable, } } @@ -128,14 +122,9 @@ func (q *LimitedPriorityHashQueue) resize() { // If it is a hash queue, the element is not added, if it is already in the queue. // If the add was successful, returns `true`. func (q *LimitedPriorityHashQueue) Add(elem interface{}) bool { - elemHash := elem - if q.hash != nil { - elemHash = q.hashFun(elem) - _, exists := (*(q.hash))[elemHash] - if exists { - // duplicate element; ignoring - return false - } + if q.hashTable != nil && q.hashTable.Contains(elem) { + // duplicate element; ignoring + return false } limitReached := false if q.count == len(q.buf) { @@ -181,8 +170,8 @@ func (q *LimitedPriorityHashQueue) Add(elem interface{}) bool { q.head = q.getIndex(q.head + 1) } } - if q.hash != nil { - delete(*(q.hash), q.hashFun(deleteElem)) + if q.hashTable != nil { + q.hashTable.Remove(deleteElem) } } if priority { @@ -199,8 +188,8 @@ func (q *LimitedPriorityHashQueue) Add(elem interface{}) bool { if !limitReached { q.count++ } - if q.hash != nil { - (*(q.hash))[elemHash] = true + if q.hashTable != nil { + q.hashTable.Add(elem) } return true } @@ -247,8 +236,8 @@ func (q *LimitedPriorityHashQueue) Remove() interface{} { if (len(q.buf) > minQueueLen) && ((q.count << 2) <= len(q.buf)) { q.resize() } - if q.hash != nil { - delete(*(q.hash), q.hashFun(ret)) + if q.hashTable != nil { + q.hashTable.Remove(ret) } return ret } diff --git a/packages/util/pipe/queue_test.go b/packages/util/pipe/queue_test.go index 02e0227182..12412028d7 100644 --- a/packages/util/pipe/queue_test.go +++ b/packages/util/pipe/queue_test.go @@ -9,16 +9,16 @@ import ( func testQueueBasicAddLengthPeekRemove(q Queue, elementsToAdd int, add func(index int) int, addResult func(index int) bool, elementsToRemove int, result func(index int) int, t *testing.T) { for i := 0; i < elementsToAdd; i++ { value := add(i) - actualAddResult := q.Add(value) + actualAddResult := q.Add(SimpleHashable(value)) require.Equalf(t, addResult(i), actualAddResult, "add result of element %d value %d missmatch", i, value) } fullLength := q.Length() require.Equalf(t, elementsToRemove, fullLength, "full queue length missmatch") for i := 0; i < elementsToRemove; i++ { - expected := result(i) - peekResult := q.Peek().(int) + expected := SimpleHashable(result(i)) + peekResult := q.Peek().(SimpleHashable) require.Equalf(t, expected, peekResult, "peek %d missmatch", i) - removeResult := q.Remove().(int) + removeResult := q.Remove().(SimpleHashable) require.Equalf(t, expected, removeResult, "remove %d missmatch", i) } emptyLength := q.Length() @@ -52,8 +52,7 @@ func TestLimitPriorityLimitedPriorityHashQueueSimple(t *testing.T) { } func TestHashLimitedPriorityHashQueueSimple(t *testing.T) { - hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } - testDefaultQueueSimple(NewHashLimitedPriorityHashQueue(&hashFun), t) + testDefaultQueueSimple(NewHashLimitedPriorityHashQueue(true), t) } func TestPriorityHashLimitedPriorityHashQueueSimple(t *testing.T) { @@ -83,9 +82,7 @@ func testLimitedPriorityQueueNoLimitSimple(makeLimitedPriorityQueueFun func(prio func testLimitedPriorityQueueSimple(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { resultArray := []int{9, 6, 3, 0, 4, 5, 7, 8} limit := len(resultArray) - q := makeLimitedPriorityQueueFun(func(i interface{}) bool { - return i.(int)%3 == 0 - }, limit) + q := makeLimitedPriorityQueueFun(priorityFunMod3, limit) result := func(index int) int { return resultArray[index] } @@ -108,9 +105,7 @@ func testLimitedQueueSimple(makeLimitedQueueFun func(limit int) Queue, t *testin } func testPriorityQueueSimple(makePriorityQueueFun func(func(i interface{}) bool) Queue, t *testing.T) { - q := makePriorityQueueFun(func(i interface{}) bool { - return i.(int)%3 == 0 - }) + q := makePriorityQueueFun(priorityFunMod3) resultArray := []int{9, 6, 3, 0, 1, 2, 4, 5, 7, 8} result := func(index int) int { return resultArray[index] @@ -162,9 +157,7 @@ func TestLimitPriorityLimitedPriorityHashQueueNoLimitTwice(t *testing.T) { func TestLimitPriorityLimitedPriorityHashQueueTwice(t *testing.T) { limit := 80 elementsToAddSingle := 50 - q := NewLimitPriorityLimitedPriorityHashQueue(func(i interface{}) bool { - return i.(int)%3 == 0 - }, limit) + q := NewLimitPriorityLimitedPriorityHashQueue(priorityFunMod3, limit) resultFun := func(index int) int { if index <= 16 { return 48 - 3*index @@ -194,34 +187,28 @@ func TestPriorityHashLimitedPriorityHashQueueTwice(t *testing.T) { } func TestLimitHashLimitedPriorityHashQueueNoLimitTwice(t *testing.T) { - testHashQueueTwice(func(hashNeededFun *func(interface{}) interface{}) Queue { - return NewLimitHashLimitedPriorityHashQueue(80, hashNeededFun) - }, t) + testHashQueueTwice(func(hashNeeded bool) Queue { return NewLimitHashLimitedPriorityHashQueue(80, hashNeeded) }, t) } func TestLimitHashLimitedPriorityHashQueueTwice(t *testing.T) { limit := 30 - hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } elementsToAddSingle := 50 indexDiff := elementsToAddSingle - limit resultFun := func(index int) int { return index + indexDiff } - q := NewLimitHashLimitedPriorityHashQueue(limit, &hashFun) + q := NewLimitHashLimitedPriorityHashQueue(limit, true) testQueueTwice(q, elementsToAddSingle, alwaysTrueFun, limit, resultFun, t) } func TestLimitedPriorityHashQueueNoLimitTwice(t *testing.T) { - testPriorityHashQueueTwice(func(priorityFun func(i interface{}) bool, hashNeededFun *func(interface{}) interface{}) Queue { - return NewLimitedPriorityHashQueue(priorityFun, 80, hashNeededFun) + testPriorityHashQueueTwice(func(priorityFun func(i interface{}) bool, hashNeeded bool) Queue { + return NewLimitedPriorityHashQueue(priorityFun, 80, hashNeeded) }, t) } func TestLimitedPriorityHashQueueTwice(t *testing.T) { limit := 30 - hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } elementsToAddSingle := 50 - q := NewLimitedPriorityHashQueue(func(i interface{}) bool { - return i.(int)%3 == 0 - }, limit, &hashFun) + q := NewLimitedPriorityHashQueue(priorityFunMod3, limit, true) addResultFun := func(index int) bool { return (index < elementsToAddSingle) || ((index-elementsToAddSingle)%3 != 0) } resultFun := func(index int) int { if index <= 16 { @@ -235,19 +222,15 @@ func TestLimitedPriorityHashQueueTwice(t *testing.T) { testQueueTwice(q, elementsToAddSingle, addResultFun, limit, resultFun, t) } -func testHashQueueTwice(makeHashQueueFun func(hashNeededFun *func(interface{}) interface{}) Queue, t *testing.T) { - hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } - q := makeHashQueueFun(&hashFun) +func testHashQueueTwice(makeHashQueueFun func(hashNeeded bool) Queue, t *testing.T) { + q := makeHashQueueFun(true) elementsToAddSingle := 50 addResultFun := func(index int) bool { return index < elementsToAddSingle } testQueueTwice(q, elementsToAddSingle, addResultFun, elementsToAddSingle, identityFunInt, t) } -func testPriorityHashQueueTwice(makePriorityHashQueueFun func(priorityFun func(i interface{}) bool, hashNeededFun *func(interface{}) interface{}) Queue, t *testing.T) { - hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } - q := makePriorityHashQueueFun(func(i interface{}) bool { - return i.(int)%3 == 0 - }, &hashFun) +func testPriorityHashQueueTwice(makePriorityHashQueueFun func(priorityFun func(i interface{}) bool, hashNeeded bool) Queue, t *testing.T) { + q := makePriorityHashQueueFun(priorityFunMod3, true) elementsToAddSingle := 50 addResultFun := func(index int) bool { return index < elementsToAddSingle } resultFun := func(index int) int { @@ -263,9 +246,7 @@ func testPriorityHashQueueTwice(makePriorityHashQueueFun func(priorityFun func(i } func testPriorityQueueTwice(makePriorityQueueFun func(func(i interface{}) bool) Queue, t *testing.T) { - q := makePriorityQueueFun(func(i interface{}) bool { - return i.(int)%3 == 0 - }) + q := makePriorityQueueFun(priorityFunMod3) elementsToAddSingle := 50 resultFun := func(index int) int { if index <= 16 { @@ -306,8 +287,9 @@ func TestLimitPriorityLimitedPriorityHashQueueOverflow(t *testing.T) { limit := 30 elementsToAddSingle := 50 cutOff := elementsToAddSingle / 2 + cutOffSh := SimpleHashable(cutOff) q := NewLimitPriorityLimitedPriorityHashQueue(func(i interface{}) bool { - return i.(int) < cutOff + return i.(SimpleHashable) < cutOffSh }, limit) addResultFun := func(index int) bool { return index < elementsToAddSingle+cutOff @@ -323,14 +305,13 @@ func TestLimitPriorityLimitedPriorityHashQueueOverflow(t *testing.T) { func TestLimitedPriorityHashQueueOverflow(t *testing.T) { limit := 30 - hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } elementsToAddSingle := 50 - cutOffLow := 20 - cutOffHigh := 40 + cutOffLow := SimpleHashable(20) + cutOffHigh := SimpleHashable(40) q := NewLimitedPriorityHashQueue(func(i interface{}) bool { - value := i.(int) + value := i.(SimpleHashable) return value < cutOffLow || cutOffHigh <= value - }, limit, &hashFun) + }, limit, true) addResultFun := func(index int) bool { return index < elementsToAddSingle } @@ -347,11 +328,8 @@ func TestLimitedPriorityHashQueueOverflow(t *testing.T) { func TestLimitedPriorityHashQueueDuplicates(t *testing.T) { limit := 80 - hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } elementsToAddFirstIteration := 50 - q := NewLimitedPriorityHashQueue(func(i interface{}) bool { - return i.(int)%3 == 0 - }, limit, &hashFun) + q := NewLimitedPriorityHashQueue(priorityFunMod3, limit, true) addFun := func(index int) int { if index < elementsToAddFirstIteration { return 2 * index @@ -408,8 +386,7 @@ func TestLimitPriorityLimitedPriorityHashQueueAddRemove(t *testing.T) { } func TestHashLimitedPriorityHashQueueAddRemove(t *testing.T) { - hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } - testDefaultQueueAddRemove(NewHashLimitedPriorityHashQueue(&hashFun), t) + testDefaultQueueAddRemove(NewHashLimitedPriorityHashQueue(true), t) } func TestPriorityHashLimitedPriorityHashQueueAddRemove(t *testing.T) { @@ -438,9 +415,7 @@ func testLimitedPriorityQueueNoLimitAddRemove(makeLimitedPriorityQueueFun func(p func testLimitedPriorityQueueAddRemove(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { limit := 80 - q := makeLimitedPriorityQueueFun(func(i interface{}) bool { - return i.(int)%3 == 0 - }, limit) + q := makeLimitedPriorityQueueFun(priorityFunMod3, limit) result := func(index int) int { if index%2 == 0 { return 3*index/2 + 31 @@ -467,9 +442,7 @@ func testLimitedQueueAddRemove(makeLimitedQueueFun func(limit int) Queue, t *tes } func testPriorityQueueAddRemove(makePriorityQueueFun func(func(i interface{}) bool) Queue, t *testing.T) { - q := makePriorityQueueFun(func(i interface{}) bool { - return i.(int)%3 == 0 - }) + q := makePriorityQueueFun(priorityFunMod3) result := func(index int) int { if index%2 == 0 { return 3*index/2 + 1 @@ -488,21 +461,21 @@ func testDefaultQueueAddRemove(q Queue, t *testing.T) { func testQueueAddRemove(q Queue, elementsToAdd, elementsToRemoveAdd, elementsToRemove int, result func(index int) int, t *testing.T) { for i := 0; i < elementsToAdd; i++ { - require.Truef(t, q.Add(i), "failed to add element %d", i) + require.Truef(t, q.Add(SimpleHashable(i)), "failed to add element %d", i) } for i := 0; i < elementsToRemoveAdd; i++ { q.Remove() add := elementsToAdd + i - require.Truef(t, q.Add(add), "failed to add element %d", add) + require.Truef(t, q.Add(SimpleHashable(add)), "failed to add element %d", add) } fullLength := q.Length() require.Equalf(t, elementsToRemove, fullLength, "full queue length missmatch") for i := 0; i < elementsToRemove; i++ { - expected := result(i) - peekResult := q.Peek().(int) + expected := SimpleHashable(result(i)) + peekResult := q.Peek().(SimpleHashable) require.Equalf(t, expected, peekResult, "peek %d missmatch", i) - removeResult := q.Remove().(int) + removeResult := q.Remove().(SimpleHashable) require.Equalf(t, expected, removeResult, "remove %d missmatch", i) } emptyLength := q.Length() @@ -536,8 +509,7 @@ func TestLimitPriorityLimitedPriorityHashQueueLength(t *testing.T) { } func TesHashLimitedPriorityHashQueueLength(t *testing.T) { - hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } - testDefaultQueueLength(NewHashLimitedPriorityHashQueue(&hashFun), t) + testDefaultQueueLength(NewHashLimitedPriorityHashQueue(true), t) } func TestPriorityHashLimitedPriorityHashQueueLength(t *testing.T) { @@ -568,9 +540,7 @@ func testLimitedPriorityQueueNoLimitLength(makeLimitedPriorityQueueFun func(prio func testLimitedPriorityQueueLength(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { limit := 800 - q := makeLimitedPriorityQueueFun(func(i interface{}) bool { - return i.(int)%3 == 0 - }, limit) + q := makeLimitedPriorityQueueFun(priorityFunMod3, limit) testQueueLength(q, 1000, limit, t) } @@ -585,9 +555,7 @@ func testLimitedQueueLength(makeLimitedQueueFun func(limit int) Queue, t *testin } func testPriorityQueueLength(makePriorityQueueFun func(func(i interface{}) bool) Queue, t *testing.T) { - q := makePriorityQueueFun(func(i interface{}) bool { - return i.(int)%3 == 0 - }) + q := makePriorityQueueFun(priorityFunMod3) elementsToAdd := 1000 testQueueLength(q, elementsToAdd, elementsToAdd, t) } @@ -602,7 +570,7 @@ func testQueueLength(q Queue, elementsToRemoveAdd, elementsToRemove int, t *test require.Equalf(t, 0, emptyLength, "empty queue length missmatch") for i := 0; i < elementsToRemoveAdd; i++ { - require.Truef(t, q.Add(i), "failed to add element %d", i) + require.Truef(t, q.Add(SimpleHashable(i)), "failed to add element %d", i) var expected int if i >= elementsToRemove { expected = elementsToRemove @@ -646,8 +614,7 @@ func TestLimitPriorityLimitedPriorityHashQueueGet(t *testing.T) { } func TestHashLimitedPriorityHashQueueGet(t *testing.T) { - hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } - testDefaultQueueGet(NewHashLimitedPriorityHashQueue(&hashFun), t) + testDefaultQueueGet(NewHashLimitedPriorityHashQueue(true), t) } func TestPriorityHashLimitedPriorityHashQueueGet(t *testing.T) { @@ -678,9 +645,7 @@ func testLimitedPriorityQueueNoLimitGet(makeLimitedPriorityQueueFun func(priorit func testLimitedPriorityQueueGet(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { limit := 800 - q := makeLimitedPriorityQueueFun(func(i interface{}) bool { - return i.(int)%2 == 0 - }, limit) + q := makeLimitedPriorityQueueFun(priorityFunMod2, limit) result := func(iteration int, index int) int { if index <= iteration/2 { return iteration - iteration%2 - 2*index @@ -710,9 +675,7 @@ func testLimitedQueueGet(makeLimitedQueueFun func(limit int) Queue, t *testing.T } func testPriorityQueueGet(makePriorityQueueFun func(func(i interface{}) bool) Queue, t *testing.T) { - q := makePriorityQueueFun(func(i interface{}) bool { - return i.(int)%2 == 0 - }) + q := makePriorityQueueFun(priorityFunMod2) result := func(iteration int, index int) int { if index <= iteration/2 { return iteration - iteration%2 - 2*index @@ -731,10 +694,9 @@ func testQueueGet(q Queue, elementsToAdd int, result func(iteration int, index i t.Skip("skipping Get test in short mode") // although it is not clear, why. Replacing require.Equalf in this code with `if a != b {t.Errorf(...)}` increases this test's performance significantly } for i := 0; i < elementsToAdd; i++ { - require.Truef(t, q.Add(i), "failed to add element %d", i) + require.Truef(t, q.Add(SimpleHashable(i)), "failed to add element %d", i) for j := 0; j < q.Length(); j++ { - getResult := q.Get(j).(int) - require.Equalf(t, result(i, j), getResult, "iteration %d index %d missmatch", i, j) + require.Equalf(t, SimpleHashable(result(i, j)), q.Get(j).(SimpleHashable), "iteration %d index %d missmatch", i, j) } } } @@ -766,8 +728,7 @@ func TestLimitPriorityLimitedPriorityHashQueueGetNegative(t *testing.T) { } func TestHashLimitedPriorityHashQueueGetNegative(t *testing.T) { - hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } - testDefaultQueueGetNegative(NewHashLimitedPriorityHashQueue(&hashFun), t) + testDefaultQueueGetNegative(NewHashLimitedPriorityHashQueue(true), t) } func TestPriorityHashLimitedPriorityHashQueueGetNegative(t *testing.T) { @@ -798,9 +759,7 @@ func testLimitedPriorityQueueNoLimitGetNegative(makeLimitedPriorityQueueFun func func testLimitedPriorityQueueGetNegative(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { limit := 800 - q := makeLimitedPriorityQueueFun(func(i interface{}) bool { - return i.(int)%2 == 0 - }, limit) + q := makeLimitedPriorityQueueFun(priorityFunMod2, limit) result := func(iteration int, index int) int { if iteration < limit { if index >= -(iteration+iteration%2)/2 { @@ -825,9 +784,7 @@ func testLimitedQueueGetNegative(makeLimitedQueueFun func(limit int) Queue, t *t } func testPriorityQueueGetNegative(makePriorityQueueFun func(func(i interface{}) bool) Queue, t *testing.T) { - q := makePriorityQueueFun(func(i interface{}) bool { - return i.(int)%2 == 0 - }) + q := makePriorityQueueFun(priorityFunMod2) result := func(iteration int, index int) int { if index >= -(iteration+iteration%2)/2 { return iteration + iteration%2 + 2*index + 1 @@ -846,10 +803,9 @@ func testQueueGetNegative(q Queue, elementsToAdd int, result func(iteration int, t.Skip("skipping GetNegative test in short mode") // although it is not clear, why. Replacing require.Equalf in this code with `if a != b {t.Errorf(...)}` increases this test's performance significantly } for i := 0; i < elementsToAdd; i++ { - require.Truef(t, q.Add(i), "failed to add element %d", i) + require.Truef(t, q.Add(SimpleHashable(i)), "failed to add element %d", i) for j := -1; j >= -q.Length(); j-- { - getResult := q.Get(j).(int) - require.Equalf(t, result(i, j), getResult, "iteration %d index %d missmatch", i, j) + require.Equalf(t, SimpleHashable(result(i, j)), q.Get(j).(SimpleHashable), "iteration %d index %d missmatch", i, j) } } } @@ -873,8 +829,7 @@ func TestLimitPriorityLimitedPriorityHashQueueGetOutOfRangePanics(t *testing.T) } func TestHashLimitedPriorityHashQueueGetOutOfRangePanics(t *testing.T) { - hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } - testQueueGetOutOfRangePanics(NewHashLimitedPriorityHashQueue(&hashFun), t) + testQueueGetOutOfRangePanics(NewHashLimitedPriorityHashQueue(true), t) } func TestPriorityHashLimitedPriorityHashQueueGetOutOfRangePanics(t *testing.T) { @@ -890,9 +845,7 @@ func TestLimitedPriorityHashQueueGetOutOfRangePanics(t *testing.T) { } func testLimitedPriorityQueueGetOutOfRangePanics(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { - q := makeLimitedPriorityQueueFun(func(i interface{}) bool { - return i.(int)%2 == 0 - }, 800) + q := makeLimitedPriorityQueueFun(priorityFunMod2, 800) testQueueGetOutOfRangePanics(q, t) } @@ -901,15 +854,13 @@ func testLimitedQueueGetOutOfRangePanics(makeLimitedQueueFun func(limit int) Que } func testPriorityQueueGetOutOfRangePanics(makePriorityQueueFun func(func(i interface{}) bool) Queue, t *testing.T) { - q := makePriorityQueueFun(func(i interface{}) bool { - return i.(int)%2 == 0 - }) + q := makePriorityQueueFun(priorityFunMod2) testQueueGetOutOfRangePanics(q, t) } func testQueueGetOutOfRangePanics(q Queue, t *testing.T) { for i := 0; i < 3; i++ { - require.Truef(t, q.Add(i), "failed to add element %d", i) + require.Truef(t, q.Add(SimpleHashable(i)), "failed to add element %d", i) } require.Panicsf(t, func() { q.Get(-4) }, "should panic when too negative index") require.Panicsf(t, func() { q.Get(4) }, "should panic when index greater than length") @@ -934,8 +885,7 @@ func TestLimitPriorityLimitedPriorityHashQueuePeekOutOfRangePanics(t *testing.T) } func TestHashtLimitedPriorityHashQueuePeekOutOfRangePanics(t *testing.T) { - hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } - testQueuePeekOutOfRangePanics(NewHashLimitedPriorityHashQueue(&hashFun), t) + testQueuePeekOutOfRangePanics(NewHashLimitedPriorityHashQueue(true), t) } func TestPriorityHashLimitedPriorityHashQueuePeekOutOfRangePanics(t *testing.T) { @@ -951,9 +901,7 @@ func TestLimitedPriorityHashQueuePeekOutOfRangePanics(t *testing.T) { } func testLimitedPriorityQueuePeekOutOfRangePanics(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { - q := makeLimitedPriorityQueueFun(func(i interface{}) bool { - return i.(int)%2 == 0 - }, 800) + q := makeLimitedPriorityQueueFun(priorityFunMod2, 800) testQueuePeekOutOfRangePanics(q, t) } @@ -962,15 +910,13 @@ func testLimitedQueuePeekOutOfRangePanics(makeLimitedQueueFun func(limit int) Qu } func testPriorityQueuePeekOutOfRangePanics(makePriorityQueueFun func(func(i interface{}) bool) Queue, t *testing.T) { - q := makePriorityQueueFun(func(i interface{}) bool { - return i.(int)%2 == 0 - }) + q := makePriorityQueueFun(priorityFunMod2) testQueuePeekOutOfRangePanics(q, t) } func testQueuePeekOutOfRangePanics(q Queue, t *testing.T) { require.Panicsf(t, func() { q.Peek() }, "should panic when peeking empty queue") - require.Truef(t, q.Add(0), "failed to add element 0") + require.Truef(t, q.Add(SimpleHashable(0)), "failed to add element 0") q.Remove() require.Panicsf(t, func() { q.Peek() }, "should panic when peeking emptied queue") } @@ -994,8 +940,7 @@ func TestLimitPriorityLimitedPriorityHashQueueRemoveOutOfRangePanics(t *testing. } func TestHashLimitedPriorityHashQueueRemoveOutOfRangePanics(t *testing.T) { - hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } - testQueueRemoveOutOfRangePanics(NewHashLimitedPriorityHashQueue(&hashFun), t) + testQueueRemoveOutOfRangePanics(NewHashLimitedPriorityHashQueue(true), t) } func TestPriorityHashLimitedPriorityHashQueueRemoveOutOfRangePanics(t *testing.T) { @@ -1011,9 +956,7 @@ func TestLimitedPriorityHashQueueRemoveOutOfRangePanics(t *testing.T) { } func testLimitedPriorityQueueRemoveOutOfRangePanics(makeLimitedPriorityQueueFun func(priorityFun func(i interface{}) bool, limit int) Queue, t *testing.T) { - q := makeLimitedPriorityQueueFun(func(i interface{}) bool { - return i.(int)%2 == 0 - }, 800) + q := makeLimitedPriorityQueueFun(priorityFunMod2, 800) testQueueRemoveOutOfRangePanics(q, t) } @@ -1022,15 +965,13 @@ func testLimitedQueueRemoveOutOfRangePanics(makeLimitedQueueFun func(limit int) } func testPriorityQueueRemoveOutOfRangePanics(makePriorityQueueFun func(func(i interface{}) bool) Queue, t *testing.T) { - q := makePriorityQueueFun(func(i interface{}) bool { - return i.(int)%2 == 0 - }) + q := makePriorityQueueFun(priorityFunMod2) testQueueRemoveOutOfRangePanics(q, t) } func testQueueRemoveOutOfRangePanics(q Queue, t *testing.T) { require.Panicsf(t, func() { q.Remove() }, "should panic when removing empty queue") - require.Truef(t, q.Add(0), "failed to add element 0") + require.Truef(t, q.Add(SimpleHashable(0)), "failed to add element 0") q.Remove() require.Panicsf(t, func() { q.Remove() }, "should panic when removing emptied queue") } @@ -1038,16 +979,13 @@ func testQueueRemoveOutOfRangePanics(q Queue, t *testing.T) { //-- func newPriorityHashLimitedPriorityHashQueue(priorityFun func(i interface{}) bool) Queue { - hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } - return NewPriorityHashLimitedPriorityHashQueue(priorityFun, &hashFun) + return NewPriorityHashLimitedPriorityHashQueue(priorityFun, true) } func newLimitHashLimitedPriorityHashQueue(limit int) Queue { - hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } - return NewLimitHashLimitedPriorityHashQueue(limit, &hashFun) + return NewLimitHashLimitedPriorityHashQueue(limit, true) } func newLimitPriorityHashLimitedPriorityHashQueue(priorityFun func(i interface{}) bool, limit int) Queue { - hashFun := func(elem interface{}) interface{} { return elem.(int) * 5 } - return NewLimitedPriorityHashQueue(priorityFun, limit, &hashFun) + return NewLimitedPriorityHashQueue(priorityFun, limit, true) } diff --git a/packages/util/pipe/test_util.go b/packages/util/pipe/test_util.go index 55cffac172..0dd6fec875 100644 --- a/packages/util/pipe/test_util.go +++ b/packages/util/pipe/test_util.go @@ -1,13 +1,39 @@ package pipe -func identityFunInt(index int) int { - return index +type SimpleHashable int + +var _ Hashable = SimpleHashable(0) + +func (sh SimpleHashable) GetHash() interface{} { + return sh } -func identityFunInterface(elem interface{}) interface{} { - return elem +func (sh SimpleHashable) Equals(elem interface{}) bool { + other, ok := elem.(SimpleHashable) + if !ok { + return false + } + return sh == other +} + +//-- + +func identityFunInt(index int) int { + return index } func alwaysTrueFun(index int) bool { return true } + +func priorityFunMod2(i interface{}) bool { + return priorityFunMod(i, 2) +} + +func priorityFunMod3(i interface{}) bool { + return priorityFunMod(i, 3) +} + +func priorityFunMod(i interface{}, mod SimpleHashable) bool { + return i.(SimpleHashable)%mod == 0 +} From e3b8124816c3b4d32407c8bbf184f6c4121fa7bf Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Fri, 15 Oct 2021 16:00:55 +0300 Subject: [PATCH 012/198] Documentation --- packages/util/pipe/interface.go | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/packages/util/pipe/interface.go b/packages/util/pipe/interface.go index bcd9a23a22..46ffa7081e 100644 --- a/packages/util/pipe/interface.go +++ b/packages/util/pipe/interface.go @@ -4,10 +4,34 @@ package pipe const minQueueLen = 16 type Hashable interface { - // For requirements of this function see https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#hashCode-- - // Additional requirement: the returned value must be valid as a map key + // GetHash should return a hash code value for the object. This method is supported + // for the benefit of hash tables such as those provided by HashSet struct. + // The general contract of GetHash is: + // * Whenever it is invoked on the same object more than once during an execution + // of Wasp, the GetHash method must consistently return the same struct, + // provided no information used in Equals comparisons on the object is + // modified. This struct need not remain consistent from one execution + // of Wasp to another. + // * If two objects are equal according to the Equals method, then calling + // the GetHash method on each of the two objects must produce the same struct. + // * It is not required that if two objects are unequal according to the + // Equals method, then calling the GetHash method on each of the two objects + // must produce distinct struct. However, the programmer should be aware + // that producing distinct struct for unequal objects may improve the performance + // of hash tables. + // * the returned struct must be valid as a map key (e.g. no slices) GetHash() interface{} - // For requirements of this function see https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#equals-java.lang.Object- + // Equals should indicate whether some other object is "equal to" this one. + // The equals method implements an equivalence relation on non-null objects: + // * It is reflexive: for any non-null value x, x.Equals(x) should return true. + // * It is symmetric: for any non-null values x and y, x.Equals(y) should + // return true if and only if y.Equals(x) returns true. + // * It is transitive: for any non-null values x, y, and z, if x.Equals(y) + // returns true and y.Equals(z) returns true, then x.Equals(z) should return true. + // * It is consistent: for any non-null values x and y, multiple invocations + // of x.Equals(y) consistently return true or consistently return false, + // provided no information used in equals comparisons on the objects is modified. + // * For any non-null value x, x.Equals(null) should return false. Equals(elem interface{}) bool } From 11d5d7c4ceb4964a08104fd20a1eb4719ab6375a Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Mon, 25 Oct 2021 13:45:56 +0300 Subject: [PATCH 013/198] Queue of the pipe duplicates checking dumbed down; TODO: real peer message hash function --- packages/chain/chainimpl/chainimpl.go | 2 +- packages/chain/messages/peermsg.go | 182 -------------------------- packages/peering/peering.go | 21 +-- packages/util/pipe/hash_set.go | 97 -------------- packages/util/pipe/interface.go | 40 +----- packages/util/pipe/queue.go | 50 +++++-- packages/util/pipe/test_util.go | 20 +-- 7 files changed, 52 insertions(+), 360 deletions(-) delete mode 100644 packages/util/pipe/hash_set.go diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index e8e798dba9..ddbe133992 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -124,7 +124,7 @@ func NewChain( ret := &chainObj{ mempool: mempool.New(state.NewOptimisticStateReader(db, chainStateSync), blobProvider, chainLog, chainMetrics), procset: processors.MustNew(processorConfig), - msgPipe: pipe.NewInfinitePipe(messagePriorityFun, maxMsgBuffer), + msgPipe: pipe.NewLimitPriorityInfinitePipe(messagePriorityFun, maxMsgBuffer), chainID: chainID, log: chainLog, nodeConn: nodeconnimpl.New(txstreamClient, chainLog), diff --git a/packages/chain/messages/peermsg.go b/packages/chain/messages/peermsg.go index 7c5e93729c..fcf816517d 100644 --- a/packages/chain/messages/peermsg.go +++ b/packages/chain/messages/peermsg.go @@ -4,7 +4,6 @@ package messages import ( - "bytes" "io" "time" @@ -13,7 +12,6 @@ import ( "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/state" "github.com/iotaledger/wasp/packages/util" - "github.com/iotaledger/wasp/packages/util/pipe" "github.com/iotaledger/wasp/packages/vm" "go.dedis.ch/kyber/v3/sign/tbls" ) @@ -32,20 +30,6 @@ const ( type TimerTick int -var _ pipe.Hashable = TimerTick(0) - -func (ttT TimerTick) GetHash() interface{} { - return ttT -} - -func (ttT TimerTick) Equals(elem interface{}) bool { - other, ok := elem.(TimerTick) - if !ok { - return false - } - return ttT == other -} - type SignedResultMsg struct { SenderIndex uint16 ChainInputID ledgerstate.OutputID @@ -76,20 +60,6 @@ type DismissChainMsg struct { Reason string } -var _ pipe.Hashable = &DismissChainMsg{} - -func (dcmT *DismissChainMsg) GetHash() interface{} { - return dcmT.Reason -} - -func (dcmT *DismissChainMsg) Equals(elem interface{}) bool { - other, ok := elem.(*DismissChainMsg) - if !ok { - return false - } - return dcmT.Reason == other.Reason -} - // StateTransitionMsg Notifies chain about changed state type StateTransitionMsg struct { // new variable state @@ -100,187 +70,35 @@ type StateTransitionMsg struct { StateTimestamp time.Time } -var _ pipe.Hashable = &StateTransitionMsg{} - -func (stmT *StateTransitionMsg) GetHash() interface{} { - return struct { - // TODO: move state fields to state.VirtualStateAccess? - stateBlockIndex uint32 - statePreviousHash hashing.HashValue - stateCommitment hashing.HashValue - outputID ledgerstate.OutputID - }{ - stateBlockIndex: stmT.State.BlockIndex(), - statePreviousHash: stmT.State.PreviousStateHash(), - stateCommitment: stmT.State.StateCommitment(), - outputID: stmT.StateOutput.ID(), - } -} - -func (stmT *StateTransitionMsg) Equals(elem interface{}) bool { - other, ok := elem.(*StateTransitionMsg) - if !ok { - return false - } - // TODO: move state fields to state.VirtualStateAccess? - if stmT.State.BlockIndex() != other.State.BlockIndex() { - return false - } - if stmT.State.PreviousStateHash() != other.State.PreviousStateHash() { - return false - } - if stmT.State.StateCommitment() != other.State.StateCommitment() { - return false - } - return stmT.StateOutput.ID() == other.StateOutput.ID() -} - // StateCandidateMsg Consensus sends the finalized next state to StateManager type StateCandidateMsg struct { State state.VirtualStateAccess ApprovingOutputID ledgerstate.OutputID } -var _ pipe.Hashable = &StateCandidateMsg{} - -func (scmT *StateCandidateMsg) GetHash() interface{} { - return struct { - stateBlockIndex uint32 - statePreviousHash hashing.HashValue - stateCommitment hashing.HashValue - outputID ledgerstate.OutputID - }{ - stateBlockIndex: scmT.State.BlockIndex(), - statePreviousHash: scmT.State.PreviousStateHash(), - stateCommitment: scmT.State.StateCommitment(), - outputID: scmT.ApprovingOutputID, - } -} - -func (scmT *StateCandidateMsg) Equals(elem interface{}) bool { - other, ok := elem.(*StateCandidateMsg) - if !ok { - return false - } - if scmT.State.BlockIndex() != other.State.BlockIndex() { - return false - } - if scmT.State.PreviousStateHash() != other.State.PreviousStateHash() { - return false - } - if scmT.State.StateCommitment() != other.State.StateCommitment() { - return false - } - return scmT.ApprovingOutputID == other.ApprovingOutputID -} - // VMResultMsg Consensus -> Consensus. VM sends result of async task started by Consensus to itself type VMResultMsg struct { Task *vm.VMTask } -var _ pipe.Hashable = &VMResultMsg{} - -func (vrmT *VMResultMsg) GetHash() interface{} { - return vrmT.Task.ACSSessionID -} - -func (vrmT *VMResultMsg) Equals(elem interface{}) bool { - other, ok := elem.(*VMResultMsg) - if !ok { - return false - } - // NOTE: is it enough??? - return vrmT.Task.ACSSessionID == other.Task.ACSSessionID -} - // AsynchronousCommonSubsetMsg type AsynchronousCommonSubsetMsg struct { ProposedBatchesBin [][]byte SessionID uint64 } -var _ pipe.Hashable = &AsynchronousCommonSubsetMsg{} - -func (acsmT *AsynchronousCommonSubsetMsg) GetHash() interface{} { - var batchesHash hashing.HashValue - for i := 0; i < len(acsmT.ProposedBatchesBin); i++ { - batchHash := hashing.HashData(acsmT.ProposedBatchesBin[i]) - for j := 0; j < len(batchesHash); j++ { - batchesHash[j] += batchHash[j] - } - } - return struct { - batchesHash hashing.HashValue - sessionID uint64 - }{ - batchesHash: batchesHash, - sessionID: acsmT.SessionID, - } -} - -func (acsmT *AsynchronousCommonSubsetMsg) Equals(elem interface{}) bool { - other, ok := elem.(*AsynchronousCommonSubsetMsg) - if !ok { - return false - } - if acsmT.SessionID != other.SessionID { - return false - } - if len(acsmT.ProposedBatchesBin) != len(other.ProposedBatchesBin) { - return false - } - for i := 0; i < len(acsmT.ProposedBatchesBin); i++ { - if bytes.Equal(acsmT.ProposedBatchesBin[i], other.ProposedBatchesBin[i]) { - return false - } - } - return true -} - // InclusionStateMsg txstream plugin sends inclusions state of the transaction to ConsensusOld type InclusionStateMsg struct { TxID ledgerstate.TransactionID State ledgerstate.InclusionState } -var _ pipe.Hashable = &InclusionStateMsg{} - -func (ismT *InclusionStateMsg) GetHash() interface{} { - return *ismT -} - -func (ismT *InclusionStateMsg) Equals(elem interface{}) bool { - other, ok := elem.(*InclusionStateMsg) - if !ok { - return false - } - if ismT.TxID != other.TxID { - return false - } - return ismT.State == other.State -} - // StateMsg txstream plugin sends the only existing AliasOutput in the chain's address to StateManager type StateMsg struct { ChainOutput *ledgerstate.AliasOutput Timestamp time.Time } -var _ pipe.Hashable = &StateMsg{} - -func (smT *StateMsg) GetHash() interface{} { - return smT.ChainOutput.ID() -} - -func (smT *StateMsg) Equals(elem interface{}) bool { - other, ok := elem.(*StateMsg) - if !ok { - return false - } - return smT.ChainOutput.ID() == other.ChainOutput.ID() -} - func (msg *GetBlockMsg) Write(w io.Writer) error { return util.WriteUint32(w, msg.BlockIndex) } diff --git a/packages/peering/peering.go b/packages/peering/peering.go index 72267712a6..77585d50a8 100644 --- a/packages/peering/peering.go +++ b/packages/peering/peering.go @@ -374,25 +374,8 @@ func (m *PeerMessage) IsUserMessage() bool { return m.MsgType >= FirstUserMsgCode } -func (m *PeerMessage) GetHash() interface{} { - return struct { - msgType byte - msgDataHash hashing.HashValue - }{ - msgType: m.MsgType, - msgDataHash: hashing.HashData(m.MsgData), - } -} - -func (m *PeerMessage) Equals(elem interface{}) bool { - other, ok := elem.(*PeerMessage) - if !ok { - return false - } - if m.MsgType != other.MsgType { - return false - } - return bytes.Equal(m.MsgData, other.MsgData) +func (m *PeerMessage) GetHash() hashing.HashValue { + return hashing.HashValue{} // TODO } // ParseNetID parses the NetID and returns the corresponding host and port. diff --git a/packages/util/pipe/hash_set.go b/packages/util/pipe/hash_set.go deleted file mode 100644 index a1729ffc08..0000000000 --- a/packages/util/pipe/hash_set.go +++ /dev/null @@ -1,97 +0,0 @@ -package pipe - -type HashSet struct { - hashTable map[interface{}][]Hashable - count int -} - -var _ Set = &HashSet{} - -// New constructs and returns a new Queue. Code duplication needed for benchmarks. -func NewHashSet() *HashSet { - return &HashSet{ - hashTable: make(map[interface{}][]Hashable), - count: 0, - } -} - -// Length returns the number of elements currently stored in the queue. -func (s *HashSet) Size() int { - return s.count -} - -func (s *HashSet) Add(elem interface{}) bool { - hashable, ok := elem.(Hashable) - if !ok { - panic("Adding not hashable element to hash set") - } - hash := hashable.GetHash() - hashEntry, ok := s.hashTable[hash] - if ok { - for i := 0; i < len(hashEntry); i++ { - if hashEntry[i].Equals(hashable) { - return false - } - } - s.hashTable[hash] = append(hashEntry, hashable) - } else { - s.hashTable[hash] = []Hashable{hashable} - } - s.count++ - return true -} - -func (s *HashSet) Clear() { - s.hashTable = make(map[interface{}][]Hashable) - s.count = 0 -} - -func (s *HashSet) Contains(elem interface{}) bool { - hashable, ok := elem.(Hashable) - if !ok { - return false - } - hash := hashable.GetHash() - hashEntry, ok := s.hashTable[hash] - if !ok { - return false - } - for i := 0; i < len(hashEntry); i++ { - if hashEntry[i].Equals(hashable) { - return true - } - } - return false -} - -func (s *HashSet) Remove(elem interface{}) bool { - hashable, ok := elem.(Hashable) - if !ok { - return false - } - hash := hashable.GetHash() - hashEntry, ok := s.hashTable[hash] - if !ok { - return false - } - length := len(hashEntry) - for i := 0; i < length; i++ { - if hashEntry[i].Equals(hashable) { - if length == 1 { - delete(s.hashTable, hash) - } else { - var newHashEntry []Hashable - if i == length-1 { - newHashEntry = hashEntry[0 : length-1] - } else { - newHashEntry = hashEntry[0:i] - newHashEntry = append(newHashEntry, hashEntry[i+1:length]...) - } - s.hashTable[hash] = newHashEntry - } - s.count-- - return true - } - } - return false -} diff --git a/packages/util/pipe/interface.go b/packages/util/pipe/interface.go index 46ffa7081e..11c6f28cfc 100644 --- a/packages/util/pipe/interface.go +++ b/packages/util/pipe/interface.go @@ -1,46 +1,12 @@ package pipe +import "github.com/iotaledger/wasp/packages/hashing" + // minQueueLen is smallest capacity that queue may have. const minQueueLen = 16 type Hashable interface { - // GetHash should return a hash code value for the object. This method is supported - // for the benefit of hash tables such as those provided by HashSet struct. - // The general contract of GetHash is: - // * Whenever it is invoked on the same object more than once during an execution - // of Wasp, the GetHash method must consistently return the same struct, - // provided no information used in Equals comparisons on the object is - // modified. This struct need not remain consistent from one execution - // of Wasp to another. - // * If two objects are equal according to the Equals method, then calling - // the GetHash method on each of the two objects must produce the same struct. - // * It is not required that if two objects are unequal according to the - // Equals method, then calling the GetHash method on each of the two objects - // must produce distinct struct. However, the programmer should be aware - // that producing distinct struct for unequal objects may improve the performance - // of hash tables. - // * the returned struct must be valid as a map key (e.g. no slices) - GetHash() interface{} - // Equals should indicate whether some other object is "equal to" this one. - // The equals method implements an equivalence relation on non-null objects: - // * It is reflexive: for any non-null value x, x.Equals(x) should return true. - // * It is symmetric: for any non-null values x and y, x.Equals(y) should - // return true if and only if y.Equals(x) returns true. - // * It is transitive: for any non-null values x, y, and z, if x.Equals(y) - // returns true and y.Equals(z) returns true, then x.Equals(z) should return true. - // * It is consistent: for any non-null values x and y, multiple invocations - // of x.Equals(y) consistently return true or consistently return false, - // provided no information used in equals comparisons on the objects is modified. - // * For any non-null value x, x.Equals(null) should return false. - Equals(elem interface{}) bool -} - -type Set interface { - Size() int - Add(elem interface{}) bool - Clear() - Contains(elem interface{}) bool - Remove(elem interface{}) bool + GetHash() hashing.HashValue } type Queue interface { diff --git a/packages/util/pipe/queue.go b/packages/util/pipe/queue.go index 6d734c6b72..fa4f435f6c 100644 --- a/packages/util/pipe/queue.go +++ b/packages/util/pipe/queue.go @@ -1,5 +1,7 @@ package pipe +import "github.com/iotaledger/wasp/packages/hashing" + // LimitedPriorityHashQueue is a queue, which can prioritize elements, // limit its growth and reject already included elements. type LimitedPriorityHashQueue struct { @@ -10,7 +12,7 @@ type LimitedPriorityHashQueue struct { count int priorityFun func(interface{}) bool limit int - hashTable Set + hashMap *map[hashing.HashValue]bool } var _ Queue = &LimitedPriorityHashQueue{} @@ -52,11 +54,12 @@ func NewLimitedPriorityHashQueue(priorityFun func(interface{}) bool, limit int, } else { initBufSize = minQueueLen } - var hashTable Set + var hashMap *map[hashing.HashValue]bool if hashNeeded { - hashTable = NewHashSet() + hMap := make(map[hashing.HashValue]bool) + hashMap = &hMap } else { - hashTable = nil + hashMap = nil } return &LimitedPriorityHashQueue{ head: 0, @@ -66,7 +69,7 @@ func NewLimitedPriorityHashQueue(priorityFun func(interface{}) bool, limit int, buf: make([]interface{}, initBufSize), priorityFun: priorityFun, limit: limit, - hashTable: hashTable, + hashMap: hashMap, } } @@ -122,9 +125,20 @@ func (q *LimitedPriorityHashQueue) resize() { // If it is a hash queue, the element is not added, if it is already in the queue. // If the add was successful, returns `true`. func (q *LimitedPriorityHashQueue) Add(elem interface{}) bool { - if q.hashTable != nil && q.hashTable.Contains(elem) { - // duplicate element; ignoring - return false + var elemHashable Hashable + var elemHash hashing.HashValue + var ok bool + if q.hashMap != nil { + elemHashable, ok = elem.(Hashable) + if !ok { + panic("Adding not hashable element") + } + elemHash = elemHashable.GetHash() + contains, ok := (*q.hashMap)[elemHash] + if ok && contains { + // duplicate element; ignoring + return false + } } limitReached := false if q.count == len(q.buf) { @@ -170,8 +184,12 @@ func (q *LimitedPriorityHashQueue) Add(elem interface{}) bool { q.head = q.getIndex(q.head + 1) } } - if q.hashTable != nil { - q.hashTable.Remove(deleteElem) + if q.hashMap != nil { + deleteElemHashable, ok := deleteElem.(Hashable) + if !ok { + panic("Deleting not hashable element") + } + delete(*q.hashMap, deleteElemHashable.GetHash()) } } if priority { @@ -188,8 +206,8 @@ func (q *LimitedPriorityHashQueue) Add(elem interface{}) bool { if !limitReached { q.count++ } - if q.hashTable != nil { - q.hashTable.Add(elem) + if q.hashMap != nil { + (*q.hashMap)[elemHash] = true } return true } @@ -236,8 +254,12 @@ func (q *LimitedPriorityHashQueue) Remove() interface{} { if (len(q.buf) > minQueueLen) && ((q.count << 2) <= len(q.buf)) { q.resize() } - if q.hashTable != nil { - q.hashTable.Remove(ret) + if q.hashMap != nil { + retHashable, ok := ret.(Hashable) + if !ok { + panic("Removing not hashable element") + } + delete(*q.hashMap, retHashable.GetHash()) } return ret } diff --git a/packages/util/pipe/test_util.go b/packages/util/pipe/test_util.go index 0dd6fec875..36ed7efb1b 100644 --- a/packages/util/pipe/test_util.go +++ b/packages/util/pipe/test_util.go @@ -1,19 +1,19 @@ package pipe +import ( + "encoding/binary" + + "github.com/iotaledger/wasp/packages/hashing" +) + type SimpleHashable int var _ Hashable = SimpleHashable(0) -func (sh SimpleHashable) GetHash() interface{} { - return sh -} - -func (sh SimpleHashable) Equals(elem interface{}) bool { - other, ok := elem.(SimpleHashable) - if !ok { - return false - } - return sh == other +func (sh SimpleHashable) GetHash() hashing.HashValue { + bin := make([]byte, binary.MaxVarintLen64) + binary.PutVarint(bin, int64(sh)) + return hashing.HashData(bin) } //-- From 7cea2ea089a4ee874de69377eb7f5b71363ed7fe Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Mon, 25 Oct 2021 14:42:57 +0300 Subject: [PATCH 014/198] Real peer message hash function added; side effect: UDP and TCP packages removed --- packages/peering/lpp/lppNetImpl.go | 2 +- packages/peering/lpp/lppPeer.go | 2 +- packages/peering/peering.go | 84 +---- packages/peering/peering_test.go | 50 +-- packages/peering/tcp/constants.go | 17 - packages/peering/tcp/doc.go | 7 - packages/peering/tcp/encode.go | 148 -------- packages/peering/tcp/netImpl.go | 235 ------------ packages/peering/tcp/netImpl_test.go | 58 --- packages/peering/tcp/peer.go | 292 --------------- packages/peering/tcp/peeredconn.go | 171 --------- packages/peering/tcp/peerpool.go | 140 ------- packages/peering/udp/udpHandshake.go | 90 ----- packages/peering/udp/udpHandshake_test.go | 50 --- packages/peering/udp/udpNetImpl.go | 426 ---------------------- packages/peering/udp/udpNetImpl_test.go | 107 ------ packages/peering/udp/udpPeer.go | 265 -------------- 17 files changed, 20 insertions(+), 2124 deletions(-) delete mode 100644 packages/peering/tcp/constants.go delete mode 100644 packages/peering/tcp/doc.go delete mode 100644 packages/peering/tcp/encode.go delete mode 100644 packages/peering/tcp/netImpl.go delete mode 100644 packages/peering/tcp/netImpl_test.go delete mode 100644 packages/peering/tcp/peer.go delete mode 100644 packages/peering/tcp/peeredconn.go delete mode 100644 packages/peering/tcp/peerpool.go delete mode 100644 packages/peering/udp/udpHandshake.go delete mode 100644 packages/peering/udp/udpHandshake_test.go delete mode 100644 packages/peering/udp/udpNetImpl.go delete mode 100644 packages/peering/udp/udpNetImpl_test.go delete mode 100644 packages/peering/udp/udpPeer.go diff --git a/packages/peering/lpp/lppNetImpl.go b/packages/peering/lpp/lppNetImpl.go index f383ff727b..9638b10913 100644 --- a/packages/peering/lpp/lppNetImpl.go +++ b/packages/peering/lpp/lppNetImpl.go @@ -211,7 +211,7 @@ func (n *netImpl) lppPeeringProtocolHandler(stream network.Stream) { n.log.Warnf("Failed to read incoming payload from %v, reason=%v", remotePeer.remoteNetID, err) return } - peerMsg, err := peering.NewPeerMessageFromBytes(payload, nil) // Do not use the signatures, we have TLS. + peerMsg, err := peering.NewPeerMessageFromBytes(payload) // Do not use the signatures, we have TLS. if err != nil { n.log.Warnf("Error while decoding a message, reason=%v", err) return diff --git a/packages/peering/lpp/lppPeer.go b/packages/peering/lpp/lppPeer.go index 24863cb09f..e053f3b4aa 100644 --- a/packages/peering/lpp/lppPeer.go +++ b/packages/peering/lpp/lppPeer.go @@ -145,7 +145,7 @@ func (p *peer) sendMsgDirect(msg *peering.PeerMessage) { } defer stream.Close() // - msgBytes, err := msg.Bytes(nil) // Do not use msg signatures, we are using TLS. + msgBytes, err := msg.Bytes() // Do not use msg signatures, we are using TLS. if err != nil { p.log.Warnf("Failed to send outgoing message, unable to serialize, reason=%v", err) return diff --git a/packages/peering/peering.go b/packages/peering/peering.go index 77585d50a8..78bf609c39 100644 --- a/packages/peering/peering.go +++ b/packages/peering/peering.go @@ -19,7 +19,6 @@ import ( "time" "github.com/iotaledger/goshimmer/packages/ledgerstate" - "github.com/iotaledger/goshimmer/packages/txstream/chopper" "github.com/iotaledger/hive.go/crypto/ed25519" "github.com/iotaledger/wasp/packages/hashing" "github.com/iotaledger/wasp/packages/util" @@ -37,8 +36,6 @@ const ( // All the equal and larger msg types are committee messages. // those with smaller are reserved by the package for heartbeat and handshake messages FirstUserMsgCode = byte(0x10) - - chunkMessageOverhead = 8 + 1 ) // PeeringID is relates peers in different nodes for a particular @@ -234,12 +231,13 @@ type PeerMessage struct { Timestamp int64 MsgType byte MsgData []byte + serialized *[]byte } var _ pipe.Hashable = &PeerMessage{} //nolint:gocritic -func NewPeerMessageFromBytes(buf []byte, peerPubKey *ed25519.PublicKey) (*PeerMessage, error) { +func NewPeerMessageFromBytes(buf []byte) (*PeerMessage, error) { var err error r := bytes.NewBuffer(buf) m := PeerMessage{} @@ -269,39 +267,22 @@ func NewPeerMessageFromBytes(buf []byte, peerPubKey *ed25519.PublicKey) (*PeerMe if m.MsgData, err = util.ReadBytes32(r); err != nil { return nil, err } - if peerPubKey != nil { - // Check the signature, if key is provided. - lenBeforeSig := r.Len() - var signatureBin []byte - if signatureBin, err = util.ReadBytes16(r); err != nil { - return nil, xerrors.Errorf("failed to read signature: %w", err) - } - var signature ed25519.Signature - if signature, _, err = ed25519.SignatureFromBytes(signatureBin); err != nil { - return nil, xerrors.Errorf("failed to parse signature: %w", err) - } - if !peerPubKey.VerifySignature(buf[:len(buf)-lenBeforeSig], signature) { - return nil, xerrors.New("signature verification failed") - } - } } return &m, nil } -// NewPeerMessageFromChunks can return nil, if there is not enough chunks to reconstruct the message. -func NewPeerMessageFromChunks(chunkBytes []byte, chunkSize int, msgChopper *chopper.Chopper, peerPubKey *ed25519.PublicKey) (*PeerMessage, error) { - var err error - var msgBytes []byte - if msgBytes, err = msgChopper.IncomingChunk(chunkBytes, chunkSize, chunkMessageOverhead); err != nil { - return nil, err - } - if msgBytes == nil { - return nil, nil +func (m *PeerMessage) Bytes() ([]byte, error) { + if m.serialized == nil { + serialized, err := m.bytes() + if err != nil { + return nil, err + } + m.serialized = &serialized } - return NewPeerMessageFromBytes(msgBytes, peerPubKey) + return *(m.serialized), nil } -func (m *PeerMessage) Bytes(nodeIdentity *ed25519.KeyPair) ([]byte, error) { +func (m *PeerMessage) bytes() ([]byte, error) { var buf bytes.Buffer if err := util.WriteInt64(&buf, m.Timestamp); err != nil { return nil, err @@ -329,53 +310,20 @@ func (m *PeerMessage) Bytes(nodeIdentity *ed25519.KeyPair) ([]byte, error) { if err := util.WriteBytes32(&buf, m.MsgData); err != nil { return nil, err } - if nodeIdentity != nil { - // Only use signatures, if the key is provided. - payload := buf.Bytes() - signature := nodeIdentity.PrivateKey.Sign(payload).Bytes() - if err := util.WriteBytes16(&buf, signature); err != nil { - return nil, xerrors.Errorf("failed to write signature: %w", err) - } - } } return buf.Bytes(), nil } -func (m *PeerMessage) ChunkedBytes(chunkSize int, msgChopper *chopper.Chopper, nodeIdentity *ed25519.KeyPair) ([][]byte, error) { - var err error - var msgBytes []byte - if msgBytes, err = m.Bytes(nodeIdentity); err != nil { - return nil, err - } - var choppedBytes [][]byte - var chopped bool - choppedBytes, chopped, err = msgChopper.ChopData(msgBytes, chunkSize, chunkMessageOverhead) - if err != nil { - return nil, err - } - if chopped { - msgs := make([][]byte, len(choppedBytes)) - for i := range choppedBytes { - chunkMsg := PeerMessage{ - Timestamp: m.Timestamp, - MsgType: MsgTypeMsgChunk, - MsgData: choppedBytes[i], - } - if msgs[i], err = chunkMsg.Bytes(nil); err != nil { - return nil, err - } - } - return msgs, nil - } - return [][]byte{msgBytes}, nil -} - func (m *PeerMessage) IsUserMessage() bool { return m.MsgType >= FirstUserMsgCode } func (m *PeerMessage) GetHash() hashing.HashValue { - return hashing.HashValue{} // TODO + mBytes, err := m.Bytes() + if err != nil { + return hashing.HashValue{} + } + return hashing.HashData(mBytes) } // ParseNetID parses the NetID and returns the corresponding host and port. diff --git a/packages/peering/peering_test.go b/packages/peering/peering_test.go index 7440947a2d..0e80610716 100644 --- a/packages/peering/peering_test.go +++ b/packages/peering/peering_test.go @@ -2,12 +2,9 @@ package peering_test import ( "bytes" - "math/rand" "testing" "time" - "github.com/iotaledger/goshimmer/packages/txstream/chopper" - "github.com/iotaledger/hive.go/crypto/ed25519" "github.com/iotaledger/wasp/packages/peering" "github.com/stretchr/testify/require" ) @@ -15,7 +12,6 @@ import ( func TestPeerMessageCodec(t *testing.T) { var err error var src, dst *peering.PeerMessage - nodeIdentity := ed25519.GenerateKeyPair() src = &peering.PeerMessage{ PeeringID: peering.RandomPeeringID(), SenderIndex: uint16(123), @@ -24,10 +20,10 @@ func TestPeerMessageCodec(t *testing.T) { MsgData: []byte{1, 2, 3, 4, 5}, } var bin []byte - bin, err = src.Bytes(&nodeIdentity) + bin, err = src.Bytes() require.Nil(t, err) require.NotNil(t, bin) - dst, err = peering.NewPeerMessageFromBytes(bin, &nodeIdentity.PublicKey) + dst, err = peering.NewPeerMessageFromBytes(bin) require.Nil(t, err) require.NotNil(t, dst) require.EqualValues(t, src.PeeringID, dst.PeeringID) @@ -36,45 +32,3 @@ func TestPeerMessageCodec(t *testing.T) { require.Equal(t, src.MsgType, dst.MsgType) require.True(t, bytes.Equal(src.MsgData, dst.MsgData)) } - -func TestPeerMessageChunks(t *testing.T) { - var err error - var src, dst *peering.PeerMessage - nodeIdentity := ed25519.GenerateKeyPair() - chunkSize := 100 - chp := chopper.NewChopper() - data := make([]byte, 2013) - for i := range data { - data[i] = byte(rand.Intn(255)) - } - src = &peering.PeerMessage{ - PeeringID: peering.RandomPeeringID(), - SenderIndex: uint16(123), - Timestamp: time.Now().UnixNano(), - MsgType: peering.FirstUserMsgCode + 17, - MsgData: data, - } - var chunks [][]byte - chunks, err = src.ChunkedBytes(chunkSize, chp, &nodeIdentity) - require.Nil(t, err) - require.NotNil(t, chunks) - require.True(t, len(chunks) > 1) - for i := range chunks { - var chunkMsg *peering.PeerMessage - chunkMsg, err = peering.NewPeerMessageFromBytes(chunks[i], &nodeIdentity.PublicKey) - require.Nil(t, err) - require.Equal(t, peering.MsgTypeMsgChunk, chunkMsg.MsgType) - dst, err = peering.NewPeerMessageFromChunks(chunkMsg.MsgData, chunkSize, chp, &nodeIdentity.PublicKey) - require.Nil(t, err) - if i == len(chunks)-1 { - require.NotNil(t, dst) - } else { - require.Nil(t, dst) - } - } - require.EqualValues(t, src.PeeringID, dst.PeeringID) - require.Equal(t, src.SenderIndex, dst.SenderIndex) - require.Equal(t, src.Timestamp, dst.Timestamp) - require.Equal(t, src.MsgType, dst.MsgType) - require.True(t, bytes.Equal(src.MsgData, dst.MsgData)) -} diff --git a/packages/peering/tcp/constants.go b/packages/peering/tcp/constants.go deleted file mode 100644 index 88d2366aec..0000000000 --- a/packages/peering/tcp/constants.go +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -package tcp - -import "time" - -const ( - msgTypeReserved = byte(0) - msgTypeHandshake = byte(1) - msgTypeMsgChunk = byte(2) - - restartAfter = 1 * time.Second - dialTimeout = 1 * time.Second - dialRetries = 10 - backoffDelay = 500 * time.Millisecond -) diff --git a/packages/peering/tcp/doc.go b/packages/peering/tcp/doc.go deleted file mode 100644 index 6a08de2eea..0000000000 --- a/packages/peering/tcp/doc.go +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// Package tcp provides a TCP based implementation of the -// peering overlay network. -// -package tcp diff --git a/packages/peering/tcp/encode.go b/packages/peering/tcp/encode.go deleted file mode 100644 index 4c0e1b9ce2..0000000000 --- a/packages/peering/tcp/encode.go +++ /dev/null @@ -1,148 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -package tcp - -import ( - "bytes" - "fmt" - "log" - - "github.com/iotaledger/hive.go/crypto/ed25519" - "github.com/iotaledger/wasp/packages/peering" - "github.com/iotaledger/wasp/packages/util" -) - -// structure of the encoded PeerMessage: -// OutputTimestamp 8 bytes -// MsgType type 1 byte -// -- if MsgType == 0 (heartbeat) --> the end of message -// -- if MsgType == 1 (handshake) -// MsgData (handshakeMsg) --> end of message -// -- if MsgType >= FirstUserMsgCode -// PeeringID 32 bytes -// SenderIndex 2 bytes -// MsgData variable bytes to the end -// -- otherwise panic wrong MsgType - -const chunkMessageOverhead = 8 + 1 - -// always puts timestamp into first 8 bytes and 1 byte msg type -func encodeMessage(msg *peering.PeerMessage, ts int64) []byte { - var buf bytes.Buffer - // puts timestamp first - _ = util.WriteUint64(&buf, uint64(ts)) - switch { - case msg == nil: - panic("msgTypeReserved") - - case msg.MsgType == msgTypeReserved: - panic("msgTypeReserved") - - case msg.MsgType == msgTypeHandshake: - buf.WriteByte(msgTypeHandshake) - buf.Write(msg.MsgData) - - case msg.MsgType == msgTypeMsgChunk: - buf.WriteByte(msgTypeMsgChunk) - buf.Write(msg.MsgData) - - case msg.MsgType >= peering.FirstUserMsgCode: - buf.WriteByte(msg.MsgType) - //TODO should these errors be checked? - //nolint:errcheck - msg.PeeringID.Write(&buf) - //nolint:errcheck - util.WriteUint16(&buf, msg.SenderIndex) - //nolint:errcheck - util.WriteBytes32(&buf, msg.MsgData) - - default: - log.Panicf("wrong msg type %d", msg.MsgType) - } - return buf.Bytes() -} - -func decodeMessage(data []byte) (*peering.PeerMessage, error) { - if len(data) < 9 { - return nil, fmt.Errorf("too short message") - } - rdr := bytes.NewBuffer(data) - var uts uint64 - err := util.ReadUint64(rdr, &uts) - if err != nil { - return nil, err - } - ret := &peering.PeerMessage{ - Timestamp: int64(uts), - } - ret.MsgType, err = util.ReadByte(rdr) - if err != nil { - return nil, err - } - switch { - case ret.MsgType == msgTypeHandshake: - ret.MsgData = rdr.Bytes() - return ret, nil - - case ret.MsgType == msgTypeMsgChunk: - ret.MsgData = rdr.Bytes() - return ret, nil - - case ret.MsgType >= peering.FirstUserMsgCode: - // committee message - if err := ret.PeeringID.Read(rdr); err != nil { - return nil, err - } - if err := util.ReadUint16(rdr, &ret.SenderIndex); err != nil { - return nil, err - } - if ret.MsgData, err = util.ReadBytes32(rdr); err != nil { - return nil, err - } - return ret, nil - - default: - return nil, fmt.Errorf("peering.decodeMessage.wrong message type: %d", ret.MsgType) - } -} - -type handshakeMsg struct { - peeringID string // Pair of peer NetIDs - srcNetID string // Their NetID - pubKey ed25519.PublicKey // Our PubKey. -} - -func (m *handshakeMsg) bytes() ([]byte, error) { - var buf bytes.Buffer - if err := util.WriteString16(&buf, m.peeringID); err != nil { - return nil, err - } - if err := util.WriteString16(&buf, m.srcNetID); err != nil { - return nil, err - } - if err := util.WriteBytes16(&buf, m.pubKey.Bytes()); err != nil { - return nil, err - } - return buf.Bytes(), nil -} - -func handshakeMsgFromBytes(buf []byte) (*handshakeMsg, error) { - var err error - r := bytes.NewReader(buf) - m := handshakeMsg{} - if m.peeringID, err = util.ReadString16(r); err != nil { - return nil, err - } - if m.srcNetID, err = util.ReadString16(r); err != nil { - return nil, err - } - var pubKeyBytes []byte - if pubKeyBytes, err = util.ReadBytes16(r); err != nil { - return nil, err - } - if m.pubKey, _, err = ed25519.PublicKeyFromBytes(pubKeyBytes); err != nil { - return nil, err - } - return &m, nil -} diff --git a/packages/peering/tcp/netImpl.go b/packages/peering/tcp/netImpl.go deleted file mode 100644 index b158e15bfd..0000000000 --- a/packages/peering/tcp/netImpl.go +++ /dev/null @@ -1,235 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -package tcp - -import ( - "errors" - "sync" - "time" - - "github.com/iotaledger/hive.go/crypto/ed25519" - "github.com/iotaledger/hive.go/events" - "github.com/iotaledger/hive.go/logger" - "github.com/iotaledger/wasp/packages/peering" - "github.com/iotaledger/wasp/packages/peering/domain" - "github.com/iotaledger/wasp/packages/peering/group" -) - -// NetImpl implements a peering.NetworkProvider interface. -type NetImpl struct { - myNetID string // NetID of this node. - port int // Port to use for peering. - - peers map[string]*peer - peersMutex *sync.RWMutex - events *events.Event - - nodeKeyPair *ed25519.KeyPair - log *logger.Logger -} - -// NewNetworkProvider is a constructor for the TCP based -// peering network implementation. -func NewNetworkProvider(myNetID string, port int, nodeKeyPair *ed25519.KeyPair, log *logger.Logger) (*NetImpl, error) { - if err := peering.CheckMyNetID(myNetID, port); err != nil { - // can't continue because NetID parameter is not correct - log.Panicf("checkMyNetworkID: '%v'. || Check the 'netid' parameter in config.json", err) - return nil, err - } - n := NetImpl{ - myNetID: myNetID, - port: port, - peers: make(map[string]*peer), - peersMutex: &sync.RWMutex{}, - nodeKeyPair: nodeKeyPair, - log: log, - } - n.events = events.NewEvent(n.eventHandler) - return &n, nil -} - -// A handler suitable for events.NewEvent(). -func (n *NetImpl) eventHandler(handler interface{}, params ...interface{}) { - callback := handler.(func(_ *peering.RecvEvent)) - recvEvent := params[0].(*peering.RecvEvent) - callback(recvEvent) -} - -// Run starts listening and communicating with the network. -func (n *NetImpl) Run(shutdownSignal <-chan struct{}) { - go n.connectOutboundLoop() - go n.connectInboundLoop() - - <-shutdownSignal - - n.log.Info("Closing all connections with peers...") - n.closeAll() - n.log.Info("Closing all connections with peers... done") -} - -// Self implements peering.NetworkProvider. -func (n *NetImpl) Self() peering.PeerSender { - return n -} - -// Group implements peering.NetworkProvider. -func (n *NetImpl) PeerGroup(peerNetIDs []string) (peering.GroupProvider, error) { - var err error - peers := make([]peering.PeerSender, len(peerNetIDs)) - for i := range peerNetIDs { - if peers[i], err = n.PeerByNetID(peerNetIDs[i]); err != nil { - return nil, err - } - } - return group.NewPeeringGroupProvider(n, peers, n.log) -} - -// Domain creates peering.PeerDomainProvider. -func (n *NetImpl) PeerDomain(peerNetIDs []string) (peering.PeerDomainProvider, error) { - return domain.NewPeerDomainByNetIDs(n, peerNetIDs, n.log) -} - -// Attach implements peering.NetworkProvider. -func (n *NetImpl) Attach(peeringID *peering.PeeringID, callback func(recv *peering.RecvEvent)) interface{} { - closure := events.NewClosure(func(recv *peering.RecvEvent) { - if peeringID == nil || *peeringID == recv.Msg.PeeringID { - callback(recv) - } - }) - n.events.Attach(closure) - return closure -} - -// Detach implements peering.NetworkProvider. -func (n *NetImpl) Detach(attachID interface{}) { - switch closure := attachID.(type) { - case *events.Closure: - n.events.Detach(closure) - default: - panic("invalid_attach_id") - } -} - -// PeerByNetID implements peering.NetworkProvider. -func (n *NetImpl) PeerByNetID(peerNetID string) (peering.PeerSender, error) { - if p := n.usePeer(peerNetID); p != nil { - return p, nil - } - return n, nil // Self -} - -// PeerByPubKey implements peering.NetworkProvider. -// NOTE: For now, only known nodes can be looked up by PubKey. -func (n *NetImpl) PeerByPubKey(peerPub *ed25519.PublicKey) (peering.PeerSender, error) { - for i := range n.peers { - pk := n.peers[i].PubKey() - if pk != nil && *pk == *peerPub { - return n.PeerByNetID(n.peers[i].NetID()) - } - } - return nil, errors.New("known peer not found by pubKey") -} - -// PeerStatus implements peering.NetworkProvider. -func (n *NetImpl) PeerStatus() []peering.PeerStatusProvider { - peerStatus := make([]peering.PeerStatusProvider, 0) - for i := range n.peers { - peerStatus = append(peerStatus, n.peers[i]) - } - return peerStatus -} - -// NetID implements peering.PeerSender for the Self() node. -func (n *NetImpl) NetID() string { - return n.myNetID -} - -// PubKey implements peering.PeerSender for the Self() node. -func (n *NetImpl) PubKey() *ed25519.PublicKey { - return &n.nodeKeyPair.PublicKey -} - -// SendMsg implements peering.PeerSender for the Self() node. -func (n *NetImpl) SendMsg(msg *peering.PeerMessage) { - // Don't go via the network, if sending a message to self. - n.events.Trigger(&peering.RecvEvent{ - From: n.Self(), - Msg: msg, - }) -} - -// IsAlive implements peering.PeerSender for the Self() node. -func (n *NetImpl) IsAlive() bool { - return true // This node is alive. -} - -// Await implements peering.PeerSender for the Self() node. -func (n *NetImpl) Await(timeout time.Duration) error { - return nil // This node is alive. -} - -// Close implements peering.PeerSender for the Self() node. -func (n *NetImpl) Close() { - // We will con close the connection of the own node. -} - -func (n *NetImpl) isInbound(remoteNetID string) bool { - // if remoteNetID == n.myNetID { // TODO: [KP] Do we need this? - // panic("remoteNetID == myNetID") - // } - return remoteNetID < n.myNetID -} - -// That's a name of the pairing, equal on both ends. -func (n *NetImpl) peeringID(remoteNetID string) string { - if n.isInbound(remoteNetID) { - return remoteNetID + "<" + n.myNetID - } - return n.myNetID + "<" + remoteNetID -} - -// usePeer adds new connection to the peer pool -// if it already exists, returns existing. -// Return nil for for own netID -// connection added to the pool is picked by loops which will try to establish connection -func (n *NetImpl) usePeer(netID string) *peer { - if netID == n.myNetID { - // nil for itself - return nil // TODO: [KP] return self - } - n.peersMutex.Lock() - defer n.peersMutex.Unlock() - - if peer, ok := n.peers[n.peeringID(netID)]; ok { - // existing peer - peer.numUsers++ - return peer - } - // new peer - ret := newPeer(netID, n) - n.peers[ret.peeringID()] = ret - n.log.Debugf("added new peer id %s", ret.peeringID()) - return ret -} - -// stopUsingPeer decreases counter. -func (n *NetImpl) stopUsingPeer(peerID string) { - n.peersMutex.Lock() - defer n.peersMutex.Unlock() - - if peer, ok := n.peers[peerID]; ok { - peer.numUsers-- - if peer.numUsers == 0 { - peer.isDismissed.Store(true) - - go func() { - n.peersMutex.Lock() - defer n.peersMutex.Unlock() - - delete(n.peers, peerID) - peer.closeConn() - }() - } - } -} diff --git a/packages/peering/tcp/netImpl_test.go b/packages/peering/tcp/netImpl_test.go deleted file mode 100644 index 47b6de5ad7..0000000000 --- a/packages/peering/tcp/netImpl_test.go +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -package tcp_test - -import ( - "testing" - "time" - - "github.com/iotaledger/hive.go/crypto/ed25519" - "github.com/iotaledger/wasp/packages/peering" - "github.com/iotaledger/wasp/packages/peering/tcp" - "github.com/iotaledger/wasp/packages/testutil/testlogger" - "github.com/stretchr/testify/require" -) - -func TestBasic(t *testing.T) { - log := testlogger.NewLogger(t) - defer log.Sync() - var err0, err1, err2 error - doneCh := make(chan bool) - netIDs := []string{"localhost:9017", "localhost:9018", "localhost:9019"} - nodeIdentities := []ed25519.KeyPair{ - ed25519.GenerateKeyPair(), - ed25519.GenerateKeyPair(), - ed25519.GenerateKeyPair(), - } - nodes := make([]peering.NetworkProvider, len(netIDs)) - nodes[0], err0 = tcp.NewNetworkProvider(netIDs[0], 9017, &nodeIdentities[0], log.Named("node0")) - nodes[1], err1 = tcp.NewNetworkProvider(netIDs[1], 9018, &nodeIdentities[1], log.Named("node1")) - nodes[2], err2 = tcp.NewNetworkProvider(netIDs[2], 9019, &nodeIdentities[2], log.Named("node2")) - require.Nil(t, err0) - require.Nil(t, err1) - require.Nil(t, err2) - for i := range nodes { - go nodes[i].Run(make(<-chan struct{})) - } - - <-time.After(time.Second) // TODO: [KP] Temporary. - - n0p2, _ := nodes[0].PeerByNetID(netIDs[2]) - n1p1, _ := nodes[1].PeerByNetID(netIDs[1]) - n2p0, _ := nodes[2].PeerByNetID(netIDs[0]) - - <-time.After(time.Second) // TODO: [KP] Temporary. - - nodes[0].Attach(nil, func(recv *peering.RecvEvent) { - doneCh <- true - }) - - chain1 := peering.RandomPeeringID() - chain2 := peering.RandomPeeringID() - n0p2.SendMsg(&peering.PeerMessage{PeeringID: chain1, MsgType: 125}) - n1p1.SendMsg(&peering.PeerMessage{PeeringID: chain1, MsgType: 125}) - n2p0.SendMsg(&peering.PeerMessage{PeeringID: chain2, MsgType: 125}) - - <-doneCh -} diff --git a/packages/peering/tcp/peer.go b/packages/peering/tcp/peer.go deleted file mode 100644 index fa0e73612b..0000000000 --- a/packages/peering/tcp/peer.go +++ /dev/null @@ -1,292 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -package tcp - -import ( - "errors" - "fmt" - "net" - "sync" - "time" - - "github.com/iotaledger/goshimmer/packages/tangle" - "github.com/iotaledger/hive.go/backoff" - "github.com/iotaledger/hive.go/crypto/ed25519" - "github.com/iotaledger/hive.go/logger" - "github.com/iotaledger/wasp/packages/peering" - "go.uber.org/atomic" -) - -// retry net.Dial once, on fail after 0.5s -var dialRetryPolicy = backoff.ConstantBackOff(backoffDelay).With(backoff.MaxRetries(dialRetries)) // TODO: Global variables. - -// peer represents point-to-point TCP connection between two nodes and another -// it is used as transport for message exchange -// Another end is always using the same connection -// the peer takes care about exchanging heartbeat messages. -// It keeps last several received heartbeats as "lad" data to be able to calculate how synced/unsynced -// clocks of peer are. -type peer struct { - *sync.RWMutex - isDismissed atomic.Bool // to be GC-ed - peerconn *peeredConnection // nil means not connected - handshakeOk bool - - remoteNetID string // network locations as taken from the SC data - remotePubKey *ed25519.PublicKey - - startOnce *sync.Once - waitReady *sync.WaitGroup - numUsers int - net *NetImpl - log *logger.Logger -} - -func newPeer(remoteNetID string, netw *NetImpl) *peer { - var waitReady sync.WaitGroup - waitReady.Add(1) - return &peer{ - RWMutex: &sync.RWMutex{}, - remoteNetID: remoteNetID, - startOnce: &sync.Once{}, - waitReady: &waitReady, - numUsers: 1, - net: netw, - log: netw.log, - } -} - -// NetID implements peering.PeerSender and peering.PeerStatusProvider interfaces for the remote peers. -func (p *peer) NetID() string { - return p.remoteNetID -} - -// PubKey implements peering.PeerSender and peering.PeerStatusProvider interfaces for the remote peers. -func (p *peer) PubKey() *ed25519.PublicKey { - p.log.Infof("Waiting for connection to become ready to get %v peer's public key.", p.remoteNetID) - p.waitReady.Wait() - return p.remotePubKey -} - -// SendMsg implements peering.PeerSender interface for the remote peers. -func (p *peer) SendMsg(msg *peering.PeerMessage) { - if err := p.doSendMsg(msg); err != nil { - // Async sending, we should ignore the errors. - p.log.Warnf("Failed to send a message, reason: %v", err) - } -} - -// IsAlive implements peering.PeerSender and peering.PeerStatusProvider interfaces for the remote peers. -// Return true if is alive and average latencyRingBuf in nanosec. -func (p *peer) IsAlive() bool { - p.RLock() - defer p.RUnlock() - return p.peerconn != nil && p.handshakeOk -} - -// IsAlive implements peering.PeerSender interface for the remote peers. -func (p *peer) Await(timeout time.Duration) error { - p.waitReady.Wait() // TODO: Use other locking to consider the timeout. - return nil -} - -// IsInbound implements peering.PeerStatusProvider. -// It is used in the dashboard. -func (p *peer) IsInbound() bool { - return p.net.isInbound(p.remoteNetID) -} - -// IsInbound implements peering.PeerStatusProvider. -// It is used in the dashboard. -func (p *peer) NumUsers() int { - p.RLock() - defer p.RUnlock() - return p.numUsers -} - -// SendMsg implements peering.PeerSender interface for the remote peers. -func (p *peer) Close() { - p.net.stopUsingPeer(p.remoteNetID) -} - -func (p *peer) peeringID() string { - return p.net.peeringID(p.remoteNetID) -} - -//nolint:unused -func (p *peer) connStatus() (bool, bool) { - p.RLock() - defer p.RUnlock() - if p.isDismissed.Load() { - return false, false - } - return p.peerconn != nil, p.handshakeOk -} - -func (p *peer) closeConn() { - p.Lock() - defer p.Unlock() - - if p.isDismissed.Load() { - return - } - if p.peerconn != nil { - _ = p.peerconn.Close() - } -} - -// dials outbound address and established connection -func (p *peer) runOutbound() { - log := p.net.log - if p.isDismissed.Load() { - return - } - if p.IsInbound() { - return - } - if p.peerconn != nil { - panic("peer.peerconn != nil") - } - log.Debugf("runOutbound %s", p.remoteNetID) - - // always try to reconnect - defer func() { - go func() { - time.Sleep(restartAfter) - p.Lock() - if !p.isDismissed.Load() { - p.startOnce = &sync.Once{} - log.Debugf("will run again: %s", p.peeringID()) - } - p.Unlock() - }() - }() - - var conn net.Conn - - if err := backoff.Retry(dialRetryPolicy, func() error { - var err error - conn, err = net.DialTimeout("tcp", p.remoteNetID, dialTimeout) - if err != nil { - return fmt.Errorf("dial %s failed: %w", p.remoteNetID, err) - } - return nil - }); err != nil { - log.Warn(err) - return - } - p.peerconn = newPeeredConnection(conn, p.net, p) - if err := p.sendHandshake(); err != nil { - log.Errorf("error during sendHandshake: %v", err) - return - } - log.Infof("starting reading outbound %s", p.remoteNetID) - err := p.peerconn.Read() - log.Errorw("stopped reading outbound. Closing", "remote", p.remoteNetID, "err", err) - p.closeConn() -} - -// sends handshake message. It contains myNetID -func (p *peer) sendHandshake() error { - var err error - msg := handshakeMsg{ - peeringID: p.peeringID(), - srcNetID: p.net.Self().NetID(), - pubKey: p.net.nodeKeyPair.PublicKey, - } - var msgData []byte - if msgData, err = msg.bytes(); err != nil { - return err - } - data := encodeMessage(&peering.PeerMessage{ - MsgType: msgTypeHandshake, - MsgData: msgData, - }, time.Now().UnixNano()) - _, err = p.peerconn.Write(data) - p.net.log.Debugf("sendHandshake '%s' --> '%s', id = %s", p.net.myNetID, p.remoteNetID, p.peeringID()) - return err -} - -func (p *peer) doSendMsg(msg *peering.PeerMessage) error { - if msg.MsgType < peering.FirstUserMsgCode { - return errors.New("reserved message code") - } - ts := msg.Timestamp - if ts == 0 { - ts = time.Now().UnixNano() - } - data := encodeMessage(msg, ts) - - choppedData, chopped, err := p.peerconn.msgChopper.ChopData(data, tangle.MaxMessageSize, chunkMessageOverhead) - if err != nil { - return err - } - - p.RLock() - defer p.RUnlock() - - if !chopped { - return p.sendData(data) - } - return p.sendChunks(choppedData) -} - -func (p *peer) sendChunks(chopped [][]byte) error { - ts := time.Now().UnixNano() - for _, piece := range chopped { - d := encodeMessage(&peering.PeerMessage{ - MsgType: msgTypeMsgChunk, - MsgData: piece, - }, ts) - if err := p.sendData(d); err != nil { - return err - } - } - return nil -} - -// SendMsgToPeers sends same msg to all peers in the slice which are not nil -// with the same timestamp -// return number of successfully sent messages and timestamp -func SendMsgToPeers(msg *peering.PeerMessage, ts int64, peers ...*peer) uint16 { // TODO: [KP] Remove, unused. - if msg.MsgType < peering.FirstUserMsgCode { - return 0 - } - // timestamped here, once - data := encodeMessage(msg, ts) - - numSent := uint16(0) - for _, peer := range peers { - if peer == nil { - continue - } - peer.RLock() - choppedData, chopped, err := peer.peerconn.msgChopper.ChopData(data, tangle.MaxMessageSize, chunkMessageOverhead) - if err != nil { - return 0 - } - if !chopped { - if err := peer.sendData(data); err == nil { - numSent++ - } - } else { - if err := peer.sendChunks(choppedData); err == nil { - numSent++ - } - } - peer.RUnlock() - } - return numSent -} - -func (p *peer) sendData(data []byte) error { - if p.peerconn == nil { - return fmt.Errorf("no connection with %s", p.remoteNetID) - } - num, err := p.peerconn.Write(data) - if num != len(data) { - return fmt.Errorf("not all bytes were written. err = %v", err) - } - return nil -} diff --git a/packages/peering/tcp/peeredconn.go b/packages/peering/tcp/peeredconn.go deleted file mode 100644 index 56e091f630..0000000000 --- a/packages/peering/tcp/peeredconn.go +++ /dev/null @@ -1,171 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -package tcp - -import ( - "net" - - "github.com/iotaledger/goshimmer/packages/tangle" - "github.com/iotaledger/goshimmer/packages/txstream/chopper" - "github.com/iotaledger/hive.go/events" - "github.com/iotaledger/hive.go/netutil/buffconn" - "github.com/iotaledger/wasp/packages/peering" -) - -// extension of BufferedConnection from hive.go -// BufferedConnection is a wrapper for net.Conn -// peeredConnection first handles handshake and then links -// with peer according to the handshake information -type peeredConnection struct { - *buffconn.BufferedConnection - peer *peer - net *NetImpl - msgChopper *chopper.Chopper - handshakeOk bool //nolint:structcheck,unused -} - -// creates new peered connection and attach event handlers for received data and closing -func newPeeredConnection(conn net.Conn, netw *NetImpl, peer *peer) *peeredConnection { - c := &peeredConnection{ - BufferedConnection: buffconn.NewBufferedConnection(conn, tangle.MaxMessageSize), - peer: peer, // may be nil - net: netw, - msgChopper: chopper.NewChopper(), - } - c.Events.ReceiveMessage.Attach(events.NewClosure(func(data []byte) { - c.receiveData(data) - })) - c.Events.Close.Attach(events.NewClosure(func() { - if c.peer != nil { - c.peer.Lock() - c.peer.peerconn = nil - c.peer.handshakeOk = false - c.peer.Unlock() - } - netw.log.Debugw("closed buff connection", "conn", conn.RemoteAddr().String()) - })) - return c -} - -// receive data handler for peered connection -func (c *peeredConnection) receiveData(data []byte) { - msg, err := decodeMessage(data) - if err != nil { - // gross violation of the protocol - c.net.log.Errorf("!!!!! peeredConnection.receiveData.decodeMessage: %v", err) - c.Close() - return - } - if msg.MsgType == peering.MsgTypeMsgChunk { - finalMsg, err := c.msgChopper.IncomingChunk(msg.MsgData, tangle.MaxMessageSize, chunkMessageOverhead) - if err != nil { - c.net.log.Errorf("peeredConnection.receiveData: %v", err) - return - } - if finalMsg != nil { - c.receiveData(finalMsg) - } - } - if c.peer != nil { - // it is peered but maybe not handshaked yet (can only be outbound) - if c.peer.handshakeOk { - // it is handshake-ed - msg.SenderNetID = c.peer.NetID() - c.net.events.Trigger(&peering.RecvEvent{ - From: c.peer, - Msg: msg, - }) - } else { - // expected handshake msg - if msg.MsgType != peering.MsgTypeHandshake { - c.net.log.Errorf("peeredConnection.receiveData: unexpected message during handshake 1") - return - } - // not handshaked => do handshake - c.processHandShakeOutbound(msg) - } - } else { - // can only be inbound - // expected handshake msg - if msg.MsgType != peering.MsgTypeHandshake { - c.net.log.Errorf("peeredConnection.receiveData: unexpected message during handshake 2") - return - } - // not peered yet can be only inbound - // peer up and do handshake - c.processHandShakeInbound(msg) - } -} - -// receives handshake response from the outbound peer -// assumes the connection is already peered (i can be only for outbound peers) -func (c *peeredConnection) processHandShakeOutbound(msg *peering.PeerMessage) { - var err error - var hMsg *handshakeMsg - if hMsg, err = handshakeMsgFromBytes(msg.MsgData); err != nil { - c.net.log.Errorf( - "closeConn the peer connection: wrong handshake message from outbound peer %v, error: %v", - c.peer.peeringID(), err, - ) - panic(err) - } - c.net.log.Debugf("received handshake from outbound %s", hMsg.peeringID) - if hMsg.peeringID != c.peer.peeringID() { - c.net.log.Errorf( - "closeConn the peer connection: wrong handshake message from outbound peer: expected %s got '%s'", - c.peer.peeringID(), hMsg.peeringID, - ) - if c.peer != nil { - // may ne be peered yet - c.peer.closeConn() - } - } else { - c.net.log.Infof("CONNECTED WITH PEER %s (outbound)", hMsg.peeringID) - c.peer.remotePubKey = &hMsg.pubKey - c.peer.handshakeOk = true - c.peer.waitReady.Done() - } -} - -// receives handshake from the inbound peer -// links connection with the peer -// sends response back to finish the handshake -func (c *peeredConnection) processHandShakeInbound(msg *peering.PeerMessage) { - var err error - var hMsg *handshakeMsg - if hMsg, err = handshakeMsgFromBytes(msg.MsgData); err != nil { - c.net.log.Errorf( - "closeConn the peer connection: wrong handshake message from outbound peer %v, error: %v", - c.peer.peeringID(), err, - ) - panic(err) - } - - c.net.log.Infof("received handshake from inbound id = %s, peers=%+v", hMsg.peeringID, c.net.peers) - - c.net.peersMutex.RLock() - peer, ok := c.net.peers[hMsg.peeringID] - c.net.peersMutex.RUnlock() - - if !ok || !peer.IsInbound() { - c.net.log.Warnf("inbound connection from unexpected peer id %s. Closing..", hMsg.peeringID) - _ = c.Close() - return - } - c.peer = peer - - peer.Lock() - peer.peerconn = c - peer.remotePubKey = &hMsg.pubKey - peer.handshakeOk = true - peer.waitReady.Done() - peer.Unlock() - - c.net.log.Infof("CONNECTED WITH PEER %s (inbound)", hMsg.peeringID) - - if err := peer.sendHandshake(); err != nil { - c.net.log.Errorf("error while responding to handshake: %v. Closing connection", err) - _ = c.Close() - } -} diff --git a/packages/peering/tcp/peerpool.go b/packages/peering/tcp/peerpool.go deleted file mode 100644 index 6ebf2d7e26..0000000000 --- a/packages/peering/tcp/peerpool.go +++ /dev/null @@ -1,140 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -package tcp - -import ( - "fmt" - "io" - "net" - "strings" - "time" - - "github.com/iotaledger/wasp/plugins/gracefulshutdown" -) - -//nolint:unused -func (n *NetImpl) iteratePeers(f func(p *peer)) { - n.peersMutex.Lock() - defer n.peersMutex.Unlock() - - for _, peer := range n.peers { - if !peer.isDismissed.Load() { - f(peer) - } - } -} - -func (n *NetImpl) closeAll() { - n.peersMutex.Lock() - defer n.peersMutex.Unlock() - - for _, cconn := range n.peers { - cconn.closeConn() - } -} - -// loop which maintains outbound peers connected (if possible) -func (n *NetImpl) connectOutboundLoop() { - for { - time.Sleep(100 * time.Millisecond) - n.peersMutex.Lock() - for _, c := range n.peers { - c.startOnce.Do(func() { - go c.runOutbound() - }) - } - n.peersMutex.Unlock() - } -} - -// loop which maintains inbound peers connected (when possible) -func (n *NetImpl) connectInboundLoop() { - listenOn := fmt.Sprintf(":%d", n.port) - listener, err := net.Listen("tcp", listenOn) - if err != nil { - n.log.Errorf("tcp listen on %s failed: %v. Shutting down...", listenOn, err) - gracefulshutdown.Shutdown() // TODO: Move it to the plugin. - - //log.Errorf("tcp listen on %s failed: %v. Restarting connectInboundLoop after 1 sec", listenOn, err) - //go func() { - // time.Sleep(1 * time.Second) - // connectInboundLoop() - //}() - return - } - n.log.Infof("tcp listen inbound on %s", listenOn) - for { - conn, err := listener.Accept() - if err != nil { - n.log.Errorf("failed accepting a connection request: %v", err) - continue - } - n.log.Debugf("accepted connection from %s", conn.RemoteAddr().String()) - - // peer is not known yet - bconn := newPeeredConnection(conn, n, nil) - go func() { - n.log.Debugf("starting reading inbound %s", conn.RemoteAddr().String()) - err := bconn.Read() - n.log.Debugw("stopped reading inbound. Closing", "remote", conn.RemoteAddr(), "err", err) - - //if err := bconn.Read(); err != nil { - // if permanentBufConnReadingError(err) { - // n.log.Warnf("Permanent error reading inbound %s: %v", conn.RemoteAddr().String(), err) - // } - //} - _ = bconn.Close() - }() - } -} - -// for testing -//nolint:unused -func (n *NetImpl) countConnectionsLoop() { - var totalNum, inboundNum, outboundNum, inConnectedNum, outConnectedNum, inHSNum, outHSNum int - for { - time.Sleep(2 * time.Second) - totalNum, inboundNum, outboundNum, inConnectedNum, outConnectedNum, inHSNum, outHSNum = 0, 0, 0, 0, 0, 0, 0 - n.peersMutex.Lock() - for _, c := range n.peers { - totalNum++ - isConn, isHandshaken := c.connStatus() - if c.IsInbound() { - inboundNum++ - if isConn { - inConnectedNum++ - } - if isHandshaken { - inHSNum++ - } - } else { - outboundNum++ - if isConn { - outConnectedNum++ - } - if isHandshaken { - outHSNum++ - } - } - } - n.peersMutex.Unlock() - n.log.Debugf("CONN STATUS: total conn: %d, in: %d, out: %d, inConnected: %d, outConnected: %d, inHS: %d, outHS: %d", - totalNum, inboundNum, outboundNum, inConnectedNum, outConnectedNum, inHSNum, outHSNum) - } -} - -//nolint:unused,deadcode -func permanentBufConnReadingError(err error) bool { - if err == io.EOF { - return false - } - if strings.Contains(err.Error(), "use of closed network connection") { - return false - } - if strings.Contains(err.Error(), "invalid message header") { - // someone with wrong protocol - return false - } - return true -} diff --git a/packages/peering/udp/udpHandshake.go b/packages/peering/udp/udpHandshake.go deleted file mode 100644 index c460bd7d3d..0000000000 --- a/packages/peering/udp/udpHandshake.go +++ /dev/null @@ -1,90 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -package udp - -import ( - "bytes" - - "github.com/iotaledger/hive.go/crypto/ed25519" - "github.com/iotaledger/wasp/packages/util" - "golang.org/x/xerrors" -) - -type handshakeMsg struct { - netID string // Their NetID - pubKey ed25519.PublicKey // Our PubKey. - respond bool // Do the message asks for a response? -} - -//nolint: gocritic -func (m *handshakeMsg) bytes(secKey ed25519.PrivateKey) ([]byte, error) { - var err error - // - // Payload. - var payloadBuf bytes.Buffer - if err = util.WriteString16(&payloadBuf, m.netID); err != nil { - return nil, err - } - if err = util.WriteBytes16(&payloadBuf, m.pubKey.Bytes()); err != nil { - return nil, err - } - if err = util.WriteBoolByte(&payloadBuf, m.respond); err != nil { - return nil, err - } - // - // Signed frame. - payload := payloadBuf.Bytes() - signature := secKey.Sign(payload) - signedBuf := bytes.Buffer{} - if err = util.WriteBytes16(&signedBuf, signature.Bytes()); err != nil { - return nil, err - } - if err = util.WriteBytes16(&signedBuf, payload); err != nil { - return nil, err - } - return signedBuf.Bytes(), nil -} - -//nolint: gocritic -func handshakeMsgFromBytes(buf []byte) (*handshakeMsg, error) { - var err error - // - // Signed frame. - rSigned := bytes.NewReader(buf) - var payload []byte - var signatureBytes []byte - if signatureBytes, err = util.ReadBytes16(rSigned); err != nil { - return nil, err - } - if payload, err = util.ReadBytes16(rSigned); err != nil { - return nil, err - } - // - // Payload. - rPayload := bytes.NewReader(payload) - m := handshakeMsg{} - if m.netID, err = util.ReadString16(rPayload); err != nil { - return nil, err - } - var pubKeyBytes []byte - if pubKeyBytes, err = util.ReadBytes16(rPayload); err != nil { - return nil, err - } - if m.pubKey, _, err = ed25519.PublicKeyFromBytes(pubKeyBytes); err != nil { - return nil, err - } - if err = util.ReadBoolByte(rPayload, &m.respond); err != nil { - return nil, err - } - // - // Verify the signature. - var signature ed25519.Signature - if signature, _, err = ed25519.SignatureFromBytes(signatureBytes); err != nil { - return nil, err - } - if !m.pubKey.VerifySignature(payload, signature) { - return nil, xerrors.New("invalid message signature") - } - return &m, nil -} diff --git a/packages/peering/udp/udpHandshake_test.go b/packages/peering/udp/udpHandshake_test.go deleted file mode 100644 index bbb5b055b2..0000000000 --- a/packages/peering/udp/udpHandshake_test.go +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -package udp - -import ( - "net" - "testing" - - "github.com/iotaledger/hive.go/crypto/ed25519" - "github.com/stretchr/testify/require" -) - -func TestHandshakeCodec(t *testing.T) { - var err error - pair := ed25519.GenerateKeyPair() - a := handshakeMsg{ - netID: "some", - pubKey: pair.PublicKey, - respond: true, - } - var buf []byte - buf, err = a.bytes(pair.PrivateKey) - require.Nil(t, err) - require.NotNil(t, buf) - // - // Correct message. - var b *handshakeMsg - b, err = handshakeMsgFromBytes(buf) - require.Nil(t, err) - require.NotNil(t, b) - require.Equal(t, a.netID, b.netID) - require.Equal(t, a.pubKey, b.pubKey) - require.Equal(t, a.respond, b.respond) - // - // Damaged message. - buf[2]++ - var c *handshakeMsg - c, err = handshakeMsgFromBytes(buf) - require.NotNil(t, err) - require.Nil(t, c) -} - -func TestUDPAddrString(t *testing.T) { - var err error - var addr *net.UDPAddr - addr, err = net.ResolveUDPAddr("udp", "localhost:1248") - require.Nil(t, err) - require.Equal(t, "127.0.0.1:1248", addr.String()) -} diff --git a/packages/peering/udp/udpNetImpl.go b/packages/peering/udp/udpNetImpl.go deleted file mode 100644 index af99b5624a..0000000000 --- a/packages/peering/udp/udpNetImpl.go +++ /dev/null @@ -1,426 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// Package udp implements a UDP based peering.NetworkProvider. -package udp - -import ( - "errors" - "net" - "os" - "sync" - "time" - - "github.com/iotaledger/hive.go/crypto/ed25519" - "github.com/iotaledger/hive.go/events" - "github.com/iotaledger/hive.go/logger" - "github.com/iotaledger/wasp/packages/peering" - "github.com/iotaledger/wasp/packages/peering/domain" - "github.com/iotaledger/wasp/packages/peering/group" -) - -const ( - maintenancePeriod = 1 * time.Second - recvQueueSize = 1024 * 5 - recvBlockingDuration = 3 * time.Second -) - -// NetImpl implements a peering.NetworkProvider interface. -type NetImpl struct { - myNetID string // NetID of this node. - myUDPConn *net.UDPConn - port int // Port to use for peering. - peers map[string]*peer // By NetID - peersByAddr map[string]*peer // By UDPAddr.String() - peersLock *sync.RWMutex - recvEvents *events.Event - recvQueue chan *peering.RecvEvent // A queue for received messages. - nodeKeyPair *ed25519.KeyPair - trusted peering.TrustedNetworkManager - log *logger.Logger -} - -// NewNetworkProvider is a constructor for the TCP based -// peering network implementation. -func NewNetworkProvider( - myNetID string, - port int, - nodeKeyPair *ed25519.KeyPair, - trusted peering.TrustedNetworkManager, - log *logger.Logger, -) (*NetImpl, error) { - var err error - var myUDPConn *net.UDPConn - if myUDPConn, err = net.ListenUDP("udp", &net.UDPAddr{Port: port}); err != nil { - return nil, err - } - n := NetImpl{ - myNetID: myNetID, - myUDPConn: myUDPConn, - port: port, - peers: make(map[string]*peer), - peersByAddr: make(map[string]*peer), - peersLock: &sync.RWMutex{}, - recvEvents: nil, // Initialized bellow. - recvQueue: make(chan *peering.RecvEvent, recvQueueSize), - nodeKeyPair: nodeKeyPair, - trusted: trusted, - log: log, - } - n.recvEvents = events.NewEvent(n.eventHandler) - return &n, nil -} - -// A handler suitable for events.NewEvent(). -func (n *NetImpl) eventHandler(handler interface{}, params ...interface{}) { - callback := handler.(func(_ *peering.RecvEvent)) - recvEvent := params[0].(*peering.RecvEvent) - callback(recvEvent) -} - -// Run starts listening and communicating with the network. -func (n *NetImpl) Run(shutdownSignal <-chan struct{}) { - queueRecvStopCh := make(chan bool) - receiveStopCh := make(chan bool) - maintenanceStopCh := make(chan bool) - go n.queueRecvLoop(queueRecvStopCh) - go n.receiveLoop(receiveStopCh) - go n.maintenanceLoop(maintenanceStopCh) - - <-shutdownSignal - close(maintenanceStopCh) - close(receiveStopCh) - close(queueRecvStopCh) -} - -// Self implements peering.NetworkProvider. -func (n *NetImpl) Self() peering.PeerSender { - return n -} - -// Group creates peering.GroupProvider. -func (n *NetImpl) PeerGroup(peerNetIDs []string) (peering.GroupProvider, error) { - var err error - groupPeers := make([]peering.PeerSender, len(peerNetIDs)) - for i := range peerNetIDs { - if groupPeers[i], err = n.usePeer(peerNetIDs[i]); err != nil { - return nil, err - } - } - return group.NewPeeringGroupProvider(n, groupPeers, n.log) -} - -// Domain creates peering.PeerDomainProvider. -func (n *NetImpl) PeerDomain(peerNetIDs []string) (peering.PeerDomainProvider, error) { - peers := make([]peering.PeerSender, 0, len(peerNetIDs)) - for _, nid := range peerNetIDs { - if nid == n.Self().NetID() { - continue - } - p, err := n.usePeer(nid) - if err != nil { - return nil, err - } - peers = append(peers, p) - } - return domain.NewPeerDomain(n, peers, n.log), nil -} - -// Attach implements peering.NetworkProvider. -func (n *NetImpl) Attach(peeringID *peering.PeeringID, callback func(recv *peering.RecvEvent)) interface{} { - closure := events.NewClosure(func(recv *peering.RecvEvent) { - if peeringID == nil || *peeringID == recv.Msg.PeeringID { - callback(recv) - } - }) - n.recvEvents.Attach(closure) - return closure -} - -// Detach implements peering.NetworkProvider. -func (n *NetImpl) Detach(attachID interface{}) { - switch closure := attachID.(type) { - case *events.Closure: - n.recvEvents.Detach(closure) - default: - panic("invalid_attach_id") - } -} - -// PeerByNetID implements peering.NetworkProvider. -func (n *NetImpl) PeerByNetID(peerNetID string) (peering.PeerSender, error) { - return n.usePeer(peerNetID) -} - -// PeerByPubKey implements peering.NetworkProvider. -// NOTE: For now, only known nodes can be looked up by PubKey. -func (n *NetImpl) PeerByPubKey(peerPub *ed25519.PublicKey) (peering.PeerSender, error) { - n.peersLock.RLock() - defer n.peersLock.RUnlock() - for i := range n.peers { - pk := n.peers[i].PubKey() - if pk != nil && *pk == *peerPub { // Compared as binaries. - return n.PeerByNetID(n.peers[i].NetID()) - } - } - return nil, errors.New("known peer not found by pubKey") -} - -// PeerStatus implements peering.NetworkProvider. -func (n *NetImpl) PeerStatus() []peering.PeerStatusProvider { - n.peersLock.RLock() - defer n.peersLock.RUnlock() - peerStatus := make([]peering.PeerStatusProvider, 0) - for i := range n.peers { - peerStatus = append(peerStatus, n.peers[i]) - } - return peerStatus -} - -// NetID implements peering.PeerSender for the Self() node. -func (n *NetImpl) NetID() string { - return n.myNetID -} - -// PubKey implements peering.PeerSender for the Self() node. -func (n *NetImpl) PubKey() *ed25519.PublicKey { - return &n.nodeKeyPair.PublicKey -} - -// SendMsg implements peering.PeerSender for the Self() node. -func (n *NetImpl) SendMsg(msg *peering.PeerMessage) { - // Don't go via the network, if sending a message to self. - n.recvQueue <- &peering.RecvEvent{ - From: n.Self(), - Msg: msg, - } -} - -// IsAlive implements peering.PeerSender for the Self() node. -func (n *NetImpl) IsAlive() bool { - return true // This node is alive. -} - -// Await implements peering.PeerSender for the Self() node. -func (n *NetImpl) Await(timeout time.Duration) error { - return nil // This node is alive immediately. -} - -// Close implements peering.PeerSender for the Self() node. -func (n *NetImpl) Close() { - // We will con close the connection of the own node. -} - -// IsTrustedPeer implements the peering.TrustedNetworkManager interface. -func (n *NetImpl) IsTrustedPeer(pubKey ed25519.PublicKey) error { - return n.trusted.IsTrustedPeer(pubKey) -} - -// TrustPeer implements the peering.TrustedNetworkManager interface. -// It delegates everything to other implementation and updates the connections accordingly. -func (n *NetImpl) TrustPeer(pubKey ed25519.PublicKey, netID string) (*peering.TrustedPeer, error) { - n.peersLock.Lock() - for _, peer := range n.peers { - peerPubKey := peer.remotePubKey - if peerPubKey != nil && *peerPubKey == pubKey { - peer.trust(true) - } - } - n.peersLock.Unlock() - return n.trusted.TrustPeer(pubKey, netID) -} - -// DistrustPeer implements the peering.TrustedNetworkManager interface. -// It delegates everything to other implementation and updates the connections accordingly. -func (n *NetImpl) DistrustPeer(pubKey ed25519.PublicKey) (*peering.TrustedPeer, error) { - n.peersLock.Lock() - for _, peer := range n.peers { - peerPubKey := peer.remotePubKey - if peerPubKey != nil && *peerPubKey == pubKey { - peer.trust(false) - } - } - n.peersLock.Unlock() - return n.trusted.DistrustPeer(pubKey) -} - -// TrustedPeers implements the peering.TrustedNetworkManager interface. -func (n *NetImpl) TrustedPeers() ([]*peering.TrustedPeer, error) { - return n.trusted.TrustedPeers() -} - -func (n *NetImpl) usePeer(remoteNetID string) (peering.PeerSender, error) { - var err error - if remoteNetID == n.myNetID { - return n, nil - } - n.peersLock.Lock() - defer n.peersLock.Unlock() - if p, ok := n.peers[remoteNetID]; ok { - p.usePeer() - return p, nil - } - var p *peer - if p, err = newPeerOnUserRequest(remoteNetID, n); err != nil { - return nil, err - } - n.peers[p.NetID()] = p - n.peersByAddr[p.remoteUDPAddr.String()] = p - return p, nil -} - -func (n *NetImpl) queueRecvLoop(stopCh chan bool) { - for { - select { - case <-stopCh: - return - case recvEvent, ok := <-n.recvQueue: - if ok { - n.recvEvents.Trigger(recvEvent) - } - } - } -} - -func (n *NetImpl) receiveLoop(stopCh chan bool) { - var err error - buf := make([]byte, 2024) - for { - select { // Terminate the loop, if such request has been made. - case <-stopCh: - return - default: - } - var peerUDPAddr *net.UDPAddr - recvDeadline := time.Now().Add(recvBlockingDuration) - if err := n.myUDPConn.SetReadDeadline(recvDeadline); err != nil { - n.log.Warnf("Error while setting UDP read timeout, %v", err) - time.Sleep(1 * time.Second) // To avoid too frequent retries. - continue - } - if _, peerUDPAddr, err = n.myUDPConn.ReadFromUDP(buf); err != nil { - if errors.Is(err, os.ErrDeadlineExceeded) { - // We need to limit the blocking to make graceful stop possible. - continue - } - n.log.Warnf("Error while reading from UDP socket, reason=%v", err) - continue - } - var peerPubKey *ed25519.PublicKey - n.peersLock.RLock() - if p, ok := n.peersByAddr[peerUDPAddr.String()]; ok { - if !p.isTrusted() { - n.peersLock.RUnlock() - n.log.Debugf("Dropping message from untrusted peer: %v.", p.NetID()) - continue - } - // We will only find the pub key, if the session is already established. - // The pub key is here needed only for user messages, so the handshake can proceed with nil. - peerPubKey = p.remotePubKey // Do not use PubKey() here, has it waits for it to be set. - } - n.peersLock.RUnlock() - var peerMsg *peering.PeerMessage - if peerMsg, err = peering.NewPeerMessageFromBytes(buf, peerPubKey); err != nil { - n.log.Warnf("Error while decoding a UDP message, reason=%v", err) - continue - } - switch peerMsg.MsgType { - case peering.MsgTypeReserved: - // Nothing - case peering.MsgTypeHandshake: - n.receiveHandshake(peerMsg, peerUDPAddr) - case peering.MsgTypeMsgChunk: - n.receiveMsgChunk(peerMsg, peerUDPAddr) - default: - n.receiveUserMsg(peerMsg, peerUDPAddr) - } - } -} - -func (n *NetImpl) receiveHandshake(peerMsg *peering.PeerMessage, peerUDPAddr *net.UDPAddr) { - var err error - var h *handshakeMsg - if h, err = handshakeMsgFromBytes(peerMsg.MsgData); err != nil { - n.log.Warnf("Error while decoding a UDP handshake, reason=%v", err) - return - } - if err = n.trusted.IsTrustedPeer(h.pubKey); err != nil { - n.log.Warnf("Dropping handshakeMsg from %v with pubKey=%v, error=%v", peerUDPAddr, h.pubKey, err) - return - } - n.peersLock.Lock() - if p, ok := n.peers[h.netID]; ok { - if oldUDPAddrStr, newUDPAddrStr := p.handleHandshake(h, peerUDPAddr); oldUDPAddrStr != newUDPAddrStr { - // Update the index to find the peer later on. - n.peersByAddr[newUDPAddrStr] = p - delete(n.peersByAddr, oldUDPAddrStr) - } - } else { - if p, err = newPeerFromHandshake(h, peerUDPAddr, n); err != nil { - n.log.Warnf("Error while creating a peer based on UDP handshake, reason=%v", err) - n.peersLock.Unlock() - return - } - n.peers[p.NetID()] = p - n.peersByAddr[p.remoteUDPAddr.String()] = p - } - n.peersLock.Unlock() -} - -func (n *NetImpl) receiveMsgChunk(peerMsg *peering.PeerMessage, peerUDPAddr *net.UDPAddr) { - var err error - remoteUDPAddrStr := peerUDPAddr.String() - n.peersLock.RLock() - if p, ok := n.peersByAddr[remoteUDPAddrStr]; ok { - n.peersLock.RUnlock() - var reconstructedMsg *peering.PeerMessage - if reconstructedMsg, err = peering.NewPeerMessageFromChunks(peerMsg.MsgData, maxChunkSize, p.msgChopper, p.remotePubKey); err != nil { - n.log.Warnf("Error while decoding chunked message, reason=%v", err) - return - } - if reconstructedMsg != nil { - n.receiveUserMsg(reconstructedMsg, peerUDPAddr) - } - } else { - n.peersLock.RUnlock() - n.log.Warnf("Dropping received message from unknown peer=%v", remoteUDPAddrStr) - return - } -} - -func (n *NetImpl) receiveUserMsg(msg *peering.PeerMessage, peerUDPAddr *net.UDPAddr) { - if !msg.IsUserMessage() { - n.log.Warnf("Dropping received message, unexpected MsgType=%v", msg.MsgType) - return - } - remoteUDPAddrStr := peerUDPAddr.String() - - n.peersLock.RLock() - if p, ok := n.peersByAddr[remoteUDPAddrStr]; ok { - n.peersLock.RUnlock() - p.noteReceived() - msg.SenderNetID = p.NetID() - n.recvQueue <- &peering.RecvEvent{ - From: p, - Msg: msg, - } - return - } - n.peersLock.RUnlock() - n.log.Warnf("Dropping received message from unknown peer=%v", remoteUDPAddrStr) -} - -func (n *NetImpl) maintenanceLoop(stopCh chan bool) { - for { - select { - case <-time.After(maintenancePeriod): - n.peersLock.RLock() - for _, p := range n.peers { - p.maintenanceCheck() - } - n.peersLock.RUnlock() - case <-stopCh: - return - } - } -} diff --git a/packages/peering/udp/udpNetImpl_test.go b/packages/peering/udp/udpNetImpl_test.go deleted file mode 100644 index 737ae975f6..0000000000 --- a/packages/peering/udp/udpNetImpl_test.go +++ /dev/null @@ -1,107 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -package udp_test - -import ( - "testing" - - "github.com/iotaledger/hive.go/crypto/ed25519" - "github.com/iotaledger/wasp/packages/peering" - "github.com/iotaledger/wasp/packages/peering/udp" - "github.com/iotaledger/wasp/packages/testutil" - "github.com/iotaledger/wasp/packages/testutil/testlogger" - "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/sign/eddsa" - "go.dedis.ch/kyber/v3/sign/schnorr" - "go.dedis.ch/kyber/v3/util/key" -) - -func TestUDPPeeringImpl(t *testing.T) { - var err error - log := testlogger.NewLogger(t) - defer log.Sync() - - doneCh := make(chan bool) - netIDs := []string{"localhost:9017", "localhost:9018", "localhost:9019"} - nodes := make([]peering.NetworkProvider, len(netIDs)) - - keys := make([]ed25519.KeyPair, len(netIDs)) - tnms := make([]peering.TrustedNetworkManager, len(netIDs)) - for i := range keys { - keys[i] = ed25519.GenerateKeyPair() - tnms[i] = testutil.NewTrustedNetworkManager() - } - for _, tnm := range tnms { - for i := range netIDs { - _, err = tnm.TrustPeer(keys[i].PublicKey, netIDs[i]) - require.NoError(t, err) - } - } - nodes[0], err = udp.NewNetworkProvider(netIDs[0], 9017, &keys[0], tnms[0], log.Named("node0")) - require.NoError(t, err) - nodes[1], err = udp.NewNetworkProvider(netIDs[1], 9018, &keys[1], tnms[1], log.Named("node1")) - require.NoError(t, err) - nodes[2], err = udp.NewNetworkProvider(netIDs[2], 9019, &keys[2], tnms[2], log.Named("node2")) - require.NoError(t, err) - for i := range nodes { - go nodes[i].Run(make(<-chan struct{})) - } - - n0p2, err := nodes[0].PeerByNetID(netIDs[2]) - require.NoError(t, err) - n1p1, err := nodes[1].PeerByNetID(netIDs[1]) - require.NoError(t, err) - n2p0, err := nodes[2].PeerByNetID(netIDs[0]) - require.NoError(t, err) - - nodes[0].Attach(nil, func(recv *peering.RecvEvent) { - doneCh <- true - }) - - chain1 := peering.RandomPeeringID() - chain2 := peering.RandomPeeringID() - n0p2.SendMsg(&peering.PeerMessage{PeeringID: chain1, MsgType: 125}) - n1p1.SendMsg(&peering.PeerMessage{PeeringID: chain1, MsgType: 125}) - n2p0.SendMsg(&peering.PeerMessage{PeeringID: chain2, MsgType: 125}) - - <-doneCh -} - -// TestHiveKyberInterop checks, if hive keys can be used in kyber. -// ``` -// public, private, _ := hive.GenerateKey() -// var kyber eddsa.EdDSA -// kyber.UnmarshalBinary(private.Bytes()) -// kyberSig, _ := kyber.Sign(msg) -// hiveSig, _, _ := hive.SignatureFromBytes(kyberSig) -// public.VerifySignature(msg, hiveSig) -// ``` -func TestHiveKyberInterop(t *testing.T) { - var err error - hiveKeyPair := ed25519.GenerateKeyPair() - kyberSuite := edwards25519.NewBlakeSHA256Ed25519() - kyberEdDSSA := eddsa.EdDSA{} - require.NoError(t, kyberEdDSSA.UnmarshalBinary(hiveKeyPair.PrivateKey.Bytes())) - kyberKeyPair := &key.Pair{ - Public: kyberEdDSSA.Public, - Private: kyberEdDSSA.Secret, - } - // Check, if pub key can be unmarshalled directly. - kyberPubUnmarshaled := kyberSuite.Point() - require.NoError(t, kyberPubUnmarshaled.UnmarshalBinary(hiveKeyPair.PublicKey.Bytes())) - // - // Check signatures. - message := []byte{0, 1, 2} - // - // Hive-to-Hive - hiveSig := hiveKeyPair.PrivateKey.Sign(message) - require.True(t, hiveKeyPair.PublicKey.VerifySignature(message, hiveSig)) - // - // Kyber-to-Kyber - kyberSig, err := schnorr.Sign(kyberSuite, kyberKeyPair.Private, message) - require.NoError(t, err) - require.NoError(t, schnorr.Verify(kyberSuite, kyberKeyPair.Public, message, kyberSig)) - require.NoError(t, schnorr.Verify(kyberSuite, kyberPubUnmarshaled, message, kyberSig)) -} diff --git a/packages/peering/udp/udpPeer.go b/packages/peering/udp/udpPeer.go deleted file mode 100644 index fd3116557e..0000000000 --- a/packages/peering/udp/udpPeer.go +++ /dev/null @@ -1,265 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -package udp - -import ( - "errors" - "fmt" - "net" - "sync" - "time" - - "github.com/iotaledger/goshimmer/packages/txstream/chopper" - "github.com/iotaledger/hive.go/crypto/ed25519" - "github.com/iotaledger/hive.go/logger" - "github.com/iotaledger/wasp/packages/peering" - "github.com/iotaledger/wasp/packages/util" -) - -const ( - inactiveDeadline = 1 * time.Minute - inactivePingTime = 30 * time.Second - sendMsgSyncTimeout = 3 * time.Second - - maxChunkSize = 508 // Safe payload size for UDP. -) - -type peer struct { - remoteNetID string - remotePubKey *ed25519.PublicKey - remoteUDPAddr *net.UDPAddr - waitReady *util.WaitChan - accessLock *sync.RWMutex - lastMsgSent time.Time - lastMsgRecv time.Time - numUsers int - trusted bool - msgChopper *chopper.Chopper - net *NetImpl - log *logger.Logger -} - -func newPeerOnUserRequest(remoteNetID string, n *NetImpl) (*peer, error) { - var err error - var remoteUDPAddr *net.UDPAddr - if remoteUDPAddr, err = net.ResolveUDPAddr("udp", remoteNetID); err != nil { - return nil, err - } - p := newPeer(remoteNetID, remoteUDPAddr, n) - p.usePeer() - return p, nil -} - -func newPeerFromHandshake(handshake *handshakeMsg, remoteUDPAddr *net.UDPAddr, n *NetImpl) (*peer, error) { - p := newPeer(handshake.netID, remoteUDPAddr, n) - if oldUDPAddrStr, newUDPAddrStr := p.handleHandshake(handshake, remoteUDPAddr); oldUDPAddrStr != newUDPAddrStr { - return nil, errors.New("inconsistent_udp_addr_on_create") - } - return p, nil -} - -// That's internal, called from other constructors. -func newPeer(remoteNetID string, remoteUDPAddr *net.UDPAddr, n *NetImpl) *peer { - log := n.log.Named("peer:" + remoteNetID) - p := &peer{ - remoteNetID: remoteNetID, - remotePubKey: nil, // Will be set on the handshake. - remoteUDPAddr: remoteUDPAddr, - waitReady: util.NewWaitChan(), - accessLock: &sync.RWMutex{}, - lastMsgSent: time.Time{}, - lastMsgRecv: time.Time{}, - numUsers: 0, - trusted: true, - msgChopper: chopper.NewChopper(), - net: n, - log: log, - } - p.sendHandshake(true) - return p -} - -func (p *peer) usePeer() { - p.accessLock.Lock() - defer p.accessLock.Unlock() - p.numUsers++ -} - -func (p *peer) handleHandshake(handshake *handshakeMsg, remoteUDPAddr *net.UDPAddr) (string, string) { - p.accessLock.Lock() - oldUDPAddrStr := p.remoteUDPAddr.String() - newUDPAddrStr := remoteUDPAddr.String() - if oldUDPAddrStr != newUDPAddrStr { - p.log.Warnf("Remote UDPAddr has changed, old=%v, new=%v", oldUDPAddrStr, newUDPAddrStr) - p.remoteUDPAddr = remoteUDPAddr - } - if p.remotePubKey == nil { - // That's the first received handshake, pairing established. - p.remotePubKey = &handshake.pubKey - p.waitReady.Done() - p.log.Infof("Node %v is now paired with %v", p.net.NetID(), p.remoteNetID) - } else if p.remotePubKey != nil && *p.remotePubKey == handshake.pubKey { - // It's just a ping. - } else { - // New PublicKey is used by the peer! - if *p.remotePubKey != handshake.pubKey { - p.log.Warnf("Remote PubKey has changed, old=%v, new=%v", p.remotePubKey, handshake.pubKey) - } - p.remotePubKey = &handshake.pubKey - } - p.lastMsgRecv = time.Now() - p.accessLock.Unlock() - if handshake.respond { - // Respond to the handshake, if asked. - p.sendHandshake(false) - } - return oldUDPAddrStr, newUDPAddrStr -} - -func (p *peer) sendHandshake(respond bool) { - var err error - handshake := handshakeMsg{ - netID: p.net.NetID(), - pubKey: *p.net.PubKey(), - respond: respond, - } - var msgDataBin []byte - if msgDataBin, err = handshake.bytes(p.net.nodeKeyPair.PrivateKey); err != nil { - p.log.Errorf("Unable to encode outgoing handshake msg, reason=%v", err) - } - p.SendMsg(&peering.PeerMessage{ - Timestamp: time.Now().UnixNano(), - MsgType: peering.MsgTypeHandshake, - MsgData: msgDataBin, - }) -} - -func (p *peer) noteReceived() { - p.accessLock.Lock() - defer p.accessLock.Unlock() - - p.lastMsgRecv = time.Now() -} - -// Send pings, if needed. Other periodic actions can be added here. -func (p *peer) maintenanceCheck() { - now := time.Now() - old := now.Add(-inactivePingTime) - p.accessLock.RLock() - if p.numUsers > 0 && p.lastMsgRecv.Before(old) { - p.accessLock.RUnlock() - p.sendHandshake(true) - } else { - p.accessLock.RUnlock() - // if p.numUsers == 0 && p.lastMsgRecv.Before(old) { - // TODO: Do a peer cleanup. - // } - } -} - -// NetID implements peering.PeerSender and peering.PeerStatusProvider interfaces for the remote peers. -func (p *peer) NetID() string { - p.accessLock.RLock() - defer p.accessLock.RUnlock() - return p.remoteNetID -} - -// PubKey implements peering.PeerSender and peering.PeerStatusProvider interfaces for the remote peers. -// This function tries to await for the public key to be resolves for some time, but with no guarantees. -func (p *peer) PubKey() *ed25519.PublicKey { - _ = p.waitReady.WaitTimeout(sendMsgSyncTimeout) - p.accessLock.RLock() - defer p.accessLock.RUnlock() - return p.remotePubKey -} - -// SendMsg implements peering.PeerSender interface for the remote peers. -func (p *peer) SendMsg(msg *peering.PeerMessage) { - var err error - var msgChunks [][]byte - // - p.accessLock.RLock() - if !p.trusted { - p.log.Infof("Dropping outgoing message, because it was meant to send to a distrusted peer.") - p.accessLock.RUnlock() - } - p.accessLock.RUnlock() - // - if msg.IsUserMessage() { - if !p.waitReady.WaitTimeout(sendMsgSyncTimeout) { - // Just log a warning and try to send a message anyway. - p.log.Warnf("Sending a message despite the peering %v -> %v is not established yet, MsgType=%v", p.net.myNetID, p.NetID(), msg.MsgType) - } - } - if msgChunks, err = msg.ChunkedBytes(maxChunkSize, p.msgChopper, p.net.nodeKeyPair); err != nil { - p.log.Warnf("Dropping outgoing message, unable to encode, reason=%v", err) - return - } - for i := range msgChunks { - var n int - if n, err = p.net.myUDPConn.WriteTo(msgChunks[i], p.remoteUDPAddr); err != nil { - p.log.Warnf("Dropping outgoing message, unable to send, reason=%v", err) - return - } - if n != len(msgChunks[i]) { - p.log.Warnf("Partial message sent, sent=%v, msgBin=%v", n, len(msgChunks[i])) - return - } - } - - p.accessLock.Lock() - defer p.accessLock.Unlock() - p.lastMsgSent = time.Now() -} - -// IsAlive implements peering.PeerSender and peering.PeerStatusProvider interfaces for the remote peers. -// Return true if is alive and average latencyRingBuf in nanosec. -func (p *peer) IsAlive() bool { - p.accessLock.RLock() - defer p.accessLock.RUnlock() - return p.remotePubKey != nil && p.lastMsgRecv.After(time.Now().Add(-inactiveDeadline)) -} - -// Await implements peering.PeerSender interface for the remote peers. -func (p *peer) Await(timeout time.Duration) error { - if p.waitReady.WaitTimeout(timeout) { - return nil - } - return fmt.Errorf("timeout waiting for %v to become ready", p.remoteNetID) -} - -// IsInbound implements peering.PeerStatusProvider. -// It is used in the dashboard. -func (p *peer) IsInbound() bool { - p.accessLock.RLock() - defer p.accessLock.RUnlock() - return p.remoteNetID < p.net.myNetID -} - -// IsInbound implements peering.PeerStatusProvider. -// It is used in the dashboard. -func (p *peer) NumUsers() int { - p.accessLock.RLock() - defer p.accessLock.RUnlock() - return p.numUsers -} - -// SendMsg implements peering.PeerSender interface for the remote peers. -func (p *peer) Close() { - p.accessLock.Lock() - defer p.accessLock.Unlock() - p.numUsers-- -} - -func (p *peer) trust(trusted bool) { - p.accessLock.Lock() - defer p.accessLock.Unlock() - p.trusted = trusted -} - -func (p *peer) isTrusted() bool { - p.accessLock.RLock() - defer p.accessLock.RUnlock() - return p.trusted -} From 2b1df52a6670b4b4ebe54b46ec7f680b7de844d9 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Fri, 29 Oct 2021 13:12:55 +0300 Subject: [PATCH 015/198] Peer messages are queued instead of events in lpp peering --- packages/peering/lpp/lppNetImpl.go | 11 ++--------- packages/peering/lpp/lppPeer.go | 12 ++++++++++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/packages/peering/lpp/lppNetImpl.go b/packages/peering/lpp/lppNetImpl.go index a73e447aba..b36a021efd 100644 --- a/packages/peering/lpp/lppNetImpl.go +++ b/packages/peering/lpp/lppNetImpl.go @@ -213,14 +213,7 @@ func (n *netImpl) lppPeeringProtocolHandler(stream network.Stream) { n.log.Warnf("Error while decoding a message, reason=%v", err) return } - remotePeer.noteReceived() - peerMsg.SenderNetID = remotePeer.NetID() - remotePeer.RecvMsg( - &peering.RecvEvent{ - From: remotePeer, - Msg: peerMsg, - }, - ) + remotePeer.RecvMsg(peerMsg) } func (n *netImpl) lppHeartbeatProtocolHandler(stream network.Stream) { @@ -418,7 +411,7 @@ func (n *netImpl) SendMsg(msg *peering.PeerMessage) { }) } -func (n *netImpl) triggerRecvEvents(msg interface{}) { +func (n *netImpl) triggerRecvEvents(msg *peering.RecvEvent) { n.recvEvents.Trigger(msg) } diff --git a/packages/peering/lpp/lppPeer.go b/packages/peering/lpp/lppPeer.go index 386fe0c9b6..925eabc034 100644 --- a/packages/peering/lpp/lppPeer.go +++ b/packages/peering/lpp/lppPeer.go @@ -119,7 +119,9 @@ func (p *peer) SendMsg(msg *peering.PeerMessage) { p.sendCh.In() <- msg } -func (p *peer) RecvMsg(msg *peering.RecvEvent) { +func (p *peer) RecvMsg(msg *peering.PeerMessage) { + p.noteReceived() + msg.SenderNetID = p.NetID() p.recvCh.In() <- msg } @@ -131,7 +133,13 @@ func (p *peer) sendLoop() { func (p *peer) recvLoop() { for msg := range p.recvCh.Out() { - p.net.triggerRecvEvents(msg) + peerMsg, ok := msg.(*peering.PeerMessage) + if ok { + p.net.triggerRecvEvents(&peering.RecvEvent{ + From: p, + Msg: peerMsg, + }) + } } } From b18f0c42085f566d52b26bbb2a4fcb904c4287de Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Wed, 3 Nov 2021 10:16:31 -0700 Subject: [PATCH 016/198] Started schema tool refactoring in preparation of client lib code generation --- contracts/wasm/cleanup.cmd | 8 +- .../go/donatewithfeedback/consts.go | 5 +- .../fairroulette/go/fairroulette/consts.go | 5 +- .../wasm/helloworld/go/helloworld/consts.go | 4 +- .../wasm/inccounter/go/inccounter/consts.go | 9 +- .../wasm/testwasmlib/go/testwasmlib/consts.go | 4 +- .../tokenregistry/go/tokenregistry/consts.go | 5 +- tools/schema/generator/generator.go | 342 +++++++++++++++--- tools/schema/generator/generator_go.go | 331 ++++------------- tools/schema/generator/generator_rust.go | 5 + tools/schema/generator/generator_ts.go | 9 +- .../generator/gotemplates/alltemplates.go | 27 ++ tools/schema/generator/gotemplates/consts.go | 58 +++ .../schema/generator/gotemplates/contract.go | 61 ++++ tools/schema/generator/gotemplates/funcs.go | 32 ++ tools/schema/generator/gotemplates/lib.go | 102 ++++++ tools/schema/generator/gotemplates/main.go | 24 ++ tools/schema/generator/schema.go | 4 +- tools/schema/generator/templates.go | 17 + 19 files changed, 721 insertions(+), 331 deletions(-) create mode 100644 tools/schema/generator/gotemplates/alltemplates.go create mode 100644 tools/schema/generator/gotemplates/consts.go create mode 100644 tools/schema/generator/gotemplates/contract.go create mode 100644 tools/schema/generator/gotemplates/funcs.go create mode 100644 tools/schema/generator/gotemplates/lib.go create mode 100644 tools/schema/generator/gotemplates/main.go create mode 100644 tools/schema/generator/templates.go diff --git a/contracts/wasm/cleanup.cmd b/contracts/wasm/cleanup.cmd index 60650bbb4d..794b584bfc 100644 --- a/contracts/wasm/cleanup.cmd +++ b/contracts/wasm/cleanup.cmd @@ -8,10 +8,12 @@ del /s state.* del /s typedefs.* del /s types.* del /s main.go -del /s index.ts -del /s tsconfig.json del /s /q *.wasm -for /d %%f in (*.) do del /s /q %%f\go\pkg\*.* + +rem careful, this could fuck up fairroulette frontend +for /d %%f in (*.) do del %%f\ts\%%f\index.ts +for /d %%f in (*.) do del %%f\ts\%%f\tsconfig.json + for /d %%f in (*.) do del /s /q %%f\pkg\*.* for /d %%f in (*.) do del /s /q %%f\ts\pkg\*.* del /s /q target\*.* diff --git a/contracts/wasm/donatewithfeedback/go/donatewithfeedback/consts.go b/contracts/wasm/donatewithfeedback/go/donatewithfeedback/consts.go index e15c8bd7a1..b0218abd72 100644 --- a/contracts/wasm/donatewithfeedback/go/donatewithfeedback/consts.go +++ b/contracts/wasm/donatewithfeedback/go/donatewithfeedback/consts.go @@ -10,8 +10,9 @@ package donatewithfeedback import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" const ( - ScName = "donatewithfeedback" - HScName = wasmlib.ScHname(0x696d7f66) + ScName = "donatewithfeedback" + ScDescription = "" + HScName = wasmlib.ScHname(0x696d7f66) ) const ( diff --git a/contracts/wasm/fairroulette/go/fairroulette/consts.go b/contracts/wasm/fairroulette/go/fairroulette/consts.go index c1909a2672..350e9d21a8 100644 --- a/contracts/wasm/fairroulette/go/fairroulette/consts.go +++ b/contracts/wasm/fairroulette/go/fairroulette/consts.go @@ -10,8 +10,9 @@ package fairroulette import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" const ( - ScName = "fairroulette" - HScName = wasmlib.ScHname(0xdf79d138) + ScName = "fairroulette" + ScDescription = "" + HScName = wasmlib.ScHname(0xdf79d138) ) const ( diff --git a/contracts/wasm/helloworld/go/helloworld/consts.go b/contracts/wasm/helloworld/go/helloworld/consts.go index 8a2c2473ee..c40715e769 100644 --- a/contracts/wasm/helloworld/go/helloworld/consts.go +++ b/contracts/wasm/helloworld/go/helloworld/consts.go @@ -15,7 +15,9 @@ const ( HScName = wasmlib.ScHname(0x0683223c) ) -const ResultHelloWorld = wasmlib.Key("helloWorld") +const ( + ResultHelloWorld = wasmlib.Key("helloWorld") +) const ( FuncHelloWorld = "helloWorld" diff --git a/contracts/wasm/inccounter/go/inccounter/consts.go b/contracts/wasm/inccounter/go/inccounter/consts.go index 9b4c883fa5..113e24aa6b 100644 --- a/contracts/wasm/inccounter/go/inccounter/consts.go +++ b/contracts/wasm/inccounter/go/inccounter/consts.go @@ -10,8 +10,9 @@ package inccounter import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" const ( - ScName = "inccounter" - HScName = wasmlib.ScHname(0xaf2438e9) + ScName = "inccounter" + ScDescription = "" + HScName = wasmlib.ScHname(0xaf2438e9) ) const ( @@ -21,7 +22,9 @@ const ( ParamNumRepeats = wasmlib.Key("numRepeats") ) -const ResultCounter = wasmlib.Key("counter") +const ( + ResultCounter = wasmlib.Key("counter") +) const ( StateCounter = wasmlib.Key("counter") diff --git a/contracts/wasm/testwasmlib/go/testwasmlib/consts.go b/contracts/wasm/testwasmlib/go/testwasmlib/consts.go index 17f1e726ee..22d8b23905 100644 --- a/contracts/wasm/testwasmlib/go/testwasmlib/consts.go +++ b/contracts/wasm/testwasmlib/go/testwasmlib/consts.go @@ -43,7 +43,9 @@ const ( ResultValue = wasmlib.Key("value") ) -const StateArrays = wasmlib.Key("arrays") +const ( + StateArrays = wasmlib.Key("arrays") +) const ( FuncArrayClear = "arrayClear" diff --git a/contracts/wasm/tokenregistry/go/tokenregistry/consts.go b/contracts/wasm/tokenregistry/go/tokenregistry/consts.go index c4983f23a6..3d19dec000 100644 --- a/contracts/wasm/tokenregistry/go/tokenregistry/consts.go +++ b/contracts/wasm/tokenregistry/go/tokenregistry/consts.go @@ -10,8 +10,9 @@ package tokenregistry import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" const ( - ScName = "tokenregistry" - HScName = wasmlib.ScHname(0xe1ba0c78) + ScName = "tokenregistry" + ScDescription = "" + HScName = wasmlib.ScHname(0xe1ba0c78) ) const ( diff --git a/tools/schema/generator/generator.go b/tools/schema/generator/generator.go index b6746acdfa..78d6750ac2 100644 --- a/tools/schema/generator/generator.go +++ b/tools/schema/generator/generator.go @@ -9,6 +9,8 @@ import ( "os" "regexp" "strings" + + "github.com/iotaledger/wasp/packages/iscp" ) // TODO nested structs @@ -19,9 +21,24 @@ const ( AccessCreator = "creator" AccessSelf = "self" AliasThis = "this" + constPrefix = "constPrefix" InitFunc = "Init" + KeyCore = "core" + KeyFunc = "func" + KeyParam = "param" + KeyParams = "params" + KeyPtrs = "ptrs" + KeyResult = "result" + KeyResults = "results" + KeyState = "state" + KeyStruct = "struct" + KeyTypeDef = "typeDef" + KeyView = "view" KindFunc = "Func" KindView = "View" + PrefixParam = "Param" + PrefixResult = "Result" + PrefixState = "State" PropImmutable = "Immutable" PropMutable = "Mutable" SpecialFuncInit = "funcInit" @@ -36,8 +53,8 @@ var ( ) type Generator interface { + init(s *Schema) funcName(f *Func) string - generateFuncSignature(f *Func) generateLanguageSpecificFiles() error generateProxyArray(field *Field, mutability, arrayType, proxyType string) generateProxyMap(field *Field, mutability, mapType, proxyType string) @@ -55,32 +72,42 @@ type Generator interface { } type GenBase struct { - extension string - file *os.File - Folder string - funcRegexp *regexp.Regexp - gen Generator - language string - NewTypes map[string]bool - rootFolder string - s *Schema - skipDisclaimer bool + currentField *Field + currentFunc *Func + currentStruct *Struct + emitters map[string]func(g *GenBase) string + extension string + file *os.File + folder string + funcRegexp *regexp.Regexp + gen Generator + keys map[string]string + language string + newTypes map[string]bool + rootFolder string + s *Schema + skipWarning bool + templates map[string]string } -func (g *GenBase) close() { - _ = g.file.Close() +func (g *GenBase) init(s *Schema) { + g.s = s + g.emitters = map[string]func(g *GenBase) string{} + g.newTypes = map[string]bool{} + g.keys = map[string]string{} + g.templates = map[string]string{} + g.addTemplates(templates) + g.setKeys() } -// TODO take copyright from schema? -func (g *GenBase) copyright() string { - text := "// Copyright 2020 IOTA Stiftung\n" + - "// SPDX-License-Identifier: Apache-2.0\n" - if !g.skipDisclaimer { - text += "\n// (Re-)generated by schema tool\n" + - "// >>>> DO NOT CHANGE THIS FILE! <<<<\n" + - "// Change the json schema instead\n" +func (g *GenBase) addTemplates(t map[string]string) { + for k, v := range t { + g.templates[k] = v } - return text +} + +func (g *GenBase) close() { + _ = g.file.Close() } func (g *GenBase) create(path string) (err error) { @@ -89,19 +116,183 @@ func (g *GenBase) create(path string) (err error) { } func (g *GenBase) createSourceFile(name string, generator func()) error { - err := g.create(g.Folder + name + g.extension) + err := g.create(g.folder + name + g.extension) if err != nil { return err } defer g.close() + // TODO take copyright from schema? + // always add copyright to source file - g.println(g.copyright()) - g.skipDisclaimer = false + g.emit("copyright") + if !g.skipWarning { + g.emit("warning") + } + g.skipWarning = false generator() return nil } +var ( + emitKeyRegExp = regexp.MustCompile(`\$[a-zA-Z_]+`) + emitCmdRegExp = regexp.MustCompile(`\$#[^\n]*\n`) +) + +func (g *GenBase) emit(template string) { + g.printf(g.emitAll(template)) +} + +func (g *GenBase) emitAll(template string) string { + template = g.templates[template] + + // first process special commands + text := emitCmdRegExp.ReplaceAllStringFunc(template, func(key string) string { + if strings.HasPrefix(key, "$#each ") { + return g.emitEach(strings.TrimSpace(key[7:])) + } + if strings.HasPrefix(key, "$#emit ") { + return g.emitAll(strings.TrimSpace(key[7:])) + } + if strings.HasPrefix(key, "$#func ") { + return g.emitFunc(strings.TrimSpace(key[7:])) + } + if strings.HasPrefix(key, "$#if ") { + return g.emitIf(strings.TrimSpace(key[5:])) + } + return "???:" + key + }) + + // then replace any remaining keys + text = emitKeyRegExp.ReplaceAllStringFunc(text, func(key string) string { + return g.emitKey(key) + }) + + // remove concatenation markers + text = strings.ReplaceAll(text, "$+", "") + + // remove leading newline + return strings.TrimPrefix(text, "\n") +} + +func (g *GenBase) emitEach(key string) string { + parts := strings.Split(key, " ") + if len(parts) != 2 { + return "???: " + key + } + + template := parts[1] + switch parts[0] { + case "func": + text := "" + for _, g.currentFunc = range g.s.Funcs { + g.setFuncKeys() + text += g.emitAll(template) + } + return text + case "mandatory": + mandatory := []*Field{} + for _, g.currentField = range g.currentFunc.Params { + if !g.currentField.Optional { + mandatory = append(mandatory, g.currentField) + } + } + return g.emitFields(mandatory, template) + case KeyParam: + return g.emitFields(g.currentFunc.Params, template) + case KeyParams: + g.keys[constPrefix] = PrefixParam + return g.emitFields(g.s.Params, template) + case KeyResult: + return g.emitFields(g.currentFunc.Results, template) + case KeyResults: + g.keys[constPrefix] = PrefixResult + return g.emitFields(g.s.Results, template) + case KeyState: + g.keys[constPrefix] = PrefixState + return g.emitFields(g.s.StateVars, template) + case KeyStruct: + text := "" + for _, g.currentStruct = range g.s.Structs { + g.setStructKeys() + text += g.emitAll(template) + } + return text + case KeyTypeDef: + return g.emitFields(g.s.Typedefs, template) + } + return "???: " + key +} + +func (g *GenBase) emitFields(fields []*Field, template string) string { + text := "" + for _, g.currentField = range fields { + if g.currentField.Alias == "this" { + continue + } + g.setFieldKeys() + text += g.emitAll(template) + } + return text +} + +func (g *GenBase) emitFunc(key string) string { + f, ok := g.emitters[key] + if ok { + return f(g) + } + return "???: " + key +} + +func (g *GenBase) emitIf(key string) string { + parts := strings.Split(key, " ") + if len(parts) < 2 || len(parts) > 3 { + return "???: " + key + } + + conditionKey := parts[0] + template := parts[1] + + condition := false + switch conditionKey { + case KeyCore: + condition = g.s.CoreContracts + case KeyFunc, KeyView: + condition = g.keys["kind"] == conditionKey + case KeyParam: + condition = len(g.currentFunc.Params) != 0 + case KeyParams: + condition = len(g.s.Params) != 0 + case KeyResult: + condition = len(g.currentFunc.Results) != 0 + case KeyResults: + condition = len(g.s.Results) != 0 + case KeyState: + condition = len(g.s.StateVars) != 0 + case KeyPtrs: + condition = len(g.currentFunc.Params) != 0 || len(g.currentFunc.Results) != 0 + default: + return "???: " + key + } + + if condition { + return g.emitAll(template) + } + if len(parts) == 3 { + template = parts[2] + return g.emitAll(template) + } + return "" +} + +func (g *GenBase) emitKey(key string) string { + text, ok := g.keys[key[1:]] + if ok { + return text + } + return "???: " + key +} + func (g *GenBase) exists(path string) (err error) { _, err = os.Stat(path) return err @@ -116,24 +307,23 @@ func (g *GenBase) formatter(on bool) { } func (g *GenBase) Generate(s *Schema) error { - g.s = s - g.NewTypes = make(map[string]bool) + g.gen.init(s) - g.Folder = g.rootFolder + "/" + g.folder = g.rootFolder + "/" if g.rootFolder != "src" { module := strings.ReplaceAll(ModuleCwd, "\\", "/") module = module[strings.LastIndex(module, "/")+1:] - g.Folder += module + "/" + g.folder += module + "/" } if g.s.CoreContracts { - g.Folder += g.s.Name + "/" + g.folder += g.s.Name + "/" } - err := os.MkdirAll(g.Folder, 0o755) + err := os.MkdirAll(g.folder, 0o755) if err != nil { return err } - info, err := os.Stat(g.Folder + "consts" + g.extension) + info, err := os.Stat(g.folder + "consts" + g.extension) if err == nil && info.ModTime().After(s.SchemaTime) { fmt.Printf("skipping %s code generation\n", g.language) return nil @@ -210,11 +400,11 @@ func (g *GenBase) generateCode() error { } func (g *GenBase) generateFuncs() error { - scFileName := g.Folder + g.s.Name + g.extension - err := g.open(g.Folder + g.s.Name + g.extension) + scFileName := g.folder + g.s.Name + g.extension + err := g.open(g.folder + g.s.Name + g.extension) if err != nil { // generate initial SC function file - g.skipDisclaimer = true + g.skipWarning = true return g.createSourceFile(g.s.Name, g.gen.writeInitialFuncs) } @@ -227,7 +417,7 @@ func (g *GenBase) generateFuncs() error { } // save old one from overwrite - scOriginal := g.Folder + g.s.Name + ".bak" + scOriginal := g.folder + g.s.Name + ".bak" err = os.Rename(scFileName, scOriginal) if err != nil { return err @@ -244,9 +434,10 @@ func (g *GenBase) generateFuncs() error { } // append any new funcs - for _, f := range g.s.Funcs { - if existing[g.gen.funcName(f)] == "" { - g.gen.generateFuncSignature(f) + for _, g.currentFunc = range g.s.Funcs { + if existing[g.gen.funcName(g.currentFunc)] == "" { + g.setFuncKeys() + g.emit("funcSignature") } } @@ -257,8 +448,8 @@ func (g *GenBase) generateProxy(field *Field, mutability string) { if field.Array { proxyType := mutability + field.Type arrayType := "ArrayOf" + proxyType - if !g.NewTypes[arrayType] { - g.NewTypes[arrayType] = true + if !g.newTypes[arrayType] { + g.newTypes[arrayType] = true g.gen.generateProxyArray(field, mutability, arrayType, proxyType) } g.gen.generateProxyReference(field, mutability, arrayType) @@ -268,8 +459,8 @@ func (g *GenBase) generateProxy(field *Field, mutability string) { if field.MapKey != "" { proxyType := mutability + field.Type mapType := "Map" + field.MapKey + "To" + proxyType - if !g.NewTypes[mapType] { - g.NewTypes[mapType] = true + if !g.newTypes[mapType] { + g.newTypes[mapType] = true g.gen.generateProxyMap(field, mutability, mapType, proxyType) } g.gen.generateProxyReference(field, mutability, mapType) @@ -347,3 +538,68 @@ func (g *GenBase) scanExistingCode() ([]string, StringMap, error) { } return lines, existing, nil } + +func (g *GenBase) setFuncKeys() { + funcName := uncapitalize(g.currentFunc.FuncName[4:]) + g.keys["funcName"] = funcName + g.keys["FuncName"] = capitalize(funcName) + g.keys["func_name"] = snake(funcName) + g.keys["FUNC_NAME"] = upper(snake(funcName)) + g.keys["funcHName"] = iscp.Hn(funcName).String() + + kind := lower(g.currentFunc.FuncName[:4]) + g.keys["kind"] = kind + g.keys["Kind"] = capitalize(kind) + g.keys["KIND"] = upper(kind) + + paramsID := "nil" + if len(g.currentFunc.Params) != 0 { + paramsID = "&f.Params.id" + } + g.keys["paramsID"] = paramsID + + resultsID := "nil" + if len(g.currentFunc.Results) != 0 { + resultsID = "&f.Results.id" + } + g.keys["resultsID"] = resultsID + + initFunc := "" + initMap := "" + if g.currentFunc.Type == InitFunc { + initFunc = InitFunc + initMap = ", keyMap[:], idxMap[:]" + } + g.keys["initFunc"] = initFunc + g.keys["initMap"] = initMap +} + +func (g *GenBase) setFieldKeys() { + fldName := uncapitalize(g.currentField.Name) + g.keys["fldName"] = fldName + g.keys["FldName"] = capitalize(fldName) + g.keys["fld_name"] = snake(fldName) + g.keys["FLD_NAME"] = upper(snake(fldName)) + g.keys["fldAlias"] = g.currentField.Alias +} + +func (g *GenBase) setKeys() { + g.keys["package"] = g.s.Name + g.keys["Package"] = g.s.FullName + scName := g.s.Name + if g.s.CoreContracts { + // strip off "core" prefix + scName = scName[4:] + } + g.keys["scName"] = scName + g.keys["hscName"] = iscp.Hn(scName).String() + g.keys["scDesc"] = g.s.Description +} + +func (g *GenBase) setStructKeys() { + name := uncapitalize(g.currentStruct.Name) + g.keys["strName"] = name + g.keys["StrName"] = capitalize(name) + g.keys["str_name"] = snake(name) + g.keys["STR_NAME"] = upper(snake(name)) +} diff --git a/tools/schema/generator/generator_go.go b/tools/schema/generator/generator_go.go index ff7c9c3648..a52c79f65c 100644 --- a/tools/schema/generator/generator_go.go +++ b/tools/schema/generator/generator_go.go @@ -9,12 +9,7 @@ import ( "strconv" "strings" - "github.com/iotaledger/wasp/packages/iscp" -) - -const ( - goImportWasmLib = "import \"github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib\"" - goImportWasmClient = "import \"github.com/iotaledger/wasp/packages/vm/wasmclient\"" + "github.com/iotaledger/wasp/tools/schema/generator/gotemplates" ) var goTypes = StringMap{ @@ -78,6 +73,15 @@ func NewGoGenerator() *GoGenerator { return g } +func (g *GoGenerator) init(s *Schema) { + g.GenBase.init(s) + for _, template := range gotemplates.GoTemplates { + g.addTemplates(template) + } + g.emitters["accessCheck"] = emitterAccessCheck + g.emitters["funcSignature"] = emitterFuncSignature +} + func (g *GoGenerator) flushConsts() { if len(g.s.ConstNames) == 0 { return @@ -110,69 +114,6 @@ func (g *GoGenerator) generateArrayType(varType string) string { return "wasmlib.TYPE_ARRAY|" + varType } -func (g *GoGenerator) generateConstsFields(fields []*Field, prefix string) { - if len(fields) != 0 { - for _, field := range fields { - if field.Alias == AliasThis { - continue - } - name := prefix + capitalize(field.Name) - value := "wasmlib.Key(\"" + field.Alias + "\")" - g.s.appendConst(name, value) - } - g.flushConsts() - } -} - -func (g *GoGenerator) generateContractFuncs() { - g.println("\ntype Funcs struct{}") - g.println("\nvar ScFuncs Funcs") - for _, f := range g.s.Funcs { - assign := "return" - paramsID := "nil" - if len(f.Params) != 0 { - assign = "f :=" - paramsID = "&f.Params.id" - } - resultsID := "nil" - if len(f.Results) != 0 { - assign = "f :=" - resultsID = "&f.Results.id" - } - kind := f.Kind - keyMap := "" - if f.Type == InitFunc { - kind = f.Type + f.Kind - keyMap = ", keyMap[:], idxMap[:]" - } - g.printf("\nfunc (sc Funcs) %s(ctx wasmlib.Sc%sCallContext) *%sCall {\n", f.Type, f.Kind, f.Type) - g.printf("\t%s &%sCall{Func: wasmlib.NewSc%s(ctx, HScName, H%s%s%s)}\n", assign, f.Type, kind, f.Kind, f.Type, keyMap) - if len(f.Params) != 0 || len(f.Results) != 0 { - g.printf("\tf.Func.SetPtrs(%s, %s)\n", paramsID, resultsID) - g.printf("\treturn f\n") - } - g.printf("}\n") - } -} - -func (g *GoGenerator) generateFuncSignature(f *Func) { - g.printf("\nfunc %s(ctx wasmlib.Sc%sContext, f *%sContext) {\n", f.FuncName, f.Kind, f.Type) - switch f.FuncName { - case SpecialFuncInit: - g.printf(" if f.Params.Owner().Exists() {\n") - g.printf(" f.State.Owner().SetValue(f.Params.Owner().Value())\n") - g.printf(" return\n") - g.printf(" }\n") - g.printf(" f.State.Owner().SetValue(ctx.ContractCreator())\n") - case SpecialFuncSetOwner: - g.printf(" f.State.Owner().SetValue(f.Params.Owner().Value())\n") - case SpecialViewGetOwner: - g.printf(" f.Results.Owner().SetValue(f.State.Owner().Value())\n") - default: - } - g.printf("}\n") -} - func (g *GoGenerator) generateKeysArray(fields []*Field, prefix string) { for _, field := range fields { if field.Alias == AliasThis { @@ -434,170 +375,20 @@ func (g *GoGenerator) generateStructProxy(typeDef *Struct, mutable bool) { g.printf("}\n") } -func (g *GoGenerator) generateThunk(f *Func) { - nameLen := f.nameLen(5) - mutability := PropMutable - if f.Kind == KindView { - mutability = PropImmutable - } - g.printf("\ntype %sContext struct {\n", f.Type) - if len(f.Params) != 0 { - g.printf("\t%s Immutable%sParams\n", pad("Params", nameLen), f.Type) - } - if len(f.Results) != 0 { - g.printf("\tResults Mutable%sResults\n", f.Type) - } - g.printf("\t%s %s%sState\n", pad("State", nameLen), mutability, g.s.FullName) - g.printf("}\n") - - g.printf("\nfunc %sThunk(ctx wasmlib.Sc%sContext) {\n", f.FuncName, f.Kind) - g.printf("\tctx.Log(\"%s.%s\")\n", g.s.Name, f.FuncName) - - if f.Access != "" { - g.generateThunkAccessCheck(f) - } - - g.printf("\tf := &%sContext{\n", f.Type) - - if len(f.Params) != 0 { - g.printf("\t\tParams: Immutable%sParams{\n", f.Type) - g.printf("\t\t\tid: wasmlib.OBJ_ID_PARAMS,\n") - g.printf("\t\t},\n") - } - - if len(f.Results) != 0 { - g.printf("\t\tResults: Mutable%sResults{\n", f.Type) - g.printf("\t\t\tid: wasmlib.OBJ_ID_RESULTS,\n") - g.printf("\t\t},\n") - } - - g.printf("\t\tState: %s%sState{\n", mutability, g.s.FullName) - g.printf("\t\t\tid: wasmlib.OBJ_ID_STATE,\n") - g.printf("\t\t},\n") - - g.printf("\t}\n") - - for _, param := range f.Params { - if !param.Optional { - name := capitalize(param.Name) - g.printf("\tctx.Require(f.Params.%s().Exists(), \"missing mandatory %s\")\n", name, param.Name) - } - } - - g.printf("\t%s(ctx, f)\n", f.FuncName) - g.printf("\tctx.Log(\"%s.%s ok\")\n", g.s.Name, f.FuncName) - g.printf("}\n") -} - -func (g *GoGenerator) generateThunkAccessCheck(f *Func) { - grant := f.Access - index := strings.Index(grant, "//") - if index >= 0 { - g.printf("\t%s\n", grant[index:]) - grant = strings.TrimSpace(grant[:index]) - } - switch grant { - case AccessSelf: - grant = "ctx.AccountID()" - case AccessChain: - grant = "ctx.ChainOwnerID()" - case AccessCreator: - grant = "ctx.ContractCreator()" - default: - g.printf("\taccess := ctx.State().GetAgentID(wasmlib.Key(\"%s\"))\n", grant) - g.printf("\tctx.Require(access.Exists(), \"access not set: %s\")\n", grant) - grant = "access.Value()" - } - g.printf("\tctx.Require(ctx.Caller() == %s, \"no permission\")\n\n", grant) -} - -func (g *GoGenerator) packageName() string { - return fmt.Sprintf("package %s\n", g.s.Name) -} - func (g *GoGenerator) writeConsts() { - g.println(g.packageName()) - g.println(goImportWasmLib) - - scName := g.s.Name - if g.s.CoreContracts { - // remove 'core' prefix - scName = scName[4:] - } - g.s.appendConst("ScName", "\""+scName+"\"") - if g.s.Description != "" { - g.s.appendConst("ScDescription", "\""+g.s.Description+"\"") - } - hName := iscp.Hn(scName) - hNameType := "wasmlib.ScHname" - g.s.appendConst("HScName", hNameType+"(0x"+hName.String()+")") - g.flushConsts() - - g.generateConstsFields(g.s.Params, "Param") - g.generateConstsFields(g.s.Results, "Result") - g.generateConstsFields(g.s.StateVars, "State") - - if len(g.s.Funcs) != 0 { - for _, f := range g.s.Funcs { - constName := capitalize(f.FuncName) - g.s.appendConst(constName, "\""+f.String+"\"") - } - g.flushConsts() - - for _, f := range g.s.Funcs { - constHname := "H" + capitalize(f.FuncName) - g.s.appendConst(constHname, hNameType+"(0x"+f.Hname.String()+")") - } - g.flushConsts() - } + g.emit("consts.go") } func (g *GoGenerator) writeContract() { - g.println(g.packageName()) - g.println(goImportWasmLib) - - for _, f := range g.s.Funcs { - nameLen := f.nameLen(4) - kind := f.Kind - if f.Type == InitFunc { - kind = f.Type + f.Kind - } - g.printf("\ntype %sCall struct {\n", f.Type) - g.printf("\t%s *wasmlib.Sc%s\n", pad(KindFunc, nameLen), kind) - if len(f.Params) != 0 { - g.printf("\t%s Mutable%sParams\n", pad("Params", nameLen), f.Type) - } - if len(f.Results) != 0 { - g.printf("\tResults Immutable%sResults\n", f.Type) - } - g.printf("}\n") - } - - g.generateContractFuncs() - - if g.s.CoreContracts { - g.printf("\nfunc OnLoad() {\n") - g.printf("\texports := wasmlib.NewScExports()\n") - for _, f := range g.s.Funcs { - constName := capitalize(f.FuncName) - g.printf("\texports.Add%s(%s, wasmlib.%sError)\n", f.Kind, constName, f.Kind) - } - g.printf("}\n") - } + g.emit("contract.go") } func (g *GoGenerator) writeInitialFuncs() { - g.println(g.packageName()) - g.println(goImportWasmLib) - - for _, f := range g.s.Funcs { - g.generateFuncSignature(f) - } + g.emit("funcs.go") } func (g *GoGenerator) writeKeys() { - g.println(g.packageName()) - g.println(goImportWasmLib) + g.emit("goHeader") g.s.KeyID = 0 g.generateKeysIndexes(g.s.Params, "Param") @@ -616,32 +407,11 @@ func (g *GoGenerator) writeKeys() { } func (g *GoGenerator) writeLib() { - g.println("//nolint:dupl") - g.println(g.packageName()) - g.println(goImportWasmLib) - - g.printf("\nfunc OnLoad() {\n") - g.printf("\texports := wasmlib.NewScExports()\n") - for _, f := range g.s.Funcs { - constName := capitalize(f.FuncName) - g.printf("\texports.Add%s(%s, %sThunk)\n", f.Kind, constName, f.FuncName) - } - - g.printf("\n\tfor i, key := range keyMap {\n") - g.printf("\t\tidxMap[i] = key.KeyID()\n") - g.printf("\t}\n") - - g.printf("}\n") - - // generate parameter structs and thunks to set up and check parameters - for _, f := range g.s.Funcs { - g.generateThunk(f) - } + g.emit("lib.go") } func (g *GoGenerator) writeParams() { - g.printf(g.packageName()) - g.println(goImportWasmLib) + g.emit("goHeader") for _, f := range g.s.Funcs { if len(f.Params) == 0 { @@ -653,8 +423,7 @@ func (g *GoGenerator) writeParams() { } func (g *GoGenerator) writeResults() { - g.printf(g.packageName()) - g.println(goImportWasmLib) + g.emit("goHeader") for _, f := range g.s.Funcs { if len(f.Results) == 0 { @@ -666,28 +435,14 @@ func (g *GoGenerator) writeResults() { } func (g *GoGenerator) writeSpecialMain() { - g.println("// +build wasm") - g.println("\npackage main") - g.println() - g.println(goImportWasmClient) - module := ModuleName + strings.Replace(ModuleCwd[len(ModulePath):], "\\", "/", -1) - g.printf("\nimport \"%s/go/%s\"\n", module, g.s.Name) - - g.printf("\nfunc main() {\n") - g.printf("}\n") - - g.printf("\n//export on_load\n") - g.printf("func onLoad() {\n") - g.printf("\th := &wasmclient.WasmVMHost{}\n") - g.printf("\th.ConnectWasmHost()\n") - g.printf("\t%s.OnLoad()\n", g.s.Name) - g.printf("}\n") + g.keys["module"] = ModuleName + strings.Replace(ModuleCwd[len(ModulePath):], "\\", "/", -1) + g.emit("main.go") } func (g *GoGenerator) writeState() { - g.printf(g.packageName()) + g.emit("goPackage") if len(g.s.StateVars) != 0 { - g.println(goImportWasmLib) + g.emit("importWasmLib") } g.generateProxyStruct(g.s.StateVars, PropImmutable, g.s.FullName, "State") @@ -695,8 +450,7 @@ func (g *GoGenerator) writeState() { } func (g *GoGenerator) writeStructs() { - g.println(g.packageName()) - g.println(goImportWasmLib) + g.emit("goHeader") for _, typeDef := range g.s.Structs { g.generateStruct(typeDef) @@ -704,11 +458,48 @@ func (g *GoGenerator) writeStructs() { } func (g *GoGenerator) writeTypeDefs() { - g.println(g.packageName()) - g.println(goImportWasmLib) + g.emit("goHeader") for _, subtype := range g.s.Typedefs { g.generateProxy(subtype, PropImmutable) g.generateProxy(subtype, PropMutable) } } + +func emitterAccessCheck(g *GenBase) string { + if g.currentFunc.Access == "" { + return "" + } + text := "" + grant := g.currentFunc.Access + index := strings.Index(grant, "//") + if index >= 0 { + text = fmt.Sprintf("\t%s\n", grant[index:]) + grant = strings.TrimSpace(grant[:index]) + } + switch grant { + case AccessSelf: + grant = "ctx.AccountID()" + case AccessChain: + grant = "ctx.ChainOwnerID()" + case AccessCreator: + grant = "ctx.ContractCreator()" + default: + g.keys["grant"] = grant + text += g.emitAll("grantForKey") + grant = "access.Value()" + } + g.keys["grant"] = grant + return text + g.emitAll("grantRequire") +} + +func emitterFuncSignature(g *GenBase) string { + switch g.currentFunc.FuncName { + case SpecialFuncInit: + case SpecialFuncSetOwner: + case SpecialViewGetOwner: + default: + return "" + } + return g.emitAll(g.currentFunc.FuncName) +} diff --git a/tools/schema/generator/generator_rust.go b/tools/schema/generator/generator_rust.go index 0eb330e612..c3c2e987e1 100644 --- a/tools/schema/generator/generator_rust.go +++ b/tools/schema/generator/generator_rust.go @@ -102,6 +102,11 @@ func NewRustGenerator() *RustGenerator { return g } +func (g *RustGenerator) init(s *Schema) { + g.GenBase.init(s) + // g.templates["exportLine"] = goExportLine +} + func (g *RustGenerator) crateOrWasmLib(withContract, withHost bool) string { if g.s.CoreContracts { retVal := useCrate diff --git a/tools/schema/generator/generator_ts.go b/tools/schema/generator/generator_ts.go index 361fac2732..c780e9c48c 100644 --- a/tools/schema/generator/generator_ts.go +++ b/tools/schema/generator/generator_ts.go @@ -91,6 +91,11 @@ func NewTypeScriptGenerator() *TypeScriptGenerator { return g } +func (g *TypeScriptGenerator) init(s *Schema) { + g.GenBase.init(s) + // g.templates["exportLine"] = goExportLine +} + func (g *TypeScriptGenerator) flushConsts() { if len(g.s.ConstNames) == 0 { return @@ -659,13 +664,13 @@ func (g *TypeScriptGenerator) writeResults() { } func (g *TypeScriptGenerator) writeSpecialConfigJSON() error { - err := g.exists(g.Folder + "tsconfig.json") + err := g.exists(g.folder + "tsconfig.json") if err == nil { // already exists return nil } - err = g.create(g.Folder + "tsconfig.json") + err = g.create(g.folder + "tsconfig.json") if err != nil { return err } diff --git a/tools/schema/generator/gotemplates/alltemplates.go b/tools/schema/generator/gotemplates/alltemplates.go new file mode 100644 index 0000000000..3794424877 --- /dev/null +++ b/tools/schema/generator/gotemplates/alltemplates.go @@ -0,0 +1,27 @@ +package gotemplates + +var goCommon = map[string]string{ + // ******************************* + "goPackage": ` +package $package +`, + // ******************************* + "importWasmLib": ` + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" +`, + // ******************************* + "goHeader": ` +$#emit goPackage +$#emit importWasmLib +`, +} + +var GoTemplates = []map[string]string{ + goCommon, + constsGo, + contractGo, + funcsGo, + libGo, + mainGo, +} diff --git a/tools/schema/generator/gotemplates/consts.go b/tools/schema/generator/gotemplates/consts.go new file mode 100644 index 0000000000..2092aa0335 --- /dev/null +++ b/tools/schema/generator/gotemplates/consts.go @@ -0,0 +1,58 @@ +package gotemplates + +var constsGo = map[string]string{ + // ******************************* + "consts.go": ` +$#emit goHeader + +const ( + ScName = "$scName" + ScDescription = "$scDesc" + HScName = wasmlib.ScHname(0x$hscName) +) +$#if params constParams +$#if results constResults +$#if state constState + +const ( +$#each func constFunc +) + +const ( +$#each func constHFunc +) +`, + // ******************************* + "constParams": ` + +const ( +$#each params constField +) +`, + // ******************************* + "constResults": ` + +const ( +$#each results constField +) +`, + // ******************************* + "constState": ` + +const ( +$#each state constField +) +`, + // ******************************* + "constField": ` + $constPrefix$FldName = wasmlib.Key("$fldAlias") +`, + // ******************************* + "constFunc": ` + $Kind$FuncName = "$funcName" +`, + // ******************************* + "constHFunc": ` + H$Kind$FuncName = wasmlib.ScHname(0x$funcHName) +`, +} diff --git a/tools/schema/generator/gotemplates/contract.go b/tools/schema/generator/gotemplates/contract.go new file mode 100644 index 0000000000..014f60e127 --- /dev/null +++ b/tools/schema/generator/gotemplates/contract.go @@ -0,0 +1,61 @@ +package gotemplates + +var contractGo = map[string]string{ + // ******************************* + "contract.go": ` +$#emit goHeader +$#each func FuncNameCall + +type Funcs struct{} + +var ScFuncs Funcs +$#each func FuncNameForCall +$#if core coreOnload +`, + // ******************************* + "FuncNameCall": ` + +type $FuncName$+Call struct { + Func *wasmlib.Sc$initFunc$Kind +$#if param MutableFuncNameParams +$#if result ImmutableFuncNameResults +} +`, + // ******************************* + "MutableFuncNameParams": ` + Params Mutable$FuncName$+Params +`, + // ******************************* + "ImmutableFuncNameResults": ` + Results Immutable$FuncName$+Results +`, + // ******************************* + "FuncNameForCall": ` + +func (sc Funcs) $FuncName(ctx wasmlib.Sc$Kind$+CallContext) *$FuncName$+Call { +$#if ptrs setPtrs noPtrs +} +`, + // ******************************* + "coreOnload": ` + +func OnLoad() { + exports := wasmlib.NewScExports() +$#each func coreExportFunc +} +`, + // ******************************* + "coreExportFunc": ` + exports.Add$Kind($Kind$FuncName, wasmlib.$Kind$+Error) +`, + // ******************************* + "setPtrs": ` + f := &$FuncName$+Call{Func: wasmlib.NewSc$initFunc$Kind(ctx, HScName, H$Kind$FuncName$initMap)} + f.Func.SetPtrs($paramsID, $resultsID) + return f +`, + // ******************************* + "noPtrs": ` + return &$FuncName$+Call{Func: wasmlib.NewSc$initFunc$Kind(ctx, HScName, H$Kind$FuncName$initMap)} +`, +} diff --git a/tools/schema/generator/gotemplates/funcs.go b/tools/schema/generator/gotemplates/funcs.go new file mode 100644 index 0000000000..af807504ba --- /dev/null +++ b/tools/schema/generator/gotemplates/funcs.go @@ -0,0 +1,32 @@ +package gotemplates + +var funcsGo = map[string]string{ + // ******************************* + "funcs.go": ` +$#emit goHeader +$#each func funcSignature +`, + // ******************************* + "funcSignature": ` + +func $kind$FuncName(ctx wasmlib.Sc$Kind$+Context, f *$FuncName$+Context) { +$#func funcSignature +} +`, + // ******************************* + "funcInit": ` + if f.Params.Owner().Exists() { + f.State.Owner().SetValue(f.Params.Owner().Value()) + return + } + f.State.Owner().SetValue(ctx.ContractCreator()) +`, + // ******************************* + "getOwner": ` + f.Results.Owner().SetValue(f.State.Owner().Value()) +`, + // ******************************* + "setOwner": ` + f.State.Owner().SetValue(f.Params.Owner().Value()) +`, +} diff --git a/tools/schema/generator/gotemplates/lib.go b/tools/schema/generator/gotemplates/lib.go new file mode 100644 index 0000000000..1b21519673 --- /dev/null +++ b/tools/schema/generator/gotemplates/lib.go @@ -0,0 +1,102 @@ +package gotemplates + +var libGo = map[string]string{ + // ******************************* + "lib.go": ` +//nolint:dupl +$#emit goHeader + +func OnLoad() { + exports := wasmlib.NewScExports() +$#each func libExportFunc + + for i, key := range keyMap { + idxMap[i] = key.KeyID() + } +} +$#each func libThunk +`, + // ******************************* + "libExportFunc": ` + exports.Add$Kind($Kind$FuncName, $kind$FuncName$+Thunk) +`, + // ******************************* + "libThunk": ` + +type $FuncName$+Context struct { +$#if param ImmutableFuncNameParams +$#if result MutableFuncNameResults +$#if func MutablePackageState +$#if view ImmutablePackageState +} + +func $kind$FuncName$+Thunk(ctx wasmlib.Sc$Kind$+Context) { + ctx.Log("$package.$kind$FuncName") +$#func accessCheck + f := &$FuncName$+Context{ +$#if param ImmutableFuncNameParamsInit +$#if result MutableFuncNameResultsInit +$#if func MutablePackageStateInit +$#if view ImmutablePackageStateInit + } +$#each mandatory requireMandatory + $kind$FuncName(ctx, f) + ctx.Log("$package.$kind$FuncName ok") +} +`, + // ******************************* + "ImmutableFuncNameParams": ` + Params Immutable$FuncName$+Params +`, + // ******************************* + "ImmutableFuncNameParamsInit": ` + Params: Immutable$FuncName$+Params{ + id: wasmlib.OBJ_ID_PARAMS, + }, +`, + // ******************************* + "MutableFuncNameResults": ` + Results Mutable$FuncName$+Results +`, + // ******************************* + "MutableFuncNameResultsInit": ` + Results: Mutable$FuncName$+Results{ + id: wasmlib.OBJ_ID_RESULTS, + }, +`, + // ******************************* + "MutablePackageState": ` + State Mutable$Package$+State +`, + // ******************************* + "MutablePackageStateInit": ` + State: Mutable$Package$+State{ + id: wasmlib.OBJ_ID_STATE, + }, +`, + // ******************************* + "ImmutablePackageState": ` + State Immutable$Package$+State +`, + // ******************************* + "ImmutablePackageStateInit": ` + State: Immutable$Package$+State{ + id: wasmlib.OBJ_ID_STATE, + }, +`, + // ******************************* + "requireMandatory": ` + ctx.Require(f.Params.$FldName().Exists(), "missing mandatory $fldName") +`, + // ******************************* + "grantForKey": ` + access := ctx.State().GetAgentID(wasmlib.Key("$grant")) + ctx.Require(access.Exists(), "access not set: $grant") +`, + // ******************************* + "grantRequire": ` + ctx.Require(ctx.Caller() == $grant, "no permission") + +`, +} + diff --git a/tools/schema/generator/gotemplates/main.go b/tools/schema/generator/gotemplates/main.go new file mode 100644 index 0000000000..20ffc7b321 --- /dev/null +++ b/tools/schema/generator/gotemplates/main.go @@ -0,0 +1,24 @@ +package gotemplates + +var mainGo = map[string]string{ + // ******************************* + "main.go": ` +// +build wasm + +package main + +import "github.com/iotaledger/wasp/packages/vm/wasmclient" + +import "$module/go/$package" + +func main() { +} + +//export on_load +func onLoad() { + h := &wasmclient.WasmVMHost{} + h.ConnectWasmHost() + $package.OnLoad() +} +`, +} diff --git a/tools/schema/generator/schema.go b/tools/schema/generator/schema.go index 07ad36c581..ceca50fdfd 100644 --- a/tools/schema/generator/schema.go +++ b/tools/schema/generator/schema.go @@ -138,10 +138,10 @@ func (s *Schema) compileField(fldName, fldType string) (*Field, error) { } func (s *Schema) compileFuncs(schemaDef *SchemaDef, params, results *FieldMap, views bool) (err error) { - kind := "func" + kind := lower(KindFunc) templateFuncs := schemaDef.Funcs if views { - kind = "view" + kind = lower(KindView) templateFuncs = schemaDef.Views } for _, funcName := range sortedFuncDescs(templateFuncs) { diff --git a/tools/schema/generator/templates.go b/tools/schema/generator/templates.go new file mode 100644 index 0000000000..547e965e24 --- /dev/null +++ b/tools/schema/generator/templates.go @@ -0,0 +1,17 @@ +package generator + +var templates = map[string]string{ + // ******************************* + "copyright": ` +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 +`, + // ******************************* + "warning": ` + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +`, +} From ba07d24871e3477a8d394ef62fb3823d6a4aef3d Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Wed, 3 Nov 2021 11:47:39 -0700 Subject: [PATCH 017/198] Immediately flush emitter buffer --- .../wasm/helloworld/go/helloworld/keys.go | 4 +- tools/schema/generator/generator.go | 149 +++++++++--------- tools/schema/generator/generator_go.go | 79 ++-------- .../generator/gotemplates/alltemplates.go | 1 + tools/schema/generator/gotemplates/keys.go | 32 ++++ tools/schema/generator/gotemplates/lib.go | 1 - 6 files changed, 121 insertions(+), 145 deletions(-) create mode 100644 tools/schema/generator/gotemplates/keys.go diff --git a/contracts/wasm/helloworld/go/helloworld/keys.go b/contracts/wasm/helloworld/go/helloworld/keys.go index cfb0975574..149a75fad1 100644 --- a/contracts/wasm/helloworld/go/helloworld/keys.go +++ b/contracts/wasm/helloworld/go/helloworld/keys.go @@ -9,7 +9,9 @@ package helloworld import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" -const IdxResultHelloWorld = 0 +const ( + IdxResultHelloWorld = 0 +) const keyMapLen = 1 diff --git a/tools/schema/generator/generator.go b/tools/schema/generator/generator.go index 78d6750ac2..f22ceef4e1 100644 --- a/tools/schema/generator/generator.go +++ b/tools/schema/generator/generator.go @@ -8,6 +8,7 @@ import ( "fmt" "os" "regexp" + "strconv" "strings" "github.com/iotaledger/wasp/packages/iscp" @@ -75,7 +76,7 @@ type GenBase struct { currentField *Field currentFunc *Func currentStruct *Struct - emitters map[string]func(g *GenBase) string + emitters map[string]func(g *GenBase) extension string file *os.File folder string @@ -92,7 +93,7 @@ type GenBase struct { func (g *GenBase) init(s *Schema) { g.s = s - g.emitters = map[string]func(g *GenBase) string{} + g.emitters = map[string]func(g *GenBase){} g.newTypes = map[string]bool{} g.keys = map[string]string{} g.templates = map[string]string{} @@ -134,62 +135,66 @@ func (g *GenBase) createSourceFile(name string, generator func()) error { return nil } -var ( - emitKeyRegExp = regexp.MustCompile(`\$[a-zA-Z_]+`) - emitCmdRegExp = regexp.MustCompile(`\$#[^\n]*\n`) -) +var emitKeyRegExp = regexp.MustCompile(`\$[a-zA-Z_]+`) func (g *GenBase) emit(template string) { - g.printf(g.emitAll(template)) -} - -func (g *GenBase) emitAll(template string) string { template = g.templates[template] - - // first process special commands - text := emitCmdRegExp.ReplaceAllStringFunc(template, func(key string) string { - if strings.HasPrefix(key, "$#each ") { - return g.emitEach(strings.TrimSpace(key[7:])) - } - if strings.HasPrefix(key, "$#emit ") { - return g.emitAll(strings.TrimSpace(key[7:])) - } - if strings.HasPrefix(key, "$#func ") { - return g.emitFunc(strings.TrimSpace(key[7:])) - } - if strings.HasPrefix(key, "$#if ") { - return g.emitIf(strings.TrimSpace(key[5:])) + lines := strings.Split(template, "\n") + for i := 1; i < len(lines)-1; i++ { + line := lines[i] + + // first process special commands + if strings.HasPrefix(line, "$#") { + if strings.HasPrefix(line, "$#each ") { + g.emitEach(strings.TrimSpace(line[7:])) + continue + } + if strings.HasPrefix(line, "$#emit ") { + g.emit(strings.TrimSpace(line[7:])) + continue + } + if strings.HasPrefix(line, "$#func ") { + g.emitFunc(strings.TrimSpace(line[7:])) + continue + } + if strings.HasPrefix(line, "$#if ") { + g.emitIf(strings.TrimSpace(line[5:])) + continue + } + g.println("???:" + line) + continue } - return "???:" + key - }) - // then replace any remaining keys - text = emitKeyRegExp.ReplaceAllStringFunc(text, func(key string) string { - return g.emitKey(key) - }) + // then replace any remaining keys + line = emitKeyRegExp.ReplaceAllStringFunc(line, func(key string) string { + text, ok := g.keys[key[1:]] + if ok { + return text + } + return "???:" + key + }) - // remove concatenation markers - text = strings.ReplaceAll(text, "$+", "") + // finally remove concatenation markers + line = strings.ReplaceAll(line, "$+", "") - // remove leading newline - return strings.TrimPrefix(text, "\n") + g.println(line) + } } -func (g *GenBase) emitEach(key string) string { +func (g *GenBase) emitEach(key string) { parts := strings.Split(key, " ") if len(parts) != 2 { - return "???: " + key + g.println("???:" + key) + return } template := parts[1] switch parts[0] { case "func": - text := "" for _, g.currentFunc = range g.s.Funcs { g.setFuncKeys() - text += g.emitAll(template) + g.emit(template) } - return text case "mandatory": mandatory := []*Field{} for _, g.currentField = range g.currentFunc.Params { @@ -197,57 +202,56 @@ func (g *GenBase) emitEach(key string) string { mandatory = append(mandatory, g.currentField) } } - return g.emitFields(mandatory, template) + g.emitFields(mandatory, template) case KeyParam: - return g.emitFields(g.currentFunc.Params, template) + g.emitFields(g.currentFunc.Params, template) case KeyParams: g.keys[constPrefix] = PrefixParam - return g.emitFields(g.s.Params, template) + g.emitFields(g.s.Params, template) case KeyResult: - return g.emitFields(g.currentFunc.Results, template) + g.emitFields(g.currentFunc.Results, template) case KeyResults: g.keys[constPrefix] = PrefixResult - return g.emitFields(g.s.Results, template) + g.emitFields(g.s.Results, template) case KeyState: g.keys[constPrefix] = PrefixState - return g.emitFields(g.s.StateVars, template) + g.emitFields(g.s.StateVars, template) case KeyStruct: - text := "" for _, g.currentStruct = range g.s.Structs { g.setStructKeys() - text += g.emitAll(template) + g.emit(template) } - return text case KeyTypeDef: - return g.emitFields(g.s.Typedefs, template) + g.emitFields(g.s.Typedefs, template) + default: + g.println("???:" + key) } - return "???: " + key } -func (g *GenBase) emitFields(fields []*Field, template string) string { - text := "" +func (g *GenBase) emitFields(fields []*Field, template string) { for _, g.currentField = range fields { - if g.currentField.Alias == "this" { + if g.currentField.Alias == AliasThis { continue } g.setFieldKeys() - text += g.emitAll(template) + g.emit(template) } - return text } -func (g *GenBase) emitFunc(key string) string { - f, ok := g.emitters[key] +func (g *GenBase) emitFunc(key string) { + emitter, ok := g.emitters[key] if ok { - return f(g) + emitter(g) + return } - return "???: " + key + g.println("???:" + key) } -func (g *GenBase) emitIf(key string) string { +func (g *GenBase) emitIf(key string) { parts := strings.Split(key, " ") if len(parts) < 2 || len(parts) > 3 { - return "???: " + key + g.println("???:" + key) + return } conditionKey := parts[0] @@ -272,25 +276,20 @@ func (g *GenBase) emitIf(key string) string { case KeyPtrs: condition = len(g.currentFunc.Params) != 0 || len(g.currentFunc.Results) != 0 default: - return "???: " + key + g.println("???:" + key) + return } if condition { - return g.emitAll(template) + g.emit(template) + return } + + // else branch? if len(parts) == 3 { template = parts[2] - return g.emitAll(template) - } - return "" -} - -func (g *GenBase) emitKey(key string) string { - text, ok := g.keys[key[1:]] - if ok { - return text + g.emit(template) } - return "???: " + key } func (g *GenBase) exists(path string) (err error) { @@ -581,6 +580,10 @@ func (g *GenBase) setFieldKeys() { g.keys["fld_name"] = snake(fldName) g.keys["FLD_NAME"] = upper(snake(fldName)) g.keys["fldAlias"] = g.currentField.Alias + g.keys["FldType"] = g.currentField.Type + g.keys["fldIndex"] = strconv.Itoa(g.s.KeyID) + g.s.KeyID++ + g.keys["maxIndex"] = strconv.Itoa(g.s.KeyID) } func (g *GenBase) setKeys() { diff --git a/tools/schema/generator/generator_go.go b/tools/schema/generator/generator_go.go index a52c79f65c..aa1dd792dc 100644 --- a/tools/schema/generator/generator_go.go +++ b/tools/schema/generator/generator_go.go @@ -4,9 +4,7 @@ package generator import ( - "fmt" "regexp" - "strconv" "strings" "github.com/iotaledger/wasp/tools/schema/generator/gotemplates" @@ -82,26 +80,6 @@ func (g *GoGenerator) init(s *Schema) { g.emitters["funcSignature"] = emitterFuncSignature } -func (g *GoGenerator) flushConsts() { - if len(g.s.ConstNames) == 0 { - return - } - - if len(g.s.ConstNames) == 1 { - name := g.s.ConstNames[0] - value := g.s.ConstValues[0] - g.printf("\nconst %s = %s\n", name, value) - g.s.flushConsts(func(name string, value string, padLen int) {}) - return - } - - g.printf("\nconst (\n") - g.s.flushConsts(func(name string, value string, padLen int) { - g.printf("\t%s = %s\n", pad(name, padLen), value) - }) - g.printf(")\n") -} - func (g *GoGenerator) funcName(f *Func) string { return f.FuncName } @@ -114,30 +92,6 @@ func (g *GoGenerator) generateArrayType(varType string) string { return "wasmlib.TYPE_ARRAY|" + varType } -func (g *GoGenerator) generateKeysArray(fields []*Field, prefix string) { - for _, field := range fields { - if field.Alias == AliasThis { - continue - } - name := prefix + capitalize(field.Name) - g.printf("\t%s,\n", name) - g.s.KeyID++ - } -} - -func (g *GoGenerator) generateKeysIndexes(fields []*Field, prefix string) { - for _, field := range fields { - if field.Alias == AliasThis { - continue - } - name := "Idx" + prefix + capitalize(field.Name) - field.KeyID = g.s.KeyID - value := strconv.Itoa(field.KeyID) - g.s.KeyID++ - g.s.appendConst(name, value) - } -} - func (g *GoGenerator) generateLanguageSpecificFiles() error { if g.s.CoreContracts { return nil @@ -388,22 +342,8 @@ func (g *GoGenerator) writeInitialFuncs() { } func (g *GoGenerator) writeKeys() { - g.emit("goHeader") - g.s.KeyID = 0 - g.generateKeysIndexes(g.s.Params, "Param") - g.generateKeysIndexes(g.s.Results, "Result") - g.generateKeysIndexes(g.s.StateVars, "State") - g.flushConsts() - - size := g.s.KeyID - g.printf("\nconst keyMapLen = %d\n", size) - g.printf("\nvar keyMap = [keyMapLen]wasmlib.Key{\n") - g.generateKeysArray(g.s.Params, "Param") - g.generateKeysArray(g.s.Results, "Result") - g.generateKeysArray(g.s.StateVars, "State") - g.printf("}\n") - g.printf("\nvar idxMap [keyMapLen]wasmlib.Key32\n") + g.emit("keys.go") } func (g *GoGenerator) writeLib() { @@ -466,15 +406,14 @@ func (g *GoGenerator) writeTypeDefs() { } } -func emitterAccessCheck(g *GenBase) string { +func emitterAccessCheck(g *GenBase) { if g.currentFunc.Access == "" { - return "" + return } - text := "" grant := g.currentFunc.Access index := strings.Index(grant, "//") if index >= 0 { - text = fmt.Sprintf("\t%s\n", grant[index:]) + g.printf("\t%s\n", grant[index:]) grant = strings.TrimSpace(grant[:index]) } switch grant { @@ -486,20 +425,20 @@ func emitterAccessCheck(g *GenBase) string { grant = "ctx.ContractCreator()" default: g.keys["grant"] = grant - text += g.emitAll("grantForKey") + g.emit("grantForKey") grant = "access.Value()" } g.keys["grant"] = grant - return text + g.emitAll("grantRequire") + g.emit("grantRequire") } -func emitterFuncSignature(g *GenBase) string { +func emitterFuncSignature(g *GenBase) { switch g.currentFunc.FuncName { case SpecialFuncInit: case SpecialFuncSetOwner: case SpecialViewGetOwner: default: - return "" + return } - return g.emitAll(g.currentFunc.FuncName) + g.emit(g.currentFunc.FuncName) } diff --git a/tools/schema/generator/gotemplates/alltemplates.go b/tools/schema/generator/gotemplates/alltemplates.go index 3794424877..6e3ddd2ae2 100644 --- a/tools/schema/generator/gotemplates/alltemplates.go +++ b/tools/schema/generator/gotemplates/alltemplates.go @@ -22,6 +22,7 @@ var GoTemplates = []map[string]string{ constsGo, contractGo, funcsGo, + keysGo, libGo, mainGo, } diff --git a/tools/schema/generator/gotemplates/keys.go b/tools/schema/generator/gotemplates/keys.go new file mode 100644 index 0000000000..58b26968c2 --- /dev/null +++ b/tools/schema/generator/gotemplates/keys.go @@ -0,0 +1,32 @@ +package gotemplates + +var keysGo = map[string]string{ + // ******************************* + "keys.go": ` +$#emit goHeader + +const ( +$#each params constFieldIdx +$#each results constFieldIdx +$#each state constFieldIdx +) + +const keyMapLen = $maxIndex + +var keyMap = [keyMapLen]wasmlib.Key{ +$#each params constFieldKey +$#each results constFieldKey +$#each state constFieldKey +} + +var idxMap [keyMapLen]wasmlib.Key32 +`, + // ******************************* + "constFieldIdx": ` + Idx$constPrefix$FldName = $fldIndex +`, + // ******************************* + "constFieldKey": ` + $constPrefix$FldName, +`, +} diff --git a/tools/schema/generator/gotemplates/lib.go b/tools/schema/generator/gotemplates/lib.go index 1b21519673..baad75b17f 100644 --- a/tools/schema/generator/gotemplates/lib.go +++ b/tools/schema/generator/gotemplates/lib.go @@ -99,4 +99,3 @@ $#each mandatory requireMandatory `, } - From 1791e6ef8029977e08ce030f6fba74841c1820e3 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Thu, 4 Nov 2021 14:02:49 +0200 Subject: [PATCH 018/198] Chainimpl message passing refactoring. Work in progress --- packages/chain/chain.go | 12 ++- packages/chain/chainimpl/chainimpl.go | 96 +++++-------------- packages/chain/chainimpl/interface.go | 33 +++++-- packages/chain/committee/committee.go | 23 +++-- packages/chain/consensus/action.go | 9 +- packages/chain/consensus/consensus.go | 29 ++++++ packages/chain/consensus/eventproc.go | 18 +++- packages/chain/consensus/setup_test.go | 10 +- packages/chain/statemgr/eventproc.go | 7 +- packages/chain/statemgr/statemgr.go | 41 ++++++-- packages/chain/statemgr/syncmgr.go | 5 +- .../testutil/testchain/mock_chain_core.go | 7 ++ 12 files changed, 161 insertions(+), 129 deletions(-) diff --git a/packages/chain/chain.go b/packages/chain/chain.go index 1936660d7b..5176a538eb 100644 --- a/packages/chain/chain.go +++ b/packages/chain/chain.go @@ -26,7 +26,9 @@ import ( type ChainCore interface { ID() *iscp.ChainID GetCommitteeInfo() *CommitteeInfo - ReceiveMessage(interface{}) + AttachToPeerMessages(fun func(recv *peering.RecvEvent)) + RequestDismissChain(reason string) + StateCandidateToStateManager(state.VirtualStateAccess, ledgerstate.OutputID) Events() ChainEvents Processors() *processors.Cache GlobalStateSync() coreutil.ChainStateSync @@ -75,7 +77,7 @@ type Committee interface { IsAlivePeer(peerIndex uint16) bool QuorumIsAlive(quorum ...uint16) bool PeerStatus() []*PeerStatus - Attach(chain ChainCore) + AttachToPeerMessages(fun func(recv *peering.RecvEvent)) IsReady() bool Close() RunACSConsensus(value []byte, sessionID uint64, stateIndex uint32, callback func(sessionID uint64, acs [][]byte)) @@ -98,17 +100,17 @@ type StateManager interface { EventBlockMsg(msg *messages.BlockMsg) EventStateMsg(msg *messages.StateMsg) EventOutputMsg(msg ledgerstate.Output) - EventStateCandidateMsg(msg *messages.StateCandidateMsg) + EventStateCandidateMsg(state.VirtualStateAccess, ledgerstate.OutputID) EventTimerMsg(msg messages.TimerTick) GetStatusSnapshot() *SyncInfo Close() } type Consensus interface { - EventStateTransitionMsg(*messages.StateTransitionMsg) + EventStateTransitionMsg(state.VirtualStateAccess, *ledgerstate.AliasOutput, time.Time) EventSignedResultMsg(*messages.SignedResultMsg) EventSignedResultAckMsg(*messages.SignedResultAckMsg) - EventInclusionsStateMsg(*messages.InclusionStateMsg) + EventInclusionsStateMsg(ledgerstate.TransactionID, ledgerstate.InclusionState) EventAsynchronousCommonSubsetMsg(msg *messages.AsynchronousCommonSubsetMsg) EventVMResultMsg(msg *messages.VMResultMsg) EventTimerMsg(messages.TimerTick) diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index 63b7e2aab2..748612b7a3 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -4,7 +4,6 @@ package chainimpl import ( - "bytes" "sync" "time" @@ -75,6 +74,8 @@ type chainObj struct { offledgerBroadcastUpToNPeers int offledgerBroadcastInterval time.Duration pullMissingRequestsFromCommittee bool + peeringID peering.PeeringID + attachIDs []interface{} chainMetrics metrics.ChainMetrics } @@ -128,6 +129,8 @@ func NewChain( offledgerBroadcastUpToNPeers: offledgerBroadcastUpToNPeers, offledgerBroadcastInterval: offledgerBroadcastInterval, pullMissingRequestsFromCommittee: pullMissingRequestsFromCommittee, + peeringID: chainID.Array(), + attachIDs: make([]interface{}, 0), chainMetrics: chainMetrics, } ret.committee.Store(&committeeStruct{}) @@ -140,10 +143,7 @@ func NewChain( } ret.stateMgr = statemgr.New(db, ret, peers, ret.nodeConn) ret.peers = &peers - var peeringID peering.PeeringID = ret.chainID.Array() - peers.Attach(&peeringID, func(recv *peering.RecvEvent) { - ret.ReceiveMessage(recv.Msg) - }) + ret.AttachToPeerMessages(ret.receiveChainPeerMessages) go func() { for msg := range ret.chMsg.Out() { ret.dispatchMessage(msg) @@ -159,27 +159,8 @@ func (c *chainObj) dispatchMessage(msg interface{}) { c.processPeerMessage(msgt) case *messages.DismissChainMsg: c.Dismiss(msgt.Reason) - case *messages.StateTransitionMsg: - if c.consensus != nil { - c.consensus.EventStateTransitionMsg(msgt) - } - case *messages.StateCandidateMsg: - c.stateMgr.EventStateCandidateMsg(msgt) - case *messages.InclusionStateMsg: - if c.consensus != nil { - c.consensus.EventInclusionsStateMsg(msgt) - } case *messages.StateMsg: c.processStateMessage(msgt) - case *messages.VMResultMsg: - // VM finished working - if c.consensus != nil { - c.consensus.EventVMResultMsg(msgt) - } - case *messages.AsynchronousCommonSubsetMsg: - if c.consensus != nil { - c.consensus.EventAsynchronousCommonSubsetMsg(msgt) - } case messages.TimerTick: if msgt%2 == 0 { c.stateMgr.EventTimerMsg(msgt / 2) @@ -195,48 +176,7 @@ func (c *chainObj) dispatchMessage(msg interface{}) { //nolint:funlen func (c *chainObj) processPeerMessage(msg *peering.PeerMessage) { - rdr := bytes.NewReader(msg.MsgData) - switch msg.MsgType { - case messages.MsgGetBlock: - msgt := &messages.GetBlockMsg{} - if err := msgt.Read(rdr); err != nil { - c.log.Error(err) - return - } - msgt.SenderNetID = msg.SenderNetID - c.stateMgr.EventGetBlockMsg(msgt) - - case messages.MsgBlock: - msgt := &messages.BlockMsg{} - if err := msgt.Read(rdr); err != nil { - c.log.Error(err) - return - } - msgt.SenderNetID = msg.SenderNetID - c.stateMgr.EventBlockMsg(msgt) - - case messages.MsgSignedResult: - msgt := &messages.SignedResultMsg{} - if err := msgt.Read(rdr); err != nil { - c.log.Error(err) - return - } - msgt.SenderIndex = msg.SenderIndex - if c.consensus != nil { - c.consensus.EventSignedResultMsg(msgt) - } - case messages.MsgSignedResultAck: - if c.consensus == nil { - return - } - msgt := &messages.SignedResultAckMsg{} - if err := msgt.Read(rdr); err != nil { - c.log.Error(err) - return - } - msgt.SenderIndex = msg.SenderIndex - c.consensus.EventSignedResultAckMsg(msgt) case messages.MsgOffLedgerRequest: msgt, err := messages.OffLedgerRequestMsgFromBytes(msg.MsgData) if err != nil { @@ -278,6 +218,23 @@ func (c *chainObj) processPeerMessage(msg *peering.PeerMessage) { } } +func (c *chainObj) receiveCommitteePeerMessages(event *peering.RecvEvent) { + if event.Msg.MsgType == messages.MsgMissingRequestIDs { + c.receiveMessage(event.Msg) + } +} + +func (c *chainObj) receiveChainPeerMessages(event *peering.RecvEvent) { + switch event.Msg.MsgType { + case + messages.MsgOffLedgerRequest, + messages.MsgRequestAck, + messages.MsgMissingRequest: + c.receiveMessage(event.Msg) + default: + } +} + // processChainTransition processes the unique chain output which exists on the chain's address // If necessary, it creates/changes/rotates committee object func (c *chainObj) processChainTransition(msg *chain.ChainTransitionEventData) { @@ -324,12 +281,7 @@ func (c *chainObj) processChainTransition(msg *chain.ChainTransitionEventData) { chain.LogGovernanceTransition(msg, c.log) chain.PublishGovernanceTransition(msg.ChainOutput) } - // send to consensus - c.ReceiveMessage(&messages.StateTransitionMsg{ - State: msg.VirtualState, - StateOutput: msg.ChainOutput, - StateTimestamp: msg.OutputTimestamp, - }) + c.consensus.EventStateTransitionMsg(msg.VirtualState, msg.ChainOutput, msg.OutputTimestamp) c.log.Debugf("processChainTransition completed: state index: %d, state hash: %s", stateIndex, msg.VirtualState.StateCommitment().String()) } @@ -457,7 +409,7 @@ func (c *chainObj) createNewCommitteeAndConsensus(cmtRec *registry.CommitteeReco return xerrors.Errorf("createNewCommitteeAndConsensus: failed to create committee object for state address %s: %w", cmtRec.Address.Base58(), err) } - cmt.Attach(c) + cmt.AttachToPeerMessages(c.receiveCommitteePeerMessages) c.log.Debugf("creating new consensus object...") c.consensus = consensus.New(c, c.mempool, cmt, c.nodeConn, c.pullMissingRequestsFromCommittee, c.chainMetrics) c.setCommittee(cmt) diff --git a/packages/chain/chainimpl/interface.go b/packages/chain/chainimpl/interface.go index b37166f0fd..0ac8771469 100644 --- a/packages/chain/chainimpl/interface.go +++ b/packages/chain/chainimpl/interface.go @@ -14,6 +14,7 @@ import ( "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/coreutil" "github.com/iotaledger/wasp/packages/iscp/request" + "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/publisher" "github.com/iotaledger/wasp/packages/registry" "github.com/iotaledger/wasp/packages/state" @@ -50,7 +51,7 @@ func (c *chainObj) startTimer() { tick := 0 for !c.IsDismissed() { time.Sleep(chain.TimerTickPeriod) - c.ReceiveMessage(messages.TimerTick(tick)) + c.receiveMessage(messages.TimerTick(tick)) tick++ } }() @@ -75,6 +76,9 @@ func (c *chainObj) Dismiss(reason string) { } c.eventRequestProcessed.DetachAll() c.eventChainTransition.DetachAll() + for _, attachID := range c.attachIDs { + (*c.peers).Detach(attachID) + } }) publisher.Publish("dismissed_chain", c.chainID.Base58()) @@ -84,11 +88,23 @@ func (c *chainObj) IsDismissed() bool { return c.dismissed.Load() } +func (c *chainObj) AttachToPeerMessages(fun func(recv *peering.RecvEvent)) { + c.attachIDs = append(c.attachIDs, (*c.peers).Attach(&c.peeringID, fun)) +} + +func (c *chainObj) RequestDismissChain(reason string) { + c.receiveMessage(messages.DismissChainMsg{Reason: reason}) +} + +func (c *chainObj) StateCandidateToStateManager(state state.VirtualStateAccess, outputID ledgerstate.OutputID) { + c.stateMgr.EventStateCandidateMsg(state, outputID) +} + // ReceiveMessage accepts an incoming message asynchronously. -func (c *chainObj) ReceiveMessage(msg interface{}) { +/*func (c *chainObj) ReceiveMessage(msg interface{}) { c.receiveMessage(msg) - c.chainMetrics.CountMessages() -} + c.chainMetrics.CountMessages() TODO +}*/ func (c *chainObj) receiveMessage(msg interface{}) { if c.IsDismissed() { @@ -215,17 +231,16 @@ func (c *chainObj) ReceiveRequest(req iscp.Request) { func (c *chainObj) ReceiveState(stateOutput *ledgerstate.AliasOutput, timestamp time.Time) { c.log.Debugf("ReceiveState #%d: outputID: %s, stateAddr: %s", stateOutput.GetStateIndex(), iscp.OID(stateOutput.ID()), stateOutput.GetStateAddress().Base58()) - c.ReceiveMessage(&messages.StateMsg{ + c.receiveMessage(&messages.StateMsg{ ChainOutput: stateOutput, Timestamp: timestamp, }) } func (c *chainObj) ReceiveInclusionState(txID ledgerstate.TransactionID, inclusionState ledgerstate.InclusionState) { - c.ReceiveMessage(&messages.InclusionStateMsg{ - TxID: txID, - State: inclusionState, - }) // TODO special entry point + if c.consensus != nil { + c.consensus.EventInclusionsStateMsg(txID, inclusionState) // TODO special entry point + } } func (c *chainObj) ReceiveOutput(output ledgerstate.Output) { diff --git a/packages/chain/committee/committee.go b/packages/chain/committee/committee.go index 2a2758a899..e6aaea746c 100644 --- a/packages/chain/committee/committee.go +++ b/packages/chain/committee/committee.go @@ -32,10 +32,12 @@ type committee struct { quorum uint16 ownIndex uint16 dkshare *tcrypto.DKShare - attachID interface{} + attachIDs []interface{} log *logger.Logger } +var _ chain.Committee = &committee{} + const waitReady = false func New( @@ -83,6 +85,7 @@ func New( quorum: dkshare.T, ownIndex: *dkshare.Index, dkshare: dkshare, + attachIDs: make([]interface{}, 0), log: log, } if len(acsRunner) > 0 { @@ -98,6 +101,11 @@ func New( log, ) } + ret.AttachToPeerMessages(func(recv *peering.RecvEvent) { + if ret.acsRunner != nil { + ret.acsRunner.TryHandleMessage(recv) + } + }) go ret.waitReady(waitReady) return ret, nil @@ -202,20 +210,15 @@ func (c *committee) PeerStatus() []*chain.PeerStatus { return ret } -func (c *committee) Attach(ch chain.ChainCore) { - c.attachID = c.validatorNodes.Attach(&c.peeringID, func(recv *peering.RecvEvent) { - if c.acsRunner != nil && c.acsRunner.TryHandleMessage(recv) { - return - } - ch.ReceiveMessage(recv.Msg) - }) +func (c *committee) AttachToPeerMessages(fun func(recv *peering.RecvEvent)) { + c.attachIDs = append(c.attachIDs, c.validatorNodes.Attach(&c.peeringID, fun)) } func (c *committee) Close() { c.acsRunner.Close() c.isReady.Store(false) - if c.attachID != nil { - c.validatorNodes.Detach(c.attachID) + for _, attachID := range c.attachIDs { + c.validatorNodes.Detach(attachID) } c.validatorNodes.Close() } diff --git a/packages/chain/consensus/action.go b/packages/chain/consensus/action.go index f9adaad88e..68ffe34027 100644 --- a/packages/chain/consensus/action.go +++ b/packages/chain/consensus/action.go @@ -67,7 +67,7 @@ func (c *Consensus) proposeBatchIfNeeded() { // call the ACS consensus. The call should spawn goroutine itself c.committee.RunACSConsensus(proposal.Bytes(), c.acsSessionID, c.stateOutput.GetStateIndex(), func(sessionID uint64, acs [][]byte) { c.log.Debugf("proposeBatch RunACSConsensus callback: responding to ACS session ID %v: len = %d", sessionID, len(acs)) - go c.chain.ReceiveMessage(&messages.AsynchronousCommonSubsetMsg{ + go c.EventAsynchronousCommonSubsetMsg(&messages.AsynchronousCommonSubsetMsg{ ProposedBatchesBin: acs, SessionID: sessionID, }) @@ -235,7 +235,7 @@ func (c *Consensus) prepareVMTask(reqs []iscp.Request) *vm.VMTask { } c.log.Debugf("runVM OnFinish callback: responding by state index: %d state hash: %s", task.VirtualStateAccess.BlockIndex(), task.VirtualStateAccess.StateCommitment()) - c.chain.ReceiveMessage(&messages.VMResultMsg{ + c.EventVMResultMsg(&messages.VMResultMsg{ Task: task, }) elapsed := time.Since(task.StartTime) @@ -336,10 +336,7 @@ func (c *Consensus) checkQuorum() { // if it is not state controller rotation, sending message to state manager // Otherwise state manager is not notified chainOutputID := chainOutput.ID() - go c.chain.ReceiveMessage(&messages.StateCandidateMsg{ - State: c.resultState, - ApprovingOutputID: chainOutputID, - }) + c.chain.StateCandidateToStateManager(c.resultState, chainOutputID) c.log.Debugf("checkQuorum: StateCandidateMsg sent for state index %v, approving output ID %v", c.resultState.BlockIndex(), iscp.OID(chainOutputID)) } diff --git a/packages/chain/consensus/consensus.go b/packages/chain/consensus/consensus.go index fb122f61a0..93fc0601a9 100644 --- a/packages/chain/consensus/consensus.go +++ b/packages/chain/consensus/consensus.go @@ -4,6 +4,7 @@ package consensus import ( + "bytes" "sync" "time" @@ -15,6 +16,7 @@ import ( "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/assert" "github.com/iotaledger/wasp/packages/metrics" + "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/state" "github.com/iotaledger/wasp/packages/vm" "github.com/iotaledger/wasp/packages/vm/runvm" @@ -111,11 +113,38 @@ func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Commi pullMissingRequestsFromCommittee: pullMissingRequestsFromCommittee, consensusMetrics: consensusMetrics, } + committee.AttachToPeerMessages(ret.receiveCommitteePeerMessages) ret.refreshConsensusInfo() go ret.recvLoop() return ret } +func (c *Consensus) receiveCommitteePeerMessages(event *peering.RecvEvent) { + msg := event.Msg + switch msg.MsgType { + case messages.MsgSignedResult: + msgt := &messages.SignedResultMsg{} + rdr := bytes.NewReader(msg.MsgData) + if err := msgt.Read(rdr); err != nil { + c.log.Error(err) + return + } + msgt.SenderIndex = msg.SenderIndex + c.EventSignedResultMsg(msgt) + case messages.MsgSignedResultAck: + msgt := &messages.SignedResultAckMsg{} + rdr := bytes.NewReader(msg.MsgData) + if err := msgt.Read(rdr); err != nil { + c.log.Error(err) + return + } + msgt.SenderIndex = msg.SenderIndex + c.EventSignedResultAckMsg(msgt) + default: + return + } +} + func (c *Consensus) IsReady() bool { return c.isReady.Load() } diff --git a/packages/chain/consensus/eventproc.go b/packages/chain/consensus/eventproc.go index 4b0b3e8d3c..10e24be264 100644 --- a/packages/chain/consensus/eventproc.go +++ b/packages/chain/consensus/eventproc.go @@ -5,14 +5,21 @@ package consensus import ( "fmt" + "time" + "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/wasp/packages/chain/messages" "github.com/iotaledger/wasp/packages/hashing" "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/state" ) -func (c *Consensus) EventStateTransitionMsg(msg *messages.StateTransitionMsg) { - c.eventStateTransitionMsgCh <- msg +func (c *Consensus) EventStateTransitionMsg(state state.VirtualStateAccess, stateOutput *ledgerstate.AliasOutput, stateTimestamp time.Time) { + c.eventStateTransitionMsgCh <- &messages.StateTransitionMsg{ + State: state, + StateOutput: stateOutput, + StateTimestamp: stateTimestamp, + } } func (c *Consensus) eventStateTransitionMsg(msg *messages.StateTransitionMsg) { @@ -44,8 +51,11 @@ func (c *Consensus) eventSignedResultAck(msg *messages.SignedResultAckMsg) { c.takeAction() } -func (c *Consensus) EventInclusionsStateMsg(msg *messages.InclusionStateMsg) { - c.eventInclusionStateMsgCh <- msg +func (c *Consensus) EventInclusionsStateMsg(txID ledgerstate.TransactionID, state ledgerstate.InclusionState) { + c.eventInclusionStateMsgCh <- &messages.InclusionStateMsg{ + TxID: txID, + State: state, + } } func (c *Consensus) eventInclusionState(msg *messages.InclusionStateMsg) { diff --git a/packages/chain/consensus/setup_test.go b/packages/chain/consensus/setup_test.go index 58a6aa3f87..f1ca5bd4fb 100644 --- a/packages/chain/consensus/setup_test.go +++ b/packages/chain/consensus/setup_test.go @@ -231,7 +231,7 @@ func (env *MockedEnv) NewNode(nodeIndex uint16, timers ConsensusTimers) *mockedN acs..., ) require.NoError(env.T, err) - cmt.Attach(ret.ChainCore) + //TODO cmt.Attach(ret.ChainCore) ret.StateOutput = env.InitStateOutput ret.SolidState, err = state.CreateOriginState(ret.store, env.ChainID) @@ -249,7 +249,7 @@ func (env *MockedEnv) NewNode(nodeIndex uint16, timers ConsensusTimers) *mockedN ret.Consensus.EventVMResultMsg(msg) }) ret.ChainCore.OnReceiveInclusionStateMsg(func(msg *messages.InclusionStateMsg) { - ret.Consensus.EventInclusionsStateMsg(msg) + //ret.Consensus.EventInclusionsStateMsg(msg) TODO }) ret.ChainCore.OnReceiveStateCandidateMsg(func(msg *messages.StateCandidateMsg) { ret.mutex.Lock() @@ -336,11 +336,7 @@ func (n *mockedNode) EventStateTransition() { n.ChainCore.GlobalStateSync().SetSolidIndex(n.SolidState.BlockIndex()) - n.Consensus.EventStateTransitionMsg(&messages.StateTransitionMsg{ - State: n.SolidState.Copy(), - StateOutput: n.StateOutput, - StateTimestamp: time.Now(), - }) + n.Consensus.EventStateTransitionMsg(n.SolidState.Copy(), n.StateOutput, time.Now()) } func (env *MockedEnv) StartTimers() { diff --git a/packages/chain/statemgr/eventproc.go b/packages/chain/statemgr/eventproc.go index 75e6d6f619..fe558b7f02 100644 --- a/packages/chain/statemgr/eventproc.go +++ b/packages/chain/statemgr/eventproc.go @@ -113,8 +113,11 @@ func (sm *stateManager) eventStateMsg(msg *messages.StateMsg) { } } -func (sm *stateManager) EventStateCandidateMsg(msg *messages.StateCandidateMsg) { - sm.eventStateCandidateMsgCh <- msg +func (sm *stateManager) EventStateCandidateMsg(state state.VirtualStateAccess, outputID ledgerstate.OutputID) { + sm.eventStateCandidateMsgCh <- &messages.StateCandidateMsg{ + State: state, + ApprovingOutputID: outputID, + } } func (sm *stateManager) eventStateCandidateMsg(msg *messages.StateCandidateMsg) { diff --git a/packages/chain/statemgr/statemgr.go b/packages/chain/statemgr/statemgr.go index dbd0b63783..720bf7f0ef 100644 --- a/packages/chain/statemgr/statemgr.go +++ b/packages/chain/statemgr/statemgr.go @@ -6,6 +6,7 @@ package statemgr import ( + "bytes" "fmt" "time" @@ -76,11 +77,38 @@ func New(store kvstore.KVStore, c chain.ChainCore, peers peering.PeerDomainProvi eventTimerMsgCh: make(chan messages.TimerTick), closeCh: make(chan bool), } + c.AttachToPeerMessages(ret.receiveChainPeerMessages) go ret.initLoadState() return ret } +func (sm *stateManager) receiveChainPeerMessages(event *peering.RecvEvent) { + msg := event.Msg + switch msg.MsgType { + case messages.MsgGetBlock: + msgt := &messages.GetBlockMsg{} + rdr := bytes.NewReader(msg.MsgData) + if err := msgt.Read(rdr); err != nil { + sm.log.Error(err) + return + } + msgt.SenderNetID = msg.SenderNetID + sm.EventGetBlockMsg(msgt) + case messages.MsgBlock: + msgt := &messages.BlockMsg{} + rdr := bytes.NewReader(msg.MsgData) + if err := msgt.Read(rdr); err != nil { + sm.log.Error(err) + return + } + msgt.SenderNetID = msg.SenderNetID + sm.EventBlockMsg(msgt) + default: + return + } +} + func (sm *stateManager) Close() { close(sm.closeCh) } @@ -89,9 +117,7 @@ func (sm *stateManager) Close() { func (sm *stateManager) initLoadState() { solidState, stateExists, err := state.LoadSolidState(sm.store, sm.chain.ID()) if err != nil { - go sm.chain.ReceiveMessage(messages.DismissChainMsg{ - Reason: fmt.Sprintf("StateManager.initLoadState: %v", err), - }) + sm.chain.RequestDismissChain(fmt.Sprintf("StateManager.initLoadState: %v", err)) return } if stateExists { @@ -101,9 +127,7 @@ func (sm *stateManager) initLoadState() { solidState.BlockIndex(), solidState.StateCommitment().String()) } else if err := sm.createOriginState(); err != nil { // create origin state in DB - go sm.chain.ReceiveMessage(messages.DismissChainMsg{ - Reason: fmt.Sprintf("StateManager.initLoadState. Failed to create origin state: %v", err), - }) + sm.chain.RequestDismissChain(fmt.Sprintf("StateManager.initLoadState. Failed to create origin state: %v", err)) return } sm.recvLoop() // Check to process external events. @@ -117,10 +141,7 @@ func (sm *stateManager) createOriginState() error { sm.chain.GlobalStateSync().SetSolidIndex(0) if err != nil { - go sm.chain.ReceiveMessage(messages.DismissChainMsg{ - Reason: fmt.Sprintf("StateManager.initLoadState. Failed to create origin state: %v", err), - }, - ) + sm.chain.RequestDismissChain(fmt.Sprintf("StateManager.initLoadState. Failed to create origin state: %v", err)) return err } sm.log.Infof("ORIGIN STATE has been created") diff --git a/packages/chain/statemgr/syncmgr.go b/packages/chain/statemgr/syncmgr.go index cdb31e75c6..510d06b165 100644 --- a/packages/chain/statemgr/syncmgr.go +++ b/packages/chain/statemgr/syncmgr.go @@ -79,10 +79,7 @@ func (sm *stateManager) doSyncActionIfNeeded() { i, requestBlockRetryTime, blockCandidatesCount, approvedBlockCandidatesCount) // TODO: temporary if. We need to find a solution to synchronize over large gaps. Making state snapshots may help. if i > startSyncFromIndex+maxBlocksToCommitConst { - go sm.chain.ReceiveMessage(messages.DismissChainMsg{ - Reason: fmt.Sprintf("StateManager.doSyncActionIfNeeded: too many blocks to catch up: %v", sm.stateOutput.GetStateIndex()-startSyncFromIndex+1), - }, - ) + sm.chain.RequestDismissChain(fmt.Sprintf("StateManager.doSyncActionIfNeeded: too many blocks to catch up: %v", sm.stateOutput.GetStateIndex()-startSyncFromIndex+1)) return } nowis := time.Now() diff --git a/packages/testutil/testchain/mock_chain_core.go b/packages/testutil/testchain/mock_chain_core.go index 25c80d1c14..78d7fb5d0a 100644 --- a/packages/testutil/testchain/mock_chain_core.go +++ b/packages/testutil/testchain/mock_chain_core.go @@ -103,6 +103,13 @@ func (m *MockedChainCore) GetCommitteeInfo() *chain.CommitteeInfo { panic("implement me") } +func (m *MockedChainCore) AttachToPeerMessages(fun func(recv *peering.RecvEvent)) {} // TODO + +func (m *MockedChainCore) RequestDismissChain(reason string) {} // TODO + +func (m *MockedChainCore) StateCandidateToStateManager(state.VirtualStateAccess, ledgerstate.OutputID) { +} // TODO + func (m *MockedChainCore) ReceiveMessage(msg interface{}) { switch msgTypecasted := msg.(type) { case *peering.PeerMessage: From c3028172c458d9e79d40a24fc45c87276f448ec8 Mon Sep 17 00:00:00 2001 From: Diego Essaya Date: Tue, 2 Nov 2021 11:28:58 -0300 Subject: [PATCH 019/198] evmlight: support block time --- contracts/native/evm/README.md | 18 + .../evm/evmchain/emulator/emulator_test.go | 2 +- contracts/native/evm/evmchain/impl.go | 18 +- contracts/native/evm/evmchain/internal.go | 9 +- .../native/evm/evminternal/management.go | 94 +++- .../evm/evmlight/emulator/blockchaindb.go | 409 ++++++++++++------ .../native/evm/evmlight/emulator/emulator.go | 82 ++-- .../evm/evmlight/emulator/emulator_test.go | 50 ++- contracts/native/evm/evmlight/impl.go | 37 +- contracts/native/evm/evmlight/internal.go | 56 ++- contracts/native/evm/evmtest/evm_test.go | 34 ++ contracts/native/evm/evmtest/utils_test.go | 21 +- contracts/native/evm/interface.go | 3 + packages/evm/evmtypes/receipt.go | 5 +- packages/iscp/assert/util.go | 17 +- packages/solo/fun.go | 11 +- packages/solo/solo.go | 14 +- 17 files changed, 620 insertions(+), 260 deletions(-) diff --git a/contracts/native/evm/README.md b/contracts/native/evm/README.md index dc7ef524e7..d1949c2e75 100644 --- a/contracts/native/evm/README.md +++ b/contracts/native/evm/README.md @@ -108,3 +108,21 @@ Finally we start the JSON-RPC server: ``` wasp-cli chain evm jsonrpc ``` + +## Predictable block time + +Some EVM contracts depend on blocks being minted periodically with regular +intervals. ISCP does not support that natively, so by default a new EVM block +is minted every time an ISCP batch is executed that contains at least one EVM +transaction. In other words, by default no EVM blocks will be minted until an +EVM transaction is received. + +However, the `evmlight` implementation supports emulating predictable block +times. To enable this feature, call the `setBlockTime` function with parameter +`FieldBlockTime (uint32)` as the average amount of seconds between blocks. + +Note that this may change the behavior of JSON-RPC functions that query the +EVM state (e.g. `getBalance`), since `evmlight` is not able to store the state +in both the latest minted block and the pending block. These functions will +always return the state computed after accepting the latest transaction (i.e. +the state of the pending block). diff --git a/contracts/native/evm/evmchain/emulator/emulator_test.go b/contracts/native/evm/evmchain/emulator/emulator_test.go index a0bf039542..5c47474f05 100644 --- a/contracts/native/evm/evmchain/emulator/emulator_test.go +++ b/contracts/native/evm/evmchain/emulator/emulator_test.go @@ -471,7 +471,6 @@ func initBenchmark(b *testing.B) (*EVMEmulator, []*types.Transaction, dict.Dict) InitGenesis(evm.DefaultChainID, db, genesisAlloc, evm.GasLimitDefault, 0) emu := NewEVMEmulator(db) - defer emu.Close() contractABI, err := abi.JSON(strings.NewReader(evmtest.StorageContractABI)) require.NoError(b, err) @@ -520,6 +519,7 @@ func initBenchmark(b *testing.B) (*EVMEmulator, []*types.Transaction, dict.Dict) func benchmarkEVMEmulator(b *testing.B, k int) { // setup: deploy the storage contract and prepare N transactions to send emu, txs, db := initBenchmark(b) + defer emu.Close() b.ResetTimer() for i := 0; i < b.N; i++ { diff --git a/contracts/native/evm/evmchain/impl.go b/contracts/native/evm/evmchain/impl.go index 588fac615c..fac2545ecd 100644 --- a/contracts/native/evm/evmchain/impl.go +++ b/contracts/native/evm/evmchain/impl.go @@ -47,7 +47,7 @@ func initialize(ctx iscp.Sandbox) (dict.Dict, error) { a.RequireNoError(err) emulator.InitGenesis( int(chainID), - rawdb.NewDatabase(emulator.NewKVAdapter(ctx.State())), // TODO: use subrealm to avoid collisions with evm management + rawdb.NewDatabase(emulator.NewKVAdapter(evminternal.EVMStateSubrealm(ctx.State()))), genesisAlloc, evm.GasLimitDefault, timestamp(ctx), @@ -57,18 +57,10 @@ func initialize(ctx iscp.Sandbox) (dict.Dict, error) { } func applyTransaction(ctx iscp.Sandbox) (dict.Dict, error) { - a := assert.NewAssert(ctx.Log()) - - tx := &types.Transaction{} - err := tx.UnmarshalBinary(ctx.Params().MustGet(evm.FieldTransactionData)) - a.RequireNoError(err) - - return evminternal.RequireGasFee(ctx, tx.Gas(), func() uint64 { - emu := getOrCreateEmulator(ctx) - receipt, err := emu.SendTransaction(tx) - a.RequireNoError(err) - return receipt.GasUsed - }), nil + return evminternal.ApplyTransaction(ctx, func(tx *types.Transaction, _ uint32) (*types.Receipt, error) { + emu := getEmulatorInBlockContext(ctx) + return emu.SendTransaction(tx) + }) } func getBalance(ctx iscp.SandboxView) (dict.Dict, error) { diff --git a/contracts/native/evm/evmchain/internal.go b/contracts/native/evm/evmchain/internal.go index 19eddbe21f..d702498f74 100644 --- a/contracts/native/evm/evmchain/internal.go +++ b/contracts/native/evm/evmchain/internal.go @@ -13,6 +13,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/iotaledger/wasp/contracts/native/evm" "github.com/iotaledger/wasp/contracts/native/evm/evmchain/emulator" + "github.com/iotaledger/wasp/contracts/native/evm/evminternal" "github.com/iotaledger/wasp/packages/evm/evmtypes" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/assert" @@ -33,16 +34,16 @@ func isNotFound(err error) bool { return false } -// getOrCreateEmulator creates a new emulator instance if this is the first call to applyTransaction +// getEmulatorInBlockContext creates a new emulator instance if this is the first call to applyTransaction // in the ISCP block; otherwise it returns the previously created instance. The purpose is to // create a single Ethereum block for each ISCP block. -func getOrCreateEmulator(ctx iscp.Sandbox) *emulator.EVMEmulator { +func getEmulatorInBlockContext(ctx iscp.Sandbox) *emulator.EVMEmulator { bctx := ctx.BlockContext(createEmulator, commitEthereumBlock) return bctx.(*emulator.EVMEmulator) } func createEmulator(ctx iscp.Sandbox) interface{} { - return emulator.NewEVMEmulator(rawdb.NewDatabase(emulator.NewKVAdapter(ctx.State())), timestamp(ctx)) + return emulator.NewEVMEmulator(rawdb.NewDatabase(emulator.NewKVAdapter(evminternal.EVMStateSubrealm(ctx.State()))), timestamp(ctx)) } // timestamp returns the current timestamp in seconds since epoch @@ -59,7 +60,7 @@ func commitEthereumBlock(blockContext interface{}) { func withEmulatorR(ctx iscp.SandboxView, f func(*emulator.EVMEmulator) (dict.Dict, error)) (dict.Dict, error) { emu := emulator.NewEVMEmulator( - rawdb.NewDatabase(emulator.NewKVAdapter(buffered.NewBufferedKVStoreAccess(ctx.State()))), + rawdb.NewDatabase(emulator.NewKVAdapter(evminternal.EVMStateSubrealm(buffered.NewBufferedKVStoreAccess(ctx.State())))), timestamp(ctx), ) defer emu.Close() diff --git a/contracts/native/evm/evminternal/management.go b/contracts/native/evm/evminternal/management.go index 8e3fd26a9b..f509631765 100644 --- a/contracts/native/evm/evminternal/management.go +++ b/contracts/native/evm/evminternal/management.go @@ -4,14 +4,19 @@ package evminternal import ( + "time" + + "github.com/ethereum/go-ethereum/core/types" "github.com/iotaledger/wasp/contracts/native/evm" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/assert" "github.com/iotaledger/wasp/packages/iscp/colored" "github.com/iotaledger/wasp/packages/iscp/coreutil" + "github.com/iotaledger/wasp/packages/kv" "github.com/iotaledger/wasp/packages/kv/codec" "github.com/iotaledger/wasp/packages/kv/dict" "github.com/iotaledger/wasp/packages/kv/kvdecoder" + "github.com/iotaledger/wasp/packages/kv/subrealm" "github.com/iotaledger/wasp/packages/vm/core/accounts" "github.com/iotaledger/wasp/packages/vm/core/governance" ) @@ -20,6 +25,10 @@ const ( keyGasPerIota = "g" keyEVMOwner = "o" keyNextEVMOwner = "n" + keyBlockTime = "b" + + // keyEVMState is the subrealm prefix for the EVM state + keyEVMState = "s" ) var ManagementHandlers = []coreutil.ProcessorEntryPoint{ @@ -29,6 +38,11 @@ var ManagementHandlers = []coreutil.ProcessorEntryPoint{ evm.FuncWithdrawGasFees.WithHandler(withdrawGasFees), evm.FuncGetOwner.WithHandler(getOwner), evm.FuncGetGasPerIota.WithHandler(getGasPerIota), + evm.FuncSetBlockTime.WithHandler(setBlockTime), +} + +func EVMStateSubrealm(state kv.KVStore) kv.KVStore { + return subrealm.New(state, keyEVMState) } func InitializeManagement(ctx iscp.Sandbox) { @@ -36,11 +50,59 @@ func InitializeManagement(ctx iscp.Sandbox) { ctx.State().Set(keyEVMOwner, codec.EncodeAgentID(ctx.ContractCreator())) } -func requireOwner(ctx iscp.Sandbox) { +func setBlockTime(ctx iscp.Sandbox) (dict.Dict, error) { + params := kvdecoder.New(ctx.Params(), ctx.Log()) + a := assert.NewAssert(ctx.Log()) + + blockTime := params.MustGetUint32(evm.FieldBlockTime) + a.Require(blockTime > 0, "blockTime must be > 0") + + mustSchedule := false + if !ctx.State().MustHas(keyBlockTime) { + // first call + mustSchedule = true + } + + ctx.State().Set(keyBlockTime, codec.EncodeUint32(blockTime)) + if mustSchedule { + ScheduleNextBlock(ctx) + } + return nil, nil +} + +func getBlockTime(state kv.KVStoreReader) uint32 { + bt, _ := codec.DecodeUint32(state.MustGet(keyBlockTime), 0) + return bt +} + +func ScheduleNextBlock(ctx iscp.Sandbox) { + requireOwner(ctx, true) + + a := assert.NewAssert(ctx.Log()) + + blockTime := getBlockTime(ctx.State()) + a.Require(blockTime > 0, "ScheduleNextBlock: blockTime must be > 0") + + ok := ctx.Send(ctx.ChainID().AsAddress(), colored.NewBalancesForIotas(1), &iscp.SendMetadata{ + TargetContract: ctx.Contract(), + EntryPoint: evm.FuncMintBlock.Hname(), + }, iscp.SendOptions{ + TimeLock: uint32(time.Unix(0, ctx.GetTimestamp()).Unix()) + blockTime, + }) + a.Require(ok, "failed to schedule next block") +} + +func requireOwner(ctx iscp.Sandbox, allowSelf ...bool) { contractOwner, err := codec.DecodeAgentID(ctx.State().MustGet(keyEVMOwner)) a := assert.NewAssert(ctx.Log()) a.RequireNoError(err) - a.Require(contractOwner.Equals(ctx.Caller()), "can only be called by the contract owner") + + allowed := []*iscp.AgentID{contractOwner} + if len(allowSelf) > 0 && allowSelf[0] { + allowed = append(allowed, iscp.NewAgentID(ctx.ChainID().AsAddress(), ctx.Contract())) + } + + a.RequireCaller(ctx, allowed) } func setNextOwner(ctx iscp.Sandbox) (dict.Dict, error) { @@ -102,30 +164,50 @@ func withdrawGasFees(ctx iscp.Sandbox) (dict.Dict, error) { return nil, nil } -func RequireGasFee(ctx iscp.Sandbox, txGasLimit uint64, f func() uint64) dict.Dict { +func ApplyTransaction(ctx iscp.Sandbox, apply func(tx *types.Transaction, blockTime uint32) (*types.Receipt, error)) (dict.Dict, error) { + a := assert.NewAssert(ctx.Log()) + + tx := &types.Transaction{} + err := tx.UnmarshalBinary(ctx.Params().MustGet(evm.FieldTransactionData)) + a.RequireNoError(err) + + transferredIotas, gasPerIota := takeGasFee(ctx, tx) + + blockTime := getBlockTime(ctx.State()) + receipt, err := apply(tx, blockTime) + a.RequireNoError(err) + + return refundUnusedGasFee(ctx, ctx.Caller(), transferredIotas, gasPerIota, receipt.GasUsed), nil +} + +func takeGasFee(ctx iscp.Sandbox, tx *types.Transaction) (uint64, uint64) { a := assert.NewAssert(ctx.Log()) transferredIotas := ctx.IncomingTransfer().Get(getFeeColor(ctx)) gasPerIota, err := codec.DecodeUint64(ctx.State().MustGet(keyGasPerIota), 0) a.RequireNoError(err) + txGasLimit := tx.Gas() a.Require( transferredIotas >= txGasLimit/gasPerIota, "transferred tokens (%d) not enough to cover the gas limit set in the transaction (%d at %d gas per iota token)", transferredIotas, txGasLimit, gasPerIota, ) - gasUsed := f() + return transferredIotas, gasPerIota +} +func refundUnusedGasFee(ctx iscp.Sandbox, caller *iscp.AgentID, transferredIotas, gasPerIota, gasUsed uint64) dict.Dict { iotasGasFee := gasUsed / gasPerIota if transferredIotas > iotasGasFee { // refund unspent gas fee to the sender's on-chain account iotasGasRefund := transferredIotas - iotasGasFee - _, err = ctx.Call( + _, err := ctx.Call( accounts.Contract.Hname(), accounts.FuncDeposit.Hname(), - dict.Dict{accounts.ParamAgentID: codec.EncodeAgentID(ctx.Caller())}, + dict.Dict{accounts.ParamAgentID: codec.EncodeAgentID(caller)}, colored.NewBalancesForIotas(iotasGasRefund), ) + a := assert.NewAssert(ctx.Log()) a.RequireNoError(err) } diff --git a/contracts/native/evm/evmlight/emulator/blockchaindb.go b/contracts/native/evm/evmlight/emulator/blockchaindb.go index 8f5ae71e21..5db8764dfd 100644 --- a/contracts/native/evm/evmlight/emulator/blockchaindb.go +++ b/contracts/native/evm/evmlight/emulator/blockchaindb.go @@ -4,6 +4,8 @@ package emulator import ( + "bytes" + "encoding/gob" "math/big" "github.com/ethereum/go-ethereum/common" @@ -12,26 +14,35 @@ import ( "github.com/iotaledger/wasp/packages/evm/evmtypes" "github.com/iotaledger/wasp/packages/kv" "github.com/iotaledger/wasp/packages/kv/codec" + "github.com/iotaledger/wasp/packages/kv/collections" ) const ( - keyChainID = "c" - keyGasLimit = "g" - keyNumber = "n" - keyTransactionByBlockNumber = "n:t" - keyReceiptByBlockNumber = "n:r" - keyTimestampByBlockNumber = "n:ts" - keyBlockHashByBlockNumber = "n:bh" + // config values: + + keyChainID = "c" + keyGasLimit = "g" + + // blocks: + + keyNumber = "n" + keyPendingTimestamp = "pt" + keyTransactionsByBlockNumber = "n:t" + keyReceiptsByBlockNumber = "n:r" + keyBlockHeaderByBlockNumber = "n:bh" // indexes: keyBlockNumberByBlockHash = "bh:n" keyBlockNumberByTxHash = "th:n" + keyBlockIndexByTxHash = "th:i" ) // Amount of blocks to keep in DB. Older blocks will be pruned every time a transaction is added const keepAmount = 100 +// BlockchainDB contains logic for storing a fake blockchain (more like a list of blocks), +// intended for satisfying EVM tools that depend on the concept of a block. type BlockchainDB struct { kv kv.KVStore } @@ -47,7 +58,7 @@ func (bc *BlockchainDB) Initialized() bool { func (bc *BlockchainDB) Init(chainID uint16, gasLimit, timestamp uint64) { bc.SetChainID(chainID) bc.SetGasLimit(gasLimit) - bc.AddBlock(bc.makeHeader(nil, nil, timestamp)) + bc.addBlock(bc.makeHeader(nil, nil, 0, timestamp), timestamp+1) } func (bc *BlockchainDB) SetChainID(chainID uint16) { @@ -74,30 +85,40 @@ func (bc *BlockchainDB) GetGasLimit() uint64 { return gas } -func (bc *BlockchainDB) SetNumber(n *big.Int) { - bc.kv.Set(keyNumber, n.Bytes()) +func (bc *BlockchainDB) setPendingTimestamp(timestamp uint64) { + bc.kv.Set(keyPendingTimestamp, codec.EncodeUint64(timestamp)) } -func (bc *BlockchainDB) GetNumber() *big.Int { - r := new(big.Int) - r.SetBytes(bc.kv.MustGet(keyNumber)) - return r +func (bc *BlockchainDB) getPendingTimestamp() uint64 { + timestamp, err := codec.DecodeUint64(bc.kv.MustGet(keyPendingTimestamp)) + if err != nil { + panic(err) + } + return timestamp +} + +func (bc *BlockchainDB) setNumber(n uint64) { + bc.kv.Set(keyNumber, codec.EncodeUint64(n)) } -func makeTransactionByBlockNumberKey(blockNumber *big.Int) kv.Key { - return keyTransactionByBlockNumber + kv.Key(blockNumber.Bytes()) +func (bc *BlockchainDB) GetNumber() uint64 { + n, err := codec.DecodeUint64(bc.kv.MustGet(keyNumber)) + if err != nil { + panic(err) + } + return n } -func makeReceiptByBlockNumberKey(blockNumber *big.Int) kv.Key { - return keyReceiptByBlockNumber + kv.Key(blockNumber.Bytes()) +func makeTransactionsByBlockNumberKey(blockNumber uint64) kv.Key { + return keyTransactionsByBlockNumber + kv.Key(codec.EncodeUint64(blockNumber)) } -func makeTimestampByBlockNumberKey(blockNumber *big.Int) kv.Key { - return keyTimestampByBlockNumber + kv.Key(blockNumber.Bytes()) +func makeReceiptsByBlockNumberKey(blockNumber uint64) kv.Key { + return keyReceiptsByBlockNumber + kv.Key(codec.EncodeUint64(blockNumber)) } -func makeBlockHashByBlockNumberKey(blockNumber *big.Int) kv.Key { - return keyBlockHashByBlockNumber + kv.Key(blockNumber.Bytes()) +func makeBlockHeaderByBlockNumberKey(blockNumber uint64) kv.Key { + return keyBlockHeaderByBlockNumber + kv.Key(codec.EncodeUint64(blockNumber)) } func makeBlockNumberByBlockHashKey(hash common.Hash) kv.Key { @@ -108,99 +129,230 @@ func makeBlockNumberByTxHashKey(hash common.Hash) kv.Key { return keyBlockNumberByTxHash + kv.Key(hash.Bytes()) } -func (bc *BlockchainDB) AddTransaction(tx *types.Transaction, receipt *types.Receipt, timestamp uint64) { - bc.kv.Set( - makeTransactionByBlockNumberKey(receipt.BlockNumber), - evmtypes.EncodeTransaction(tx), - ) +func makeBlockIndexByTxHashKey(hash common.Hash) kv.Key { + return keyBlockIndexByTxHash + kv.Key(hash.Bytes()) +} + +func (bc *BlockchainDB) getTxArray(blockNumber uint64) *collections.Array32 { + return collections.NewArray32(bc.kv, string(makeTransactionsByBlockNumberKey(blockNumber))) +} + +func (bc *BlockchainDB) getReceiptArray(blockNumber uint64) *collections.Array32 { + return collections.NewArray32(bc.kv, string(makeReceiptsByBlockNumberKey(blockNumber))) +} + +func (bc *BlockchainDB) GetPendingBlockNumber() uint64 { + return bc.GetNumber() + 1 +} + +func (bc *BlockchainDB) GetPendingHeader() *types.Header { + return &types.Header{ + Difficulty: &big.Int{}, + Number: new(big.Int).SetUint64(bc.GetPendingBlockNumber()), + GasLimit: bc.GetGasLimit(), + Time: bc.getPendingTimestamp(), + } +} + +func (bc *BlockchainDB) GetLatestPendingReceipt() *types.Receipt { + blockNumber := bc.GetPendingBlockNumber() + receiptArray := bc.getReceiptArray(blockNumber) + n, err := receiptArray.Len() + if err != nil { + panic(err) + } + if n == 0 { + return nil + } + return bc.GetReceiptByBlockNumberAndIndex(blockNumber, n-1) +} + +func (bc *BlockchainDB) AddTransaction(tx *types.Transaction, receipt *types.Receipt) { + blockNumber := bc.GetPendingBlockNumber() + + txArray := bc.getTxArray(blockNumber) + txArray.MustPush(evmtypes.EncodeTransaction(tx)) bc.kv.Set( - makeReceiptByBlockNumberKey(receipt.BlockNumber), - evmtypes.EncodeReceipt(receipt), + makeBlockNumberByTxHashKey(tx.Hash()), + codec.EncodeUint64(blockNumber), ) bc.kv.Set( - makeBlockNumberByTxHashKey(tx.Hash()), - receipt.BlockNumber.Bytes(), + makeBlockIndexByTxHashKey(tx.Hash()), + codec.EncodeUint32(txArray.MustLen()-1), ) - header := bc.makeHeader(tx, receipt, timestamp) - bc.AddBlock(header) - bc.prune(header.Number) + receiptArray := bc.getReceiptArray(blockNumber) + receiptArray.MustPush(evmtypes.EncodeReceipt(receipt)) } -func (bc *BlockchainDB) prune(currentNumber *big.Int) { - forget := new(big.Int).Sub(currentNumber, big.NewInt(int64(keepAmount))) - if forget.Cmp(common.Big1) >= 0 { - blockHash := bc.GetBlockHashByBlockNumber(forget) - txHash := bc.GetTransactionByBlockNumber(forget).Hash() +func (bc *BlockchainDB) MintBlock(timestamp uint64) { + blockNumber := bc.GetPendingBlockNumber() + header := bc.makeHeader( + bc.GetTransactionsByBlockNumber(blockNumber), + bc.GetReceiptsByBlockNumber(blockNumber), + blockNumber, + bc.getPendingTimestamp(), + ) + bc.addBlock(header, timestamp) + bc.prune(header.Number.Uint64()) +} - bc.kv.Del(makeTransactionByBlockNumberKey(forget)) - bc.kv.Del(makeReceiptByBlockNumberKey(forget)) - bc.kv.Del(makeTimestampByBlockNumberKey(forget)) - bc.kv.Del(makeBlockHashByBlockNumberKey(forget)) - bc.kv.Del(makeBlockNumberByBlockHashKey(blockHash)) +func (bc *BlockchainDB) prune(currentNumber uint64) { + if currentNumber <= keepAmount { + return + } + forget := currentNumber - keepAmount + blockHash := bc.GetBlockHashByBlockNumber(forget) + txs := bc.getTxArray(forget) + n := txs.MustLen() + for i := uint32(0); i < n; i++ { + txHash := bc.GetTransactionByBlockNumberAndIndex(forget, i).Hash() bc.kv.Del(makeBlockNumberByTxHashKey(txHash)) + bc.kv.Del(makeBlockIndexByTxHashKey(txHash)) + } + txs.MustErase() + bc.getReceiptArray(forget).MustErase() + bc.kv.Del(makeBlockHeaderByBlockNumberKey(forget)) + bc.kv.Del(makeBlockNumberByBlockHashKey(blockHash)) +} + +type headerGob struct { + Hash common.Hash + GasUsed uint64 + Time uint64 + TxHash common.Hash + ReceiptHash common.Hash + Bloom types.Bloom +} + +func makeHeaderGob(header *types.Header) *headerGob { + return &headerGob{ + Hash: header.Hash(), + GasUsed: header.GasUsed, + Time: header.Time, + TxHash: header.TxHash, + ReceiptHash: header.ReceiptHash, + Bloom: header.Bloom, } } -func (bc *BlockchainDB) AddBlock(header *types.Header) { - bc.kv.Set( - makeTimestampByBlockNumberKey(header.Number), - codec.EncodeUint64(header.Time), - ) +func encodeHeaderGob(g *headerGob) []byte { + buf := new(bytes.Buffer) + err := gob.NewEncoder(buf).Encode(g) + if err != nil { + panic(err) + } + return buf.Bytes() +} + +func (bc *BlockchainDB) decodeHeaderGob(b []byte) *headerGob { + var g headerGob + err := gob.NewDecoder(bytes.NewReader(b)).Decode(&g) + if err != nil { + panic(err) + } + return &g +} + +func (bc *BlockchainDB) headerFromGob(g *headerGob, blockNumber uint64) *types.Header { + var parentHash common.Hash + if blockNumber > 0 { + parentHash = bc.GetBlockHashByBlockNumber(blockNumber - 1) + } + return &types.Header{ + ParentHash: parentHash, + Number: new(big.Int).SetUint64(blockNumber), + GasLimit: bc.GetGasLimit(), + GasUsed: g.GasUsed, + Time: g.Time, + TxHash: g.TxHash, + ReceiptHash: g.ReceiptHash, + Bloom: g.Bloom, + UncleHash: types.EmptyUncleHash, + } +} + +func (bc *BlockchainDB) addBlock(header *types.Header, pendingTimestamp uint64) { + blockNumber := header.Number.Uint64() bc.kv.Set( - makeBlockHashByBlockNumberKey(header.Number), - header.Hash().Bytes(), + makeBlockHeaderByBlockNumberKey(blockNumber), + encodeHeaderGob(makeHeaderGob(header)), ) bc.kv.Set( makeBlockNumberByBlockHashKey(header.Hash()), - header.Number.Bytes(), + codec.EncodeUint64(blockNumber), ) - bc.SetNumber(header.Number) + bc.setNumber(blockNumber) + bc.setPendingTimestamp(pendingTimestamp) } -func (bc *BlockchainDB) GetReceiptByBlockNumber(blockNumber *big.Int) *types.Receipt { - b := bc.kv.MustGet(makeReceiptByBlockNumberKey(blockNumber)) - if b == nil { +func (bc *BlockchainDB) GetReceiptByBlockNumberAndIndex(blockNumber uint64, i uint32) *types.Receipt { + receipts := bc.getReceiptArray(blockNumber) + if i >= receipts.MustLen() { return nil } - r, err := evmtypes.DecodeReceipt(b) + r, err := evmtypes.DecodeReceipt(receipts.MustGetAt(i)) if err != nil { panic(err) } - tx := bc.GetTransactionByBlockNumber(blockNumber) + tx := bc.GetTransactionByBlockNumberAndIndex(blockNumber, i) r.TxHash = tx.Hash() if tx.To() == nil { from, _ := types.Sender(evmtypes.Signer(big.NewInt(int64(bc.GetChainID()))), tx) r.ContractAddress = crypto.CreateAddress(from, tx.Nonce()) } r.GasUsed = r.CumulativeGasUsed + if i > 0 { + prev, err := evmtypes.DecodeReceipt(receipts.MustGetAt(i - 1)) + if err != nil { + panic(err) + } + r.GasUsed -= prev.CumulativeGasUsed + } r.BlockHash = bc.GetBlockHashByBlockNumber(blockNumber) - r.BlockNumber = blockNumber + r.BlockNumber = new(big.Int).SetUint64(blockNumber) return r } -func (bc *BlockchainDB) GetBlockNumberByTxHash(txHash common.Hash) *big.Int { - b := bc.kv.MustGet(makeBlockNumberByTxHashKey(txHash)) +func (bc *BlockchainDB) getBlockNumberBy(key kv.Key) (uint64, bool) { + b := bc.kv.MustGet(key) if b == nil { - return nil + return 0, false + } + n, err := codec.DecodeUint64(b) + if err != nil { + panic(err) + } + return n, true +} + +func (bc *BlockchainDB) GetBlockNumberByTxHash(txHash common.Hash) (uint64, bool) { + return bc.getBlockNumberBy(makeBlockNumberByTxHashKey(txHash)) +} + +func (bc *BlockchainDB) GetBlockIndexByTxHash(txHash common.Hash) uint32 { + n, err := codec.DecodeUint32(bc.kv.MustGet(makeBlockIndexByTxHashKey(txHash)), 0) + if err != nil { + panic(err) } - return new(big.Int).SetBytes(b) + return n } func (bc *BlockchainDB) GetReceiptByTxHash(txHash common.Hash) *types.Receipt { - blockNumber := bc.GetBlockNumberByTxHash(txHash) - if blockNumber == nil { + blockNumber, ok := bc.GetBlockNumberByTxHash(txHash) + if !ok { return nil } - return bc.GetReceiptByBlockNumber(blockNumber) + i := bc.GetBlockIndexByTxHash(txHash) + return bc.GetReceiptByBlockNumberAndIndex(blockNumber, i) } -func (bc *BlockchainDB) GetTransactionByBlockNumber(blockNumber *big.Int) *types.Transaction { - b := bc.kv.MustGet(makeTransactionByBlockNumberKey(blockNumber)) - if b == nil { +func (bc *BlockchainDB) GetTransactionByBlockNumberAndIndex(blockNumber uint64, i uint32) *types.Transaction { + txs := bc.getTxArray(blockNumber) + if i >= txs.MustLen() { return nil } - tx, err := evmtypes.DecodeTransaction(b) + tx, err := evmtypes.DecodeTransaction(txs.MustGetAt(i)) if err != nil { panic(err) } @@ -208,43 +360,39 @@ func (bc *BlockchainDB) GetTransactionByBlockNumber(blockNumber *big.Int) *types } func (bc *BlockchainDB) GetTransactionByHash(txHash common.Hash) *types.Transaction { - blockNumber := bc.GetBlockNumberByTxHash(txHash) - if blockNumber == nil { + blockNumber, ok := bc.GetBlockNumberByTxHash(txHash) + if !ok { return nil } - return bc.GetTransactionByBlockNumber(blockNumber) + i := bc.GetBlockIndexByTxHash(txHash) + return bc.GetTransactionByBlockNumberAndIndex(blockNumber, i) } -func (bc *BlockchainDB) GetBlockHashByBlockNumber(blockNumber *big.Int) common.Hash { - b := bc.kv.MustGet(makeBlockHashByBlockNumberKey(blockNumber)) - if b == nil { +func (bc *BlockchainDB) GetBlockHashByBlockNumber(blockNumber uint64) common.Hash { + g := bc.getHeaderGobByBlockNumber(blockNumber) + if g == nil { return common.Hash{} } - return common.BytesToHash(b) + return g.Hash } -func (bc *BlockchainDB) GetBlockNumberByBlockHash(hash common.Hash) *big.Int { - b := bc.kv.MustGet(makeBlockNumberByBlockHashKey(hash)) - if b == nil { - return nil - } - return new(big.Int).SetBytes(b) +func (bc *BlockchainDB) GetBlockNumberByBlockHash(hash common.Hash) (uint64, bool) { + return bc.getBlockNumberBy(makeBlockNumberByBlockHashKey(hash)) } -func (bc *BlockchainDB) GetTimestampByBlockNumber(blockNumber *big.Int) uint64 { - n, err := codec.DecodeUint64(bc.kv.MustGet(makeTimestampByBlockNumberKey(blockNumber))) - if err != nil { - panic(err) +func (bc *BlockchainDB) GetTimestampByBlockNumber(blockNumber uint64) uint64 { + g := bc.getHeaderGobByBlockNumber(blockNumber) + if g == nil { + return 0 } - return n + return g.Time } -func (bc *BlockchainDB) makeHeader(tx *types.Transaction, receipt *types.Receipt, timestamp uint64) *types.Header { - if tx == nil { +func (bc *BlockchainDB) makeHeader(txs []*types.Transaction, receipts []*types.Receipt, blockNumber, timestamp uint64) *types.Header { + if blockNumber == 0 { // genesis block hash - blockNumber := common.Big0 return &types.Header{ - Number: blockNumber, + Number: new(big.Int).SetUint64(blockNumber), GasLimit: bc.GetGasLimit(), Time: timestamp, TxHash: types.EmptyRootHash, @@ -252,35 +400,42 @@ func (bc *BlockchainDB) makeHeader(tx *types.Transaction, receipt *types.Receipt UncleHash: types.EmptyUncleHash, } } - blockNumber := receipt.BlockNumber - prevBlockNumber := new(big.Int).Sub(blockNumber, common.Big1) + prevBlockNumber := blockNumber - 1 + gasUsed := uint64(0) + if len(receipts) > 0 { + gasUsed = receipts[len(receipts)-1].CumulativeGasUsed + } return &types.Header{ ParentHash: bc.GetBlockHashByBlockNumber(prevBlockNumber), - Number: blockNumber, + Number: new(big.Int).SetUint64(blockNumber), GasLimit: bc.GetGasLimit(), - GasUsed: receipt.GasUsed, + GasUsed: gasUsed, Time: timestamp, - TxHash: types.DeriveSha(types.Transactions{tx}, &fakeHasher{}), - ReceiptHash: types.DeriveSha(types.Receipts{receipt}, &fakeHasher{}), - Bloom: types.CreateBloom([]*types.Receipt{receipt}), + TxHash: types.DeriveSha(types.Transactions(txs), &fakeHasher{}), + ReceiptHash: types.DeriveSha(types.Receipts(receipts), &fakeHasher{}), + Bloom: types.CreateBloom(receipts), UncleHash: types.EmptyUncleHash, } } -func (bc *BlockchainDB) GetHeaderByBlockNumber(blockNumber *big.Int) *types.Header { - if blockNumber.Cmp(bc.GetNumber()) > 0 { +func (bc *BlockchainDB) GetHeaderByBlockNumber(blockNumber uint64) *types.Header { + if blockNumber > bc.GetNumber() { return nil } - return bc.makeHeader( - bc.GetTransactionByBlockNumber(blockNumber), - bc.GetReceiptByBlockNumber(blockNumber), - bc.GetTimestampByBlockNumber(blockNumber), - ) + return bc.headerFromGob(bc.getHeaderGobByBlockNumber(blockNumber), blockNumber) +} + +func (bc *BlockchainDB) getHeaderGobByBlockNumber(blockNumber uint64) *headerGob { + b := bc.kv.MustGet(makeBlockHeaderByBlockNumberKey(blockNumber)) + if b == nil { + return nil + } + return bc.decodeHeaderGob(b) } func (bc *BlockchainDB) GetHeaderByHash(hash common.Hash) *types.Header { - n := bc.GetBlockNumberByBlockHash(hash) - if n == nil { + n, ok := bc.GetBlockNumberByBlockHash(hash) + if !ok { return nil } return bc.GetHeaderByBlockNumber(n) @@ -290,7 +445,7 @@ func (bc *BlockchainDB) GetBlockByHash(hash common.Hash) *types.Block { return bc.makeBlock(bc.GetHeaderByHash(hash)) } -func (bc *BlockchainDB) GetBlockByNumber(blockNumber *big.Int) *types.Block { +func (bc *BlockchainDB) GetBlockByNumber(blockNumber uint64) *types.Block { return bc.makeBlock(bc.GetHeaderByBlockNumber(blockNumber)) } @@ -298,26 +453,36 @@ func (bc *BlockchainDB) GetCurrentBlock() *types.Block { return bc.GetBlockByNumber(bc.GetNumber()) } +func (bc *BlockchainDB) GetTransactionsByBlockNumber(blockNumber uint64) []*types.Transaction { + txArray := bc.getTxArray(blockNumber) + n := txArray.MustLen() + txs := make([]*types.Transaction, n) + for i := uint32(0); i < n; i++ { + txs[i] = bc.GetTransactionByBlockNumberAndIndex(blockNumber, i) + } + return txs +} + +func (bc *BlockchainDB) GetReceiptsByBlockNumber(blockNumber uint64) []*types.Receipt { + txArray := bc.getTxArray(blockNumber) + n := txArray.MustLen() + receipts := make([]*types.Receipt, n) + for i := uint32(0); i < n; i++ { + receipts[i] = bc.GetReceiptByBlockNumberAndIndex(blockNumber, i) + } + return receipts +} + func (bc *BlockchainDB) makeBlock(header *types.Header) *types.Block { if header == nil { return nil } - tx := bc.GetTransactionByBlockNumber(header.Number) - if tx == nil { - return types.NewBlock( - header, - []*types.Transaction{}, - []*types.Header{}, - []*types.Receipt{}, - &fakeHasher{}, - ) - } - receipt := bc.GetReceiptByBlockNumber(header.Number) + blockNumber := header.Number.Uint64() return types.NewBlock( header, - []*types.Transaction{tx}, + bc.GetTransactionsByBlockNumber(blockNumber), []*types.Header{}, - []*types.Receipt{receipt}, + bc.GetReceiptsByBlockNumber(blockNumber), &fakeHasher{}, ) } diff --git a/contracts/native/evm/evmlight/emulator/emulator.go b/contracts/native/evm/evmlight/emulator/emulator.go index 38c09b70e0..6fa8459f37 100644 --- a/contracts/native/evm/evmlight/emulator/emulator.go +++ b/contracts/native/evm/evmlight/emulator/emulator.go @@ -5,7 +5,6 @@ package emulator import ( "errors" - "fmt" "math/big" "github.com/ethereum/go-ethereum" @@ -179,7 +178,7 @@ func (e *EVMEmulator) EstimateGas(call ethereum.CallMsg) (uint64, error) { if errors.Is(err, core.ErrIntrinsicGas) { return true, nil, nil // Special case, raise gas limit } - return true, nil, fmt.Errorf("Bail out: %w", err) + return true, nil, xerrors.Errorf("Bail out: %w", err) } return res.Failed(), res, nil //nolint:gocritic } @@ -192,7 +191,7 @@ func (e *EVMEmulator) EstimateGas(call ethereum.CallMsg) (uint64, error) { // call or transaction will never be accepted no matter how much gas it is // assigned. Return the error directly, don't struggle any more if err != nil { - return 0, fmt.Errorf("executable(mid): %w", err) + return 0, xerrors.Errorf("executable(mid): %w", err) } if failed { lo = mid @@ -205,31 +204,22 @@ func (e *EVMEmulator) EstimateGas(call ethereum.CallMsg) (uint64, error) { if hi == max { failed, result, err := executable(hi) if err != nil { - return 0, fmt.Errorf("executable(hi): %w", err) + return 0, xerrors.Errorf("executable(hi): %w", err) } if failed { if result != nil && !errors.Is(result.Err, vm.ErrOutOfGas) { if len(result.Revert()) > 0 { return 0, newRevertError(result) } - return 0, fmt.Errorf("revert: %w", result.Err) + return 0, xerrors.Errorf("revert: %w", result.Err) } // Otherwise, the specified gas cap is too low - return 0, fmt.Errorf("gas required exceeds allowance (%d)", max) + return 0, xerrors.Errorf("gas required exceeds allowance (%d)", max) } } return hi, nil } -func (e *EVMEmulator) PendingHeader() *types.Header { - return &types.Header{ - Difficulty: &big.Int{}, - Number: new(big.Int).Add(e.BlockchainDB().GetNumber(), common.Big1), - GasLimit: e.GasLimit(), - Time: e.timestamp, - } -} - func (e *EVMEmulator) ChainContext() core.ChainContext { return &chainContext{ engine: ethash.NewFaker(), @@ -249,16 +239,16 @@ func (e *EVMEmulator) callContract(call ethereum.CallMsg) (*core.ExecutionResult } msg := callMsg{call} + pendingHeader := e.BlockchainDB().GetPendingHeader() // run the EVM code on a buffered state (so that writes are not committed) statedb := e.StateDB().Buffered().StateDB() - return e.applyMessage(msg, statedb) + return e.applyMessage(msg, statedb, pendingHeader) } -func (e *EVMEmulator) applyMessage(msg core.Message, statedb vm.StateDB) (*core.ExecutionResult, error) { - pendingHeader := e.PendingHeader() - blockContext := core.NewEVMBlockContext(pendingHeader, e.ChainContext(), nil) +func (e *EVMEmulator) applyMessage(msg core.Message, statedb vm.StateDB, header *types.Header) (*core.ExecutionResult, error) { + blockContext := core.NewEVMBlockContext(header, e.ChainContext(), nil) txContext := core.NewEVMTxContext(msg) vmEnv := vm.NewEVM(blockContext, txContext, statedb, e.chainConfig, e.vmConfig()) gasPool := core.GasPool(msg.Gas()) @@ -276,9 +266,11 @@ func (e *EVMEmulator) GetIEVMBackend() vm.ISCPBackend { return e.IEVMBackend } -// SendTransaction updates the pending block to include the given transaction. -// It returns an error if the transaction is invalid. func (e *EVMEmulator) SendTransaction(tx *types.Transaction) (*types.Receipt, error) { + buf := e.StateDB().Buffered() + statedb := buf.StateDB() + pendingHeader := e.BlockchainDB().GetPendingHeader() + sender, err := types.Sender(e.Signer(), tx) if err != nil { return nil, xerrors.Errorf("invalid transaction: %w", err) @@ -288,32 +280,35 @@ func (e *EVMEmulator) SendTransaction(tx *types.Transaction) (*types.Receipt, er return nil, xerrors.Errorf("invalid transaction nonce: got %d, want %d", tx.Nonce(), nonce) } - buf := e.StateDB().Buffered() - - pendingHeader := e.PendingHeader() msg, err := tx.AsMessage(types.MakeSigner(e.chainConfig, pendingHeader.Number), pendingHeader.BaseFee) if err != nil { return nil, err } - statedb := buf.StateDB() - - result, err := e.applyMessage(msg, statedb) + result, err := e.applyMessage(msg, statedb, pendingHeader) if err != nil { return nil, err } + cumulativeGasUsed := result.UsedGas + index := uint(0) + latest := e.BlockchainDB().GetLatestPendingReceipt() + if latest != nil { + cumulativeGasUsed += latest.CumulativeGasUsed + index = latest.TransactionIndex + 1 + } + receipt := &types.Receipt{ Type: tx.Type(), - CumulativeGasUsed: result.UsedGas, + CumulativeGasUsed: cumulativeGasUsed, TxHash: tx.Hash(), GasUsed: result.UsedGas, Logs: statedb.GetLogs(tx.Hash()), - BlockNumber: e.PendingHeader().Number, + BlockNumber: pendingHeader.Number, + TransactionIndex: index, } receipt.Bloom = types.CreateBloom(types.Receipts{receipt}) if result.Failed() { - fmt.Printf("%s - gas limit %d - gas used %d - refund %d\n", result.Err, msg.Gas(), result.UsedGas, statedb.GetRefund()) receipt.Status = types.ReceiptStatusFailed } else { receipt.Status = types.ReceiptStatusSuccessful @@ -323,12 +318,15 @@ func (e *EVMEmulator) SendTransaction(tx *types.Transaction) (*types.Receipt, er } buf.Commit() - - e.BlockchainDB().AddTransaction(tx, receipt, e.timestamp) + e.BlockchainDB().AddTransaction(tx, receipt) return receipt, nil } +func (e *EVMEmulator) MintBlock() { + e.BlockchainDB().MintBlock(e.timestamp) +} + // FilterLogs executes a log filter operation, blocking during execution and // returning all the results in one batch. func (e *EVMEmulator) FilterLogs(query *ethereum.FilterQuery) []*types.Log { @@ -340,20 +338,16 @@ func (e *EVMEmulator) getReceiptsInFilterRange(query *ethereum.FilterQuery) []*t bc := e.BlockchainDB() if query.BlockHash != nil { - blockNumber := bc.GetBlockNumberByBlockHash(*query.BlockHash) - if blockNumber == nil { - return nil - } - receipt := bc.GetReceiptByBlockNumber(blockNumber) - if receipt == nil { + blockNumber, ok := bc.GetBlockNumberByBlockHash(*query.BlockHash) + if !ok { return nil } - return []*types.Receipt{receipt} + return bc.GetReceiptsByBlockNumber(blockNumber) } // Initialize unset filter boundaries to run from genesis to chain head first := big.NewInt(1) // skip genesis since it has no logs - last := bc.GetNumber() + last := new(big.Int).SetUint64(bc.GetNumber()) from := first if query.FromBlock != nil && query.FromBlock.Cmp(first) >= 0 && query.FromBlock.Cmp(last) <= 0 { from = query.FromBlock @@ -364,10 +358,10 @@ func (e *EVMEmulator) getReceiptsInFilterRange(query *ethereum.FilterQuery) []*t } var receipts []*types.Receipt - for i := new(big.Int).Set(from); i.Cmp(to) <= 0; i = i.Add(i, common.Big1) { - receipt := bc.GetReceiptByBlockNumber(i) - if receipt != nil { - receipts = append(receipts, receipt) + { + to := to.Uint64() + for i := from.Uint64(); i <= to; i++ { + receipts = append(receipts, bc.GetReceiptsByBlockNumber(i)...) } } return receipts diff --git a/contracts/native/evm/evmlight/emulator/emulator_test.go b/contracts/native/evm/evmlight/emulator/emulator_test.go index f45f0df61c..cdd64354a6 100644 --- a/contracts/native/evm/evmlight/emulator/emulator_test.go +++ b/contracts/native/evm/evmlight/emulator/emulator_test.go @@ -52,6 +52,7 @@ func sendTransaction(t testing.TB, emu *EVMEmulator, sender *ecdsa.PrivateKey, r receipt, err := emu.SendTransaction(tx) require.NoError(t, err) + emu.MintBlock() return receipt } @@ -81,7 +82,7 @@ func TestBlockchain(t *testing.T) { require.EqualValues(t, evm.GasLimitDefault, emu.BlockchainDB().GetGasLimit()) require.EqualValues(t, evm.DefaultChainID, emu.BlockchainDB().GetChainID()) - genesis := emu.BlockchainDB().GetBlockByNumber(common.Big0) + genesis := emu.BlockchainDB().GetBlockByNumber(0) require.NotNil(t, genesis) // the genesis block has block number 0 @@ -117,13 +118,13 @@ func TestBlockchain(t *testing.T) { { receipt := sendTransaction(t, emu, faucet, receiverAddress, transferAmount, nil) - require.EqualValues(t, 1, emu.BlockchainDB().GetNumber().Uint64()) + require.EqualValues(t, 1, emu.BlockchainDB().GetNumber()) block := emu.BlockchainDB().GetCurrentBlock() require.EqualValues(t, 1, block.Header().Number.Uint64()) require.EqualValues(t, evm.GasLimitDefault, block.Header().GasLimit) require.EqualValues(t, receipt.Bloom, block.Bloom()) require.EqualValues(t, receipt.GasUsed, block.GasUsed()) - require.EqualValues(t, emu.BlockchainDB().GetBlockByNumber(common.Big0).Hash(), block.ParentHash()) + require.EqualValues(t, emu.BlockchainDB().GetBlockByNumber(0).Hash(), block.ParentHash()) } { @@ -200,12 +201,13 @@ func deployEVMContract(t testing.TB, emu *EVMEmulator, creator *ecdsa.PrivateKey receipt, err := emu.SendTransaction(tx) require.NoError(t, err) + emu.MintBlock() contractAddress := crypto.CreateAddress(creatorAddress, nonce) // assertions { - require.EqualValues(t, 1, emu.BlockchainDB().GetNumber().Uint64()) + require.EqualValues(t, 1, emu.BlockchainDB().GetNumber()) // verify contract address { @@ -284,13 +286,13 @@ func TestStorageContract(t *testing.T) { require.EqualValues(t, 42, v) // no state change - require.EqualValues(t, 1, emu.BlockchainDB().GetNumber().Uint64()) + require.EqualValues(t, 1, emu.BlockchainDB().GetNumber()) } // send tx that calls `store(43)` { callFn(faucet, "store", uint32(43)) - require.EqualValues(t, 2, emu.BlockchainDB().GetNumber().Uint64()) + require.EqualValues(t, 2, emu.BlockchainDB().GetNumber()) } // call `retrieve` view again, get 43 @@ -311,7 +313,7 @@ func TestStorageContract(t *testing.T) { require.EqualValues(t, 43, v) // no state change - require.EqualValues(t, 2, emu.BlockchainDB().GetNumber().Uint64()) + require.EqualValues(t, 2, emu.BlockchainDB().GetNumber()) } } @@ -457,26 +459,48 @@ func initBenchmark(b *testing.B) (*EVMEmulator, []*types.Transaction, dict.Dict) return emu, txs, db } -// BenchmarkEVMEmulator is a benchmark for the EVMEmulator that sends N EVM transactions. +// benchmarkEVMEmulator is a benchmark for the EVMEmulator that sends N EVM transactions +// calling `storage.store()`, committing a block every k transactions. // // run with: go test -benchmem -cpu=1 -run=' ' -bench='Bench.*' // // To generate mem and cpu profiles, add -cpuprofile=cpu.out -memprofile=mem.out // Then: go tool pprof -http :8080 {cpu,mem}.out -func BenchmarkEVMEmulator(b *testing.B) { +func benchmarkEVMEmulator(b *testing.B, k int) { // setup: deploy the storage contract and prepare N transactions to send emu, txs, db := initBenchmark(b) + var chunks [][]*types.Transaction + var chunk []*types.Transaction + for _, tx := range txs { + chunk = append(chunk, tx) + if len(chunk) == k { + chunks = append(chunks, chunk) + chunk = nil + } + } + if len(chunk) > 0 { + chunks = append(chunks, chunk) + } + b.ResetTimer() - for i := 0; i < b.N; i++ { - receipt, err := emu.SendTransaction(txs[i]) - require.NoError(b, err) - require.Equal(b, types.ReceiptStatusSuccessful, receipt.Status) + for _, chunk := range chunks { + for _, tx := range chunk { + receipt, err := emu.SendTransaction(tx) + require.NoError(b, err) + require.Equal(b, types.ReceiptStatusSuccessful, receipt.Status) + } + emu.MintBlock() } b.ReportMetric(dbSize(db)/float64(b.N), "db:bytes/op") } +func BenchmarkEVMEmulator1(b *testing.B) { benchmarkEVMEmulator(b, 1) } +func BenchmarkEVMEmulator10(b *testing.B) { benchmarkEVMEmulator(b, 10) } +func BenchmarkEVMEmulator50(b *testing.B) { benchmarkEVMEmulator(b, 50) } +func BenchmarkEVMEmulator100(b *testing.B) { benchmarkEVMEmulator(b, 100) } + func dbSize(db kv.KVStore) float64 { r := float64(0) db.MustIterate("", func(key kv.Key, value []byte) bool { diff --git a/contracts/native/evm/evmlight/impl.go b/contracts/native/evm/evmlight/impl.go index 087f6f460d..6178d93e23 100644 --- a/contracts/native/evm/evmlight/impl.go +++ b/contracts/native/evm/evmlight/impl.go @@ -4,6 +4,8 @@ package evmlight import ( + "math/big" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/iotaledger/wasp/contracts/native/evm" @@ -20,6 +22,7 @@ import ( var Processor = Contract.Processor(initialize, append( evminternal.ManagementHandlers, + evm.FuncMintBlock.WithHandler(mintBlock), evm.FuncSendTransaction.WithHandler(applyTransaction), evm.FuncGetBalance.WithHandler(getBalance), evm.FuncCallContract.WithHandler(callContract), @@ -50,7 +53,7 @@ func initialize(ctx iscp.Sandbox) (dict.Dict, error) { chainID, err := codec.DecodeUint16(ctx.Params().MustGet(evm.FieldChainID), evm.DefaultChainID) a.RequireNoError(err) emulator.Init( - evmStateSubrealm(ctx.State()), + evminternal.EVMStateSubrealm(ctx.State()), chainID, evm.GasLimitDefault, // TODO: make gas limit configurable timestamp(ctx), @@ -60,19 +63,25 @@ func initialize(ctx iscp.Sandbox) (dict.Dict, error) { return nil, nil } -func applyTransaction(ctx iscp.Sandbox) (dict.Dict, error) { - a := assert.NewAssert(ctx.Log()) - - tx := &types.Transaction{} - err := tx.UnmarshalBinary(ctx.Params().MustGet(evm.FieldTransactionData)) - a.RequireNoError(err) +func mintBlock(ctx iscp.Sandbox) (dict.Dict, error) { + evminternal.ScheduleNextBlock(ctx) + emu := createEmulator(ctx) + emu.MintBlock() + return nil, nil +} - return evminternal.RequireGasFee(ctx, tx.Gas(), func() uint64 { - emu := createEmulator(ctx) - receipt, err := emu.SendTransaction(tx) - a.RequireNoError(err) - return receipt.GasUsed - }), nil +func applyTransaction(ctx iscp.Sandbox) (dict.Dict, error) { + return evminternal.ApplyTransaction(ctx, func(tx *types.Transaction, blockTime uint32) (*types.Receipt, error) { + var emu *emulator.EVMEmulator + if blockTime > 0 { + // next block will be minted when mintBlock() is called (via timelocked request) + emu = createEmulator(ctx) + } else { + // next block will be minted when the ISCP block is closed + emu = getEmulatorInBlockContext(ctx) + } + return emu.SendTransaction(tx) + }) } func getBalance(ctx iscp.SandboxView) (dict.Dict, error) { @@ -84,7 +93,7 @@ func getBalance(ctx iscp.SandboxView) (dict.Dict, error) { func getBlockNumber(ctx iscp.SandboxView) (dict.Dict, error) { emu := createEmulatorR(ctx) - return evminternal.Result(emu.BlockchainDB().GetNumber().Bytes()), nil + return evminternal.Result(new(big.Int).SetUint64(emu.BlockchainDB().GetNumber()).Bytes()), nil } func getBlockByNumber(ctx iscp.SandboxView) (dict.Dict, error) { diff --git a/contracts/native/evm/evmlight/internal.go b/contracts/native/evm/evmlight/internal.go index 67579d4e00..3eece7f9d6 100644 --- a/contracts/native/evm/evmlight/internal.go +++ b/contracts/native/evm/evmlight/internal.go @@ -16,27 +16,28 @@ import ( "github.com/iotaledger/wasp/packages/evm/evmtypes" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/assert" - "github.com/iotaledger/wasp/packages/kv" "github.com/iotaledger/wasp/packages/kv/buffered" "github.com/iotaledger/wasp/packages/kv/codec" "github.com/iotaledger/wasp/packages/kv/dict" - "github.com/iotaledger/wasp/packages/kv/subrealm" ) -// keyEVMState is the subrealm prefix for the EVM state -// If changed, make sure it does not collide with evm management keys -const keyEVMState = "s" - -func evmStateSubrealm(state kv.KVStore) kv.KVStore { - return subrealm.New(state, keyEVMState) +// getEmulatorInBlockContext creates a new emulator instance if this is the first call to applyTransaction +// in the ISCP block; otherwise it returns the previously created instance. The purpose is to +// create a single Ethereum block for each ISCP block. +func getEmulatorInBlockContext(ctx iscp.Sandbox) *emulator.EVMEmulator { + bctx := ctx.BlockContext( + func(ctx iscp.Sandbox) interface{} { return createEmulator(ctx) }, + func(bctx interface{}) { bctx.(*emulator.EVMEmulator).MintBlock() }, + ) + return bctx.(*emulator.EVMEmulator) } func createEmulator(ctx iscp.Sandbox) *emulator.EVMEmulator { - return emulator.NewEVMEmulator(evmStateSubrealm(ctx.State()), timestamp(ctx), &iscpBackend{ctx}) + return emulator.NewEVMEmulator(evminternal.EVMStateSubrealm(ctx.State()), timestamp(ctx), &iscpBackend{ctx}) } func createEmulatorR(ctx iscp.SandboxView) *emulator.EVMEmulator { - return emulator.NewEVMEmulator(evmStateSubrealm(buffered.NewBufferedKVStoreAccess(ctx.State())), timestamp(ctx), &iscpBackendR{ctx}) + return emulator.NewEVMEmulator(evminternal.EVMStateSubrealm(buffered.NewBufferedKVStoreAccess(ctx.State())), timestamp(ctx), &iscpBackendR{ctx}) } // timestamp returns the current timestamp in seconds since epoch @@ -57,11 +58,14 @@ func txResult(emu *emulator.EVMEmulator, tx *types.Transaction) (dict.Dict, erro return nil, nil } bc := emu.BlockchainDB() - blockNumber := bc.GetBlockNumberByTxHash(tx.Hash()) + blockNumber, ok := bc.GetBlockNumberByTxHash(tx.Hash()) + if !ok { + panic("cannot find block number of tx") + } return dict.Dict{ evm.FieldTransaction: evmtypes.EncodeTransaction(tx), evm.FieldBlockHash: bc.GetBlockHashByBlockNumber(blockNumber).Bytes(), - evm.FieldBlockNumber: codec.EncodeUint64(blockNumber.Uint64()), + evm.FieldBlockNumber: codec.EncodeUint64(blockNumber), }, nil } @@ -101,17 +105,13 @@ func transactionByBlockHashAndIndex(ctx iscp.SandboxView) (*emulator.EVMEmulator a := assert.NewAssert(ctx.Log()) index, err := codec.DecodeUint64(ctx.Params().MustGet(evm.FieldTransactionIndex), 0) a.RequireNoError(err) - // all blocks contain at most 1 tx - if index > 0 { - return emu, nil - } bc := emu.BlockchainDB() - blockNumber := bc.GetBlockNumberByBlockHash(blockHash) - if blockNumber == nil { + blockNumber, ok := bc.GetBlockNumberByBlockHash(blockHash) + if !ok { return emu, nil } - return emu, bc.GetTransactionByBlockNumber(blockNumber) + return emu, bc.GetTransactionByBlockNumberAndIndex(blockNumber, uint32(index)) } func transactionByBlockNumberAndIndex(ctx iscp.SandboxView) (*emulator.EVMEmulator, *types.Transaction) { @@ -121,38 +121,34 @@ func transactionByBlockNumberAndIndex(ctx iscp.SandboxView) (*emulator.EVMEmulat a := assert.NewAssert(ctx.Log()) index, err := codec.DecodeUint64(ctx.Params().MustGet(evm.FieldTransactionIndex), 0) a.RequireNoError(err) - // all blocks contain at most 1 tx - if index > 0 { - return emu, nil - } - return emu, emu.BlockchainDB().GetTransactionByBlockNumber(blockNumber) + return emu, emu.BlockchainDB().GetTransactionByBlockNumberAndIndex(blockNumber, uint32(index)) } -func requireLatestBlock(ctx iscp.SandboxView, emu *emulator.EVMEmulator, allowPrevious bool, blockNumber *big.Int) *big.Int { +func requireLatestBlock(ctx iscp.SandboxView, emu *emulator.EVMEmulator, allowPrevious bool, blockNumber uint64) uint64 { current := emu.BlockchainDB().GetNumber() - if blockNumber.Cmp(current) != 0 { + if blockNumber != current { assert.NewAssert(ctx.Log()).Require(allowPrevious, "unsupported operation") } return blockNumber } -func paramBlockNumber(ctx iscp.SandboxView, emu *emulator.EVMEmulator, allowPrevious bool) *big.Int { +func paramBlockNumber(ctx iscp.SandboxView, emu *emulator.EVMEmulator, allowPrevious bool) uint64 { current := emu.BlockchainDB().GetNumber() if ctx.Params().MustHas(evm.FieldBlockNumber) { blockNumber := new(big.Int).SetBytes(ctx.Params().MustGet(evm.FieldBlockNumber)) - return requireLatestBlock(ctx, emu, allowPrevious, blockNumber) + return requireLatestBlock(ctx, emu, allowPrevious, blockNumber.Uint64()) } return current } -func paramBlockNumberOrHashAsNumber(ctx iscp.SandboxView, emu *emulator.EVMEmulator, allowPrevious bool) *big.Int { // nolint:unparam +func paramBlockNumberOrHashAsNumber(ctx iscp.SandboxView, emu *emulator.EVMEmulator, allowPrevious bool) uint64 { // nolint:unparam if ctx.Params().MustHas(evm.FieldBlockHash) { a := assert.NewAssert(ctx.Log()) blockHash := common.BytesToHash(ctx.Params().MustGet(evm.FieldBlockHash)) header := emu.BlockchainDB().GetHeaderByHash(blockHash) a.Require(header != nil, "block not found") - return requireLatestBlock(ctx, emu, allowPrevious, header.Number) + return requireLatestBlock(ctx, emu, allowPrevious, header.Number.Uint64()) } return paramBlockNumber(ctx, emu, allowPrevious) } diff --git a/contracts/native/evm/evmtest/evm_test.go b/contracts/native/evm/evmtest/evm_test.go index 3da67cd6ca..a6b136c8ca 100644 --- a/contracts/native/evm/evmtest/evm_test.go +++ b/contracts/native/evm/evmtest/evm_test.go @@ -7,6 +7,7 @@ import ( "bytes" "math/big" "testing" + "time" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" @@ -45,6 +46,7 @@ func TestStorageContract(t *testing.T) { // deploy solidity `storage` contract storage := evmChain.deployStorageContract(evmChain.faucetKey, 42) + require.EqualValues(t, 1, evmChain.getBlockNumber()) // call FuncCallView to call EVM contract's `retrieve` view, get 42 require.EqualValues(t, 42, storage.retrieve()) @@ -53,6 +55,7 @@ func TestStorageContract(t *testing.T) { res, err := storage.store(43) require.NoError(t, err) require.Equal(t, types.ReceiptStatusSuccessful, res.receipt.Status) + require.EqualValues(t, 2, evmChain.getBlockNumber()) // call `retrieve` view, get 43 require.EqualValues(t, 43, storage.retrieve()) @@ -438,6 +441,37 @@ func TestISCPEntropy(t *testing.T) { require.NotEqualValues(t, entropy, make([]byte, 32)) } +func TestBlockTime(t *testing.T) { + evmChain := initEVMChain(t, evmlight.Contract) + evmChain.setBlockTime(60) + + storage := evmChain.deployStorageContract(evmChain.faucetKey, 42) + require.EqualValues(t, 42, storage.retrieve()) + require.EqualValues(t, 0, evmChain.getBlockNumber()) + + res, err := storage.store(43) + require.NoError(t, err) + require.Equal(t, types.ReceiptStatusSuccessful, res.receipt.Status) + + require.EqualValues(t, 43, storage.retrieve()) + require.EqualValues(t, 0, evmChain.getBlockNumber()) + + // first block gets minted + evmChain.solo.AdvanceClockBy(61 * time.Second) + evmChain.soloChain.Sync() + require.EqualValues(t, 1, evmChain.getBlockNumber()) + block := evmChain.getBlockByNumber(1) + require.EqualValues(t, 2, len(block.Transactions())) + + // second (empty) block gets minted + evmChain.solo.AdvanceClockBy(61 * time.Second) + evmChain.soloChain.Sync() + time.Sleep(100 * time.Millisecond) // TODO this shouldn't be necessary? + require.EqualValues(t, 2, evmChain.getBlockNumber()) + block = evmChain.getBlockByNumber(2) + require.EqualValues(t, 0, len(block.Transactions())) +} + func initBenchmark(b *testing.B, evmFlavor *coreutil.ContractInfo) (*solo.Chain, []*solo.CallParams) { // setup: deploy the EVM chain log := testlogger.NewSilentLogger(b.Name(), true) diff --git a/contracts/native/evm/evmtest/utils_test.go b/contracts/native/evm/evmtest/utils_test.go index f079f775f1..efa08dd119 100644 --- a/contracts/native/evm/evmtest/utils_test.go +++ b/contracts/native/evm/evmtest/utils_test.go @@ -141,6 +141,25 @@ func (e *evmChainInstance) callView(funName string, params ...interface{}) (dict return e.soloChain.CallView(e.evmFlavor.Name, funName, params...) } +func (e *evmChainInstance) setBlockTime(t uint32) { + _, err := e.postRequest(nil, evm.FuncSetBlockTime.Name, evm.FieldBlockTime, codec.EncodeUint32(t)) + require.NoError(e.t, err) +} + +func (e *evmChainInstance) getBlockNumber() uint64 { + ret, err := e.callView(evm.FuncGetBlockNumber.Name) + require.NoError(e.t, err) + return new(big.Int).SetBytes(ret.MustGet(evm.FieldResult)).Uint64() +} + +func (e *evmChainInstance) getBlockByNumber(n uint64) *types.Block { + ret, err := e.callView(evm.FuncGetBlockByNumber.Name, evm.FieldBlockNumber, new(big.Int).SetUint64(n).Bytes()) + require.NoError(e.t, err) + block, err := evmtypes.DecodeBlock(ret.MustGet(evm.FieldResult)) + require.NoError(e.t, err) + return block +} + func (e *evmChainInstance) getCode(addr common.Address) []byte { ret, err := e.callView(evm.FuncGetCode.Name, evm.FieldAddress, addr.Bytes()) require.NoError(e.t, err) @@ -369,7 +388,7 @@ func (e *evmContractInstance) callFn(opts []ethCallOptions, fnName string, args res.receipt, err = evmtypes.DecodeReceiptFull(receiptResult.MustGet(evm.FieldResult)) require.NoError(e.chain.t, err) - require.LessOrEqual(e.chain.t, res.receipt.GasUsed, gasUsed) + require.EqualValues(e.chain.t, res.receipt.GasUsed, gasUsed) return } diff --git a/contracts/native/evm/interface.go b/contracts/native/evm/interface.go index 58ff731689..2c8ec3c5eb 100644 --- a/contracts/native/evm/interface.go +++ b/contracts/native/evm/interface.go @@ -36,6 +36,8 @@ var ( FuncSetGasPerIota = coreutil.Func("setGasPerIota") FuncGetGasPerIota = coreutil.ViewFunc("getGasPerIota") FuncWithdrawGasFees = coreutil.Func("withdrawGasFees") + FuncSetBlockTime = coreutil.Func("setBlockTime") // only implemented by evmlight + FuncMintBlock = coreutil.Func("mintBlock") // only implemented by evmlight ) const ( @@ -59,6 +61,7 @@ const ( FieldGasFee = "f" FieldGasUsed = "gu" FieldFilterQuery = "fq" + FieldBlockTime = "bt" // uint32, avg block time in seconds ) const ( diff --git a/packages/evm/evmtypes/receipt.go b/packages/evm/evmtypes/receipt.go index 5fdd3547bd..b036a4dca5 100644 --- a/packages/evm/evmtypes/receipt.go +++ b/packages/evm/evmtypes/receipt.go @@ -37,6 +37,7 @@ func EncodeReceiptFull(r *types.Receipt) []byte { m.WriteBytes(r.BlockHash.Bytes()) writeBytes(m, r.BlockNumber.Bytes()) m.WriteBytes(r.ContractAddress.Bytes()) + m.WriteUint64(r.GasUsed) return m.Bytes() } @@ -73,7 +74,9 @@ func DecodeReceiptFull(receiptBytes []byte) (*types.Receipt, error) { } r.ContractAddress.SetBytes(b) - r.GasUsed = r.CumulativeGasUsed + if r.GasUsed, err = m.ReadUint64(); err != nil { + return nil, err + } return r, nil } diff --git a/packages/iscp/assert/util.go b/packages/iscp/assert/util.go index 36a0037451..0773788bb3 100644 --- a/packages/iscp/assert/util.go +++ b/packages/iscp/assert/util.go @@ -39,11 +39,18 @@ func (a Assert) RequireNoError(err error, str ...string) { } func (a Assert) RequireChainOwner(ctx iscp.Sandbox, name ...string) { - if !ctx.ChainOwnerID().Equals(ctx.Caller()) { - if len(name) > 0 { - a.log.Panicf(a.prefix+"unauthorized access: %s", name[0]) - } else { - a.log.Panicf(a.prefix + "unauthorized access") + a.RequireCaller(ctx, []*iscp.AgentID{ctx.ChainOwnerID()}, name...) +} + +func (a Assert) RequireCaller(ctx iscp.Sandbox, allowed []*iscp.AgentID, name ...string) { + for _, agentID := range allowed { + if ctx.Caller().Equals(agentID) { + return } } + if len(name) > 0 { + a.log.Panicf(a.prefix+"%s: unauthorized access", name[0]) + } else { + a.log.Panicf(a.prefix + "unauthorized access") + } } diff --git a/packages/solo/fun.go b/packages/solo/fun.go index d13e3b7ad0..6d1c65ec23 100644 --- a/packages/solo/fun.go +++ b/packages/solo/fun.go @@ -241,9 +241,14 @@ func (ch *Chain) GetWasmBinary(progHash hashing.HashValue) ([]byte, error) { // - it can be a hash (ID) of the example smart contract ("hardcoded"). The "hardcoded" // smart contract must be made available with the call examples.AddProcessor func (ch *Chain) DeployContract(keyPair *ed25519.KeyPair, name string, programHash hashing.HashValue, params ...interface{}) error { - par := []interface{}{root.ParamProgramHash, programHash, root.ParamName, name} - par = append(par, params...) - req := NewCallParams(root.Contract.Name, root.FuncDeployContract.Name, par...).WithIotas(1) + par := codec.MakeDict(map[string]interface{}{ + root.ParamProgramHash: programHash, + root.ParamName: name, + }) + for k, v := range parseParams(params) { + par[k] = v + } + req := NewCallParams(root.Contract.Name, root.FuncDeployContract.Name, par).WithIotas(1) _, err := ch.PostRequestSync(req, keyPair) return err } diff --git a/packages/solo/solo.go b/packages/solo/solo.go index 1f0f1fdd34..b6607b1840 100644 --- a/packages/solo/solo.go +++ b/packages/solo/solo.go @@ -434,9 +434,17 @@ func (ch *Chain) collateBatch() []iscp.Request { // batchLoop mimics behavior Wasp consensus func (ch *Chain) batchLoop() { + for { + ch.Sync() + time.Sleep(50 * time.Millisecond) + } +} + +// Sync runs all ready requests +func (ch *Chain) Sync() { for { if !ch.collateAndRunBatch() { - time.Sleep(50 * time.Millisecond) + return } } } @@ -456,8 +464,8 @@ func (ch *Chain) collateAndRunBatch() bool { return false } -// backlogLen is a thread-safe function to return size of the current backlog -func (ch *Chain) backlogLen() int { //nolint:unused +// BacklogLen is a thread-safe function to return size of the current backlog +func (ch *Chain) BacklogLen() int { mstats := ch.mempool.Info() return mstats.InBufCounter - mstats.OutPoolCounter } From 46fcf1cbe4193880befc964b292187951652115e Mon Sep 17 00:00:00 2001 From: Diego Essaya Date: Thu, 4 Nov 2021 13:57:19 -0300 Subject: [PATCH 020/198] add missing requireOwner --- contracts/native/evm/evminternal/management.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contracts/native/evm/evminternal/management.go b/contracts/native/evm/evminternal/management.go index f509631765..c5356354bd 100644 --- a/contracts/native/evm/evminternal/management.go +++ b/contracts/native/evm/evminternal/management.go @@ -51,6 +51,8 @@ func InitializeManagement(ctx iscp.Sandbox) { } func setBlockTime(ctx iscp.Sandbox) (dict.Dict, error) { + requireOwner(ctx) + params := kvdecoder.New(ctx.Params(), ctx.Log()) a := assert.NewAssert(ctx.Log()) From 31840de4f085e73dfeaecc781836149643954bdc Mon Sep 17 00:00:00 2001 From: Diego Essaya Date: Thu, 4 Nov 2021 14:05:38 -0300 Subject: [PATCH 021/198] Update contracts/native/evm/evminternal/management.go Co-authored-by: Jorge Silva --- contracts/native/evm/evminternal/management.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/contracts/native/evm/evminternal/management.go b/contracts/native/evm/evminternal/management.go index c5356354bd..b63c2faa40 100644 --- a/contracts/native/evm/evminternal/management.go +++ b/contracts/native/evm/evminternal/management.go @@ -59,11 +59,7 @@ func setBlockTime(ctx iscp.Sandbox) (dict.Dict, error) { blockTime := params.MustGetUint32(evm.FieldBlockTime) a.Require(blockTime > 0, "blockTime must be > 0") - mustSchedule := false - if !ctx.State().MustHas(keyBlockTime) { - // first call - mustSchedule = true - } + mustSchedule := !ctx.State().MustHas(keyBlockTime) ctx.State().Set(keyBlockTime, codec.EncodeUint32(blockTime)) if mustSchedule { From abc4f9c3fb89a614a6dbcc8eeaff764f096cac75 Mon Sep 17 00:00:00 2001 From: Diego Essaya Date: Thu, 4 Nov 2021 14:21:08 -0300 Subject: [PATCH 022/198] fix tests --- contracts/native/evm/evminternal/management.go | 2 +- contracts/native/evm/evmtest/evm_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contracts/native/evm/evminternal/management.go b/contracts/native/evm/evminternal/management.go index b63c2faa40..5a727eb935 100644 --- a/contracts/native/evm/evminternal/management.go +++ b/contracts/native/evm/evminternal/management.go @@ -115,7 +115,7 @@ func claimOwnership(ctx iscp.Sandbox) (dict.Dict, error) { nextOwner, err := codec.DecodeAgentID(ctx.State().MustGet(keyNextEVMOwner)) a.RequireNoError(err) - a.Require(nextOwner.Equals(ctx.Caller()), "Can only be called by the contract owner") + a.RequireCaller(ctx, []*iscp.AgentID{nextOwner}) ctx.State().Set(keyEVMOwner, codec.EncodeAgentID(nextOwner)) return nil, nil diff --git a/contracts/native/evm/evmtest/evm_test.go b/contracts/native/evm/evmtest/evm_test.go index a6b136c8ca..3c6f8ca14b 100644 --- a/contracts/native/evm/evmtest/evm_test.go +++ b/contracts/native/evm/evmtest/evm_test.go @@ -217,7 +217,7 @@ func TestGasPerIotas(t *testing.T) { newGasPerIota := evm.DefaultGasPerIota * 1000 newUserWallet, _ := evmChain.solo.NewKeyPairWithFunds() err = evmChain.setGasPerIotas(newGasPerIota, iotaCallOptions{wallet: newUserWallet}) - require.Contains(t, err.Error(), "can only be called by the contract owner") + require.Contains(t, err.Error(), "unauthorized access") require.Equal(t, evm.DefaultGasPerIota, evmChain.getGasPerIotas()) // current owner is able to set a new gasPerIotas @@ -242,7 +242,7 @@ func TestWithdrawalOwnerFees(t *testing.T) { user1AgentID := iscp.NewAgentID(user1Address, 0) err := evmChain.withdrawGasFees(user1Wallet) - require.Contains(t, err.Error(), "can only be called by the contract owner") + require.Contains(t, err.Error(), "unauthorized access") // change owner to user1 err = evmChain.setNextOwner(user1AgentID) From 646c613b908a313e59f817c7344a850ccf15be31 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Thu, 4 Nov 2021 12:10:16 -0700 Subject: [PATCH 023/198] Initial new Go generator --- contracts/wasm/testcore/go/testcore/consts.go | 2 + contracts/wasm/testcore/go/testcore/keys.go | 16 +- .../wasm/testwasmlib/go/testwasmlib/consts.go | 1 + .../wasm/testwasmlib/go/testwasmlib/keys.go | 24 +- tools/schema/generator/generator.go | 149 +++++++--- tools/schema/generator/generator_go.go | 278 +----------------- .../generator/gotemplates/alltemplates.go | 6 + tools/schema/generator/gotemplates/params.go | 32 ++ tools/schema/generator/gotemplates/proxy.go | 68 +++++ tools/schema/generator/gotemplates/results.go | 32 ++ tools/schema/generator/gotemplates/state.go | 25 ++ tools/schema/generator/gotemplates/structs.go | 70 +++++ .../schema/generator/gotemplates/typedefs.go | 139 +++++++++ tools/schema/generator/templates.go | 3 + 14 files changed, 521 insertions(+), 324 deletions(-) create mode 100644 tools/schema/generator/gotemplates/params.go create mode 100644 tools/schema/generator/gotemplates/proxy.go create mode 100644 tools/schema/generator/gotemplates/results.go create mode 100644 tools/schema/generator/gotemplates/state.go create mode 100644 tools/schema/generator/gotemplates/structs.go create mode 100644 tools/schema/generator/gotemplates/typedefs.go diff --git a/contracts/wasm/testcore/go/testcore/consts.go b/contracts/wasm/testcore/go/testcore/consts.go index 678fc04456..12caa9f4f3 100644 --- a/contracts/wasm/testcore/go/testcore/consts.go +++ b/contracts/wasm/testcore/go/testcore/consts.go @@ -47,6 +47,8 @@ const ( ResultMintedColor = wasmlib.Key("mintedColor") ResultMintedSupply = wasmlib.Key("mintedSupply") ResultSandboxCall = wasmlib.Key("sandboxCall") + ResultValues = wasmlib.Key("this") + ResultVars = wasmlib.Key("this") ) const ( diff --git a/contracts/wasm/testcore/go/testcore/keys.go b/contracts/wasm/testcore/go/testcore/keys.go index eeed6a32d3..52a50f73b5 100644 --- a/contracts/wasm/testcore/go/testcore/keys.go +++ b/contracts/wasm/testcore/go/testcore/keys.go @@ -38,14 +38,16 @@ const ( IdxResultMintedColor = 25 IdxResultMintedSupply = 26 IdxResultSandboxCall = 27 - IdxStateCounter = 28 - IdxStateHnameEP = 29 - IdxStateInts = 30 - IdxStateMintedColor = 31 - IdxStateMintedSupply = 32 + IdxResultValues = 28 + IdxResultVars = 29 + IdxStateCounter = 30 + IdxStateHnameEP = 31 + IdxStateInts = 32 + IdxStateMintedColor = 33 + IdxStateMintedSupply = 34 ) -const keyMapLen = 33 +const keyMapLen = 35 var keyMap = [keyMapLen]wasmlib.Key{ ParamAddress, @@ -76,6 +78,8 @@ var keyMap = [keyMapLen]wasmlib.Key{ ResultMintedColor, ResultMintedSupply, ResultSandboxCall, + ResultValues, + ResultVars, StateCounter, StateHnameEP, StateInts, diff --git a/contracts/wasm/testwasmlib/go/testwasmlib/consts.go b/contracts/wasm/testwasmlib/go/testwasmlib/consts.go index 22d8b23905..132d9d5162 100644 --- a/contracts/wasm/testwasmlib/go/testwasmlib/consts.go +++ b/contracts/wasm/testwasmlib/go/testwasmlib/consts.go @@ -29,6 +29,7 @@ const ( ParamInt32 = wasmlib.Key("int32") ParamInt64 = wasmlib.Key("int64") ParamName = wasmlib.Key("name") + ParamParam = wasmlib.Key("this") ParamRecordIndex = wasmlib.Key("recordIndex") ParamRequestID = wasmlib.Key("requestID") ParamString = wasmlib.Key("string") diff --git a/contracts/wasm/testwasmlib/go/testwasmlib/keys.go b/contracts/wasm/testwasmlib/go/testwasmlib/keys.go index 8dbbd0d026..1962dca503 100644 --- a/contracts/wasm/testwasmlib/go/testwasmlib/keys.go +++ b/contracts/wasm/testwasmlib/go/testwasmlib/keys.go @@ -23,19 +23,20 @@ const ( IdxParamInt32 = 10 IdxParamInt64 = 11 IdxParamName = 12 - IdxParamRecordIndex = 13 - IdxParamRequestID = 14 - IdxParamString = 15 - IdxParamValue = 16 - IdxResultCount = 17 - IdxResultIotas = 18 - IdxResultLength = 19 - IdxResultRecord = 20 - IdxResultValue = 21 - IdxStateArrays = 22 + IdxParamParam = 13 + IdxParamRecordIndex = 14 + IdxParamRequestID = 15 + IdxParamString = 16 + IdxParamValue = 17 + IdxResultCount = 18 + IdxResultIotas = 19 + IdxResultLength = 20 + IdxResultRecord = 21 + IdxResultValue = 22 + IdxStateArrays = 23 ) -const keyMapLen = 23 +const keyMapLen = 24 var keyMap = [keyMapLen]wasmlib.Key{ ParamAddress, @@ -51,6 +52,7 @@ var keyMap = [keyMapLen]wasmlib.Key{ ParamInt32, ParamInt64, ParamName, + ParamParam, ParamRecordIndex, ParamRequestID, ParamString, diff --git a/tools/schema/generator/generator.go b/tools/schema/generator/generator.go index f22ceef4e1..3fd461ec54 100644 --- a/tools/schema/generator/generator.go +++ b/tools/schema/generator/generator.go @@ -24,16 +24,25 @@ const ( AliasThis = "this" constPrefix = "constPrefix" InitFunc = "Init" + KeyArray = "array" + KeyBaseType = "basetype" KeyCore = "core" + KeyExist = "exist" + KeyMap = "map" + KeyMut = "mut" KeyFunc = "func" + KeyMandatory = "mandatory" KeyParam = "param" KeyParams = "params" + KeyProxy = "proxy" KeyPtrs = "ptrs" KeyResult = "result" KeyResults = "results" KeyState = "state" KeyStruct = "struct" - KeyTypeDef = "typeDef" + KeyStructs = "structs" + KeyThis = "this" + KeyTypeDef = "typedef" KeyView = "view" KindFunc = "Func" KindView = "View" @@ -161,24 +170,30 @@ func (g *GenBase) emit(template string) { g.emitIf(strings.TrimSpace(line[5:])) continue } + if strings.HasPrefix(line, "$#set ") { + g.emitSet(strings.TrimSpace(line[6:])) + continue + } g.println("???:" + line) continue } - // then replace any remaining keys - line = emitKeyRegExp.ReplaceAllStringFunc(line, func(key string) string { - text, ok := g.keys[key[1:]] - if ok { - return text - } - return "???:" + key - }) + g.println(g.replaceKeys(line)) + } +} - // finally remove concatenation markers - line = strings.ReplaceAll(line, "$+", "") +func (g *GenBase) replaceKeys(line string) string { + // replace any keys + line = emitKeyRegExp.ReplaceAllStringFunc(line, func(key string) string { + text, ok := g.keys[key[1:]] + if ok { + return text + } + return "???:" + key + }) - g.println(line) - } + // remove concatenation markers + return strings.ReplaceAll(line, "$+", "") } func (g *GenBase) emitEach(key string) { @@ -190,12 +205,12 @@ func (g *GenBase) emitEach(key string) { template := parts[1] switch parts[0] { - case "func": + case KeyFunc: for _, g.currentFunc = range g.s.Funcs { g.setFuncKeys() g.emit(template) } - case "mandatory": + case KeyMandatory: mandatory := []*Field{} for _, g.currentField = range g.currentFunc.Params { if !g.currentField.Optional { @@ -217,8 +232,10 @@ func (g *GenBase) emitEach(key string) { g.keys[constPrefix] = PrefixState g.emitFields(g.s.StateVars, template) case KeyStruct: + g.emitFields(g.currentStruct.Fields, template) + case KeyStructs: for _, g.currentStruct = range g.s.Structs { - g.setStructKeys() + g.setKeyValues("strName", g.currentStruct.Name) g.emit(template) } case KeyTypeDef: @@ -230,9 +247,9 @@ func (g *GenBase) emitEach(key string) { func (g *GenBase) emitFields(fields []*Field, template string) { for _, g.currentField = range fields { - if g.currentField.Alias == AliasThis { - continue - } + //if g.currentField.Alias == KeyThis { + // continue + //} g.setFieldKeys() g.emit(template) } @@ -259,6 +276,17 @@ func (g *GenBase) emitIf(key string) { condition := false switch conditionKey { + case KeyArray: + condition = g.currentField.Array + case KeyBaseType: + condition = g.currentField.TypeID != 0 + case KeyExist: + proxy := g.keys[KeyProxy] + condition = g.newTypes[proxy] + case KeyMap: + condition = g.currentField.MapKey != "" + case KeyMut: + condition = g.keys[KeyMut] == "Mutable" case KeyCore: condition = g.s.CoreContracts case KeyFunc, KeyView: @@ -273,6 +301,10 @@ func (g *GenBase) emitIf(key string) { condition = len(g.s.Results) != 0 case KeyState: condition = len(g.s.StateVars) != 0 + case KeyThis: + condition = g.currentField.Alias == KeyThis + case KeyTypeDef: + condition = g.fieldIsTypeDef() case KeyPtrs: condition = len(g.currentFunc.Params) != 0 || len(g.currentFunc.Results) != 0 default: @@ -292,6 +324,33 @@ func (g *GenBase) emitIf(key string) { } } +func (g *GenBase) fieldIsTypeDef() bool { + for _, typeDef := range g.s.Typedefs { + if typeDef.Name == g.currentField.Type { + g.currentField = typeDef + g.setFieldKeys() + return true + } + } + return false +} + +func (g *GenBase) emitSet(key string) { + parts := strings.Split(key, " ") + if len(parts) != 2 { + g.println("???:" + key) + return + } + + key = parts[0] + value := g.replaceKeys(parts[1]) + g.keys[key] = value + + if key == KeyExist { + g.newTypes[value] = true + } +} + func (g *GenBase) exists(path string) (err error) { _, err = os.Stat(path) return err @@ -539,17 +598,9 @@ func (g *GenBase) scanExistingCode() ([]string, StringMap, error) { } func (g *GenBase) setFuncKeys() { - funcName := uncapitalize(g.currentFunc.FuncName[4:]) - g.keys["funcName"] = funcName - g.keys["FuncName"] = capitalize(funcName) - g.keys["func_name"] = snake(funcName) - g.keys["FUNC_NAME"] = upper(snake(funcName)) - g.keys["funcHName"] = iscp.Hn(funcName).String() - - kind := lower(g.currentFunc.FuncName[:4]) - g.keys["kind"] = kind - g.keys["Kind"] = capitalize(kind) - g.keys["KIND"] = upper(kind) + g.setKeyValues("funcName", g.currentFunc.FuncName[4:]) + g.setKeyValues("kind", g.currentFunc.FuncName[:4]) + g.keys["funcHName"] = iscp.Hn(g.keys["funcName"]).String() paramsID := "nil" if len(g.currentFunc.Params) != 0 { @@ -574,21 +625,37 @@ func (g *GenBase) setFuncKeys() { } func (g *GenBase) setFieldKeys() { - fldName := uncapitalize(g.currentField.Name) - g.keys["fldName"] = fldName - g.keys["FldName"] = capitalize(fldName) - g.keys["fld_name"] = snake(fldName) - g.keys["FLD_NAME"] = upper(snake(fldName)) + g.setKeyValues("fldName", g.currentField.Name) + g.keys["fldAlias"] = g.currentField.Alias + g.keys["FldComment"] = g.currentField.Comment g.keys["FldType"] = g.currentField.Type + fldTypeID := goTypeIds[g.currentField.Type] + if fldTypeID == "" { + fldTypeID = goTypeBytes + } + g.keys["FldTypeID"] = fldTypeID + g.keys["FldTypeKey"] = goKeys[g.currentField.Type] + g.keys["FldLangType"] = goTypes[g.currentField.Type] + g.keys["FldMapKey"] = g.currentField.MapKey + g.keys["FldMapKeyLangType"] = goTypes[g.currentField.MapKey] + g.keys["FldMapKeyKey"] = goKeys[g.currentField.MapKey] g.keys["fldIndex"] = strconv.Itoa(g.s.KeyID) g.s.KeyID++ g.keys["maxIndex"] = strconv.Itoa(g.s.KeyID) + + // native core contracts use Array16 instead of our nested array type + arrayTypeID := "wasmlib.TYPE_ARRAY" + if g.s.CoreContracts { + arrayTypeID = "wasmlib.TYPE_ARRAY16" + } + g.keys["ArrayTypeID"] = arrayTypeID } func (g *GenBase) setKeys() { g.keys["package"] = g.s.Name g.keys["Package"] = g.s.FullName + g.keys["module"] = ModuleName + strings.Replace(ModuleCwd[len(ModulePath):], "\\", "/", -1) scName := g.s.Name if g.s.CoreContracts { // strip off "core" prefix @@ -599,10 +666,10 @@ func (g *GenBase) setKeys() { g.keys["scDesc"] = g.s.Description } -func (g *GenBase) setStructKeys() { - name := uncapitalize(g.currentStruct.Name) - g.keys["strName"] = name - g.keys["StrName"] = capitalize(name) - g.keys["str_name"] = snake(name) - g.keys["STR_NAME"] = upper(snake(name)) +func (g *GenBase) setKeyValues(key, value string) { + value = uncapitalize(value) + g.keys[key] = value + g.keys[capitalize(key)] = capitalize(value) + g.keys[snake(key)] = snake(value) + g.keys[upper(snake(key))] = upper(snake(value)) } diff --git a/tools/schema/generator/generator_go.go b/tools/schema/generator/generator_go.go index aa1dd792dc..7fd0ac9554 100644 --- a/tools/schema/generator/generator_go.go +++ b/tools/schema/generator/generator_go.go @@ -54,7 +54,6 @@ var goTypeIds = StringMap{ const ( goTypeBytes = "wasmlib.TYPE_BYTES" - goTypeMap = "wasmlib.TYPE_MAP" ) type GoGenerator struct { @@ -84,14 +83,6 @@ func (g *GoGenerator) funcName(f *Func) string { return f.FuncName } -func (g *GoGenerator) generateArrayType(varType string) string { - // native core contracts use Array16 instead of our nested array type - if g.s.CoreContracts { - return "wasmlib.TYPE_ARRAY16|" + varType - } - return "wasmlib.TYPE_ARRAY|" + varType -} - func (g *GoGenerator) generateLanguageSpecificFiles() error { if g.s.CoreContracts { return nil @@ -100,233 +91,15 @@ func (g *GoGenerator) generateLanguageSpecificFiles() error { } func (g *GoGenerator) generateProxyArray(field *Field, mutability, arrayType, proxyType string) { - g.printf("\ntype %s struct {\n", arrayType) - g.printf("\tobjID int32\n") - g.printf("}\n") - - if mutability == PropMutable { - g.printf("\nfunc (a %s) Clear() {\n", arrayType) - g.printf("\twasmlib.Clear(a.objID)\n") - g.printf("}\n") - } - - g.printf("\nfunc (a %s) Length() int32 {\n", arrayType) - g.printf("\treturn wasmlib.GetLength(a.objID)\n") - g.printf("}\n") - - if field.TypeID == 0 { - g.generateProxyArrayNewType(field, proxyType, arrayType) - return - } - - // array of predefined type - g.printf("\nfunc (a %s) Get%s(index int32) wasmlib.Sc%s {\n", arrayType, field.Type, proxyType) - g.printf("\treturn wasmlib.NewSc%s(a.objID, wasmlib.Key32(index))\n", proxyType) - g.printf("}\n") -} - -func (g *GoGenerator) generateProxyArrayNewType(field *Field, proxyType, arrayType string) { - for _, subtype := range g.s.Typedefs { - if subtype.Name != field.Type { - continue - } - varType := goTypeMap - if subtype.Array { - varType = goTypeIds[subtype.Type] - if varType == "" { - varType = goTypeBytes - } - varType = g.generateArrayType(varType) - } - g.printf("\nfunc (a %s) Get%s(index int32) %s {\n", arrayType, field.Type, proxyType) - g.printf("\tsubID := wasmlib.GetObjectID(a.objID, wasmlib.Key32(index), %s)\n", varType) - g.printf("\treturn %s{objID: subID}\n", proxyType) - g.printf("}\n") - return - } - - g.printf("\nfunc (a %s) Get%s(index int32) %s {\n", arrayType, field.Type, proxyType) - g.printf("\treturn %s{objID: a.objID, keyID: wasmlib.Key32(index)}\n", proxyType) - g.printf("}\n") + panic("generateProxyArray") } func (g *GoGenerator) generateProxyMap(field *Field, mutability, mapType, proxyType string) { - keyType := goTypes[field.MapKey] - keyValue := goKeys[field.MapKey] - - g.printf("\ntype %s struct {\n", mapType) - g.printf("\tobjID int32\n") - g.printf("}\n") - - if mutability == PropMutable { - g.printf("\nfunc (m %s) Clear() {\n", mapType) - g.printf("\twasmlib.Clear(m.objID)\n") - g.printf("}\n") - } - - if field.TypeID == 0 { - g.generateProxyMapNewType(field, proxyType, mapType, keyType, keyValue) - return - } - - // map of predefined type - g.printf("\nfunc (m %s) Get%s(key %s) wasmlib.Sc%s {\n", mapType, field.Type, keyType, proxyType) - g.printf("\treturn wasmlib.NewSc%s(m.objID, %s.KeyID())\n", proxyType, keyValue) - g.printf("}\n") -} - -func (g *GoGenerator) generateProxyMapNewType(field *Field, proxyType, mapType, keyType, keyValue string) { - for _, subtype := range g.s.Typedefs { - if subtype.Name != field.Type { - continue - } - varType := goTypeMap - if subtype.Array { - varType = goTypeIds[subtype.Type] - if varType == "" { - varType = goTypeBytes - } - varType = g.generateArrayType(varType) - } - g.printf("\nfunc (m %s) Get%s(key %s) %s {\n", mapType, field.Type, keyType, proxyType) - g.printf("\tsubID := wasmlib.GetObjectID(m.objID, %s.KeyID(), %s)\n", keyValue, varType) - g.printf("\treturn %s{objID: subID}\n", proxyType) - g.printf("}\n") - return - } - - g.printf("\nfunc (m %s) Get%s(key %s) %s {\n", mapType, field.Type, keyType, proxyType) - g.printf("\treturn %s{objID: m.objID, keyID: %s.KeyID()}\n", proxyType, keyValue) - g.printf("}\n") + panic("generateProxyMap") } func (g *GoGenerator) generateProxyReference(field *Field, mutability, typeName string) { - if field.Name[0] >= 'A' && field.Name[0] <= 'Z' { - g.printf("\ntype %s%s = %s\n", mutability, field.Name, typeName) - } -} - -func (g *GoGenerator) generateProxyStruct(fields []*Field, mutability, typeName, kind string) { - typeName = mutability + typeName + kind - kind = strings.TrimSuffix(kind, "s") - - // first generate necessary array and map types - for _, field := range fields { - g.generateProxy(field, mutability) - } - - g.printf("\ntype %s struct {\n", typeName) - g.printf("\tid int32\n") - g.printf("}\n") - - for _, field := range fields { - varName := capitalize(field.Name) - varID := "idxMap[Idx" + kind + varName + "]" - if g.s.CoreContracts { - varID = kind + varName + ".KeyID()" - } - varType := goTypeIds[field.Type] - if varType == "" { - varType = goTypeBytes - } - if field.Array { - varType = g.generateArrayType(varType) - arrayType := "ArrayOf" + mutability + field.Type - g.printf("\nfunc (s %s) %s() %s {\n", typeName, varName, arrayType) - g.printf("\tarrID := wasmlib.GetObjectID(s.id, %s, %s)\n", varID, varType) - g.printf("\treturn %s{objID: arrID}\n", arrayType) - g.printf("}\n") - continue - } - if field.MapKey != "" { - varType = goTypeMap - mapType := "Map" + field.MapKey + "To" + mutability + field.Type - g.printf("\nfunc (s %s) %s() %s {\n", typeName, varName, mapType) - mapID := "s.id" - if field.Alias != AliasThis { - mapID = "mapID" - g.printf("\tmapID := wasmlib.GetObjectID(s.id, %s, %s)\n", varID, varType) - } - g.printf("\treturn %s{objID: %s}\n", mapType, mapID) - g.printf("}\n") - continue - } - - proxyType := mutability + field.Type - if field.TypeID == 0 { - g.printf("\nfunc (s %s) %s() %s {\n", typeName, varName, proxyType) - g.printf("\treturn %s{objID: s.id, keyID: %s}\n", proxyType, varID) - g.printf("}\n") - continue - } - - g.printf("\nfunc (s %s) %s() wasmlib.Sc%s {\n", typeName, varName, proxyType) - g.printf("\treturn wasmlib.NewSc%s(s.id, %s)\n", proxyType, varID) - g.printf("}\n") - } -} - -func (g *GoGenerator) generateStruct(typeDef *Struct) { - nameLen, typeLen := calculatePadding(typeDef.Fields, goTypes, false) - - g.printf("\ntype %s struct {\n", typeDef.Name) - for _, field := range typeDef.Fields { - fldName := pad(capitalize(field.Name), nameLen) - fldType := goTypes[field.Type] - if field.Comment != "" { - fldType = pad(fldType, typeLen) - } - g.printf("\t%s %s%s\n", fldName, fldType, field.Comment) - } - g.printf("}\n") - - // write encoder and decoder for struct - g.printf("\nfunc New%sFromBytes(bytes []byte) *%s {\n", typeDef.Name, typeDef.Name) - g.printf("\tdecode := wasmlib.NewBytesDecoder(bytes)\n") - g.printf("\tdata := &%s{}\n", typeDef.Name) - for _, field := range typeDef.Fields { - name := capitalize(field.Name) - g.printf("\tdata.%s = decode.%s()\n", name, field.Type) - } - g.printf("\tdecode.Close()\n") - g.printf("\treturn data\n}\n") - - g.printf("\nfunc (o *%s) Bytes() []byte {\n", typeDef.Name) - g.printf("\treturn wasmlib.NewBytesEncoder().\n") - for _, field := range typeDef.Fields { - name := capitalize(field.Name) - g.printf("\t\t%s(o.%s).\n", field.Type, name) - } - g.printf("\t\tData()\n}\n") - - g.generateStructProxy(typeDef, false) - g.generateStructProxy(typeDef, true) -} - -func (g *GoGenerator) generateStructProxy(typeDef *Struct, mutable bool) { - typeName := PropImmutable + typeDef.Name - if mutable { - typeName = PropMutable + typeDef.Name - } - - g.printf("\ntype %s struct {\n", typeName) - g.printf("\tobjID int32\n") - g.printf("\tkeyID wasmlib.Key32\n") - g.printf("}\n") - - g.printf("\nfunc (o %s) Exists() bool {\n", typeName) - g.printf("\treturn wasmlib.Exists(o.objID, o.keyID, wasmlib.TYPE_BYTES)\n") - g.printf("}\n") - - if mutable { - g.printf("\nfunc (o %s) SetValue(value *%s) {\n", typeName, typeDef.Name) - g.printf("\twasmlib.SetBytes(o.objID, o.keyID, wasmlib.TYPE_BYTES, value.Bytes())\n") - g.printf("}\n") - } - - g.printf("\nfunc (o %s) Value() *%s {\n", typeName, typeDef.Name) - g.printf("\treturn New%sFromBytes(wasmlib.GetBytes(o.objID, o.keyID, wasmlib.TYPE_BYTES))\n", typeDef.Name) - g.printf("}\n") + panic("generateProxyReference") } func (g *GoGenerator) writeConsts() { @@ -351,59 +124,32 @@ func (g *GoGenerator) writeLib() { } func (g *GoGenerator) writeParams() { - g.emit("goHeader") - - for _, f := range g.s.Funcs { - if len(f.Params) == 0 { - continue - } - g.generateProxyStruct(f.Params, PropImmutable, f.Type, "Params") - g.generateProxyStruct(f.Params, PropMutable, f.Type, "Params") - } + g.emit("params.go") } func (g *GoGenerator) writeResults() { - g.emit("goHeader") - - for _, f := range g.s.Funcs { - if len(f.Results) == 0 { - continue - } - g.generateProxyStruct(f.Results, PropImmutable, f.Type, "Results") - g.generateProxyStruct(f.Results, PropMutable, f.Type, "Results") - } + g.emit("results.go") } func (g *GoGenerator) writeSpecialMain() { - g.keys["module"] = ModuleName + strings.Replace(ModuleCwd[len(ModulePath):], "\\", "/", -1) g.emit("main.go") } func (g *GoGenerator) writeState() { - g.emit("goPackage") - if len(g.s.StateVars) != 0 { - g.emit("importWasmLib") - } - - g.generateProxyStruct(g.s.StateVars, PropImmutable, g.s.FullName, "State") - g.generateProxyStruct(g.s.StateVars, PropMutable, g.s.FullName, "State") + g.emit("state.go") } func (g *GoGenerator) writeStructs() { - g.emit("goHeader") - - for _, typeDef := range g.s.Structs { - g.generateStruct(typeDef) - } + g.emit("structs.go") } func (g *GoGenerator) writeTypeDefs() { - g.emit("goHeader") + g.emit("typedefs.go") - for _, subtype := range g.s.Typedefs { - g.generateProxy(subtype, PropImmutable) - g.generateProxy(subtype, PropMutable) - } + //for _, subtype := range g.s.Typedefs { + // g.generateProxy(subtype, PropImmutable) + // g.generateProxy(subtype, PropMutable) + //} } func emitterAccessCheck(g *GenBase) { diff --git a/tools/schema/generator/gotemplates/alltemplates.go b/tools/schema/generator/gotemplates/alltemplates.go index 6e3ddd2ae2..fbbd26b144 100644 --- a/tools/schema/generator/gotemplates/alltemplates.go +++ b/tools/schema/generator/gotemplates/alltemplates.go @@ -25,4 +25,10 @@ var GoTemplates = []map[string]string{ keysGo, libGo, mainGo, + paramsGo, + proxyGo, + resultsGo, + stateGo, + structsGo, + typedefsGo, } diff --git a/tools/schema/generator/gotemplates/params.go b/tools/schema/generator/gotemplates/params.go new file mode 100644 index 0000000000..76b6624398 --- /dev/null +++ b/tools/schema/generator/gotemplates/params.go @@ -0,0 +1,32 @@ +package gotemplates + +var paramsGo = map[string]string{ + // ******************************* + "params.go": ` +$#emit goHeader +$#each func paramsFunc +`, + // ******************************* + "paramsFunc": ` +$#if params paramsFuncParams +`, + // ******************************* + "paramsFuncParams": ` +$#set Kind Param +$#set mut Immutable +$#if param paramsProxyStruct +$#set mut Mutable +$#if param paramsProxyStruct +`, + // ******************************* + "paramsProxyStruct": ` +$#set TypeName $mut$FuncName$+Params +$#each param proxyContainers + +type $TypeName struct { + id int32 +} +$#each param proxyMethods +`, +} + diff --git a/tools/schema/generator/gotemplates/proxy.go b/tools/schema/generator/gotemplates/proxy.go new file mode 100644 index 0000000000..5ff1e53804 --- /dev/null +++ b/tools/schema/generator/gotemplates/proxy.go @@ -0,0 +1,68 @@ +package gotemplates + +var proxyGo = map[string]string{ + // ******************************* + "proxyContainers": ` +$#if array typedefProxyArray +$#if map typedefProxyMap +`, + // ******************************* + "proxyMethods": ` +$#set varID idxMap[Idx$Kind$FldName] +$#if core setCoreVarID +$#if array proxyArray proxyMethods2 +`, + // ******************************* + "proxyMethods2": ` +$#if map proxyMap proxyMethods3 +`, + // ******************************* + "proxyMethods3": ` +$#if basetype proxyBaseType proxyNewType +`, + // ******************************* + "setCoreVarID": ` +$#set varID $Kind$FldName.KeyID() +`, + // ******************************* + "proxyArray": ` + +func (s $TypeName) $FldName() ArrayOf$mut$FldType { + arrID := wasmlib.GetObjectID(s.id, $varID, $ArrayTypeID|$FldTypeID) + return ArrayOf$mut$FldType{objID: arrID} +} +`, + // ******************************* + "proxyMap": ` +$#if this proxyMapThis proxyMapOther +`, + // ******************************* + "proxyMapThis": ` + +func (s $TypeName) $FldName() Map$FldMapKey$+To$mut$FldType { + return Map$FldMapKey$+To$mut$FldType{objID: s.id} +} +`, + // ******************************* + "proxyMapOther": `55544444.0 + +func (s $TypeName) $FldName() Map$FldMapKey$+To$mut$FldType { + mapID := wasmlib.GetObjectID(s.id, $varID, wasmlib.TYPE_MAP) + return Map$FldMapKey$+To$mut$FldType{objID: mapID} +} +`, + // ******************************* + "proxyBaseType": ` + +func (s $TypeName) $FldName() wasmlib.Sc$mut$FldType { + return wasmlib.NewSc$mut$FldType(s.id, $varID) +} +`, + // ******************************* + "proxyNewType": ` + +func (s $TypeName) $FldName() $mut$FldType { + return $mut$FldType{objID: s.id, keyID: $varID} +} +`, +} diff --git a/tools/schema/generator/gotemplates/results.go b/tools/schema/generator/gotemplates/results.go new file mode 100644 index 0000000000..69de3d9b27 --- /dev/null +++ b/tools/schema/generator/gotemplates/results.go @@ -0,0 +1,32 @@ +package gotemplates + +var resultsGo = map[string]string{ + // ******************************* + "results.go": ` +$#emit goHeader +$#each func resultsFunc +`, + // ******************************* + "resultsFunc": ` +$#if results resultsFuncResults +`, + // ******************************* + "resultsFuncResults": ` +$#set Kind Result +$#set mut Immutable +$#if result resultsProxyStruct +$#set mut Mutable +$#if result resultsProxyStruct +`, + // ******************************* + "resultsProxyStruct": ` +$#set TypeName $mut$FuncName$+Results +$#each result proxyContainers + +type $TypeName struct { + id int32 +} +$#each result proxyMethods +`, +} + diff --git a/tools/schema/generator/gotemplates/state.go b/tools/schema/generator/gotemplates/state.go new file mode 100644 index 0000000000..baddad11f8 --- /dev/null +++ b/tools/schema/generator/gotemplates/state.go @@ -0,0 +1,25 @@ +package gotemplates + +var stateGo = map[string]string{ + // ******************************* + "state.go": ` +$#emit goPackage +$#if state importWasmLib +$#set Kind State +$#set mut Immutable +$#emit stateProxyStruct +$#set mut Mutable +$#emit stateProxyStruct +`, + // ******************************* + "stateProxyStruct": ` +$#set TypeName $mut$Package$+State +$#each state proxyContainers + +type $TypeName struct { + id int32 +} +$#each state proxyMethods +`, +} + diff --git a/tools/schema/generator/gotemplates/structs.go b/tools/schema/generator/gotemplates/structs.go new file mode 100644 index 0000000000..58af2c2c71 --- /dev/null +++ b/tools/schema/generator/gotemplates/structs.go @@ -0,0 +1,70 @@ +package gotemplates + +var structsGo = map[string]string{ + // ******************************* + "structs.go": ` +$#emit goHeader +$#each structs structType +`, + // ******************************* + "structType": ` + +type $StrName struct { +$#each struct structField +} + +func New$StrName$+FromBytes(bytes []byte) *$StrName { + decode := wasmlib.NewBytesDecoder(bytes) + data := &$StrName$+{} +$#each struct structDecode + decode.Close() + return data +} + +func (o *$StrName) Bytes() []byte { + return wasmlib.NewBytesEncoder(). +$#each struct structEncode + Data() +} +$#set mut Immutable +$#emit structMethods +$#set mut Mutable +$#emit structMethods +`, + // ******************************* + "structField": ` + $FldName $FldLangType $FldComment +`, + // ******************************* + "structDecode": ` + data.$FldName = decode.$FldType() +`, + // ******************************* + "structEncode": ` + $FldType(o.$FldName). +`, + // ******************************* + "structMethods": ` + +type $mut$StrName struct { + objID int32 + keyID wasmlib.Key32 +} + +func (o $mut$StrName) Exists() bool { + return wasmlib.Exists(o.objID, o.keyID, wasmlib.TYPE_BYTES) +} +$#if mut structMethodSetValue + +func (o $mut$StrName) Value() *$StrName { + return New$StrName$+FromBytes(wasmlib.GetBytes(o.objID, o.keyID, wasmlib.TYPE_BYTES)) +} +`, + // ******************************* + "structMethodSetValue": ` + +func (o $mut$StrName) SetValue(value *$StrName) { + wasmlib.SetBytes(o.objID, o.keyID, wasmlib.TYPE_BYTES, value.Bytes()) +} +`, +} diff --git a/tools/schema/generator/gotemplates/typedefs.go b/tools/schema/generator/gotemplates/typedefs.go new file mode 100644 index 0000000000..ef15327d28 --- /dev/null +++ b/tools/schema/generator/gotemplates/typedefs.go @@ -0,0 +1,139 @@ +package gotemplates + +var typedefsGo = map[string]string{ + // ******************************* + "typedefs.go": ` +$#emit goHeader +$#each typedef typedefProxy +`, + // ******************************* + "typedefProxy": ` +$#set mut Immutable +$#if array typedefProxyArray +$#if array typedefProxyAlias +$#if map typedefProxyMap +$#if map typedefProxyAlias +$#set mut Mutable +$#if array typedefProxyArray +$#if array typedefProxyAlias +$#if map typedefProxyMap +$#if map typedefProxyAlias +`, + // ******************************* + "typedefProxyAlias": ` + +type $mut$FldName = $proxy +`, + // ******************************* + "typedefProxyArray": ` +$#set proxy ArrayOf$mut$FldType +$#if exist nil typedefProxyArrayNew +`, + // ******************************* + "typedefProxyArrayNew": ` + +type $proxy struct { + objID int32 +} +$#if mut typedefProxyArrayClear + +func (a $proxy) Length() int32 { + return wasmlib.GetLength(a.objID) +} +$#if basetype typedefProxyArrayNewBaseType typedefProxyArrayNewOtherType +$#set exist $proxy +`, + // ******************************* + "typedefProxyArrayClear": ` + +func (a $proxy) Clear() { + wasmlib.Clear(a.objID) +} +`, + // ******************************* + "typedefProxyArrayNewBaseType": ` + +func (a $proxy) Get$FldType(index int32) wasmlib.Sc$mut$FldType { + return wasmlib.NewSc$mut$FldType(a.objID, wasmlib.Key32(index)) +} +`, + // ******************************* + "typedefProxyArrayNewOtherType": ` +$#set OldType $FldType +$#if typedef typedefProxyArrayNewOtherTypeTypeDef typedefProxyArrayNewOtherTypeStruct +`, + // ******************************* + "typedefProxyArrayNewOtherTypeTypeDef": ` +$#set varType wasmlib.TYPE_MAP +$#if array setVarTypeArray + +func (a $proxy) Get$OldType(index int32) $mut$OldType { + subID := wasmlib.GetObjectID(a.objID, wasmlib.Key32(index), $varType) + return $mut$OldType{objID: subID} +} +`, + // ******************************* + "typedefProxyArrayNewOtherTypeStruct": ` + +func (a $proxy) Get$FldType(index int32) $mut$FldType { + return $mut$FldType{objID: a.objID, keyID: wasmlib.Key32(index)} +} +`, + // ******************************* + "typedefProxyMap": ` +$#set proxy Map$FldMapKey$+To$mut$FldType +$#if exist nil typedefProxyMapNew +`, + // ******************************* + "typedefProxyMapNew": ` + +type $proxy struct { + objID int32 +} +$#if mut typedefProxyMapClear +$#if basetype typedefProxyMapNewBaseType typedefProxyMapNewOtherType +$#set exist $proxy +`, + // ******************************* + "typedefProxyMapClear": ` + +func (m $proxy) Clear() { + wasmlib.Clear(m.objID) +} +`, + // ******************************* + "typedefProxyMapNewBaseType": ` + +func (m $proxy) Get$FldType(key $FldMapKeyLangType) wasmlib.Sc$mut$FldType { + return wasmlib.NewSc$mut$FldType(m.objID, $FldMapKeyKey.KeyID()) +} +`, + // ******************************* + "typedefProxyMapNewOtherType": ` +$#set OldType $FldType +$#set OldMapKeyLangType $FldMapKeyLangType +$#set OldMapKeyKey $FldMapKeyKey +$#if typedef typedefProxyMapNewOtherTypeTypeDef typedefProxyMapNewOtherTypeStruct +`, + // ******************************* + "typedefProxyMapNewOtherTypeTypeDef": ` +$#set varType wasmlib.TYPE_MAP +$#if array setVarTypeArray + +func (m $proxy) Get$OldType(key $OldMapKeyLangType) $mut$OldType { + subID := wasmlib.GetObjectID(m.objID, $OldMapKeyKey.KeyID(), $varType) + return $mut$OldType{objID: subID} +} +`, + // ******************************* + "typedefProxyMapNewOtherTypeStruct": ` + +func (m $proxy) Get$FldType(key $FldMapKeyLangType) $mut$FldType { + return $mut$FldType{objID: m.objID, keyID: $FldMapKeyKey.KeyID()} +} +`, + // ******************************* + "setVarTypeArray": ` +$#set varType $ArrayTypeID|$FldTypeID +`, +} diff --git a/tools/schema/generator/templates.go b/tools/schema/generator/templates.go index 547e965e24..1e4ddffe07 100644 --- a/tools/schema/generator/templates.go +++ b/tools/schema/generator/templates.go @@ -1,6 +1,9 @@ package generator var templates = map[string]string{ + // ******************************* + "nil": ` +`, // ******************************* "copyright": ` // Copyright 2020 IOTA Stiftung From eab239c45c5b41bd4eb0edc9c59905eee53cb2b1 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Fri, 5 Nov 2021 12:19:58 +0200 Subject: [PATCH 024/198] Many channels for chainimpl --- packages/chain/chain.go | 2 +- packages/chain/chainimpl/chainimpl.go | 101 ++------- packages/chain/chainimpl/eventproc.go | 309 ++++++++++++++++++++++++++ packages/chain/chainimpl/interface.go | 30 +-- packages/chain/statemgr/statemgr.go | 6 +- packages/chain/statemgr/syncmgr.go | 2 +- 6 files changed, 348 insertions(+), 102 deletions(-) create mode 100644 packages/chain/chainimpl/eventproc.go diff --git a/packages/chain/chain.go b/packages/chain/chain.go index 5176a538eb..a4548d9d0f 100644 --- a/packages/chain/chain.go +++ b/packages/chain/chain.go @@ -27,7 +27,7 @@ type ChainCore interface { ID() *iscp.ChainID GetCommitteeInfo() *CommitteeInfo AttachToPeerMessages(fun func(recv *peering.RecvEvent)) - RequestDismissChain(reason string) + EnqueueDismissChain(reason string) StateCandidateToStateManager(state.VirtualStateAccess, ledgerstate.OutputID) Events() ChainEvents Processors() *processors.Cache diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index 748612b7a3..c1085a2bfd 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -55,7 +55,6 @@ type chainObj struct { chainStateSync coreutil.ChainStateSync stateReader state.OptimisticStateReader procset *processors.Cache - chMsg *channels.InfiniteChannel stateMgr chain.StateManager consensus chain.Consensus log *logger.Logger @@ -77,6 +76,13 @@ type chainObj struct { peeringID peering.PeeringID attachIDs []interface{} chainMetrics metrics.ChainMetrics + dismissChainMsgChannel *channels.InfiniteChannel + stateMsgChannel *channels.InfiniteChannel + offLedgerRequestPeerMsgChannel *channels.InfiniteChannel + requestAckPeerMsgChannel *channels.InfiniteChannel + missingRequestIDsPeerMsgChannel *channels.InfiniteChannel + missingRequestPeerMsgChannel *channels.InfiniteChannel + timerTickMsgChannel *channels.InfiniteChannel } type committeeStruct struct { @@ -107,7 +113,6 @@ func NewChain( ret := &chainObj{ mempool: mempool.New(state.NewOptimisticStateReader(db, chainStateSync), blobProvider, chainLog, chainMetrics), procset: processors.MustNew(processorConfig), - chMsg: channels.NewInfiniteChannel(), chainID: chainID, log: chainLog, nodeConn: nodeconnimpl.New(txstreamClient, chainLog), @@ -132,6 +137,13 @@ func NewChain( peeringID: chainID.Array(), attachIDs: make([]interface{}, 0), chainMetrics: chainMetrics, + dismissChainMsgChannel: channels.NewInfiniteChannel(), + stateMsgChannel: channels.NewInfiniteChannel(), + offLedgerRequestPeerMsgChannel: channels.NewInfiniteChannel(), + requestAckPeerMsgChannel: channels.NewInfiniteChannel(), + missingRequestIDsPeerMsgChannel: channels.NewInfiniteChannel(), + missingRequestPeerMsgChannel: channels.NewInfiniteChannel(), + timerTickMsgChannel: channels.NewInfiniteChannel(), } ret.committee.Store(&committeeStruct{}) ret.eventChainTransition.Attach(events.NewClosure(ret.processChainTransition)) @@ -144,93 +156,26 @@ func NewChain( ret.stateMgr = statemgr.New(db, ret, peers, ret.nodeConn) ret.peers = &peers ret.AttachToPeerMessages(ret.receiveChainPeerMessages) - go func() { - for msg := range ret.chMsg.Out() { - ret.dispatchMessage(msg) - } - }() + go ret.handleMessagesLoop() ret.startTimer() return ret } -func (c *chainObj) dispatchMessage(msg interface{}) { - switch msgt := msg.(type) { - case *peering.PeerMessage: - c.processPeerMessage(msgt) - case *messages.DismissChainMsg: - c.Dismiss(msgt.Reason) - case *messages.StateMsg: - c.processStateMessage(msgt) - case messages.TimerTick: - if msgt%2 == 0 { - c.stateMgr.EventTimerMsg(msgt / 2) - } else if c.consensus != nil { - c.consensus.EventTimerMsg(msgt / 2) - } - if msgt%40 == 0 { - stats := c.mempool.Info() - c.log.Debugf("mempool total = %d, ready = %d, in = %d, out = %d", stats.TotalPool, stats.ReadyCounter, stats.InPoolCounter, stats.OutPoolCounter) - } - } -} - -//nolint:funlen -func (c *chainObj) processPeerMessage(msg *peering.PeerMessage) { - switch msg.MsgType { - case messages.MsgOffLedgerRequest: - msgt, err := messages.OffLedgerRequestMsgFromBytes(msg.MsgData) - if err != nil { - c.log.Error(err) - return - } - c.ReceiveOffLedgerRequest(msgt.Req, msg.SenderNetID) - case messages.MsgRequestAck: - msgt, err := messages.RequestAckMsgFromBytes(msg.MsgData) - if err != nil { - c.log.Error(err) - return - } - c.ReceiveRequestAckMessage(msgt.ReqID, msg.SenderNetID) - case messages.MsgMissingRequestIDs: - if !c.pullMissingRequestsFromCommittee { - return - } - msgt, err := messages.MissingRequestIDsMsgFromBytes(msg.MsgData) - if err != nil { - c.log.Error(err) - return - } - c.SendMissingRequestsToPeer(msgt, msg.SenderNetID) - case messages.MsgMissingRequest: - if !c.pullMissingRequestsFromCommittee { - return - } - msgt, err := messages.MissingRequestMsgFromBytes(msg.MsgData) - if err != nil { - c.log.Error(err) - return - } - if c.consensus.ShouldReceiveMissingRequest(msgt.Request) { - c.mempool.ReceiveRequest(msgt.Request) - } - default: - c.log.Errorf("processPeerMessage: wrong msg type") - } -} - func (c *chainObj) receiveCommitteePeerMessages(event *peering.RecvEvent) { if event.Msg.MsgType == messages.MsgMissingRequestIDs { - c.receiveMessage(event.Msg) + c.enqueueMissingRequestIDsPeerMsg(event.Msg) } } func (c *chainObj) receiveChainPeerMessages(event *peering.RecvEvent) { + msg := event.Msg switch event.Msg.MsgType { - case - messages.MsgOffLedgerRequest, - messages.MsgRequestAck, - messages.MsgMissingRequest: - c.receiveMessage(event.Msg) + case messages.MsgOffLedgerRequest: + c.enqueueOffLedgerRequestPeerMsg(msg) + case messages.MsgRequestAck: + c.enqueueRequestAckPeerMsg(msg) + case messages.MsgMissingRequest: + c.enqueueMissingRequestPeerMsg(msg) default: } } diff --git a/packages/chain/chainimpl/eventproc.go b/packages/chain/chainimpl/eventproc.go new file mode 100644 index 0000000000..ab00619e06 --- /dev/null +++ b/packages/chain/chainimpl/eventproc.go @@ -0,0 +1,309 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +package chainimpl + +import ( + "time" + + "github.com/iotaledger/goshimmer/packages/ledgerstate" + "github.com/iotaledger/wasp/packages/chain/messages" + "github.com/iotaledger/wasp/packages/peering" + // "github.com/iotaledger/wasp/packages/hashing" + // "github.com/iotaledger/wasp/packages/iscp" + // "github.com/iotaledger/wasp/packages/state" + // "github.com/iotaledger/wasp/packages/util" +) + +func (c *chainObj) handleMessagesLoop() { + nDismissChainMsgChannel := c.dismissChainMsgChannel.Out() + nStateMsgChannel := c.stateMsgChannel.Out() + nOffLedgerRequestPeerMsgChannel := c.offLedgerRequestPeerMsgChannel.Out() + nRequestAckPeerMsgChannel := c.requestAckPeerMsgChannel.Out() + nMissingRequestIDsPeerMsgChannel := c.missingRequestIDsPeerMsgChannel.Out() + nMissingRequestPeerMsgChannel := c.missingRequestPeerMsgChannel.Out() + nTimerTickMsgChannel := c.timerTickMsgChannel.Out() + for { + select { + case msg, ok := <-nDismissChainMsgChannel: + if ok { + c.handleDismissChain(msg.(messages.DismissChainMsg)) + } else { + nDismissChainMsgChannel = nil + } + case msg, ok := <-nStateMsgChannel: + if ok { + c.handleLedgerState(msg.(*messages.StateMsg)) + } else { + nStateMsgChannel = nil + } + case msg, ok := <-nOffLedgerRequestPeerMsgChannel: + if ok { + c.handleOffLedgerRequestPeerMsg(msg.(*peering.PeerMessage)) + } else { + nOffLedgerRequestPeerMsgChannel = nil + } + case msg, ok := <-nRequestAckPeerMsgChannel: + if ok { + c.handleRequestAckPeerMsg(msg.(*peering.PeerMessage)) + } else { + nRequestAckPeerMsgChannel = nil + } + case msg, ok := <-nMissingRequestIDsPeerMsgChannel: + if ok { + c.handleMissingRequestIDsPeerMsg(msg.(*peering.PeerMessage)) + } else { + nMissingRequestIDsPeerMsgChannel = nil + } + case msg, ok := <-nMissingRequestPeerMsgChannel: + if ok { + c.handleMissingRequestPeerMsg(msg.(*peering.PeerMessage)) + } else { + nMissingRequestPeerMsgChannel = nil + } + case msg, ok := <-nTimerTickMsgChannel: + if ok { + c.handleTimerTick(msg.(messages.TimerTick)) + } else { + nTimerTickMsgChannel = nil + } + } + if nDismissChainMsgChannel == nil && + nStateMsgChannel == nil && + nOffLedgerRequestPeerMsgChannel == nil && + nRequestAckPeerMsgChannel == nil && + nMissingRequestIDsPeerMsgChannel == nil && + nMissingRequestPeerMsgChannel == nil && + nTimerTickMsgChannel == nil { + return + } + } +} + +func (c *chainObj) EnqueueDismissChain(reason string) { + c.dismissChainMsgChannel.In() <- messages.DismissChainMsg{Reason: reason} +} + +func (c *chainObj) handleDismissChain(msg messages.DismissChainMsg) { + c.Dismiss(msg.Reason) +} + +func (c *chainObj) enqueueMissingRequestIDsPeerMsg(peerMsg *peering.PeerMessage) { + c.missingRequestIDsPeerMsgChannel.In() <- peerMsg +} + +func (c *chainObj) handleMissingRequestIDsPeerMsg(peerMsg *peering.PeerMessage) { + if !c.pullMissingRequestsFromCommittee { + return + } + msg, err := messages.MissingRequestIDsMsgFromBytes(peerMsg.MsgData) + if err != nil { + c.log.Error(err) + return + } + c.SendMissingRequestsToPeer(msg, peerMsg.SenderNetID) +} + +func (c *chainObj) enqueueOffLedgerRequestPeerMsg(peerMsg *peering.PeerMessage) { + c.offLedgerRequestPeerMsgChannel.In() <- peerMsg +} + +func (c *chainObj) handleOffLedgerRequestPeerMsg(peerMsg *peering.PeerMessage) { + msg, err := messages.OffLedgerRequestMsgFromBytes(peerMsg.MsgData) + if err != nil { + c.log.Error(err) + return + } + c.ReceiveOffLedgerRequest(msg.Req, peerMsg.SenderNetID) +} + +func (c *chainObj) enqueueRequestAckPeerMsg(peerMsg *peering.PeerMessage) { + c.requestAckPeerMsgChannel.In() <- peerMsg +} + +func (c *chainObj) handleRequestAckPeerMsg(peerMsg *peering.PeerMessage) { + msg, err := messages.RequestAckMsgFromBytes(peerMsg.MsgData) + if err != nil { + c.log.Error(err) + return + } + c.ReceiveRequestAckMessage(msg.ReqID, peerMsg.SenderNetID) +} + +func (c *chainObj) enqueueMissingRequestPeerMsg(peerMsg *peering.PeerMessage) { + c.missingRequestPeerMsgChannel.In() <- peerMsg +} + +func (c *chainObj) handleMissingRequestPeerMsg(peerMsg *peering.PeerMessage) { + if !c.pullMissingRequestsFromCommittee { + return + } + msg, err := messages.MissingRequestMsgFromBytes(peerMsg.MsgData) + if err != nil { + c.log.Error(err) + return + } + if c.consensus.ShouldReceiveMissingRequest(msg.Request) { + c.mempool.ReceiveRequest(msg.Request) + } +} + +func (c *chainObj) enqueueLedgerState(chainOutput *ledgerstate.AliasOutput, timestamp time.Time) { + c.stateMsgChannel.In() <- &messages.StateMsg{ + ChainOutput: chainOutput, + Timestamp: timestamp, + } +} + +func (c *chainObj) handleLedgerState(msg *messages.StateMsg) { + c.processStateMessage(msg) +} + +func (c *chainObj) enqueueTimerTick(tick int) { + c.timerTickMsgChannel.In() <- messages.TimerTick(tick) +} + +func (c *chainObj) handleTimerTick(msg messages.TimerTick) { + if msg%2 == 0 { + c.stateMgr.EventTimerMsg(msg / 2) + } else if c.consensus != nil { + c.consensus.EventTimerMsg(msg / 2) + } + if msg%40 == 0 { + stats := c.mempool.Info() + c.log.Debugf("mempool total = %d, ready = %d, in = %d, out = %d", stats.TotalPool, stats.ReadyCounter, stats.InPoolCounter, stats.OutPoolCounter) + } +} + +/*// EventGetBlockMsg is a request for a block while syncing +func (sm *stateManager) EventGetBlockMsg(msg *messages.GetBlockMsg) { + sm.eventGetBlockMsgCh <- msg +} + +func (sm *stateManager) eventGetBlockMsg(msg *messages.GetBlockMsg) { + sm.log.Debugw("EventGetBlockMsg received: ", + "sender", msg.SenderNetID, + "block index", msg.BlockIndex, + ) + if sm.stateOutput == nil { // Not a necessary check, only for optimization. + sm.log.Debugf("EventGetBlockMsg ignored: stateOutput is nil") + return + } + if msg.BlockIndex > sm.stateOutput.GetStateIndex() { // Not a necessary check, only for optimization. + sm.log.Debugf("EventGetBlockMsg ignored 1: block #%d not found. Current state index: #%d", + msg.BlockIndex, sm.stateOutput.GetStateIndex()) + return + } + blockBytes, err := state.LoadBlockBytes(sm.store, msg.BlockIndex) + if err != nil { + sm.log.Errorf("EventGetBlockMsg: LoadBlockBytes: %v", err) + return + } + if blockBytes == nil { + sm.log.Debugf("EventGetBlockMsg ignored 2: block #%d not found. Current state index: #%d", + msg.BlockIndex, sm.stateOutput.GetStateIndex()) + return + } + + sm.log.Debugf("EventGetBlockMsg for state index #%d --> responding to peer %s", msg.BlockIndex, msg.SenderNetID) + + sm.peers.SendSimple(msg.SenderNetID, messages.MsgBlock, util.MustBytes(&messages.BlockMsg{ + BlockBytes: blockBytes, + })) +} + +// EventBlockMsg +func (sm *stateManager) EventBlockMsg(msg *messages.BlockMsg) { + sm.eventBlockMsgCh <- msg +} + +func (sm *stateManager) eventBlockMsg(msg *messages.BlockMsg) { + sm.log.Debugf("EventBlockMsg received from %v", msg.SenderNetID) + if sm.stateOutput == nil { + sm.log.Debugf("EventBlockMsg ignored: stateOutput is nil") + return + } + block, err := state.BlockFromBytes(msg.BlockBytes) + if err != nil { + sm.log.Warnf("EventBlockMsg ignored: wrong block received from peer %s. Err: %v", msg.SenderNetID, err) + return + } + sm.log.Debugw("EventBlockMsg from ", + "sender", msg.SenderNetID, + "block index", block.BlockIndex(), + "approving output", iscp.OID(block.ApprovingOutputID()), + ) + if sm.addBlockFromPeer(block) { + sm.takeAction() + } +} + +func (sm *stateManager) EventOutputMsg(msg ledgerstate.Output) { + sm.eventOutputMsgCh <- msg +} + +func (sm *stateManager) eventOutputMsg(msg ledgerstate.Output) { + sm.log.Debugf("EventOutputMsg received: %s", iscp.OID(msg.ID())) + chainOutput, ok := msg.(*ledgerstate.AliasOutput) + if !ok { + sm.log.Debugf("EventOutputMsg ignored: output is of type %t, expecting *ledgerstate.AliasOutput", msg) + return + } + if sm.outputPulled(chainOutput) { + sm.takeAction() + } +} + +// EventStateTransactionMsg triggered whenever new state transaction arrives +// the state transaction may be confirmed or not +func (sm *stateManager) EventStateMsg(msg *messages.StateMsg) { + sm.eventStateOutputMsgCh <- msg +} + +func (sm *stateManager) eventStateMsg(msg *messages.StateMsg) { + sm.log.Debugw("EventStateMsg received: ", + "state index", msg.ChainOutput.GetStateIndex(), + "chainOutput", iscp.OID(msg.ChainOutput.ID()), + ) + stateHash, err := hashing.HashValueFromBytes(msg.ChainOutput.GetStateData()) + if err != nil { + sm.log.Errorf("EventStateMsg ignored: failed to parse state hash: %v", err) + return + } + sm.log.Debugf("EventStateMsg state hash is %v", stateHash.String()) + if sm.stateOutputReceived(msg.ChainOutput, msg.Timestamp) { + sm.takeAction() + } +} + +func (sm *stateManager) EventStateCandidateMsg(state state.VirtualStateAccess, outputID ledgerstate.OutputID) { + sm.eventStateCandidateMsgCh <- &messages.StateCandidateMsg{ + State: state, + ApprovingOutputID: outputID, + } +} + +func (sm *stateManager) eventStateCandidateMsg(msg *messages.StateCandidateMsg) { + sm.log.Debugf("EventStateCandidateMsg received: state index: %d, timestamp: %v", + msg.State.BlockIndex(), msg.State.Timestamp(), + ) + if sm.stateOutput == nil { + sm.log.Debugf("EventStateCandidateMsg ignored: stateOutput is nil") + return + } + if sm.addStateCandidateFromConsensus(msg.State, msg.ApprovingOutputID) { + sm.takeAction() + } +} + +func (sm *stateManager) EventTimerMsg(msg messages.TimerTick) { + if msg%2 == 0 { + sm.eventTimerMsgCh <- msg + } +} + +func (sm *stateManager) eventTimerMsg() { + sm.log.Debugf("EventTimerMsg received") + sm.takeAction() +} +*/ diff --git a/packages/chain/chainimpl/interface.go b/packages/chain/chainimpl/interface.go index 0ac8771469..f8fe056387 100644 --- a/packages/chain/chainimpl/interface.go +++ b/packages/chain/chainimpl/interface.go @@ -51,7 +51,7 @@ func (c *chainObj) startTimer() { tick := 0 for !c.IsDismissed() { time.Sleep(chain.TimerTickPeriod) - c.receiveMessage(messages.TimerTick(tick)) + c.enqueueTimerTick(tick) tick++ } }() @@ -63,7 +63,13 @@ func (c *chainObj) Dismiss(reason string) { c.dismissOnce.Do(func() { c.dismissed.Store(true) - c.chMsg.Close() + c.dismissChainMsgChannel.Close() + c.stateMsgChannel.Close() + c.offLedgerRequestPeerMsgChannel.Close() + c.requestAckPeerMsgChannel.Close() + c.missingRequestIDsPeerMsgChannel.Close() + c.missingRequestPeerMsgChannel.Close() + c.timerTickMsgChannel.Close() c.mempool.Close() c.stateMgr.Close() @@ -92,12 +98,8 @@ func (c *chainObj) AttachToPeerMessages(fun func(recv *peering.RecvEvent)) { c.attachIDs = append(c.attachIDs, (*c.peers).Attach(&c.peeringID, fun)) } -func (c *chainObj) RequestDismissChain(reason string) { - c.receiveMessage(messages.DismissChainMsg{Reason: reason}) -} - -func (c *chainObj) StateCandidateToStateManager(state state.VirtualStateAccess, outputID ledgerstate.OutputID) { - c.stateMgr.EventStateCandidateMsg(state, outputID) +func (c *chainObj) StateCandidateToStateManager(virtualState state.VirtualStateAccess, outputID ledgerstate.OutputID) { + c.stateMgr.EventStateCandidateMsg(virtualState, outputID) } // ReceiveMessage accepts an incoming message asynchronously. @@ -106,13 +108,6 @@ func (c *chainObj) StateCandidateToStateManager(state state.VirtualStateAccess, c.chainMetrics.CountMessages() TODO }*/ -func (c *chainObj) receiveMessage(msg interface{}) { - if c.IsDismissed() { - return - } - c.chMsg.In() <- msg -} - func shouldSendToPeer(peerID string, ackPeers []string) bool { for _, p := range ackPeers { if p == peerID { @@ -231,10 +226,7 @@ func (c *chainObj) ReceiveRequest(req iscp.Request) { func (c *chainObj) ReceiveState(stateOutput *ledgerstate.AliasOutput, timestamp time.Time) { c.log.Debugf("ReceiveState #%d: outputID: %s, stateAddr: %s", stateOutput.GetStateIndex(), iscp.OID(stateOutput.ID()), stateOutput.GetStateAddress().Base58()) - c.receiveMessage(&messages.StateMsg{ - ChainOutput: stateOutput, - Timestamp: timestamp, - }) + c.enqueueLedgerState(stateOutput, timestamp) } func (c *chainObj) ReceiveInclusionState(txID ledgerstate.TransactionID, inclusionState ledgerstate.InclusionState) { diff --git a/packages/chain/statemgr/statemgr.go b/packages/chain/statemgr/statemgr.go index 720bf7f0ef..399f3e2b46 100644 --- a/packages/chain/statemgr/statemgr.go +++ b/packages/chain/statemgr/statemgr.go @@ -117,7 +117,7 @@ func (sm *stateManager) Close() { func (sm *stateManager) initLoadState() { solidState, stateExists, err := state.LoadSolidState(sm.store, sm.chain.ID()) if err != nil { - sm.chain.RequestDismissChain(fmt.Sprintf("StateManager.initLoadState: %v", err)) + sm.chain.EnqueueDismissChain(fmt.Sprintf("StateManager.initLoadState: %v", err)) return } if stateExists { @@ -127,7 +127,7 @@ func (sm *stateManager) initLoadState() { solidState.BlockIndex(), solidState.StateCommitment().String()) } else if err := sm.createOriginState(); err != nil { // create origin state in DB - sm.chain.RequestDismissChain(fmt.Sprintf("StateManager.initLoadState. Failed to create origin state: %v", err)) + sm.chain.EnqueueDismissChain(fmt.Sprintf("StateManager.initLoadState. Failed to create origin state: %v", err)) return } sm.recvLoop() // Check to process external events. @@ -141,7 +141,7 @@ func (sm *stateManager) createOriginState() error { sm.chain.GlobalStateSync().SetSolidIndex(0) if err != nil { - sm.chain.RequestDismissChain(fmt.Sprintf("StateManager.initLoadState. Failed to create origin state: %v", err)) + sm.chain.EnqueueDismissChain(fmt.Sprintf("StateManager.initLoadState. Failed to create origin state: %v", err)) return err } sm.log.Infof("ORIGIN STATE has been created") diff --git a/packages/chain/statemgr/syncmgr.go b/packages/chain/statemgr/syncmgr.go index 510d06b165..ae6bc91d5c 100644 --- a/packages/chain/statemgr/syncmgr.go +++ b/packages/chain/statemgr/syncmgr.go @@ -79,7 +79,7 @@ func (sm *stateManager) doSyncActionIfNeeded() { i, requestBlockRetryTime, blockCandidatesCount, approvedBlockCandidatesCount) // TODO: temporary if. We need to find a solution to synchronize over large gaps. Making state snapshots may help. if i > startSyncFromIndex+maxBlocksToCommitConst { - sm.chain.RequestDismissChain(fmt.Sprintf("StateManager.doSyncActionIfNeeded: too many blocks to catch up: %v", sm.stateOutput.GetStateIndex()-startSyncFromIndex+1)) + sm.chain.EnqueueDismissChain(fmt.Sprintf("StateManager.doSyncActionIfNeeded: too many blocks to catch up: %v", sm.stateOutput.GetStateIndex()-startSyncFromIndex+1)) return } nowis := time.Now() From 9c02f90141c1828a95b460db3b6028da6f147681 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Fri, 5 Nov 2021 13:47:20 +0200 Subject: [PATCH 025/198] Some chainimpl methods moved --- packages/chain/chainimpl/chainimpl.go | 27 -------------- packages/chain/chainimpl/eventproc.go | 36 +++++++++++++++++-- packages/chain/chainimpl/interface.go | 11 ------ .../testutil/testchain/mock_chain_core.go | 2 +- 4 files changed, 34 insertions(+), 42 deletions(-) diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index c1085a2bfd..956e0e06b0 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -19,7 +19,6 @@ import ( "github.com/iotaledger/wasp/packages/chain/messages" "github.com/iotaledger/wasp/packages/chain/nodeconnimpl" "github.com/iotaledger/wasp/packages/chain/statemgr" - "github.com/iotaledger/wasp/packages/hashing" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/coreutil" "github.com/iotaledger/wasp/packages/kv" @@ -251,32 +250,6 @@ func (c *chainObj) publishNewBlockEvents(blockIndex uint32) { }() } -// processStateMessage processes the only chain output which exists on the chain's address -// If necessary, it creates/changes/rotates committee object -func (c *chainObj) processStateMessage(msg *messages.StateMsg) { - sh, err := hashing.HashValueFromBytes(msg.ChainOutput.GetStateData()) - if err != nil { - c.log.Error(xerrors.Errorf("parsing state hash: %w", err)) - return - } - c.log.Debugf("processStateMessage. stateIndex: %d, stateHash: %s, stateAddr: %s, state transition: %v", - msg.ChainOutput.GetStateIndex(), sh.String(), - msg.ChainOutput.GetStateAddress().Base58(), !msg.ChainOutput.GetIsGovernanceUpdated(), - ) - cmt := c.getCommittee() - - if cmt != nil { - err = c.rotateCommitteeIfNeeded(msg.ChainOutput, cmt) - } else { - err = c.createCommitteeIfNeeded(msg.ChainOutput) - } - if err != nil { - c.log.Errorf("processStateMessage: %v", err) - return - } - c.stateMgr.EventStateMsg(msg) -} - func (c *chainObj) rotateCommitteeIfNeeded(anchorOutput *ledgerstate.AliasOutput, currentCmt chain.Committee) error { if currentCmt.Address().Equals(anchorOutput.GetStateAddress()) { // nothing changed. no rotation diff --git a/packages/chain/chainimpl/eventproc.go b/packages/chain/chainimpl/eventproc.go index ab00619e06..77a3371cf7 100644 --- a/packages/chain/chainimpl/eventproc.go +++ b/packages/chain/chainimpl/eventproc.go @@ -8,8 +8,9 @@ import ( "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/wasp/packages/chain/messages" + "github.com/iotaledger/wasp/packages/hashing" "github.com/iotaledger/wasp/packages/peering" - // "github.com/iotaledger/wasp/packages/hashing" + "golang.org/x/xerrors" // "github.com/iotaledger/wasp/packages/iscp" // "github.com/iotaledger/wasp/packages/state" // "github.com/iotaledger/wasp/packages/util" @@ -101,7 +102,14 @@ func (c *chainObj) handleMissingRequestIDsPeerMsg(peerMsg *peering.PeerMessage) c.log.Error(err) return } - c.SendMissingRequestsToPeer(msg, peerMsg.SenderNetID) + peerID := peerMsg.SenderNetID + for _, reqID := range msg.IDs { + c.log.Debugf("Sending MissingRequestsToPeer: reqID: %s, peerID: %s", reqID.Base58(), peerID) + if req := c.mempool.GetRequest(reqID); req != nil { + msg := messages.NewMissingRequestMsg(req) + (*c.peers).SendSimple(peerID, messages.MsgMissingRequest, msg.Bytes()) + } + } } func (c *chainObj) enqueueOffLedgerRequestPeerMsg(peerMsg *peering.PeerMessage) { @@ -155,8 +163,30 @@ func (c *chainObj) enqueueLedgerState(chainOutput *ledgerstate.AliasOutput, time } } +// handleLedgerState processes the only chain output which exists on the chain's address +// If necessary, it creates/changes/rotates committee object func (c *chainObj) handleLedgerState(msg *messages.StateMsg) { - c.processStateMessage(msg) + sh, err := hashing.HashValueFromBytes(msg.ChainOutput.GetStateData()) + if err != nil { + c.log.Error(xerrors.Errorf("parsing state hash: %w", err)) + return + } + c.log.Debugf("processStateMessage. stateIndex: %d, stateHash: %s, stateAddr: %s, state transition: %v", + msg.ChainOutput.GetStateIndex(), sh.String(), + msg.ChainOutput.GetStateAddress().Base58(), !msg.ChainOutput.GetIsGovernanceUpdated(), + ) + cmt := c.getCommittee() + + if cmt != nil { + err = c.rotateCommitteeIfNeeded(msg.ChainOutput, cmt) + } else { + err = c.createCommitteeIfNeeded(msg.ChainOutput) + } + if err != nil { + c.log.Errorf("processStateMessage: %v", err) + return + } + c.stateMgr.EventStateMsg(msg) } func (c *chainObj) enqueueTimerTick(tick int) { diff --git a/packages/chain/chainimpl/interface.go b/packages/chain/chainimpl/interface.go index f8fe056387..229f2d6895 100644 --- a/packages/chain/chainimpl/interface.go +++ b/packages/chain/chainimpl/interface.go @@ -192,17 +192,6 @@ func (c *chainObj) ReceiveRequestAckMessage(reqID *iscp.RequestID, peerID string c.chainMetrics.CountRequestAckMessages() } -// SendMissingRequestsToPeer sends the requested missing requests by a peer -func (c *chainObj) SendMissingRequestsToPeer(msg *messages.MissingRequestIDsMsg, peerID string) { - for _, reqID := range msg.IDs { - c.log.Debugf("Sending MissingRequestsToPeer: reqID: %s, peerID: %s", reqID.Base58(), peerID) - if req := c.mempool.GetRequest(reqID); req != nil { - msg := messages.NewMissingRequestMsg(req) - (*c.peers).SendSimple(peerID, messages.MsgMissingRequest, msg.Bytes()) - } - } -} - func (c *chainObj) ReceiveTransaction(tx *ledgerstate.Transaction) { c.log.Debugf("ReceiveTransaction: %s", tx.ID().Base58()) reqs, err := request.OnLedgerFromTransaction(tx, c.chainID.AsAddress()) diff --git a/packages/testutil/testchain/mock_chain_core.go b/packages/testutil/testchain/mock_chain_core.go index 78d7fb5d0a..1b590c830e 100644 --- a/packages/testutil/testchain/mock_chain_core.go +++ b/packages/testutil/testchain/mock_chain_core.go @@ -105,7 +105,7 @@ func (m *MockedChainCore) GetCommitteeInfo() *chain.CommitteeInfo { func (m *MockedChainCore) AttachToPeerMessages(fun func(recv *peering.RecvEvent)) {} // TODO -func (m *MockedChainCore) RequestDismissChain(reason string) {} // TODO +func (m *MockedChainCore) EnqueDismissChain(reason string) {} // TODO func (m *MockedChainCore) StateCandidateToStateManager(state.VirtualStateAccess, ledgerstate.OutputID) { } // TODO From 08de5c35a94f9ad1165e81ee17d5751c17a075e0 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Fri, 5 Nov 2021 13:49:54 +0200 Subject: [PATCH 026/198] Methods reordered --- packages/chain/chainimpl/eventproc.go | 88 +++++++++++++-------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/packages/chain/chainimpl/eventproc.go b/packages/chain/chainimpl/eventproc.go index 77a3371cf7..b27b7b65f9 100644 --- a/packages/chain/chainimpl/eventproc.go +++ b/packages/chain/chainimpl/eventproc.go @@ -89,27 +89,37 @@ func (c *chainObj) handleDismissChain(msg messages.DismissChainMsg) { c.Dismiss(msg.Reason) } -func (c *chainObj) enqueueMissingRequestIDsPeerMsg(peerMsg *peering.PeerMessage) { - c.missingRequestIDsPeerMsgChannel.In() <- peerMsg +func (c *chainObj) enqueueLedgerState(chainOutput *ledgerstate.AliasOutput, timestamp time.Time) { + c.stateMsgChannel.In() <- &messages.StateMsg{ + ChainOutput: chainOutput, + Timestamp: timestamp, + } } -func (c *chainObj) handleMissingRequestIDsPeerMsg(peerMsg *peering.PeerMessage) { - if !c.pullMissingRequestsFromCommittee { +// handleLedgerState processes the only chain output which exists on the chain's address +// If necessary, it creates/changes/rotates committee object +func (c *chainObj) handleLedgerState(msg *messages.StateMsg) { + sh, err := hashing.HashValueFromBytes(msg.ChainOutput.GetStateData()) + if err != nil { + c.log.Error(xerrors.Errorf("parsing state hash: %w", err)) return } - msg, err := messages.MissingRequestIDsMsgFromBytes(peerMsg.MsgData) + c.log.Debugf("processStateMessage. stateIndex: %d, stateHash: %s, stateAddr: %s, state transition: %v", + msg.ChainOutput.GetStateIndex(), sh.String(), + msg.ChainOutput.GetStateAddress().Base58(), !msg.ChainOutput.GetIsGovernanceUpdated(), + ) + cmt := c.getCommittee() + + if cmt != nil { + err = c.rotateCommitteeIfNeeded(msg.ChainOutput, cmt) + } else { + err = c.createCommitteeIfNeeded(msg.ChainOutput) + } if err != nil { - c.log.Error(err) + c.log.Errorf("processStateMessage: %v", err) return } - peerID := peerMsg.SenderNetID - for _, reqID := range msg.IDs { - c.log.Debugf("Sending MissingRequestsToPeer: reqID: %s, peerID: %s", reqID.Base58(), peerID) - if req := c.mempool.GetRequest(reqID); req != nil { - msg := messages.NewMissingRequestMsg(req) - (*c.peers).SendSimple(peerID, messages.MsgMissingRequest, msg.Bytes()) - } - } + c.stateMgr.EventStateMsg(msg) } func (c *chainObj) enqueueOffLedgerRequestPeerMsg(peerMsg *peering.PeerMessage) { @@ -138,55 +148,45 @@ func (c *chainObj) handleRequestAckPeerMsg(peerMsg *peering.PeerMessage) { c.ReceiveRequestAckMessage(msg.ReqID, peerMsg.SenderNetID) } -func (c *chainObj) enqueueMissingRequestPeerMsg(peerMsg *peering.PeerMessage) { - c.missingRequestPeerMsgChannel.In() <- peerMsg +func (c *chainObj) enqueueMissingRequestIDsPeerMsg(peerMsg *peering.PeerMessage) { + c.missingRequestIDsPeerMsgChannel.In() <- peerMsg } -func (c *chainObj) handleMissingRequestPeerMsg(peerMsg *peering.PeerMessage) { +func (c *chainObj) handleMissingRequestIDsPeerMsg(peerMsg *peering.PeerMessage) { if !c.pullMissingRequestsFromCommittee { return } - msg, err := messages.MissingRequestMsgFromBytes(peerMsg.MsgData) + msg, err := messages.MissingRequestIDsMsgFromBytes(peerMsg.MsgData) if err != nil { c.log.Error(err) return } - if c.consensus.ShouldReceiveMissingRequest(msg.Request) { - c.mempool.ReceiveRequest(msg.Request) + peerID := peerMsg.SenderNetID + for _, reqID := range msg.IDs { + c.log.Debugf("Sending MissingRequestsToPeer: reqID: %s, peerID: %s", reqID.Base58(), peerID) + if req := c.mempool.GetRequest(reqID); req != nil { + msg := messages.NewMissingRequestMsg(req) + (*c.peers).SendSimple(peerID, messages.MsgMissingRequest, msg.Bytes()) + } } } -func (c *chainObj) enqueueLedgerState(chainOutput *ledgerstate.AliasOutput, timestamp time.Time) { - c.stateMsgChannel.In() <- &messages.StateMsg{ - ChainOutput: chainOutput, - Timestamp: timestamp, - } +func (c *chainObj) enqueueMissingRequestPeerMsg(peerMsg *peering.PeerMessage) { + c.missingRequestPeerMsgChannel.In() <- peerMsg } -// handleLedgerState processes the only chain output which exists on the chain's address -// If necessary, it creates/changes/rotates committee object -func (c *chainObj) handleLedgerState(msg *messages.StateMsg) { - sh, err := hashing.HashValueFromBytes(msg.ChainOutput.GetStateData()) - if err != nil { - c.log.Error(xerrors.Errorf("parsing state hash: %w", err)) +func (c *chainObj) handleMissingRequestPeerMsg(peerMsg *peering.PeerMessage) { + if !c.pullMissingRequestsFromCommittee { return } - c.log.Debugf("processStateMessage. stateIndex: %d, stateHash: %s, stateAddr: %s, state transition: %v", - msg.ChainOutput.GetStateIndex(), sh.String(), - msg.ChainOutput.GetStateAddress().Base58(), !msg.ChainOutput.GetIsGovernanceUpdated(), - ) - cmt := c.getCommittee() - - if cmt != nil { - err = c.rotateCommitteeIfNeeded(msg.ChainOutput, cmt) - } else { - err = c.createCommitteeIfNeeded(msg.ChainOutput) - } + msg, err := messages.MissingRequestMsgFromBytes(peerMsg.MsgData) if err != nil { - c.log.Errorf("processStateMessage: %v", err) + c.log.Error(err) return } - c.stateMgr.EventStateMsg(msg) + if c.consensus.ShouldReceiveMissingRequest(msg.Request) { + c.mempool.ReceiveRequest(msg.Request) + } } func (c *chainObj) enqueueTimerTick(tick int) { From 93a5fb4c1ec5341c3863752b23bdd8557c6d26ff Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Fri, 5 Nov 2021 08:59:34 -0700 Subject: [PATCH 027/198] Initial new Rust generator --- contracts/wasm/dividend/src/consts.rs | 30 +- contracts/wasm/dividend/src/contract.rs | 36 +- contracts/wasm/dividend/src/keys.rs | 34 +- contracts/wasm/dividend/src/lib.rs | 180 ++-- contracts/wasm/dividend/src/params.rs | 48 +- contracts/wasm/dividend/src/results.rs | 20 +- contracts/wasm/dividend/src/state.rs | 52 +- .../wasm/donatewithfeedback/src/consts.rs | 43 +- .../wasm/donatewithfeedback/src/contract.rs | 28 +- contracts/wasm/donatewithfeedback/src/keys.rs | 54 +- contracts/wasm/donatewithfeedback/src/lib.rs | 118 +-- .../wasm/donatewithfeedback/src/params.rs | 30 +- .../wasm/donatewithfeedback/src/results.rs | 68 +- .../wasm/donatewithfeedback/src/state.rs | 46 +- .../wasm/donatewithfeedback/src/structs.rs | 20 +- contracts/wasm/erc20/src/consts.rs | 40 +- contracts/wasm/erc20/src/contract.rs | 50 +- contracts/wasm/erc20/src/keys.rs | 42 +- contracts/wasm/erc20/src/lib.rs | 222 ++--- contracts/wasm/erc20/src/params.rs | 108 ++- contracts/wasm/erc20/src/results.rs | 30 +- contracts/wasm/erc20/src/state.rs | 40 +- contracts/wasm/erc20/src/typedefs.rs | 6 +- contracts/wasm/fairauction/src/consts.rs | 54 +- contracts/wasm/fairauction/src/contract.rs | 34 +- contracts/wasm/fairauction/src/keys.rs | 82 +- contracts/wasm/fairauction/src/lib.rs | 158 ++-- contracts/wasm/fairauction/src/params.rs | 74 +- contracts/wasm/fairauction/src/results.rs | 98 +- contracts/wasm/fairauction/src/state.rs | 64 +- contracts/wasm/fairauction/src/structs.rs | 56 +- contracts/wasm/fairauction/src/typedefs.rs | 11 +- contracts/wasm/fairroulette/src/consts.rs | 61 +- contracts/wasm/fairroulette/src/contract.rs | 42 +- contracts/wasm/fairroulette/src/keys.rs | 46 +- contracts/wasm/fairroulette/src/lib.rs | 222 ++--- contracts/wasm/fairroulette/src/params.rs | 20 +- contracts/wasm/fairroulette/src/results.rs | 40 +- contracts/wasm/fairroulette/src/state.rs | 70 +- contracts/wasm/fairroulette/src/structs.rs | 12 +- contracts/wasm/helloworld/src/consts.rs | 6 +- contracts/wasm/helloworld/src/contract.rs | 8 +- contracts/wasm/helloworld/src/keys.rs | 2 +- contracts/wasm/helloworld/src/lib.rs | 44 +- contracts/wasm/helloworld/src/results.rs | 10 +- contracts/wasm/inccounter/src/consts.rs | 65 +- contracts/wasm/inccounter/src/contract.rs | 48 +- contracts/wasm/inccounter/src/keys.rs | 24 +- contracts/wasm/inccounter/src/lib.rs | 294 +++--- contracts/wasm/inccounter/src/params.rs | 40 +- contracts/wasm/inccounter/src/results.rs | 10 +- contracts/wasm/inccounter/src/state.rs | 18 +- contracts/wasm/testcore/src/consts.rs | 186 ++-- contracts/wasm/testcore/src/contract.rs | 164 ++-- contracts/wasm/testcore/src/keys.rs | 136 +-- contracts/wasm/testcore/src/lib.rs | 864 +++++++++--------- contracts/wasm/testcore/src/params.rs | 390 ++++---- contracts/wasm/testcore/src/results.rs | 120 ++- contracts/wasm/testcore/src/state.rs | 46 +- contracts/wasm/testwasmlib/src/consts.rs | 65 +- contracts/wasm/testwasmlib/src/contract.rs | 70 +- contracts/wasm/testwasmlib/src/keys.rs | 96 +- contracts/wasm/testwasmlib/src/lib.rs | 288 +++--- contracts/wasm/testwasmlib/src/params.rs | 214 +++-- contracts/wasm/testwasmlib/src/results.rs | 50 +- contracts/wasm/testwasmlib/src/state.rs | 20 +- contracts/wasm/testwasmlib/src/typedefs.rs | 4 +- contracts/wasm/tokenregistry/src/consts.rs | 25 +- contracts/wasm/tokenregistry/src/contract.rs | 24 +- contracts/wasm/tokenregistry/src/keys.rs | 18 +- contracts/wasm/tokenregistry/src/lib.rs | 118 +-- contracts/wasm/tokenregistry/src/params.rs | 48 +- contracts/wasm/tokenregistry/src/state.rs | 36 +- contracts/wasm/tokenregistry/src/structs.rs | 28 +- tools/schema/generator/generator.go | 103 +-- tools/schema/generator/generator_go.go | 66 +- tools/schema/generator/generator_rust.go | 651 ++----------- tools/schema/generator/generator_ts.go | 46 + tools/schema/generator/gotemplates/consts.go | 3 + tools/schema/generator/gotemplates/keys.go | 6 + .../schema/generator/gotemplates/typedefs.go | 4 +- .../generator/rstemplates/alltemplates.go | 64 ++ tools/schema/generator/rstemplates/consts.go | 55 ++ .../schema/generator/rstemplates/contract.go | 79 ++ tools/schema/generator/rstemplates/funcs.go | 37 + tools/schema/generator/rstemplates/keys.go | 50 + tools/schema/generator/rstemplates/lib.go | 128 +++ tools/schema/generator/rstemplates/main.go | 24 + tools/schema/generator/rstemplates/params.go | 47 + tools/schema/generator/rstemplates/proxy.go | 68 ++ tools/schema/generator/rstemplates/results.go | 48 + tools/schema/generator/rstemplates/state.go | 41 + tools/schema/generator/rstemplates/structs.go | 80 ++ .../schema/generator/rstemplates/typedefs.go | 149 +++ tools/schema/generator/templates.go | 3 + .../generator/tstemplates/alltemplates.go | 34 + tools/schema/generator/tstemplates/consts.go | 61 ++ .../schema/generator/tstemplates/contract.go | 61 ++ tools/schema/generator/tstemplates/funcs.go | 32 + tools/schema/generator/tstemplates/keys.go | 38 + tools/schema/generator/tstemplates/lib.go | 101 ++ tools/schema/generator/tstemplates/main.go | 24 + tools/schema/generator/tstemplates/params.go | 32 + tools/schema/generator/tstemplates/proxy.go | 68 ++ tools/schema/generator/tstemplates/results.go | 32 + tools/schema/generator/tstemplates/state.go | 25 + tools/schema/generator/tstemplates/structs.go | 70 ++ .../schema/generator/tstemplates/typedefs.go | 139 +++ 108 files changed, 4945 insertions(+), 3592 deletions(-) create mode 100644 tools/schema/generator/rstemplates/alltemplates.go create mode 100644 tools/schema/generator/rstemplates/consts.go create mode 100644 tools/schema/generator/rstemplates/contract.go create mode 100644 tools/schema/generator/rstemplates/funcs.go create mode 100644 tools/schema/generator/rstemplates/keys.go create mode 100644 tools/schema/generator/rstemplates/lib.go create mode 100644 tools/schema/generator/rstemplates/main.go create mode 100644 tools/schema/generator/rstemplates/params.go create mode 100644 tools/schema/generator/rstemplates/proxy.go create mode 100644 tools/schema/generator/rstemplates/results.go create mode 100644 tools/schema/generator/rstemplates/state.go create mode 100644 tools/schema/generator/rstemplates/structs.go create mode 100644 tools/schema/generator/rstemplates/typedefs.go create mode 100644 tools/schema/generator/tstemplates/alltemplates.go create mode 100644 tools/schema/generator/tstemplates/consts.go create mode 100644 tools/schema/generator/tstemplates/contract.go create mode 100644 tools/schema/generator/tstemplates/funcs.go create mode 100644 tools/schema/generator/tstemplates/keys.go create mode 100644 tools/schema/generator/tstemplates/lib.go create mode 100644 tools/schema/generator/tstemplates/main.go create mode 100644 tools/schema/generator/tstemplates/params.go create mode 100644 tools/schema/generator/tstemplates/proxy.go create mode 100644 tools/schema/generator/tstemplates/results.go create mode 100644 tools/schema/generator/tstemplates/state.go create mode 100644 tools/schema/generator/tstemplates/structs.go create mode 100644 tools/schema/generator/tstemplates/typedefs.go diff --git a/contracts/wasm/dividend/src/consts.rs b/contracts/wasm/dividend/src/consts.rs index 9223c37771..f07bfa8410 100644 --- a/contracts/wasm/dividend/src/consts.rs +++ b/contracts/wasm/dividend/src/consts.rs @@ -16,29 +16,29 @@ pub const SC_DESCRIPTION: &str = "Simple dividend smart contract"; pub const HSC_NAME: ScHname = ScHname(0xcce2e239); pub const PARAM_ADDRESS: &str = "address"; -pub const PARAM_FACTOR: &str = "factor"; -pub const PARAM_OWNER: &str = "owner"; +pub const PARAM_FACTOR: &str = "factor"; +pub const PARAM_OWNER: &str = "owner"; pub const RESULT_FACTOR: &str = "factor"; -pub const RESULT_OWNER: &str = "owner"; +pub const RESULT_OWNER: &str = "owner"; -pub const STATE_MEMBER_LIST: &str = "memberList"; -pub const STATE_MEMBERS: &str = "members"; -pub const STATE_OWNER: &str = "owner"; +pub const STATE_MEMBER_LIST: &str = "memberList"; +pub const STATE_MEMBERS: &str = "members"; +pub const STATE_OWNER: &str = "owner"; pub const STATE_TOTAL_FACTOR: &str = "totalFactor"; -pub const FUNC_DIVIDE: &str = "divide"; -pub const FUNC_INIT: &str = "init"; -pub const FUNC_MEMBER: &str = "member"; +pub const FUNC_DIVIDE: &str = "divide"; +pub const FUNC_INIT: &str = "init"; +pub const FUNC_MEMBER: &str = "member"; pub const FUNC_SET_OWNER: &str = "setOwner"; -pub const VIEW_GET_FACTOR: &str = "getFactor"; +pub const VIEW_GET_FACTOR: &str = "getFactor"; pub const VIEW_GET_OWNER: &str = "getOwner"; -pub const HFUNC_DIVIDE: ScHname = ScHname(0xc7878107); -pub const HFUNC_INIT: ScHname = ScHname(0x1f44d644); -pub const HFUNC_MEMBER: ScHname = ScHname(0xc07da2cb); -pub const HFUNC_SET_OWNER: ScHname = ScHname(0x2a15fe7b); +pub const HFUNC_DIVIDE: ScHname = ScHname(0xc7878107); +pub const HFUNC_INIT: ScHname = ScHname(0x1f44d644); +pub const HFUNC_MEMBER: ScHname = ScHname(0xc07da2cb); +pub const HFUNC_SET_OWNER: ScHname = ScHname(0x2a15fe7b); pub const HVIEW_GET_FACTOR: ScHname = ScHname(0x0ee668fe); -pub const HVIEW_GET_OWNER: ScHname = ScHname(0x137107a6); +pub const HVIEW_GET_OWNER: ScHname = ScHname(0x137107a6); // @formatter:on diff --git a/contracts/wasm/dividend/src/contract.rs b/contracts/wasm/dividend/src/contract.rs index fdc997da3d..4db2acb901 100644 --- a/contracts/wasm/dividend/src/contract.rs +++ b/contracts/wasm/dividend/src/contract.rs @@ -18,33 +18,33 @@ use crate::params::*; use crate::results::*; pub struct DivideCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct InitCall { - pub func: ScInitFunc, - pub params: MutableInitParams, + pub func: ScInitFunc, + pub params: MutableInitParams, } pub struct MemberCall { - pub func: ScFunc, - pub params: MutableMemberParams, + pub func: ScFunc, + pub params: MutableMemberParams, } pub struct SetOwnerCall { - pub func: ScFunc, - pub params: MutableSetOwnerParams, + pub func: ScFunc, + pub params: MutableSetOwnerParams, } pub struct GetFactorCall { - pub func: ScView, - pub params: MutableGetFactorParams, - pub results: ImmutableGetFactorResults, + pub func: ScView, + pub params: MutableGetFactorParams, + pub results: ImmutableGetFactorResults, } pub struct GetOwnerCall { - pub func: ScView, - pub results: ImmutableGetOwnerResults, + pub func: ScView, + pub results: ImmutableGetOwnerResults, } pub struct ScFuncs { @@ -58,7 +58,7 @@ impl ScFuncs { } pub fn init(_ctx: & dyn ScFuncCallContext) -> InitCall { let mut f = InitCall { - func: ScInitFunc::new(HSC_NAME, HFUNC_INIT), + func: ScInitFunc::new(HSC_NAME, HFUNC_INIT), params: MutableInitParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -66,7 +66,7 @@ impl ScFuncs { } pub fn member(_ctx: & dyn ScFuncCallContext) -> MemberCall { let mut f = MemberCall { - func: ScFunc::new(HSC_NAME, HFUNC_MEMBER), + func: ScFunc::new(HSC_NAME, HFUNC_MEMBER), params: MutableMemberParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -74,7 +74,7 @@ impl ScFuncs { } pub fn set_owner(_ctx: & dyn ScFuncCallContext) -> SetOwnerCall { let mut f = SetOwnerCall { - func: ScFunc::new(HSC_NAME, HFUNC_SET_OWNER), + func: ScFunc::new(HSC_NAME, HFUNC_SET_OWNER), params: MutableSetOwnerParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -82,8 +82,8 @@ impl ScFuncs { } pub fn get_factor(_ctx: & dyn ScViewCallContext) -> GetFactorCall { let mut f = GetFactorCall { - func: ScView::new(HSC_NAME, HVIEW_GET_FACTOR), - params: MutableGetFactorParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_GET_FACTOR), + params: MutableGetFactorParams { id: 0 }, results: ImmutableGetFactorResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -91,7 +91,7 @@ impl ScFuncs { } pub fn get_owner(_ctx: & dyn ScViewCallContext) -> GetOwnerCall { let mut f = GetOwnerCall { - func: ScView::new(HSC_NAME, HVIEW_GET_OWNER), + func: ScView::new(HSC_NAME, HVIEW_GET_OWNER), results: ImmutableGetOwnerResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); diff --git a/contracts/wasm/dividend/src/keys.rs b/contracts/wasm/dividend/src/keys.rs index 2f9c2814aa..057e25b20f 100644 --- a/contracts/wasm/dividend/src/keys.rs +++ b/contracts/wasm/dividend/src/keys.rs @@ -13,28 +13,28 @@ use wasmlib::*; use crate::*; -pub(crate) const IDX_PARAM_ADDRESS: usize = 0; -pub(crate) const IDX_PARAM_FACTOR: usize = 1; -pub(crate) const IDX_PARAM_OWNER: usize = 2; -pub(crate) const IDX_RESULT_FACTOR: usize = 3; -pub(crate) const IDX_RESULT_OWNER: usize = 4; -pub(crate) const IDX_STATE_MEMBER_LIST: usize = 5; -pub(crate) const IDX_STATE_MEMBERS: usize = 6; -pub(crate) const IDX_STATE_OWNER: usize = 7; +pub(crate) const IDX_PARAM_ADDRESS: usize = 0; +pub(crate) const IDX_PARAM_FACTOR: usize = 1; +pub(crate) const IDX_PARAM_OWNER: usize = 2; +pub(crate) const IDX_RESULT_FACTOR: usize = 3; +pub(crate) const IDX_RESULT_OWNER: usize = 4; +pub(crate) const IDX_STATE_MEMBER_LIST: usize = 5; +pub(crate) const IDX_STATE_MEMBERS: usize = 6; +pub(crate) const IDX_STATE_OWNER: usize = 7; pub(crate) const IDX_STATE_TOTAL_FACTOR: usize = 8; pub const KEY_MAP_LEN: usize = 9; pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ - PARAM_ADDRESS, - PARAM_FACTOR, - PARAM_OWNER, - RESULT_FACTOR, - RESULT_OWNER, - STATE_MEMBER_LIST, - STATE_MEMBERS, - STATE_OWNER, - STATE_TOTAL_FACTOR, + PARAM_ADDRESS, + PARAM_FACTOR, + PARAM_OWNER, + RESULT_FACTOR, + RESULT_OWNER, + STATE_MEMBER_LIST, + STATE_MEMBERS, + STATE_OWNER, + STATE_TOTAL_FACTOR, ]; pub static mut IDX_MAP: [Key32; KEY_MAP_LEN] = [Key32(0); KEY_MAP_LEN]; diff --git a/contracts/wasm/dividend/src/lib.rs b/contracts/wasm/dividend/src/lib.rs index ef70c94781..9e80107f6f 100644 --- a/contracts/wasm/dividend/src/lib.rs +++ b/contracts/wasm/dividend/src/lib.rs @@ -46,131 +46,131 @@ fn on_load() { } pub struct DivideContext { - state: MutableDividendState, + state: MutableDividendState, } fn func_divide_thunk(ctx: &ScFuncContext) { - ctx.log("dividend.funcDivide"); - let f = DivideContext { - state: MutableDividendState { - id: OBJ_ID_STATE, - }, - }; - func_divide(ctx, &f); - ctx.log("dividend.funcDivide ok"); + ctx.log("dividend.funcDivide"); + let f = DivideContext { + state: MutableDividendState { + id: OBJ_ID_STATE, + }, + }; + func_divide(ctx, &f); + ctx.log("dividend.funcDivide ok"); } pub struct InitContext { - params: ImmutableInitParams, - state: MutableDividendState, + params: ImmutableInitParams, + state: MutableDividendState, } fn func_init_thunk(ctx: &ScFuncContext) { - ctx.log("dividend.funcInit"); - let f = InitContext { - params: ImmutableInitParams { - id: OBJ_ID_PARAMS, - }, - state: MutableDividendState { - id: OBJ_ID_STATE, - }, - }; - func_init(ctx, &f); - ctx.log("dividend.funcInit ok"); + ctx.log("dividend.funcInit"); + let f = InitContext { + params: ImmutableInitParams { + id: OBJ_ID_PARAMS, + }, + state: MutableDividendState { + id: OBJ_ID_STATE, + }, + }; + func_init(ctx, &f); + ctx.log("dividend.funcInit ok"); } pub struct MemberContext { - params: ImmutableMemberParams, - state: MutableDividendState, + params: ImmutableMemberParams, + state: MutableDividendState, } fn func_member_thunk(ctx: &ScFuncContext) { - ctx.log("dividend.funcMember"); + ctx.log("dividend.funcMember"); // only defined owner of contract can add members - let access = ctx.state().get_agent_id("owner"); - ctx.require(access.exists(), "access not set: owner"); - ctx.require(ctx.caller() == access.value(), "no permission"); - - let f = MemberContext { - params: ImmutableMemberParams { - id: OBJ_ID_PARAMS, - }, - state: MutableDividendState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.address().exists(), "missing mandatory address"); - ctx.require(f.params.factor().exists(), "missing mandatory factor"); - func_member(ctx, &f); - ctx.log("dividend.funcMember ok"); + let access = ctx.state().get_agent_id("owner"); + ctx.require(access.exists(), "access not set: owner"); + ctx.require(ctx.caller() == access.value(), "no permission"); + + let f = MemberContext { + params: ImmutableMemberParams { + id: OBJ_ID_PARAMS, + }, + state: MutableDividendState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.address().exists(), "missing mandatory address"); + ctx.require(f.params.factor().exists(), "missing mandatory factor"); + func_member(ctx, &f); + ctx.log("dividend.funcMember ok"); } pub struct SetOwnerContext { - params: ImmutableSetOwnerParams, - state: MutableDividendState, + params: ImmutableSetOwnerParams, + state: MutableDividendState, } fn func_set_owner_thunk(ctx: &ScFuncContext) { - ctx.log("dividend.funcSetOwner"); + ctx.log("dividend.funcSetOwner"); // only defined owner of contract can change owner - let access = ctx.state().get_agent_id("owner"); - ctx.require(access.exists(), "access not set: owner"); - ctx.require(ctx.caller() == access.value(), "no permission"); - - let f = SetOwnerContext { - params: ImmutableSetOwnerParams { - id: OBJ_ID_PARAMS, - }, - state: MutableDividendState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.owner().exists(), "missing mandatory owner"); - func_set_owner(ctx, &f); - ctx.log("dividend.funcSetOwner ok"); + let access = ctx.state().get_agent_id("owner"); + ctx.require(access.exists(), "access not set: owner"); + ctx.require(ctx.caller() == access.value(), "no permission"); + + let f = SetOwnerContext { + params: ImmutableSetOwnerParams { + id: OBJ_ID_PARAMS, + }, + state: MutableDividendState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.owner().exists(), "missing mandatory owner"); + func_set_owner(ctx, &f); + ctx.log("dividend.funcSetOwner ok"); } pub struct GetFactorContext { - params: ImmutableGetFactorParams, - results: MutableGetFactorResults, - state: ImmutableDividendState, + params: ImmutableGetFactorParams, + results: MutableGetFactorResults, + state: ImmutableDividendState, } fn view_get_factor_thunk(ctx: &ScViewContext) { - ctx.log("dividend.viewGetFactor"); - let f = GetFactorContext { - params: ImmutableGetFactorParams { - id: OBJ_ID_PARAMS, - }, - results: MutableGetFactorResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableDividendState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.address().exists(), "missing mandatory address"); - view_get_factor(ctx, &f); - ctx.log("dividend.viewGetFactor ok"); + ctx.log("dividend.viewGetFactor"); + let f = GetFactorContext { + params: ImmutableGetFactorParams { + id: OBJ_ID_PARAMS, + }, + results: MutableGetFactorResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableDividendState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.address().exists(), "missing mandatory address"); + view_get_factor(ctx, &f); + ctx.log("dividend.viewGetFactor ok"); } pub struct GetOwnerContext { - results: MutableGetOwnerResults, - state: ImmutableDividendState, + results: MutableGetOwnerResults, + state: ImmutableDividendState, } fn view_get_owner_thunk(ctx: &ScViewContext) { - ctx.log("dividend.viewGetOwner"); - let f = GetOwnerContext { - results: MutableGetOwnerResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableDividendState { - id: OBJ_ID_STATE, - }, - }; - view_get_owner(ctx, &f); - ctx.log("dividend.viewGetOwner ok"); + ctx.log("dividend.viewGetOwner"); + let f = GetOwnerContext { + results: MutableGetOwnerResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableDividendState { + id: OBJ_ID_STATE, + }, + }; + view_get_owner(ctx, &f); + ctx.log("dividend.viewGetOwner ok"); } // @formatter:on diff --git a/contracts/wasm/dividend/src/params.rs b/contracts/wasm/dividend/src/params.rs index 1de499db04..72ea177294 100644 --- a/contracts/wasm/dividend/src/params.rs +++ b/contracts/wasm/dividend/src/params.rs @@ -20,9 +20,10 @@ pub struct ImmutableInitParams { } impl ImmutableInitParams { + pub fn owner(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) + } } #[derive(Clone, Copy)] @@ -31,9 +32,10 @@ pub struct MutableInitParams { } impl MutableInitParams { + pub fn owner(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) + } } #[derive(Clone, Copy)] @@ -42,13 +44,14 @@ pub struct ImmutableMemberParams { } impl ImmutableMemberParams { + pub fn address(&self) -> ScImmutableAddress { - ScImmutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) - } + ScImmutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) + } pub fn factor(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_FACTOR)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_FACTOR)) + } } #[derive(Clone, Copy)] @@ -57,13 +60,14 @@ pub struct MutableMemberParams { } impl MutableMemberParams { + pub fn address(&self) -> ScMutableAddress { - ScMutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) - } + ScMutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) + } pub fn factor(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_FACTOR)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_FACTOR)) + } } #[derive(Clone, Copy)] @@ -72,9 +76,10 @@ pub struct ImmutableSetOwnerParams { } impl ImmutableSetOwnerParams { + pub fn owner(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) + } } #[derive(Clone, Copy)] @@ -83,9 +88,10 @@ pub struct MutableSetOwnerParams { } impl MutableSetOwnerParams { + pub fn owner(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) + } } #[derive(Clone, Copy)] @@ -94,9 +100,10 @@ pub struct ImmutableGetFactorParams { } impl ImmutableGetFactorParams { + pub fn address(&self) -> ScImmutableAddress { - ScImmutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) - } + ScImmutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) + } } #[derive(Clone, Copy)] @@ -105,7 +112,8 @@ pub struct MutableGetFactorParams { } impl MutableGetFactorParams { + pub fn address(&self) -> ScMutableAddress { - ScMutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) - } + ScMutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) + } } diff --git a/contracts/wasm/dividend/src/results.rs b/contracts/wasm/dividend/src/results.rs index 69e7db1ff7..efece102d2 100644 --- a/contracts/wasm/dividend/src/results.rs +++ b/contracts/wasm/dividend/src/results.rs @@ -20,9 +20,10 @@ pub struct ImmutableGetFactorResults { } impl ImmutableGetFactorResults { + pub fn factor(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_FACTOR)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_FACTOR)) + } } #[derive(Clone, Copy)] @@ -31,9 +32,10 @@ pub struct MutableGetFactorResults { } impl MutableGetFactorResults { + pub fn factor(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_FACTOR)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_FACTOR)) + } } #[derive(Clone, Copy)] @@ -42,9 +44,10 @@ pub struct ImmutableGetOwnerResults { } impl ImmutableGetOwnerResults { + pub fn owner(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_RESULT_OWNER)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_RESULT_OWNER)) + } } #[derive(Clone, Copy)] @@ -53,7 +56,8 @@ pub struct MutableGetOwnerResults { } impl MutableGetOwnerResults { + pub fn owner(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_RESULT_OWNER)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_RESULT_OWNER)) + } } diff --git a/contracts/wasm/dividend/src/state.rs b/contracts/wasm/dividend/src/state.rs index b2334301a0..0cd7684d9f 100644 --- a/contracts/wasm/dividend/src/state.rs +++ b/contracts/wasm/dividend/src/state.rs @@ -15,7 +15,7 @@ use crate::*; use crate::keys::*; pub struct ArrayOfImmutableAddress { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl ArrayOfImmutableAddress { @@ -29,7 +29,7 @@ impl ArrayOfImmutableAddress { } pub struct MapAddressToImmutableInt64 { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapAddressToImmutableInt64 { @@ -44,27 +44,28 @@ pub struct ImmutableDividendState { } impl ImmutableDividendState { + pub fn member_list(&self) -> ArrayOfImmutableAddress { - let arr_id = get_object_id(self.id, idx_map(IDX_STATE_MEMBER_LIST), TYPE_ARRAY | TYPE_ADDRESS); - ArrayOfImmutableAddress { obj_id: arr_id } - } + let arr_id = get_object_id(self.id, idx_map(IDX_STATE_MEMBER_LIST), TYPE_ARRAY | TYPE_ADDRESS); + ArrayOfImmutableAddress { obj_id: arr_id } + } pub fn members(&self) -> MapAddressToImmutableInt64 { - let map_id = get_object_id(self.id, idx_map(IDX_STATE_MEMBERS), TYPE_MAP); - MapAddressToImmutableInt64 { obj_id: map_id } - } + let map_id = get_object_id(self.id, idx_map(IDX_STATE_MEMBERS), TYPE_MAP); + MapAddressToImmutableInt64 { obj_id: map_id } + } pub fn owner(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_STATE_OWNER)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_STATE_OWNER)) + } pub fn total_factor(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_STATE_TOTAL_FACTOR)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_STATE_TOTAL_FACTOR)) + } } pub struct ArrayOfMutableAddress { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl ArrayOfMutableAddress { @@ -82,12 +83,12 @@ impl ArrayOfMutableAddress { } pub struct MapAddressToMutableInt64 { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapAddressToMutableInt64 { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_int64(&self, key: &ScAddress) -> ScMutableInt64 { @@ -101,21 +102,22 @@ pub struct MutableDividendState { } impl MutableDividendState { + pub fn member_list(&self) -> ArrayOfMutableAddress { - let arr_id = get_object_id(self.id, idx_map(IDX_STATE_MEMBER_LIST), TYPE_ARRAY | TYPE_ADDRESS); - ArrayOfMutableAddress { obj_id: arr_id } - } + let arr_id = get_object_id(self.id, idx_map(IDX_STATE_MEMBER_LIST), TYPE_ARRAY | TYPE_ADDRESS); + ArrayOfMutableAddress { obj_id: arr_id } + } pub fn members(&self) -> MapAddressToMutableInt64 { - let map_id = get_object_id(self.id, idx_map(IDX_STATE_MEMBERS), TYPE_MAP); - MapAddressToMutableInt64 { obj_id: map_id } - } + let map_id = get_object_id(self.id, idx_map(IDX_STATE_MEMBERS), TYPE_MAP); + MapAddressToMutableInt64 { obj_id: map_id } + } pub fn owner(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_STATE_OWNER)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_STATE_OWNER)) + } pub fn total_factor(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_STATE_TOTAL_FACTOR)) - } + ScMutableInt64::new(self.id, idx_map(IDX_STATE_TOTAL_FACTOR)) + } } diff --git a/contracts/wasm/donatewithfeedback/src/consts.rs b/contracts/wasm/donatewithfeedback/src/consts.rs index 635b8117f7..1213470668 100644 --- a/contracts/wasm/donatewithfeedback/src/consts.rs +++ b/contracts/wasm/donatewithfeedback/src/consts.rs @@ -11,34 +11,35 @@ use wasmlib::*; -pub const SC_NAME: &str = "donatewithfeedback"; -pub const HSC_NAME: ScHname = ScHname(0x696d7f66); +pub const SC_NAME: &str = "donatewithfeedback"; +pub const SC_DESCRIPTION: &str = ""; +pub const HSC_NAME: ScHname = ScHname(0x696d7f66); -pub const PARAM_AMOUNT: &str = "amount"; +pub const PARAM_AMOUNT: &str = "amount"; pub const PARAM_FEEDBACK: &str = "feedback"; -pub const PARAM_NR: &str = "nr"; - -pub const RESULT_AMOUNT: &str = "amount"; -pub const RESULT_COUNT: &str = "count"; -pub const RESULT_DONATOR: &str = "donator"; -pub const RESULT_ERROR: &str = "error"; -pub const RESULT_FEEDBACK: &str = "feedback"; -pub const RESULT_MAX_DONATION: &str = "maxDonation"; -pub const RESULT_TIMESTAMP: &str = "timestamp"; +pub const PARAM_NR: &str = "nr"; + +pub const RESULT_AMOUNT: &str = "amount"; +pub const RESULT_COUNT: &str = "count"; +pub const RESULT_DONATOR: &str = "donator"; +pub const RESULT_ERROR: &str = "error"; +pub const RESULT_FEEDBACK: &str = "feedback"; +pub const RESULT_MAX_DONATION: &str = "maxDonation"; +pub const RESULT_TIMESTAMP: &str = "timestamp"; pub const RESULT_TOTAL_DONATION: &str = "totalDonation"; -pub const STATE_LOG: &str = "log"; -pub const STATE_MAX_DONATION: &str = "maxDonation"; +pub const STATE_LOG: &str = "log"; +pub const STATE_MAX_DONATION: &str = "maxDonation"; pub const STATE_TOTAL_DONATION: &str = "totalDonation"; -pub const FUNC_DONATE: &str = "donate"; -pub const FUNC_WITHDRAW: &str = "withdraw"; -pub const VIEW_DONATION: &str = "donation"; -pub const VIEW_DONATION_INFO: &str = "donationInfo"; +pub const FUNC_DONATE: &str = "donate"; +pub const FUNC_WITHDRAW: &str = "withdraw"; +pub const VIEW_DONATION: &str = "donation"; +pub const VIEW_DONATION_INFO: &str = "donationInfo"; -pub const HFUNC_DONATE: ScHname = ScHname(0xdc9b133a); -pub const HFUNC_WITHDRAW: ScHname = ScHname(0x9dcc0f41); -pub const HVIEW_DONATION: ScHname = ScHname(0xbdb245ba); +pub const HFUNC_DONATE: ScHname = ScHname(0xdc9b133a); +pub const HFUNC_WITHDRAW: ScHname = ScHname(0x9dcc0f41); +pub const HVIEW_DONATION: ScHname = ScHname(0xbdb245ba); pub const HVIEW_DONATION_INFO: ScHname = ScHname(0xc8f7c726); // @formatter:on diff --git a/contracts/wasm/donatewithfeedback/src/contract.rs b/contracts/wasm/donatewithfeedback/src/contract.rs index dac9b03941..741500c9d3 100644 --- a/contracts/wasm/donatewithfeedback/src/contract.rs +++ b/contracts/wasm/donatewithfeedback/src/contract.rs @@ -18,24 +18,24 @@ use crate::params::*; use crate::results::*; pub struct DonateCall { - pub func: ScFunc, - pub params: MutableDonateParams, + pub func: ScFunc, + pub params: MutableDonateParams, } pub struct WithdrawCall { - pub func: ScFunc, - pub params: MutableWithdrawParams, + pub func: ScFunc, + pub params: MutableWithdrawParams, } pub struct DonationCall { - pub func: ScView, - pub params: MutableDonationParams, - pub results: ImmutableDonationResults, + pub func: ScView, + pub params: MutableDonationParams, + pub results: ImmutableDonationResults, } pub struct DonationInfoCall { - pub func: ScView, - pub results: ImmutableDonationInfoResults, + pub func: ScView, + pub results: ImmutableDonationInfoResults, } pub struct ScFuncs { @@ -44,7 +44,7 @@ pub struct ScFuncs { impl ScFuncs { pub fn donate(_ctx: & dyn ScFuncCallContext) -> DonateCall { let mut f = DonateCall { - func: ScFunc::new(HSC_NAME, HFUNC_DONATE), + func: ScFunc::new(HSC_NAME, HFUNC_DONATE), params: MutableDonateParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -52,7 +52,7 @@ impl ScFuncs { } pub fn withdraw(_ctx: & dyn ScFuncCallContext) -> WithdrawCall { let mut f = WithdrawCall { - func: ScFunc::new(HSC_NAME, HFUNC_WITHDRAW), + func: ScFunc::new(HSC_NAME, HFUNC_WITHDRAW), params: MutableWithdrawParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -60,8 +60,8 @@ impl ScFuncs { } pub fn donation(_ctx: & dyn ScViewCallContext) -> DonationCall { let mut f = DonationCall { - func: ScView::new(HSC_NAME, HVIEW_DONATION), - params: MutableDonationParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_DONATION), + params: MutableDonationParams { id: 0 }, results: ImmutableDonationResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -69,7 +69,7 @@ impl ScFuncs { } pub fn donation_info(_ctx: & dyn ScViewCallContext) -> DonationInfoCall { let mut f = DonationInfoCall { - func: ScView::new(HSC_NAME, HVIEW_DONATION_INFO), + func: ScView::new(HSC_NAME, HVIEW_DONATION_INFO), results: ImmutableDonationInfoResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); diff --git a/contracts/wasm/donatewithfeedback/src/keys.rs b/contracts/wasm/donatewithfeedback/src/keys.rs index 116236ae1f..cf3da41b2e 100644 --- a/contracts/wasm/donatewithfeedback/src/keys.rs +++ b/contracts/wasm/donatewithfeedback/src/keys.rs @@ -13,38 +13,38 @@ use wasmlib::*; use crate::*; -pub(crate) const IDX_PARAM_AMOUNT: usize = 0; -pub(crate) const IDX_PARAM_FEEDBACK: usize = 1; -pub(crate) const IDX_PARAM_NR: usize = 2; -pub(crate) const IDX_RESULT_AMOUNT: usize = 3; -pub(crate) const IDX_RESULT_COUNT: usize = 4; -pub(crate) const IDX_RESULT_DONATOR: usize = 5; -pub(crate) const IDX_RESULT_ERROR: usize = 6; -pub(crate) const IDX_RESULT_FEEDBACK: usize = 7; -pub(crate) const IDX_RESULT_MAX_DONATION: usize = 8; -pub(crate) const IDX_RESULT_TIMESTAMP: usize = 9; +pub(crate) const IDX_PARAM_AMOUNT: usize = 0; +pub(crate) const IDX_PARAM_FEEDBACK: usize = 1; +pub(crate) const IDX_PARAM_NR: usize = 2; +pub(crate) const IDX_RESULT_AMOUNT: usize = 3; +pub(crate) const IDX_RESULT_COUNT: usize = 4; +pub(crate) const IDX_RESULT_DONATOR: usize = 5; +pub(crate) const IDX_RESULT_ERROR: usize = 6; +pub(crate) const IDX_RESULT_FEEDBACK: usize = 7; +pub(crate) const IDX_RESULT_MAX_DONATION: usize = 8; +pub(crate) const IDX_RESULT_TIMESTAMP: usize = 9; pub(crate) const IDX_RESULT_TOTAL_DONATION: usize = 10; -pub(crate) const IDX_STATE_LOG: usize = 11; -pub(crate) const IDX_STATE_MAX_DONATION: usize = 12; -pub(crate) const IDX_STATE_TOTAL_DONATION: usize = 13; +pub(crate) const IDX_STATE_LOG: usize = 11; +pub(crate) const IDX_STATE_MAX_DONATION: usize = 12; +pub(crate) const IDX_STATE_TOTAL_DONATION: usize = 13; pub const KEY_MAP_LEN: usize = 14; pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ - PARAM_AMOUNT, - PARAM_FEEDBACK, - PARAM_NR, - RESULT_AMOUNT, - RESULT_COUNT, - RESULT_DONATOR, - RESULT_ERROR, - RESULT_FEEDBACK, - RESULT_MAX_DONATION, - RESULT_TIMESTAMP, - RESULT_TOTAL_DONATION, - STATE_LOG, - STATE_MAX_DONATION, - STATE_TOTAL_DONATION, + PARAM_AMOUNT, + PARAM_FEEDBACK, + PARAM_NR, + RESULT_AMOUNT, + RESULT_COUNT, + RESULT_DONATOR, + RESULT_ERROR, + RESULT_FEEDBACK, + RESULT_MAX_DONATION, + RESULT_TIMESTAMP, + RESULT_TOTAL_DONATION, + STATE_LOG, + STATE_MAX_DONATION, + STATE_TOTAL_DONATION, ]; pub static mut IDX_MAP: [Key32; KEY_MAP_LEN] = [Key32(0); KEY_MAP_LEN]; diff --git a/contracts/wasm/donatewithfeedback/src/lib.rs b/contracts/wasm/donatewithfeedback/src/lib.rs index bad98e5096..fda5b49d22 100644 --- a/contracts/wasm/donatewithfeedback/src/lib.rs +++ b/contracts/wasm/donatewithfeedback/src/lib.rs @@ -45,87 +45,87 @@ fn on_load() { } pub struct DonateContext { - params: ImmutableDonateParams, - state: MutableDonateWithFeedbackState, + params: ImmutableDonateParams, + state: MutableDonateWithFeedbackState, } fn func_donate_thunk(ctx: &ScFuncContext) { - ctx.log("donatewithfeedback.funcDonate"); - let f = DonateContext { - params: ImmutableDonateParams { - id: OBJ_ID_PARAMS, - }, - state: MutableDonateWithFeedbackState { - id: OBJ_ID_STATE, - }, - }; - func_donate(ctx, &f); - ctx.log("donatewithfeedback.funcDonate ok"); + ctx.log("donatewithfeedback.funcDonate"); + let f = DonateContext { + params: ImmutableDonateParams { + id: OBJ_ID_PARAMS, + }, + state: MutableDonateWithFeedbackState { + id: OBJ_ID_STATE, + }, + }; + func_donate(ctx, &f); + ctx.log("donatewithfeedback.funcDonate ok"); } pub struct WithdrawContext { - params: ImmutableWithdrawParams, - state: MutableDonateWithFeedbackState, + params: ImmutableWithdrawParams, + state: MutableDonateWithFeedbackState, } fn func_withdraw_thunk(ctx: &ScFuncContext) { - ctx.log("donatewithfeedback.funcWithdraw"); + ctx.log("donatewithfeedback.funcWithdraw"); // only SC creator can withdraw donated funds - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); - - let f = WithdrawContext { - params: ImmutableWithdrawParams { - id: OBJ_ID_PARAMS, - }, - state: MutableDonateWithFeedbackState { - id: OBJ_ID_STATE, - }, - }; - func_withdraw(ctx, &f); - ctx.log("donatewithfeedback.funcWithdraw ok"); + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + + let f = WithdrawContext { + params: ImmutableWithdrawParams { + id: OBJ_ID_PARAMS, + }, + state: MutableDonateWithFeedbackState { + id: OBJ_ID_STATE, + }, + }; + func_withdraw(ctx, &f); + ctx.log("donatewithfeedback.funcWithdraw ok"); } pub struct DonationContext { - params: ImmutableDonationParams, - results: MutableDonationResults, - state: ImmutableDonateWithFeedbackState, + params: ImmutableDonationParams, + results: MutableDonationResults, + state: ImmutableDonateWithFeedbackState, } fn view_donation_thunk(ctx: &ScViewContext) { - ctx.log("donatewithfeedback.viewDonation"); - let f = DonationContext { - params: ImmutableDonationParams { - id: OBJ_ID_PARAMS, - }, - results: MutableDonationResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableDonateWithFeedbackState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.nr().exists(), "missing mandatory nr"); - view_donation(ctx, &f); - ctx.log("donatewithfeedback.viewDonation ok"); + ctx.log("donatewithfeedback.viewDonation"); + let f = DonationContext { + params: ImmutableDonationParams { + id: OBJ_ID_PARAMS, + }, + results: MutableDonationResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableDonateWithFeedbackState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.nr().exists(), "missing mandatory nr"); + view_donation(ctx, &f); + ctx.log("donatewithfeedback.viewDonation ok"); } pub struct DonationInfoContext { - results: MutableDonationInfoResults, - state: ImmutableDonateWithFeedbackState, + results: MutableDonationInfoResults, + state: ImmutableDonateWithFeedbackState, } fn view_donation_info_thunk(ctx: &ScViewContext) { - ctx.log("donatewithfeedback.viewDonationInfo"); - let f = DonationInfoContext { - results: MutableDonationInfoResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableDonateWithFeedbackState { - id: OBJ_ID_STATE, - }, - }; - view_donation_info(ctx, &f); - ctx.log("donatewithfeedback.viewDonationInfo ok"); + ctx.log("donatewithfeedback.viewDonationInfo"); + let f = DonationInfoContext { + results: MutableDonationInfoResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableDonateWithFeedbackState { + id: OBJ_ID_STATE, + }, + }; + view_donation_info(ctx, &f); + ctx.log("donatewithfeedback.viewDonationInfo ok"); } // @formatter:on diff --git a/contracts/wasm/donatewithfeedback/src/params.rs b/contracts/wasm/donatewithfeedback/src/params.rs index a9aab5e8ee..9fe6f6fb7a 100644 --- a/contracts/wasm/donatewithfeedback/src/params.rs +++ b/contracts/wasm/donatewithfeedback/src/params.rs @@ -20,9 +20,10 @@ pub struct ImmutableDonateParams { } impl ImmutableDonateParams { + pub fn feedback(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_PARAM_FEEDBACK)) - } + ScImmutableString::new(self.id, idx_map(IDX_PARAM_FEEDBACK)) + } } #[derive(Clone, Copy)] @@ -31,9 +32,10 @@ pub struct MutableDonateParams { } impl MutableDonateParams { + pub fn feedback(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_PARAM_FEEDBACK)) - } + ScMutableString::new(self.id, idx_map(IDX_PARAM_FEEDBACK)) + } } #[derive(Clone, Copy)] @@ -42,9 +44,10 @@ pub struct ImmutableWithdrawParams { } impl ImmutableWithdrawParams { + pub fn amount(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_AMOUNT)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_AMOUNT)) + } } #[derive(Clone, Copy)] @@ -53,9 +56,10 @@ pub struct MutableWithdrawParams { } impl MutableWithdrawParams { + pub fn amount(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_AMOUNT)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_AMOUNT)) + } } #[derive(Clone, Copy)] @@ -64,9 +68,10 @@ pub struct ImmutableDonationParams { } impl ImmutableDonationParams { + pub fn nr(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_NR)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_NR)) + } } #[derive(Clone, Copy)] @@ -75,7 +80,8 @@ pub struct MutableDonationParams { } impl MutableDonationParams { + pub fn nr(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_NR)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_NR)) + } } diff --git a/contracts/wasm/donatewithfeedback/src/results.rs b/contracts/wasm/donatewithfeedback/src/results.rs index 2f65fcdb4b..05bedeb1a6 100644 --- a/contracts/wasm/donatewithfeedback/src/results.rs +++ b/contracts/wasm/donatewithfeedback/src/results.rs @@ -21,25 +21,26 @@ pub struct ImmutableDonationResults { } impl ImmutableDonationResults { + pub fn amount(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_AMOUNT)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_AMOUNT)) + } pub fn donator(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_RESULT_DONATOR)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_RESULT_DONATOR)) + } pub fn error(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_RESULT_ERROR)) - } + ScImmutableString::new(self.id, idx_map(IDX_RESULT_ERROR)) + } pub fn feedback(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_RESULT_FEEDBACK)) - } + ScImmutableString::new(self.id, idx_map(IDX_RESULT_FEEDBACK)) + } pub fn timestamp(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_TIMESTAMP)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_TIMESTAMP)) + } } #[derive(Clone, Copy)] @@ -48,25 +49,26 @@ pub struct MutableDonationResults { } impl MutableDonationResults { + pub fn amount(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_AMOUNT)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_AMOUNT)) + } pub fn donator(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_RESULT_DONATOR)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_RESULT_DONATOR)) + } pub fn error(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_RESULT_ERROR)) - } + ScMutableString::new(self.id, idx_map(IDX_RESULT_ERROR)) + } pub fn feedback(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_RESULT_FEEDBACK)) - } + ScMutableString::new(self.id, idx_map(IDX_RESULT_FEEDBACK)) + } pub fn timestamp(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_TIMESTAMP)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_TIMESTAMP)) + } } #[derive(Clone, Copy)] @@ -75,17 +77,18 @@ pub struct ImmutableDonationInfoResults { } impl ImmutableDonationInfoResults { + pub fn count(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_COUNT)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_COUNT)) + } pub fn max_donation(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_MAX_DONATION)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_MAX_DONATION)) + } pub fn total_donation(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_TOTAL_DONATION)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_TOTAL_DONATION)) + } } #[derive(Clone, Copy)] @@ -94,15 +97,16 @@ pub struct MutableDonationInfoResults { } impl MutableDonationInfoResults { + pub fn count(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_COUNT)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_COUNT)) + } pub fn max_donation(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_MAX_DONATION)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_MAX_DONATION)) + } pub fn total_donation(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_TOTAL_DONATION)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_TOTAL_DONATION)) + } } diff --git a/contracts/wasm/donatewithfeedback/src/state.rs b/contracts/wasm/donatewithfeedback/src/state.rs index f424d24c95..7bb4d36765 100644 --- a/contracts/wasm/donatewithfeedback/src/state.rs +++ b/contracts/wasm/donatewithfeedback/src/state.rs @@ -16,7 +16,7 @@ use crate::keys::*; use crate::structs::*; pub struct ArrayOfImmutableDonation { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl ArrayOfImmutableDonation { @@ -24,9 +24,9 @@ impl ArrayOfImmutableDonation { get_length(self.obj_id) } - pub fn get_donation(&self, index: i32) -> ImmutableDonation { - ImmutableDonation { obj_id: self.obj_id, key_id: Key32(index) } - } + pub fn get_donation(&self, index: i32) -> ImmutableDonation { + ImmutableDonation { obj_id: self.obj_id, key_id: Key32(index) } + } } #[derive(Clone, Copy)] @@ -35,22 +35,23 @@ pub struct ImmutableDonateWithFeedbackState { } impl ImmutableDonateWithFeedbackState { + pub fn log(&self) -> ArrayOfImmutableDonation { - let arr_id = get_object_id(self.id, idx_map(IDX_STATE_LOG), TYPE_ARRAY | TYPE_BYTES); - ArrayOfImmutableDonation { obj_id: arr_id } - } + let arr_id = get_object_id(self.id, idx_map(IDX_STATE_LOG), TYPE_ARRAY | TYPE_BYTES); + ArrayOfImmutableDonation { obj_id: arr_id } + } pub fn max_donation(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_STATE_MAX_DONATION)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_STATE_MAX_DONATION)) + } pub fn total_donation(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_STATE_TOTAL_DONATION)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_STATE_TOTAL_DONATION)) + } } pub struct ArrayOfMutableDonation { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl ArrayOfMutableDonation { @@ -62,9 +63,9 @@ impl ArrayOfMutableDonation { get_length(self.obj_id) } - pub fn get_donation(&self, index: i32) -> MutableDonation { - MutableDonation { obj_id: self.obj_id, key_id: Key32(index) } - } + pub fn get_donation(&self, index: i32) -> MutableDonation { + MutableDonation { obj_id: self.obj_id, key_id: Key32(index) } + } } #[derive(Clone, Copy)] @@ -73,16 +74,17 @@ pub struct MutableDonateWithFeedbackState { } impl MutableDonateWithFeedbackState { + pub fn log(&self) -> ArrayOfMutableDonation { - let arr_id = get_object_id(self.id, idx_map(IDX_STATE_LOG), TYPE_ARRAY | TYPE_BYTES); - ArrayOfMutableDonation { obj_id: arr_id } - } + let arr_id = get_object_id(self.id, idx_map(IDX_STATE_LOG), TYPE_ARRAY | TYPE_BYTES); + ArrayOfMutableDonation { obj_id: arr_id } + } pub fn max_donation(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_STATE_MAX_DONATION)) - } + ScMutableInt64::new(self.id, idx_map(IDX_STATE_MAX_DONATION)) + } pub fn total_donation(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_STATE_TOTAL_DONATION)) - } + ScMutableInt64::new(self.id, idx_map(IDX_STATE_TOTAL_DONATION)) + } } diff --git a/contracts/wasm/donatewithfeedback/src/structs.rs b/contracts/wasm/donatewithfeedback/src/structs.rs index b4944aad21..14b51dac7c 100644 --- a/contracts/wasm/donatewithfeedback/src/structs.rs +++ b/contracts/wasm/donatewithfeedback/src/structs.rs @@ -13,11 +13,11 @@ use wasmlib::*; use wasmlib::host::*; pub struct Donation { - pub amount: i64, // amount donated - pub donator: ScAgentID, // who donated - pub error: String, // error to be reported to donator if anything goes wrong - pub feedback: String, // the feedback for the person donated to - pub timestamp: i64, // when the donation took place + pub amount: i64, // amount donated + pub donator: ScAgentID, // who donated + pub error: String, // error to be reported to donator if anything goes wrong + pub feedback: String, // the feedback for the person donated to + pub timestamp: i64, // when the donation took place } impl Donation { @@ -34,11 +34,11 @@ impl Donation { pub fn to_bytes(&self) -> Vec { let mut encode = BytesEncoder::new(); - encode.int64(self.amount); - encode.agent_id(&self.donator); - encode.string(&self.error); - encode.string(&self.feedback); - encode.int64(self.timestamp); + encode.int64(self.amount); + encode.agent_id(&self.donator); + encode.string(&self.error); + encode.string(&self.feedback); + encode.int64(self.timestamp); return encode.data(); } } diff --git a/contracts/wasm/erc20/src/consts.rs b/contracts/wasm/erc20/src/consts.rs index f6d645cef5..92e25125dd 100644 --- a/contracts/wasm/erc20/src/consts.rs +++ b/contracts/wasm/erc20/src/consts.rs @@ -15,34 +15,34 @@ pub const SC_NAME: &str = "erc20"; pub const SC_DESCRIPTION: &str = "ERC-20 PoC for IOTA Smart Contracts"; pub const HSC_NAME: ScHname = ScHname(0x200e3733); -pub const PARAM_ACCOUNT: &str = "ac"; -pub const PARAM_AMOUNT: &str = "am"; -pub const PARAM_CREATOR: &str = "c"; +pub const PARAM_ACCOUNT: &str = "ac"; +pub const PARAM_AMOUNT: &str = "am"; +pub const PARAM_CREATOR: &str = "c"; pub const PARAM_DELEGATION: &str = "d"; -pub const PARAM_RECIPIENT: &str = "r"; -pub const PARAM_SUPPLY: &str = "s"; +pub const PARAM_RECIPIENT: &str = "r"; +pub const PARAM_SUPPLY: &str = "s"; pub const RESULT_AMOUNT: &str = "am"; pub const RESULT_SUPPLY: &str = "s"; pub const STATE_ALL_ALLOWANCES: &str = "a"; -pub const STATE_BALANCES: &str = "b"; -pub const STATE_SUPPLY: &str = "s"; - -pub const FUNC_APPROVE: &str = "approve"; -pub const FUNC_INIT: &str = "init"; -pub const FUNC_TRANSFER: &str = "transfer"; -pub const FUNC_TRANSFER_FROM: &str = "transferFrom"; -pub const VIEW_ALLOWANCE: &str = "allowance"; -pub const VIEW_BALANCE_OF: &str = "balanceOf"; +pub const STATE_BALANCES: &str = "b"; +pub const STATE_SUPPLY: &str = "s"; + +pub const FUNC_APPROVE: &str = "approve"; +pub const FUNC_INIT: &str = "init"; +pub const FUNC_TRANSFER: &str = "transfer"; +pub const FUNC_TRANSFER_FROM: &str = "transferFrom"; +pub const VIEW_ALLOWANCE: &str = "allowance"; +pub const VIEW_BALANCE_OF: &str = "balanceOf"; pub const VIEW_TOTAL_SUPPLY: &str = "totalSupply"; -pub const HFUNC_APPROVE: ScHname = ScHname(0xa0661268); -pub const HFUNC_INIT: ScHname = ScHname(0x1f44d644); -pub const HFUNC_TRANSFER: ScHname = ScHname(0xa15da184); +pub const HFUNC_APPROVE: ScHname = ScHname(0xa0661268); +pub const HFUNC_INIT: ScHname = ScHname(0x1f44d644); +pub const HFUNC_TRANSFER: ScHname = ScHname(0xa15da184); pub const HFUNC_TRANSFER_FROM: ScHname = ScHname(0xd5e0a602); -pub const HVIEW_ALLOWANCE: ScHname = ScHname(0x5e16006a); -pub const HVIEW_BALANCE_OF: ScHname = ScHname(0x67ef8df4); -pub const HVIEW_TOTAL_SUPPLY: ScHname = ScHname(0x9505e6ca); +pub const HVIEW_ALLOWANCE: ScHname = ScHname(0x5e16006a); +pub const HVIEW_BALANCE_OF: ScHname = ScHname(0x67ef8df4); +pub const HVIEW_TOTAL_SUPPLY: ScHname = ScHname(0x9505e6ca); // @formatter:on diff --git a/contracts/wasm/erc20/src/contract.rs b/contracts/wasm/erc20/src/contract.rs index 4d3d30f540..4a45a9ec40 100644 --- a/contracts/wasm/erc20/src/contract.rs +++ b/contracts/wasm/erc20/src/contract.rs @@ -18,40 +18,40 @@ use crate::params::*; use crate::results::*; pub struct ApproveCall { - pub func: ScFunc, - pub params: MutableApproveParams, + pub func: ScFunc, + pub params: MutableApproveParams, } pub struct InitCall { - pub func: ScInitFunc, - pub params: MutableInitParams, + pub func: ScInitFunc, + pub params: MutableInitParams, } pub struct TransferCall { - pub func: ScFunc, - pub params: MutableTransferParams, + pub func: ScFunc, + pub params: MutableTransferParams, } pub struct TransferFromCall { - pub func: ScFunc, - pub params: MutableTransferFromParams, + pub func: ScFunc, + pub params: MutableTransferFromParams, } pub struct AllowanceCall { - pub func: ScView, - pub params: MutableAllowanceParams, - pub results: ImmutableAllowanceResults, + pub func: ScView, + pub params: MutableAllowanceParams, + pub results: ImmutableAllowanceResults, } pub struct BalanceOfCall { - pub func: ScView, - pub params: MutableBalanceOfParams, - pub results: ImmutableBalanceOfResults, + pub func: ScView, + pub params: MutableBalanceOfParams, + pub results: ImmutableBalanceOfResults, } pub struct TotalSupplyCall { - pub func: ScView, - pub results: ImmutableTotalSupplyResults, + pub func: ScView, + pub results: ImmutableTotalSupplyResults, } pub struct ScFuncs { @@ -60,7 +60,7 @@ pub struct ScFuncs { impl ScFuncs { pub fn approve(_ctx: & dyn ScFuncCallContext) -> ApproveCall { let mut f = ApproveCall { - func: ScFunc::new(HSC_NAME, HFUNC_APPROVE), + func: ScFunc::new(HSC_NAME, HFUNC_APPROVE), params: MutableApproveParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -68,7 +68,7 @@ impl ScFuncs { } pub fn init(_ctx: & dyn ScFuncCallContext) -> InitCall { let mut f = InitCall { - func: ScInitFunc::new(HSC_NAME, HFUNC_INIT), + func: ScInitFunc::new(HSC_NAME, HFUNC_INIT), params: MutableInitParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -76,7 +76,7 @@ impl ScFuncs { } pub fn transfer(_ctx: & dyn ScFuncCallContext) -> TransferCall { let mut f = TransferCall { - func: ScFunc::new(HSC_NAME, HFUNC_TRANSFER), + func: ScFunc::new(HSC_NAME, HFUNC_TRANSFER), params: MutableTransferParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -84,7 +84,7 @@ impl ScFuncs { } pub fn transfer_from(_ctx: & dyn ScFuncCallContext) -> TransferFromCall { let mut f = TransferFromCall { - func: ScFunc::new(HSC_NAME, HFUNC_TRANSFER_FROM), + func: ScFunc::new(HSC_NAME, HFUNC_TRANSFER_FROM), params: MutableTransferFromParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -92,8 +92,8 @@ impl ScFuncs { } pub fn allowance(_ctx: & dyn ScViewCallContext) -> AllowanceCall { let mut f = AllowanceCall { - func: ScView::new(HSC_NAME, HVIEW_ALLOWANCE), - params: MutableAllowanceParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_ALLOWANCE), + params: MutableAllowanceParams { id: 0 }, results: ImmutableAllowanceResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -101,8 +101,8 @@ impl ScFuncs { } pub fn balance_of(_ctx: & dyn ScViewCallContext) -> BalanceOfCall { let mut f = BalanceOfCall { - func: ScView::new(HSC_NAME, HVIEW_BALANCE_OF), - params: MutableBalanceOfParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_BALANCE_OF), + params: MutableBalanceOfParams { id: 0 }, results: ImmutableBalanceOfResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -110,7 +110,7 @@ impl ScFuncs { } pub fn total_supply(_ctx: & dyn ScViewCallContext) -> TotalSupplyCall { let mut f = TotalSupplyCall { - func: ScView::new(HSC_NAME, HVIEW_TOTAL_SUPPLY), + func: ScView::new(HSC_NAME, HVIEW_TOTAL_SUPPLY), results: ImmutableTotalSupplyResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); diff --git a/contracts/wasm/erc20/src/keys.rs b/contracts/wasm/erc20/src/keys.rs index a10438202e..ce25fdf63a 100644 --- a/contracts/wasm/erc20/src/keys.rs +++ b/contracts/wasm/erc20/src/keys.rs @@ -13,32 +13,32 @@ use wasmlib::*; use crate::*; -pub(crate) const IDX_PARAM_ACCOUNT: usize = 0; -pub(crate) const IDX_PARAM_AMOUNT: usize = 1; -pub(crate) const IDX_PARAM_CREATOR: usize = 2; -pub(crate) const IDX_PARAM_DELEGATION: usize = 3; -pub(crate) const IDX_PARAM_RECIPIENT: usize = 4; -pub(crate) const IDX_PARAM_SUPPLY: usize = 5; -pub(crate) const IDX_RESULT_AMOUNT: usize = 6; -pub(crate) const IDX_RESULT_SUPPLY: usize = 7; +pub(crate) const IDX_PARAM_ACCOUNT: usize = 0; +pub(crate) const IDX_PARAM_AMOUNT: usize = 1; +pub(crate) const IDX_PARAM_CREATOR: usize = 2; +pub(crate) const IDX_PARAM_DELEGATION: usize = 3; +pub(crate) const IDX_PARAM_RECIPIENT: usize = 4; +pub(crate) const IDX_PARAM_SUPPLY: usize = 5; +pub(crate) const IDX_RESULT_AMOUNT: usize = 6; +pub(crate) const IDX_RESULT_SUPPLY: usize = 7; pub(crate) const IDX_STATE_ALL_ALLOWANCES: usize = 8; -pub(crate) const IDX_STATE_BALANCES: usize = 9; -pub(crate) const IDX_STATE_SUPPLY: usize = 10; +pub(crate) const IDX_STATE_BALANCES: usize = 9; +pub(crate) const IDX_STATE_SUPPLY: usize = 10; pub const KEY_MAP_LEN: usize = 11; pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ - PARAM_ACCOUNT, - PARAM_AMOUNT, - PARAM_CREATOR, - PARAM_DELEGATION, - PARAM_RECIPIENT, - PARAM_SUPPLY, - RESULT_AMOUNT, - RESULT_SUPPLY, - STATE_ALL_ALLOWANCES, - STATE_BALANCES, - STATE_SUPPLY, + PARAM_ACCOUNT, + PARAM_AMOUNT, + PARAM_CREATOR, + PARAM_DELEGATION, + PARAM_RECIPIENT, + PARAM_SUPPLY, + RESULT_AMOUNT, + RESULT_SUPPLY, + STATE_ALL_ALLOWANCES, + STATE_BALANCES, + STATE_SUPPLY, ]; pub static mut IDX_MAP: [Key32; KEY_MAP_LEN] = [Key32(0); KEY_MAP_LEN]; diff --git a/contracts/wasm/erc20/src/lib.rs b/contracts/wasm/erc20/src/lib.rs index 6aacad2b4a..a12d40e8a6 100644 --- a/contracts/wasm/erc20/src/lib.rs +++ b/contracts/wasm/erc20/src/lib.rs @@ -48,156 +48,156 @@ fn on_load() { } pub struct ApproveContext { - params: ImmutableApproveParams, - state: MutableErc20State, + params: ImmutableApproveParams, + state: MutableErc20State, } fn func_approve_thunk(ctx: &ScFuncContext) { - ctx.log("erc20.funcApprove"); - let f = ApproveContext { - params: ImmutableApproveParams { - id: OBJ_ID_PARAMS, - }, - state: MutableErc20State { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.amount().exists(), "missing mandatory amount"); - ctx.require(f.params.delegation().exists(), "missing mandatory delegation"); - func_approve(ctx, &f); - ctx.log("erc20.funcApprove ok"); + ctx.log("erc20.funcApprove"); + let f = ApproveContext { + params: ImmutableApproveParams { + id: OBJ_ID_PARAMS, + }, + state: MutableErc20State { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.amount().exists(), "missing mandatory amount"); + ctx.require(f.params.delegation().exists(), "missing mandatory delegation"); + func_approve(ctx, &f); + ctx.log("erc20.funcApprove ok"); } pub struct InitContext { - params: ImmutableInitParams, - state: MutableErc20State, + params: ImmutableInitParams, + state: MutableErc20State, } fn func_init_thunk(ctx: &ScFuncContext) { - ctx.log("erc20.funcInit"); - let f = InitContext { - params: ImmutableInitParams { - id: OBJ_ID_PARAMS, - }, - state: MutableErc20State { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.creator().exists(), "missing mandatory creator"); - ctx.require(f.params.supply().exists(), "missing mandatory supply"); - func_init(ctx, &f); - ctx.log("erc20.funcInit ok"); + ctx.log("erc20.funcInit"); + let f = InitContext { + params: ImmutableInitParams { + id: OBJ_ID_PARAMS, + }, + state: MutableErc20State { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.creator().exists(), "missing mandatory creator"); + ctx.require(f.params.supply().exists(), "missing mandatory supply"); + func_init(ctx, &f); + ctx.log("erc20.funcInit ok"); } pub struct TransferContext { - params: ImmutableTransferParams, - state: MutableErc20State, + params: ImmutableTransferParams, + state: MutableErc20State, } fn func_transfer_thunk(ctx: &ScFuncContext) { - ctx.log("erc20.funcTransfer"); - let f = TransferContext { - params: ImmutableTransferParams { - id: OBJ_ID_PARAMS, - }, - state: MutableErc20State { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.account().exists(), "missing mandatory account"); - ctx.require(f.params.amount().exists(), "missing mandatory amount"); - func_transfer(ctx, &f); - ctx.log("erc20.funcTransfer ok"); + ctx.log("erc20.funcTransfer"); + let f = TransferContext { + params: ImmutableTransferParams { + id: OBJ_ID_PARAMS, + }, + state: MutableErc20State { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.account().exists(), "missing mandatory account"); + ctx.require(f.params.amount().exists(), "missing mandatory amount"); + func_transfer(ctx, &f); + ctx.log("erc20.funcTransfer ok"); } pub struct TransferFromContext { - params: ImmutableTransferFromParams, - state: MutableErc20State, + params: ImmutableTransferFromParams, + state: MutableErc20State, } fn func_transfer_from_thunk(ctx: &ScFuncContext) { - ctx.log("erc20.funcTransferFrom"); - let f = TransferFromContext { - params: ImmutableTransferFromParams { - id: OBJ_ID_PARAMS, - }, - state: MutableErc20State { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.account().exists(), "missing mandatory account"); - ctx.require(f.params.amount().exists(), "missing mandatory amount"); - ctx.require(f.params.recipient().exists(), "missing mandatory recipient"); - func_transfer_from(ctx, &f); - ctx.log("erc20.funcTransferFrom ok"); + ctx.log("erc20.funcTransferFrom"); + let f = TransferFromContext { + params: ImmutableTransferFromParams { + id: OBJ_ID_PARAMS, + }, + state: MutableErc20State { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.account().exists(), "missing mandatory account"); + ctx.require(f.params.amount().exists(), "missing mandatory amount"); + ctx.require(f.params.recipient().exists(), "missing mandatory recipient"); + func_transfer_from(ctx, &f); + ctx.log("erc20.funcTransferFrom ok"); } pub struct AllowanceContext { - params: ImmutableAllowanceParams, - results: MutableAllowanceResults, - state: ImmutableErc20State, + params: ImmutableAllowanceParams, + results: MutableAllowanceResults, + state: ImmutableErc20State, } fn view_allowance_thunk(ctx: &ScViewContext) { - ctx.log("erc20.viewAllowance"); - let f = AllowanceContext { - params: ImmutableAllowanceParams { - id: OBJ_ID_PARAMS, - }, - results: MutableAllowanceResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableErc20State { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.account().exists(), "missing mandatory account"); - ctx.require(f.params.delegation().exists(), "missing mandatory delegation"); - view_allowance(ctx, &f); - ctx.log("erc20.viewAllowance ok"); + ctx.log("erc20.viewAllowance"); + let f = AllowanceContext { + params: ImmutableAllowanceParams { + id: OBJ_ID_PARAMS, + }, + results: MutableAllowanceResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableErc20State { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.account().exists(), "missing mandatory account"); + ctx.require(f.params.delegation().exists(), "missing mandatory delegation"); + view_allowance(ctx, &f); + ctx.log("erc20.viewAllowance ok"); } pub struct BalanceOfContext { - params: ImmutableBalanceOfParams, - results: MutableBalanceOfResults, - state: ImmutableErc20State, + params: ImmutableBalanceOfParams, + results: MutableBalanceOfResults, + state: ImmutableErc20State, } fn view_balance_of_thunk(ctx: &ScViewContext) { - ctx.log("erc20.viewBalanceOf"); - let f = BalanceOfContext { - params: ImmutableBalanceOfParams { - id: OBJ_ID_PARAMS, - }, - results: MutableBalanceOfResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableErc20State { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.account().exists(), "missing mandatory account"); - view_balance_of(ctx, &f); - ctx.log("erc20.viewBalanceOf ok"); + ctx.log("erc20.viewBalanceOf"); + let f = BalanceOfContext { + params: ImmutableBalanceOfParams { + id: OBJ_ID_PARAMS, + }, + results: MutableBalanceOfResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableErc20State { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.account().exists(), "missing mandatory account"); + view_balance_of(ctx, &f); + ctx.log("erc20.viewBalanceOf ok"); } pub struct TotalSupplyContext { - results: MutableTotalSupplyResults, - state: ImmutableErc20State, + results: MutableTotalSupplyResults, + state: ImmutableErc20State, } fn view_total_supply_thunk(ctx: &ScViewContext) { - ctx.log("erc20.viewTotalSupply"); - let f = TotalSupplyContext { - results: MutableTotalSupplyResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableErc20State { - id: OBJ_ID_STATE, - }, - }; - view_total_supply(ctx, &f); - ctx.log("erc20.viewTotalSupply ok"); + ctx.log("erc20.viewTotalSupply"); + let f = TotalSupplyContext { + results: MutableTotalSupplyResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableErc20State { + id: OBJ_ID_STATE, + }, + }; + view_total_supply(ctx, &f); + ctx.log("erc20.viewTotalSupply ok"); } // @formatter:on diff --git a/contracts/wasm/erc20/src/params.rs b/contracts/wasm/erc20/src/params.rs index 268522f51b..2af59079fd 100644 --- a/contracts/wasm/erc20/src/params.rs +++ b/contracts/wasm/erc20/src/params.rs @@ -20,13 +20,14 @@ pub struct ImmutableApproveParams { } impl ImmutableApproveParams { + pub fn amount(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_AMOUNT)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_AMOUNT)) + } pub fn delegation(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_DELEGATION)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_DELEGATION)) + } } #[derive(Clone, Copy)] @@ -35,13 +36,14 @@ pub struct MutableApproveParams { } impl MutableApproveParams { + pub fn amount(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_AMOUNT)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_AMOUNT)) + } pub fn delegation(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_DELEGATION)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_DELEGATION)) + } } #[derive(Clone, Copy)] @@ -50,13 +52,14 @@ pub struct ImmutableInitParams { } impl ImmutableInitParams { + pub fn creator(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_CREATOR)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_CREATOR)) + } pub fn supply(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_SUPPLY)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_SUPPLY)) + } } #[derive(Clone, Copy)] @@ -65,13 +68,14 @@ pub struct MutableInitParams { } impl MutableInitParams { + pub fn creator(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_CREATOR)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_CREATOR)) + } pub fn supply(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_SUPPLY)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_SUPPLY)) + } } #[derive(Clone, Copy)] @@ -80,13 +84,14 @@ pub struct ImmutableTransferParams { } impl ImmutableTransferParams { + pub fn account(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) + } pub fn amount(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_AMOUNT)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_AMOUNT)) + } } #[derive(Clone, Copy)] @@ -95,13 +100,14 @@ pub struct MutableTransferParams { } impl MutableTransferParams { + pub fn account(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) + } pub fn amount(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_AMOUNT)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_AMOUNT)) + } } #[derive(Clone, Copy)] @@ -110,17 +116,18 @@ pub struct ImmutableTransferFromParams { } impl ImmutableTransferFromParams { + pub fn account(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) + } pub fn amount(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_AMOUNT)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_AMOUNT)) + } pub fn recipient(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_RECIPIENT)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_RECIPIENT)) + } } #[derive(Clone, Copy)] @@ -129,17 +136,18 @@ pub struct MutableTransferFromParams { } impl MutableTransferFromParams { + pub fn account(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) + } pub fn amount(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_AMOUNT)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_AMOUNT)) + } pub fn recipient(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_RECIPIENT)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_RECIPIENT)) + } } #[derive(Clone, Copy)] @@ -148,13 +156,14 @@ pub struct ImmutableAllowanceParams { } impl ImmutableAllowanceParams { + pub fn account(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) + } pub fn delegation(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_DELEGATION)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_DELEGATION)) + } } #[derive(Clone, Copy)] @@ -163,13 +172,14 @@ pub struct MutableAllowanceParams { } impl MutableAllowanceParams { + pub fn account(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) + } pub fn delegation(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_DELEGATION)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_DELEGATION)) + } } #[derive(Clone, Copy)] @@ -178,9 +188,10 @@ pub struct ImmutableBalanceOfParams { } impl ImmutableBalanceOfParams { + pub fn account(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) + } } #[derive(Clone, Copy)] @@ -189,7 +200,8 @@ pub struct MutableBalanceOfParams { } impl MutableBalanceOfParams { + pub fn account(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) + } } diff --git a/contracts/wasm/erc20/src/results.rs b/contracts/wasm/erc20/src/results.rs index 4318c1600e..9fcf06e9b6 100644 --- a/contracts/wasm/erc20/src/results.rs +++ b/contracts/wasm/erc20/src/results.rs @@ -20,9 +20,10 @@ pub struct ImmutableAllowanceResults { } impl ImmutableAllowanceResults { + pub fn amount(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_AMOUNT)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_AMOUNT)) + } } #[derive(Clone, Copy)] @@ -31,9 +32,10 @@ pub struct MutableAllowanceResults { } impl MutableAllowanceResults { + pub fn amount(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_AMOUNT)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_AMOUNT)) + } } #[derive(Clone, Copy)] @@ -42,9 +44,10 @@ pub struct ImmutableBalanceOfResults { } impl ImmutableBalanceOfResults { + pub fn amount(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_AMOUNT)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_AMOUNT)) + } } #[derive(Clone, Copy)] @@ -53,9 +56,10 @@ pub struct MutableBalanceOfResults { } impl MutableBalanceOfResults { + pub fn amount(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_AMOUNT)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_AMOUNT)) + } } #[derive(Clone, Copy)] @@ -64,9 +68,10 @@ pub struct ImmutableTotalSupplyResults { } impl ImmutableTotalSupplyResults { + pub fn supply(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_SUPPLY)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_SUPPLY)) + } } #[derive(Clone, Copy)] @@ -75,7 +80,8 @@ pub struct MutableTotalSupplyResults { } impl MutableTotalSupplyResults { + pub fn supply(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_SUPPLY)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_SUPPLY)) + } } diff --git a/contracts/wasm/erc20/src/state.rs b/contracts/wasm/erc20/src/state.rs index 53e02ccc72..45b7bbc939 100644 --- a/contracts/wasm/erc20/src/state.rs +++ b/contracts/wasm/erc20/src/state.rs @@ -16,7 +16,7 @@ use crate::keys::*; use crate::typedefs::*; pub struct MapAgentIDToImmutableAllowancesForAgent { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapAgentIDToImmutableAllowancesForAgent { @@ -32,28 +32,29 @@ pub struct ImmutableErc20State { } impl ImmutableErc20State { + pub fn all_allowances(&self) -> MapAgentIDToImmutableAllowancesForAgent { - let map_id = get_object_id(self.id, idx_map(IDX_STATE_ALL_ALLOWANCES), TYPE_MAP); - MapAgentIDToImmutableAllowancesForAgent { obj_id: map_id } - } + let map_id = get_object_id(self.id, idx_map(IDX_STATE_ALL_ALLOWANCES), TYPE_MAP); + MapAgentIDToImmutableAllowancesForAgent { obj_id: map_id } + } pub fn balances(&self) -> MapAgentIDToImmutableInt64 { - let map_id = get_object_id(self.id, idx_map(IDX_STATE_BALANCES), TYPE_MAP); - MapAgentIDToImmutableInt64 { obj_id: map_id } - } + let map_id = get_object_id(self.id, idx_map(IDX_STATE_BALANCES), TYPE_MAP); + MapAgentIDToImmutableInt64 { obj_id: map_id } + } pub fn supply(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_STATE_SUPPLY)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_STATE_SUPPLY)) + } } pub struct MapAgentIDToMutableAllowancesForAgent { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapAgentIDToMutableAllowancesForAgent { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_allowances_for_agent(&self, key: &ScAgentID) -> MutableAllowancesForAgent { @@ -68,17 +69,18 @@ pub struct MutableErc20State { } impl MutableErc20State { + pub fn all_allowances(&self) -> MapAgentIDToMutableAllowancesForAgent { - let map_id = get_object_id(self.id, idx_map(IDX_STATE_ALL_ALLOWANCES), TYPE_MAP); - MapAgentIDToMutableAllowancesForAgent { obj_id: map_id } - } + let map_id = get_object_id(self.id, idx_map(IDX_STATE_ALL_ALLOWANCES), TYPE_MAP); + MapAgentIDToMutableAllowancesForAgent { obj_id: map_id } + } pub fn balances(&self) -> MapAgentIDToMutableInt64 { - let map_id = get_object_id(self.id, idx_map(IDX_STATE_BALANCES), TYPE_MAP); - MapAgentIDToMutableInt64 { obj_id: map_id } - } + let map_id = get_object_id(self.id, idx_map(IDX_STATE_BALANCES), TYPE_MAP); + MapAgentIDToMutableInt64 { obj_id: map_id } + } pub fn supply(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_STATE_SUPPLY)) - } + ScMutableInt64::new(self.id, idx_map(IDX_STATE_SUPPLY)) + } } diff --git a/contracts/wasm/erc20/src/typedefs.rs b/contracts/wasm/erc20/src/typedefs.rs index 406956ec5e..e5e37f89b9 100644 --- a/contracts/wasm/erc20/src/typedefs.rs +++ b/contracts/wasm/erc20/src/typedefs.rs @@ -13,7 +13,7 @@ use wasmlib::*; use wasmlib::host::*; pub struct MapAgentIDToImmutableInt64 { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapAgentIDToImmutableInt64 { @@ -25,12 +25,12 @@ impl MapAgentIDToImmutableInt64 { pub type ImmutableAllowancesForAgent = MapAgentIDToImmutableInt64; pub struct MapAgentIDToMutableInt64 { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapAgentIDToMutableInt64 { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_int64(&self, key: &ScAgentID) -> ScMutableInt64 { diff --git a/contracts/wasm/fairauction/src/consts.rs b/contracts/wasm/fairauction/src/consts.rs index b1ed46861d..011f1e8037 100644 --- a/contracts/wasm/fairauction/src/consts.rs +++ b/contracts/wasm/fairauction/src/consts.rs @@ -15,40 +15,40 @@ pub const SC_NAME: &str = "fairauction"; pub const SC_DESCRIPTION: &str = "Decentralized auction to securely sell tokens to the highest bidder"; pub const HSC_NAME: ScHname = ScHname(0x1b5c43b1); -pub const PARAM_COLOR: &str = "color"; -pub const PARAM_DESCRIPTION: &str = "description"; -pub const PARAM_DURATION: &str = "duration"; -pub const PARAM_MINIMUM_BID: &str = "minimumBid"; +pub const PARAM_COLOR: &str = "color"; +pub const PARAM_DESCRIPTION: &str = "description"; +pub const PARAM_DURATION: &str = "duration"; +pub const PARAM_MINIMUM_BID: &str = "minimumBid"; pub const PARAM_OWNER_MARGIN: &str = "ownerMargin"; -pub const RESULT_BIDDERS: &str = "bidders"; -pub const RESULT_COLOR: &str = "color"; -pub const RESULT_CREATOR: &str = "creator"; -pub const RESULT_DEPOSIT: &str = "deposit"; -pub const RESULT_DESCRIPTION: &str = "description"; -pub const RESULT_DURATION: &str = "duration"; -pub const RESULT_HIGHEST_BID: &str = "highestBid"; +pub const RESULT_BIDDERS: &str = "bidders"; +pub const RESULT_COLOR: &str = "color"; +pub const RESULT_CREATOR: &str = "creator"; +pub const RESULT_DEPOSIT: &str = "deposit"; +pub const RESULT_DESCRIPTION: &str = "description"; +pub const RESULT_DURATION: &str = "duration"; +pub const RESULT_HIGHEST_BID: &str = "highestBid"; pub const RESULT_HIGHEST_BIDDER: &str = "highestBidder"; -pub const RESULT_MINIMUM_BID: &str = "minimumBid"; -pub const RESULT_NUM_TOKENS: &str = "numTokens"; -pub const RESULT_OWNER_MARGIN: &str = "ownerMargin"; -pub const RESULT_WHEN_STARTED: &str = "whenStarted"; - -pub const STATE_AUCTIONS: &str = "auctions"; -pub const STATE_BIDDER_LIST: &str = "bidderList"; -pub const STATE_BIDS: &str = "bids"; +pub const RESULT_MINIMUM_BID: &str = "minimumBid"; +pub const RESULT_NUM_TOKENS: &str = "numTokens"; +pub const RESULT_OWNER_MARGIN: &str = "ownerMargin"; +pub const RESULT_WHEN_STARTED: &str = "whenStarted"; + +pub const STATE_AUCTIONS: &str = "auctions"; +pub const STATE_BIDDER_LIST: &str = "bidderList"; +pub const STATE_BIDS: &str = "bids"; pub const STATE_OWNER_MARGIN: &str = "ownerMargin"; -pub const FUNC_FINALIZE_AUCTION: &str = "finalizeAuction"; -pub const FUNC_PLACE_BID: &str = "placeBid"; -pub const FUNC_SET_OWNER_MARGIN: &str = "setOwnerMargin"; -pub const FUNC_START_AUCTION: &str = "startAuction"; -pub const VIEW_GET_INFO: &str = "getInfo"; +pub const FUNC_FINALIZE_AUCTION: &str = "finalizeAuction"; +pub const FUNC_PLACE_BID: &str = "placeBid"; +pub const FUNC_SET_OWNER_MARGIN: &str = "setOwnerMargin"; +pub const FUNC_START_AUCTION: &str = "startAuction"; +pub const VIEW_GET_INFO: &str = "getInfo"; pub const HFUNC_FINALIZE_AUCTION: ScHname = ScHname(0x8d534ddc); -pub const HFUNC_PLACE_BID: ScHname = ScHname(0x9bd72fa9); +pub const HFUNC_PLACE_BID: ScHname = ScHname(0x9bd72fa9); pub const HFUNC_SET_OWNER_MARGIN: ScHname = ScHname(0x1774461a); -pub const HFUNC_START_AUCTION: ScHname = ScHname(0xd5b7bacb); -pub const HVIEW_GET_INFO: ScHname = ScHname(0xcfedba5f); +pub const HFUNC_START_AUCTION: ScHname = ScHname(0xd5b7bacb); +pub const HVIEW_GET_INFO: ScHname = ScHname(0xcfedba5f); // @formatter:on diff --git a/contracts/wasm/fairauction/src/contract.rs b/contracts/wasm/fairauction/src/contract.rs index 5a918bb9c7..29ac58e97e 100644 --- a/contracts/wasm/fairauction/src/contract.rs +++ b/contracts/wasm/fairauction/src/contract.rs @@ -18,29 +18,29 @@ use crate::params::*; use crate::results::*; pub struct FinalizeAuctionCall { - pub func: ScFunc, - pub params: MutableFinalizeAuctionParams, + pub func: ScFunc, + pub params: MutableFinalizeAuctionParams, } pub struct PlaceBidCall { - pub func: ScFunc, - pub params: MutablePlaceBidParams, + pub func: ScFunc, + pub params: MutablePlaceBidParams, } pub struct SetOwnerMarginCall { - pub func: ScFunc, - pub params: MutableSetOwnerMarginParams, + pub func: ScFunc, + pub params: MutableSetOwnerMarginParams, } pub struct StartAuctionCall { - pub func: ScFunc, - pub params: MutableStartAuctionParams, + pub func: ScFunc, + pub params: MutableStartAuctionParams, } pub struct GetInfoCall { - pub func: ScView, - pub params: MutableGetInfoParams, - pub results: ImmutableGetInfoResults, + pub func: ScView, + pub params: MutableGetInfoParams, + pub results: ImmutableGetInfoResults, } pub struct ScFuncs { @@ -49,7 +49,7 @@ pub struct ScFuncs { impl ScFuncs { pub fn finalize_auction(_ctx: & dyn ScFuncCallContext) -> FinalizeAuctionCall { let mut f = FinalizeAuctionCall { - func: ScFunc::new(HSC_NAME, HFUNC_FINALIZE_AUCTION), + func: ScFunc::new(HSC_NAME, HFUNC_FINALIZE_AUCTION), params: MutableFinalizeAuctionParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -57,7 +57,7 @@ impl ScFuncs { } pub fn place_bid(_ctx: & dyn ScFuncCallContext) -> PlaceBidCall { let mut f = PlaceBidCall { - func: ScFunc::new(HSC_NAME, HFUNC_PLACE_BID), + func: ScFunc::new(HSC_NAME, HFUNC_PLACE_BID), params: MutablePlaceBidParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -65,7 +65,7 @@ impl ScFuncs { } pub fn set_owner_margin(_ctx: & dyn ScFuncCallContext) -> SetOwnerMarginCall { let mut f = SetOwnerMarginCall { - func: ScFunc::new(HSC_NAME, HFUNC_SET_OWNER_MARGIN), + func: ScFunc::new(HSC_NAME, HFUNC_SET_OWNER_MARGIN), params: MutableSetOwnerMarginParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -73,7 +73,7 @@ impl ScFuncs { } pub fn start_auction(_ctx: & dyn ScFuncCallContext) -> StartAuctionCall { let mut f = StartAuctionCall { - func: ScFunc::new(HSC_NAME, HFUNC_START_AUCTION), + func: ScFunc::new(HSC_NAME, HFUNC_START_AUCTION), params: MutableStartAuctionParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -81,8 +81,8 @@ impl ScFuncs { } pub fn get_info(_ctx: & dyn ScViewCallContext) -> GetInfoCall { let mut f = GetInfoCall { - func: ScView::new(HSC_NAME, HVIEW_GET_INFO), - params: MutableGetInfoParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_GET_INFO), + params: MutableGetInfoParams { id: 0 }, results: ImmutableGetInfoResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); diff --git a/contracts/wasm/fairauction/src/keys.rs b/contracts/wasm/fairauction/src/keys.rs index f8be26b53c..cb75fdd3b9 100644 --- a/contracts/wasm/fairauction/src/keys.rs +++ b/contracts/wasm/fairauction/src/keys.rs @@ -13,52 +13,52 @@ use wasmlib::*; use crate::*; -pub(crate) const IDX_PARAM_COLOR: usize = 0; -pub(crate) const IDX_PARAM_DESCRIPTION: usize = 1; -pub(crate) const IDX_PARAM_DURATION: usize = 2; -pub(crate) const IDX_PARAM_MINIMUM_BID: usize = 3; -pub(crate) const IDX_PARAM_OWNER_MARGIN: usize = 4; -pub(crate) const IDX_RESULT_BIDDERS: usize = 5; -pub(crate) const IDX_RESULT_COLOR: usize = 6; -pub(crate) const IDX_RESULT_CREATOR: usize = 7; -pub(crate) const IDX_RESULT_DEPOSIT: usize = 8; -pub(crate) const IDX_RESULT_DESCRIPTION: usize = 9; -pub(crate) const IDX_RESULT_DURATION: usize = 10; -pub(crate) const IDX_RESULT_HIGHEST_BID: usize = 11; +pub(crate) const IDX_PARAM_COLOR: usize = 0; +pub(crate) const IDX_PARAM_DESCRIPTION: usize = 1; +pub(crate) const IDX_PARAM_DURATION: usize = 2; +pub(crate) const IDX_PARAM_MINIMUM_BID: usize = 3; +pub(crate) const IDX_PARAM_OWNER_MARGIN: usize = 4; +pub(crate) const IDX_RESULT_BIDDERS: usize = 5; +pub(crate) const IDX_RESULT_COLOR: usize = 6; +pub(crate) const IDX_RESULT_CREATOR: usize = 7; +pub(crate) const IDX_RESULT_DEPOSIT: usize = 8; +pub(crate) const IDX_RESULT_DESCRIPTION: usize = 9; +pub(crate) const IDX_RESULT_DURATION: usize = 10; +pub(crate) const IDX_RESULT_HIGHEST_BID: usize = 11; pub(crate) const IDX_RESULT_HIGHEST_BIDDER: usize = 12; -pub(crate) const IDX_RESULT_MINIMUM_BID: usize = 13; -pub(crate) const IDX_RESULT_NUM_TOKENS: usize = 14; -pub(crate) const IDX_RESULT_OWNER_MARGIN: usize = 15; -pub(crate) const IDX_RESULT_WHEN_STARTED: usize = 16; -pub(crate) const IDX_STATE_AUCTIONS: usize = 17; -pub(crate) const IDX_STATE_BIDDER_LIST: usize = 18; -pub(crate) const IDX_STATE_BIDS: usize = 19; -pub(crate) const IDX_STATE_OWNER_MARGIN: usize = 20; +pub(crate) const IDX_RESULT_MINIMUM_BID: usize = 13; +pub(crate) const IDX_RESULT_NUM_TOKENS: usize = 14; +pub(crate) const IDX_RESULT_OWNER_MARGIN: usize = 15; +pub(crate) const IDX_RESULT_WHEN_STARTED: usize = 16; +pub(crate) const IDX_STATE_AUCTIONS: usize = 17; +pub(crate) const IDX_STATE_BIDDER_LIST: usize = 18; +pub(crate) const IDX_STATE_BIDS: usize = 19; +pub(crate) const IDX_STATE_OWNER_MARGIN: usize = 20; pub const KEY_MAP_LEN: usize = 21; pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ - PARAM_COLOR, - PARAM_DESCRIPTION, - PARAM_DURATION, - PARAM_MINIMUM_BID, - PARAM_OWNER_MARGIN, - RESULT_BIDDERS, - RESULT_COLOR, - RESULT_CREATOR, - RESULT_DEPOSIT, - RESULT_DESCRIPTION, - RESULT_DURATION, - RESULT_HIGHEST_BID, - RESULT_HIGHEST_BIDDER, - RESULT_MINIMUM_BID, - RESULT_NUM_TOKENS, - RESULT_OWNER_MARGIN, - RESULT_WHEN_STARTED, - STATE_AUCTIONS, - STATE_BIDDER_LIST, - STATE_BIDS, - STATE_OWNER_MARGIN, + PARAM_COLOR, + PARAM_DESCRIPTION, + PARAM_DURATION, + PARAM_MINIMUM_BID, + PARAM_OWNER_MARGIN, + RESULT_BIDDERS, + RESULT_COLOR, + RESULT_CREATOR, + RESULT_DEPOSIT, + RESULT_DESCRIPTION, + RESULT_DURATION, + RESULT_HIGHEST_BID, + RESULT_HIGHEST_BIDDER, + RESULT_MINIMUM_BID, + RESULT_NUM_TOKENS, + RESULT_OWNER_MARGIN, + RESULT_WHEN_STARTED, + STATE_AUCTIONS, + STATE_BIDDER_LIST, + STATE_BIDS, + STATE_OWNER_MARGIN, ]; pub static mut IDX_MAP: [Key32; KEY_MAP_LEN] = [Key32(0); KEY_MAP_LEN]; diff --git a/contracts/wasm/fairauction/src/lib.rs b/contracts/wasm/fairauction/src/lib.rs index d9b6366b4b..1c5129b4d9 100644 --- a/contracts/wasm/fairauction/src/lib.rs +++ b/contracts/wasm/fairauction/src/lib.rs @@ -47,114 +47,114 @@ fn on_load() { } pub struct FinalizeAuctionContext { - params: ImmutableFinalizeAuctionParams, - state: MutableFairAuctionState, + params: ImmutableFinalizeAuctionParams, + state: MutableFairAuctionState, } fn func_finalize_auction_thunk(ctx: &ScFuncContext) { - ctx.log("fairauction.funcFinalizeAuction"); + ctx.log("fairauction.funcFinalizeAuction"); // only SC itself can invoke this function - ctx.require(ctx.caller() == ctx.account_id(), "no permission"); - - let f = FinalizeAuctionContext { - params: ImmutableFinalizeAuctionParams { - id: OBJ_ID_PARAMS, - }, - state: MutableFairAuctionState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.color().exists(), "missing mandatory color"); - func_finalize_auction(ctx, &f); - ctx.log("fairauction.funcFinalizeAuction ok"); + ctx.require(ctx.caller() == ctx.account_id(), "no permission"); + + let f = FinalizeAuctionContext { + params: ImmutableFinalizeAuctionParams { + id: OBJ_ID_PARAMS, + }, + state: MutableFairAuctionState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.color().exists(), "missing mandatory color"); + func_finalize_auction(ctx, &f); + ctx.log("fairauction.funcFinalizeAuction ok"); } pub struct PlaceBidContext { - params: ImmutablePlaceBidParams, - state: MutableFairAuctionState, + params: ImmutablePlaceBidParams, + state: MutableFairAuctionState, } fn func_place_bid_thunk(ctx: &ScFuncContext) { - ctx.log("fairauction.funcPlaceBid"); - let f = PlaceBidContext { - params: ImmutablePlaceBidParams { - id: OBJ_ID_PARAMS, - }, - state: MutableFairAuctionState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.color().exists(), "missing mandatory color"); - func_place_bid(ctx, &f); - ctx.log("fairauction.funcPlaceBid ok"); + ctx.log("fairauction.funcPlaceBid"); + let f = PlaceBidContext { + params: ImmutablePlaceBidParams { + id: OBJ_ID_PARAMS, + }, + state: MutableFairAuctionState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.color().exists(), "missing mandatory color"); + func_place_bid(ctx, &f); + ctx.log("fairauction.funcPlaceBid ok"); } pub struct SetOwnerMarginContext { - params: ImmutableSetOwnerMarginParams, - state: MutableFairAuctionState, + params: ImmutableSetOwnerMarginParams, + state: MutableFairAuctionState, } fn func_set_owner_margin_thunk(ctx: &ScFuncContext) { - ctx.log("fairauction.funcSetOwnerMargin"); + ctx.log("fairauction.funcSetOwnerMargin"); // only SC creator can set owner margin - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); - - let f = SetOwnerMarginContext { - params: ImmutableSetOwnerMarginParams { - id: OBJ_ID_PARAMS, - }, - state: MutableFairAuctionState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.owner_margin().exists(), "missing mandatory ownerMargin"); - func_set_owner_margin(ctx, &f); - ctx.log("fairauction.funcSetOwnerMargin ok"); + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + + let f = SetOwnerMarginContext { + params: ImmutableSetOwnerMarginParams { + id: OBJ_ID_PARAMS, + }, + state: MutableFairAuctionState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.owner_margin().exists(), "missing mandatory ownerMargin"); + func_set_owner_margin(ctx, &f); + ctx.log("fairauction.funcSetOwnerMargin ok"); } pub struct StartAuctionContext { - params: ImmutableStartAuctionParams, - state: MutableFairAuctionState, + params: ImmutableStartAuctionParams, + state: MutableFairAuctionState, } fn func_start_auction_thunk(ctx: &ScFuncContext) { - ctx.log("fairauction.funcStartAuction"); - let f = StartAuctionContext { - params: ImmutableStartAuctionParams { - id: OBJ_ID_PARAMS, - }, - state: MutableFairAuctionState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.color().exists(), "missing mandatory color"); - ctx.require(f.params.minimum_bid().exists(), "missing mandatory minimumBid"); - func_start_auction(ctx, &f); - ctx.log("fairauction.funcStartAuction ok"); + ctx.log("fairauction.funcStartAuction"); + let f = StartAuctionContext { + params: ImmutableStartAuctionParams { + id: OBJ_ID_PARAMS, + }, + state: MutableFairAuctionState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.color().exists(), "missing mandatory color"); + ctx.require(f.params.minimum_bid().exists(), "missing mandatory minimumBid"); + func_start_auction(ctx, &f); + ctx.log("fairauction.funcStartAuction ok"); } pub struct GetInfoContext { - params: ImmutableGetInfoParams, - results: MutableGetInfoResults, - state: ImmutableFairAuctionState, + params: ImmutableGetInfoParams, + results: MutableGetInfoResults, + state: ImmutableFairAuctionState, } fn view_get_info_thunk(ctx: &ScViewContext) { - ctx.log("fairauction.viewGetInfo"); - let f = GetInfoContext { - params: ImmutableGetInfoParams { - id: OBJ_ID_PARAMS, - }, - results: MutableGetInfoResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableFairAuctionState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.color().exists(), "missing mandatory color"); - view_get_info(ctx, &f); - ctx.log("fairauction.viewGetInfo ok"); + ctx.log("fairauction.viewGetInfo"); + let f = GetInfoContext { + params: ImmutableGetInfoParams { + id: OBJ_ID_PARAMS, + }, + results: MutableGetInfoResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableFairAuctionState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.color().exists(), "missing mandatory color"); + view_get_info(ctx, &f); + ctx.log("fairauction.viewGetInfo ok"); } // @formatter:on diff --git a/contracts/wasm/fairauction/src/params.rs b/contracts/wasm/fairauction/src/params.rs index ed009024e5..e022b2b18b 100644 --- a/contracts/wasm/fairauction/src/params.rs +++ b/contracts/wasm/fairauction/src/params.rs @@ -20,9 +20,10 @@ pub struct ImmutableFinalizeAuctionParams { } impl ImmutableFinalizeAuctionParams { + pub fn color(&self) -> ScImmutableColor { - ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) - } + ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) + } } #[derive(Clone, Copy)] @@ -31,9 +32,10 @@ pub struct MutableFinalizeAuctionParams { } impl MutableFinalizeAuctionParams { + pub fn color(&self) -> ScMutableColor { - ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) - } + ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) + } } #[derive(Clone, Copy)] @@ -42,9 +44,10 @@ pub struct ImmutablePlaceBidParams { } impl ImmutablePlaceBidParams { + pub fn color(&self) -> ScImmutableColor { - ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) - } + ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) + } } #[derive(Clone, Copy)] @@ -53,9 +56,10 @@ pub struct MutablePlaceBidParams { } impl MutablePlaceBidParams { + pub fn color(&self) -> ScMutableColor { - ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) - } + ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) + } } #[derive(Clone, Copy)] @@ -64,9 +68,10 @@ pub struct ImmutableSetOwnerMarginParams { } impl ImmutableSetOwnerMarginParams { + pub fn owner_margin(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_OWNER_MARGIN)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_OWNER_MARGIN)) + } } #[derive(Clone, Copy)] @@ -75,9 +80,10 @@ pub struct MutableSetOwnerMarginParams { } impl MutableSetOwnerMarginParams { + pub fn owner_margin(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_OWNER_MARGIN)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_OWNER_MARGIN)) + } } #[derive(Clone, Copy)] @@ -86,21 +92,22 @@ pub struct ImmutableStartAuctionParams { } impl ImmutableStartAuctionParams { + pub fn color(&self) -> ScImmutableColor { - ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) - } + ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) + } pub fn description(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_PARAM_DESCRIPTION)) - } + ScImmutableString::new(self.id, idx_map(IDX_PARAM_DESCRIPTION)) + } pub fn duration(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_DURATION)) - } + ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_DURATION)) + } pub fn minimum_bid(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_MINIMUM_BID)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_MINIMUM_BID)) + } } #[derive(Clone, Copy)] @@ -109,21 +116,22 @@ pub struct MutableStartAuctionParams { } impl MutableStartAuctionParams { + pub fn color(&self) -> ScMutableColor { - ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) - } + ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) + } pub fn description(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_PARAM_DESCRIPTION)) - } + ScMutableString::new(self.id, idx_map(IDX_PARAM_DESCRIPTION)) + } pub fn duration(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, idx_map(IDX_PARAM_DURATION)) - } + ScMutableInt32::new(self.id, idx_map(IDX_PARAM_DURATION)) + } pub fn minimum_bid(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_MINIMUM_BID)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_MINIMUM_BID)) + } } #[derive(Clone, Copy)] @@ -132,9 +140,10 @@ pub struct ImmutableGetInfoParams { } impl ImmutableGetInfoParams { + pub fn color(&self) -> ScImmutableColor { - ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) - } + ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) + } } #[derive(Clone, Copy)] @@ -143,7 +152,8 @@ pub struct MutableGetInfoParams { } impl MutableGetInfoParams { + pub fn color(&self) -> ScMutableColor { - ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) - } + ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) + } } diff --git a/contracts/wasm/fairauction/src/results.rs b/contracts/wasm/fairauction/src/results.rs index 2edace8c43..7d9644094b 100644 --- a/contracts/wasm/fairauction/src/results.rs +++ b/contracts/wasm/fairauction/src/results.rs @@ -21,53 +21,54 @@ pub struct ImmutableGetInfoResults { } impl ImmutableGetInfoResults { + pub fn bidders(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, idx_map(IDX_RESULT_BIDDERS)) - } + ScImmutableInt32::new(self.id, idx_map(IDX_RESULT_BIDDERS)) + } pub fn color(&self) -> ScImmutableColor { - ScImmutableColor::new(self.id, idx_map(IDX_RESULT_COLOR)) - } + ScImmutableColor::new(self.id, idx_map(IDX_RESULT_COLOR)) + } pub fn creator(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_RESULT_CREATOR)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_RESULT_CREATOR)) + } pub fn deposit(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_DEPOSIT)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_DEPOSIT)) + } pub fn description(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_RESULT_DESCRIPTION)) - } + ScImmutableString::new(self.id, idx_map(IDX_RESULT_DESCRIPTION)) + } pub fn duration(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, idx_map(IDX_RESULT_DURATION)) - } + ScImmutableInt32::new(self.id, idx_map(IDX_RESULT_DURATION)) + } pub fn highest_bid(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_HIGHEST_BID)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_HIGHEST_BID)) + } pub fn highest_bidder(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_RESULT_HIGHEST_BIDDER)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_RESULT_HIGHEST_BIDDER)) + } pub fn minimum_bid(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_MINIMUM_BID)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_MINIMUM_BID)) + } pub fn num_tokens(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_NUM_TOKENS)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_NUM_TOKENS)) + } pub fn owner_margin(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_OWNER_MARGIN)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_OWNER_MARGIN)) + } pub fn when_started(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_WHEN_STARTED)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_WHEN_STARTED)) + } } #[derive(Clone, Copy)] @@ -76,51 +77,52 @@ pub struct MutableGetInfoResults { } impl MutableGetInfoResults { + pub fn bidders(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, idx_map(IDX_RESULT_BIDDERS)) - } + ScMutableInt32::new(self.id, idx_map(IDX_RESULT_BIDDERS)) + } pub fn color(&self) -> ScMutableColor { - ScMutableColor::new(self.id, idx_map(IDX_RESULT_COLOR)) - } + ScMutableColor::new(self.id, idx_map(IDX_RESULT_COLOR)) + } pub fn creator(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_RESULT_CREATOR)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_RESULT_CREATOR)) + } pub fn deposit(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_DEPOSIT)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_DEPOSIT)) + } pub fn description(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_RESULT_DESCRIPTION)) - } + ScMutableString::new(self.id, idx_map(IDX_RESULT_DESCRIPTION)) + } pub fn duration(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, idx_map(IDX_RESULT_DURATION)) - } + ScMutableInt32::new(self.id, idx_map(IDX_RESULT_DURATION)) + } pub fn highest_bid(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_HIGHEST_BID)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_HIGHEST_BID)) + } pub fn highest_bidder(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_RESULT_HIGHEST_BIDDER)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_RESULT_HIGHEST_BIDDER)) + } pub fn minimum_bid(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_MINIMUM_BID)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_MINIMUM_BID)) + } pub fn num_tokens(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_NUM_TOKENS)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_NUM_TOKENS)) + } pub fn owner_margin(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_OWNER_MARGIN)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_OWNER_MARGIN)) + } pub fn when_started(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_WHEN_STARTED)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_WHEN_STARTED)) + } } diff --git a/contracts/wasm/fairauction/src/state.rs b/contracts/wasm/fairauction/src/state.rs index 6201943eb4..c98ea0c7eb 100644 --- a/contracts/wasm/fairauction/src/state.rs +++ b/contracts/wasm/fairauction/src/state.rs @@ -17,7 +17,7 @@ use crate::structs::*; use crate::typedefs::*; pub struct MapColorToImmutableAuction { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapColorToImmutableAuction { @@ -27,7 +27,7 @@ impl MapColorToImmutableAuction { } pub struct MapColorToImmutableBidderList { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapColorToImmutableBidderList { @@ -38,7 +38,7 @@ impl MapColorToImmutableBidderList { } pub struct MapColorToImmutableBids { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapColorToImmutableBids { @@ -54,33 +54,34 @@ pub struct ImmutableFairAuctionState { } impl ImmutableFairAuctionState { + pub fn auctions(&self) -> MapColorToImmutableAuction { - let map_id = get_object_id(self.id, idx_map(IDX_STATE_AUCTIONS), TYPE_MAP); - MapColorToImmutableAuction { obj_id: map_id } - } + let map_id = get_object_id(self.id, idx_map(IDX_STATE_AUCTIONS), TYPE_MAP); + MapColorToImmutableAuction { obj_id: map_id } + } pub fn bidder_list(&self) -> MapColorToImmutableBidderList { - let map_id = get_object_id(self.id, idx_map(IDX_STATE_BIDDER_LIST), TYPE_MAP); - MapColorToImmutableBidderList { obj_id: map_id } - } + let map_id = get_object_id(self.id, idx_map(IDX_STATE_BIDDER_LIST), TYPE_MAP); + MapColorToImmutableBidderList { obj_id: map_id } + } pub fn bids(&self) -> MapColorToImmutableBids { - let map_id = get_object_id(self.id, idx_map(IDX_STATE_BIDS), TYPE_MAP); - MapColorToImmutableBids { obj_id: map_id } - } + let map_id = get_object_id(self.id, idx_map(IDX_STATE_BIDS), TYPE_MAP); + MapColorToImmutableBids { obj_id: map_id } + } pub fn owner_margin(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_STATE_OWNER_MARGIN)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_STATE_OWNER_MARGIN)) + } } pub struct MapColorToMutableAuction { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapColorToMutableAuction { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_auction(&self, key: &ScColor) -> MutableAuction { @@ -89,12 +90,12 @@ impl MapColorToMutableAuction { } pub struct MapColorToMutableBidderList { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapColorToMutableBidderList { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_bidder_list(&self, key: &ScColor) -> MutableBidderList { @@ -104,12 +105,12 @@ impl MapColorToMutableBidderList { } pub struct MapColorToMutableBids { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapColorToMutableBids { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_bids(&self, key: &ScColor) -> MutableBids { @@ -124,22 +125,23 @@ pub struct MutableFairAuctionState { } impl MutableFairAuctionState { + pub fn auctions(&self) -> MapColorToMutableAuction { - let map_id = get_object_id(self.id, idx_map(IDX_STATE_AUCTIONS), TYPE_MAP); - MapColorToMutableAuction { obj_id: map_id } - } + let map_id = get_object_id(self.id, idx_map(IDX_STATE_AUCTIONS), TYPE_MAP); + MapColorToMutableAuction { obj_id: map_id } + } pub fn bidder_list(&self) -> MapColorToMutableBidderList { - let map_id = get_object_id(self.id, idx_map(IDX_STATE_BIDDER_LIST), TYPE_MAP); - MapColorToMutableBidderList { obj_id: map_id } - } + let map_id = get_object_id(self.id, idx_map(IDX_STATE_BIDDER_LIST), TYPE_MAP); + MapColorToMutableBidderList { obj_id: map_id } + } pub fn bids(&self) -> MapColorToMutableBids { - let map_id = get_object_id(self.id, idx_map(IDX_STATE_BIDS), TYPE_MAP); - MapColorToMutableBids { obj_id: map_id } - } + let map_id = get_object_id(self.id, idx_map(IDX_STATE_BIDS), TYPE_MAP); + MapColorToMutableBids { obj_id: map_id } + } pub fn owner_margin(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_STATE_OWNER_MARGIN)) - } + ScMutableInt64::new(self.id, idx_map(IDX_STATE_OWNER_MARGIN)) + } } diff --git a/contracts/wasm/fairauction/src/structs.rs b/contracts/wasm/fairauction/src/structs.rs index 9c238f72c6..b5db0c0c97 100644 --- a/contracts/wasm/fairauction/src/structs.rs +++ b/contracts/wasm/fairauction/src/structs.rs @@ -13,17 +13,17 @@ use wasmlib::*; use wasmlib::host::*; pub struct Auction { - pub color: ScColor, // color of tokens for sale - pub creator: ScAgentID, // issuer of start_auction transaction - pub deposit: i64, // deposit by auction owner to cover the SC fees - pub description: String, // auction description - pub duration: i32, // auction duration in minutes - pub highest_bid: i64, // the current highest bid amount - pub highest_bidder: ScAgentID, // the current highest bidder - pub minimum_bid: i64, // minimum bid amount - pub num_tokens: i64, // number of tokens for sale - pub owner_margin: i64, // auction owner's margin in promilles - pub when_started: i64, // timestamp when auction started + pub color: ScColor, // color of tokens for sale + pub creator: ScAgentID, // issuer of start_auction transaction + pub deposit: i64, // deposit by auction owner to cover the SC fees + pub description: String, // auction description + pub duration: i32, // auction duration in minutes + pub highest_bid: i64, // the current highest bid amount + pub highest_bidder: ScAgentID, // the current highest bidder + pub minimum_bid: i64, // minimum bid amount + pub num_tokens: i64, // number of tokens for sale + pub owner_margin: i64, // auction owner's margin in promilles + pub when_started: i64, // timestamp when auction started } impl Auction { @@ -46,17 +46,17 @@ impl Auction { pub fn to_bytes(&self) -> Vec { let mut encode = BytesEncoder::new(); - encode.color(&self.color); - encode.agent_id(&self.creator); - encode.int64(self.deposit); - encode.string(&self.description); - encode.int32(self.duration); - encode.int64(self.highest_bid); - encode.agent_id(&self.highest_bidder); - encode.int64(self.minimum_bid); - encode.int64(self.num_tokens); - encode.int64(self.owner_margin); - encode.int64(self.when_started); + encode.color(&self.color); + encode.agent_id(&self.creator); + encode.int64(self.deposit); + encode.string(&self.description); + encode.int32(self.duration); + encode.int64(self.highest_bid); + encode.agent_id(&self.highest_bidder); + encode.int64(self.minimum_bid); + encode.int64(self.num_tokens); + encode.int64(self.owner_margin); + encode.int64(self.when_started); return encode.data(); } } @@ -96,9 +96,9 @@ impl MutableAuction { } pub struct Bid { - pub amount: i64, // cumulative amount of bids from same bidder - pub index: i32, // index of bidder in bidder list - pub timestamp: i64, // timestamp of most recent bid + pub amount: i64, // cumulative amount of bids from same bidder + pub index: i32, // index of bidder in bidder list + pub timestamp: i64, // timestamp of most recent bid } impl Bid { @@ -113,9 +113,9 @@ impl Bid { pub fn to_bytes(&self) -> Vec { let mut encode = BytesEncoder::new(); - encode.int64(self.amount); - encode.int32(self.index); - encode.int64(self.timestamp); + encode.int64(self.amount); + encode.int32(self.index); + encode.int64(self.timestamp); return encode.data(); } } diff --git a/contracts/wasm/fairauction/src/typedefs.rs b/contracts/wasm/fairauction/src/typedefs.rs index 260aaebe7c..41dbc79344 100644 --- a/contracts/wasm/fairauction/src/typedefs.rs +++ b/contracts/wasm/fairauction/src/typedefs.rs @@ -11,11 +11,10 @@ use wasmlib::*; use wasmlib::host::*; - use crate::structs::*; pub struct ArrayOfImmutableAgentID { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl ArrayOfImmutableAgentID { @@ -31,7 +30,7 @@ impl ArrayOfImmutableAgentID { pub type ImmutableBidderList = ArrayOfImmutableAgentID; pub struct ArrayOfMutableAgentID { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl ArrayOfMutableAgentID { @@ -51,7 +50,7 @@ impl ArrayOfMutableAgentID { pub type MutableBidderList = ArrayOfMutableAgentID; pub struct MapAgentIDToImmutableBid { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapAgentIDToImmutableBid { @@ -63,12 +62,12 @@ impl MapAgentIDToImmutableBid { pub type ImmutableBids = MapAgentIDToImmutableBid; pub struct MapAgentIDToMutableBid { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapAgentIDToMutableBid { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_bid(&self, key: &ScAgentID) -> MutableBid { diff --git a/contracts/wasm/fairroulette/src/consts.rs b/contracts/wasm/fairroulette/src/consts.rs index e2fabf0556..6087aea9e8 100644 --- a/contracts/wasm/fairroulette/src/consts.rs +++ b/contracts/wasm/fairroulette/src/consts.rs @@ -11,42 +11,43 @@ use wasmlib::*; -pub const SC_NAME: &str = "fairroulette"; -pub const HSC_NAME: ScHname = ScHname(0xdf79d138); +pub const SC_NAME: &str = "fairroulette"; +pub const SC_DESCRIPTION: &str = ""; +pub const HSC_NAME: ScHname = ScHname(0xdf79d138); -pub const PARAM_NUMBER: &str = "number"; +pub const PARAM_NUMBER: &str = "number"; pub const PARAM_PLAY_PERIOD: &str = "playPeriod"; pub const RESULT_LAST_WINNING_NUMBER: &str = "lastWinningNumber"; -pub const RESULT_ROUND_NUMBER: &str = "roundNumber"; -pub const RESULT_ROUND_STARTED_AT: &str = "roundStartedAt"; -pub const RESULT_ROUND_STATUS: &str = "roundStatus"; +pub const RESULT_ROUND_NUMBER: &str = "roundNumber"; +pub const RESULT_ROUND_STARTED_AT: &str = "roundStartedAt"; +pub const RESULT_ROUND_STATUS: &str = "roundStatus"; -pub const STATE_BETS: &str = "bets"; +pub const STATE_BETS: &str = "bets"; pub const STATE_LAST_WINNING_NUMBER: &str = "lastWinningNumber"; -pub const STATE_PLAY_PERIOD: &str = "playPeriod"; -pub const STATE_ROUND_NUMBER: &str = "roundNumber"; -pub const STATE_ROUND_STARTED_AT: &str = "roundStartedAt"; -pub const STATE_ROUND_STATUS: &str = "roundStatus"; - -pub const FUNC_FORCE_PAYOUT: &str = "forcePayout"; -pub const FUNC_FORCE_RESET: &str = "forceReset"; -pub const FUNC_PAY_WINNERS: &str = "payWinners"; -pub const FUNC_PLACE_BET: &str = "placeBet"; -pub const FUNC_PLAY_PERIOD: &str = "playPeriod"; -pub const VIEW_LAST_WINNING_NUMBER: &str = "lastWinningNumber"; -pub const VIEW_ROUND_NUMBER: &str = "roundNumber"; -pub const VIEW_ROUND_STARTED_AT: &str = "roundStartedAt"; -pub const VIEW_ROUND_STATUS: &str = "roundStatus"; - -pub const HFUNC_FORCE_PAYOUT: ScHname = ScHname(0x555a4c4f); -pub const HFUNC_FORCE_RESET: ScHname = ScHname(0xa331951e); -pub const HFUNC_PAY_WINNERS: ScHname = ScHname(0xfb2b0144); -pub const HFUNC_PLACE_BET: ScHname = ScHname(0xdfba7d1b); -pub const HFUNC_PLAY_PERIOD: ScHname = ScHname(0xcb94b293); +pub const STATE_PLAY_PERIOD: &str = "playPeriod"; +pub const STATE_ROUND_NUMBER: &str = "roundNumber"; +pub const STATE_ROUND_STARTED_AT: &str = "roundStartedAt"; +pub const STATE_ROUND_STATUS: &str = "roundStatus"; + +pub const FUNC_FORCE_PAYOUT: &str = "forcePayout"; +pub const FUNC_FORCE_RESET: &str = "forceReset"; +pub const FUNC_PAY_WINNERS: &str = "payWinners"; +pub const FUNC_PLACE_BET: &str = "placeBet"; +pub const FUNC_PLAY_PERIOD: &str = "playPeriod"; +pub const VIEW_LAST_WINNING_NUMBER: &str = "lastWinningNumber"; +pub const VIEW_ROUND_NUMBER: &str = "roundNumber"; +pub const VIEW_ROUND_STARTED_AT: &str = "roundStartedAt"; +pub const VIEW_ROUND_STATUS: &str = "roundStatus"; + +pub const HFUNC_FORCE_PAYOUT: ScHname = ScHname(0x555a4c4f); +pub const HFUNC_FORCE_RESET: ScHname = ScHname(0xa331951e); +pub const HFUNC_PAY_WINNERS: ScHname = ScHname(0xfb2b0144); +pub const HFUNC_PLACE_BET: ScHname = ScHname(0xdfba7d1b); +pub const HFUNC_PLAY_PERIOD: ScHname = ScHname(0xcb94b293); pub const HVIEW_LAST_WINNING_NUMBER: ScHname = ScHname(0x2f5f09fe); -pub const HVIEW_ROUND_NUMBER: ScHname = ScHname(0x0dcfe520); -pub const HVIEW_ROUND_STARTED_AT: ScHname = ScHname(0x725de8b4); -pub const HVIEW_ROUND_STATUS: ScHname = ScHname(0x145053b5); +pub const HVIEW_ROUND_NUMBER: ScHname = ScHname(0x0dcfe520); +pub const HVIEW_ROUND_STARTED_AT: ScHname = ScHname(0x725de8b4); +pub const HVIEW_ROUND_STATUS: ScHname = ScHname(0x145053b5); // @formatter:on diff --git a/contracts/wasm/fairroulette/src/contract.rs b/contracts/wasm/fairroulette/src/contract.rs index 174a6ed640..c30443bf34 100644 --- a/contracts/wasm/fairroulette/src/contract.rs +++ b/contracts/wasm/fairroulette/src/contract.rs @@ -18,45 +18,45 @@ use crate::params::*; use crate::results::*; pub struct ForcePayoutCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct ForceResetCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct PayWinnersCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct PlaceBetCall { - pub func: ScFunc, - pub params: MutablePlaceBetParams, + pub func: ScFunc, + pub params: MutablePlaceBetParams, } pub struct PlayPeriodCall { - pub func: ScFunc, - pub params: MutablePlayPeriodParams, + pub func: ScFunc, + pub params: MutablePlayPeriodParams, } pub struct LastWinningNumberCall { - pub func: ScView, - pub results: ImmutableLastWinningNumberResults, + pub func: ScView, + pub results: ImmutableLastWinningNumberResults, } pub struct RoundNumberCall { - pub func: ScView, - pub results: ImmutableRoundNumberResults, + pub func: ScView, + pub results: ImmutableRoundNumberResults, } pub struct RoundStartedAtCall { - pub func: ScView, - pub results: ImmutableRoundStartedAtResults, + pub func: ScView, + pub results: ImmutableRoundStartedAtResults, } pub struct RoundStatusCall { - pub func: ScView, - pub results: ImmutableRoundStatusResults, + pub func: ScView, + pub results: ImmutableRoundStatusResults, } pub struct ScFuncs { @@ -80,7 +80,7 @@ impl ScFuncs { } pub fn place_bet(_ctx: & dyn ScFuncCallContext) -> PlaceBetCall { let mut f = PlaceBetCall { - func: ScFunc::new(HSC_NAME, HFUNC_PLACE_BET), + func: ScFunc::new(HSC_NAME, HFUNC_PLACE_BET), params: MutablePlaceBetParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -88,7 +88,7 @@ impl ScFuncs { } pub fn play_period(_ctx: & dyn ScFuncCallContext) -> PlayPeriodCall { let mut f = PlayPeriodCall { - func: ScFunc::new(HSC_NAME, HFUNC_PLAY_PERIOD), + func: ScFunc::new(HSC_NAME, HFUNC_PLAY_PERIOD), params: MutablePlayPeriodParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -96,7 +96,7 @@ impl ScFuncs { } pub fn last_winning_number(_ctx: & dyn ScViewCallContext) -> LastWinningNumberCall { let mut f = LastWinningNumberCall { - func: ScView::new(HSC_NAME, HVIEW_LAST_WINNING_NUMBER), + func: ScView::new(HSC_NAME, HVIEW_LAST_WINNING_NUMBER), results: ImmutableLastWinningNumberResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); @@ -104,7 +104,7 @@ impl ScFuncs { } pub fn round_number(_ctx: & dyn ScViewCallContext) -> RoundNumberCall { let mut f = RoundNumberCall { - func: ScView::new(HSC_NAME, HVIEW_ROUND_NUMBER), + func: ScView::new(HSC_NAME, HVIEW_ROUND_NUMBER), results: ImmutableRoundNumberResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); @@ -112,7 +112,7 @@ impl ScFuncs { } pub fn round_started_at(_ctx: & dyn ScViewCallContext) -> RoundStartedAtCall { let mut f = RoundStartedAtCall { - func: ScView::new(HSC_NAME, HVIEW_ROUND_STARTED_AT), + func: ScView::new(HSC_NAME, HVIEW_ROUND_STARTED_AT), results: ImmutableRoundStartedAtResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); @@ -120,7 +120,7 @@ impl ScFuncs { } pub fn round_status(_ctx: & dyn ScViewCallContext) -> RoundStatusCall { let mut f = RoundStatusCall { - func: ScView::new(HSC_NAME, HVIEW_ROUND_STATUS), + func: ScView::new(HSC_NAME, HVIEW_ROUND_STATUS), results: ImmutableRoundStatusResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); diff --git a/contracts/wasm/fairroulette/src/keys.rs b/contracts/wasm/fairroulette/src/keys.rs index 8f0d713f5a..a362646823 100644 --- a/contracts/wasm/fairroulette/src/keys.rs +++ b/contracts/wasm/fairroulette/src/keys.rs @@ -13,34 +13,34 @@ use wasmlib::*; use crate::*; -pub(crate) const IDX_PARAM_NUMBER: usize = 0; -pub(crate) const IDX_PARAM_PLAY_PERIOD: usize = 1; +pub(crate) const IDX_PARAM_NUMBER: usize = 0; +pub(crate) const IDX_PARAM_PLAY_PERIOD: usize = 1; pub(crate) const IDX_RESULT_LAST_WINNING_NUMBER: usize = 2; -pub(crate) const IDX_RESULT_ROUND_NUMBER: usize = 3; -pub(crate) const IDX_RESULT_ROUND_STARTED_AT: usize = 4; -pub(crate) const IDX_RESULT_ROUND_STATUS: usize = 5; -pub(crate) const IDX_STATE_BETS: usize = 6; -pub(crate) const IDX_STATE_LAST_WINNING_NUMBER: usize = 7; -pub(crate) const IDX_STATE_PLAY_PERIOD: usize = 8; -pub(crate) const IDX_STATE_ROUND_NUMBER: usize = 9; -pub(crate) const IDX_STATE_ROUND_STARTED_AT: usize = 10; -pub(crate) const IDX_STATE_ROUND_STATUS: usize = 11; +pub(crate) const IDX_RESULT_ROUND_NUMBER: usize = 3; +pub(crate) const IDX_RESULT_ROUND_STARTED_AT: usize = 4; +pub(crate) const IDX_RESULT_ROUND_STATUS: usize = 5; +pub(crate) const IDX_STATE_BETS: usize = 6; +pub(crate) const IDX_STATE_LAST_WINNING_NUMBER: usize = 7; +pub(crate) const IDX_STATE_PLAY_PERIOD: usize = 8; +pub(crate) const IDX_STATE_ROUND_NUMBER: usize = 9; +pub(crate) const IDX_STATE_ROUND_STARTED_AT: usize = 10; +pub(crate) const IDX_STATE_ROUND_STATUS: usize = 11; pub const KEY_MAP_LEN: usize = 12; pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ - PARAM_NUMBER, - PARAM_PLAY_PERIOD, - RESULT_LAST_WINNING_NUMBER, - RESULT_ROUND_NUMBER, - RESULT_ROUND_STARTED_AT, - RESULT_ROUND_STATUS, - STATE_BETS, - STATE_LAST_WINNING_NUMBER, - STATE_PLAY_PERIOD, - STATE_ROUND_NUMBER, - STATE_ROUND_STARTED_AT, - STATE_ROUND_STATUS, + PARAM_NUMBER, + PARAM_PLAY_PERIOD, + RESULT_LAST_WINNING_NUMBER, + RESULT_ROUND_NUMBER, + RESULT_ROUND_STARTED_AT, + RESULT_ROUND_STATUS, + STATE_BETS, + STATE_LAST_WINNING_NUMBER, + STATE_PLAY_PERIOD, + STATE_ROUND_NUMBER, + STATE_ROUND_STARTED_AT, + STATE_ROUND_STATUS, ]; pub static mut IDX_MAP: [Key32; KEY_MAP_LEN] = [Key32(0); KEY_MAP_LEN]; diff --git a/contracts/wasm/fairroulette/src/lib.rs b/contracts/wasm/fairroulette/src/lib.rs index 86a275e671..b100022194 100644 --- a/contracts/wasm/fairroulette/src/lib.rs +++ b/contracts/wasm/fairroulette/src/lib.rs @@ -50,176 +50,176 @@ fn on_load() { } pub struct ForcePayoutContext { - state: MutableFairRouletteState, + state: MutableFairRouletteState, } fn func_force_payout_thunk(ctx: &ScFuncContext) { - ctx.log("fairroulette.funcForcePayout"); + ctx.log("fairroulette.funcForcePayout"); // only SC creator can restart the round forcefully - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); - let f = ForcePayoutContext { - state: MutableFairRouletteState { - id: OBJ_ID_STATE, - }, - }; - func_force_payout(ctx, &f); - ctx.log("fairroulette.funcForcePayout ok"); + let f = ForcePayoutContext { + state: MutableFairRouletteState { + id: OBJ_ID_STATE, + }, + }; + func_force_payout(ctx, &f); + ctx.log("fairroulette.funcForcePayout ok"); } pub struct ForceResetContext { - state: MutableFairRouletteState, + state: MutableFairRouletteState, } fn func_force_reset_thunk(ctx: &ScFuncContext) { - ctx.log("fairroulette.funcForceReset"); + ctx.log("fairroulette.funcForceReset"); // only SC creator can restart the round forcefully - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); - let f = ForceResetContext { - state: MutableFairRouletteState { - id: OBJ_ID_STATE, - }, - }; - func_force_reset(ctx, &f); - ctx.log("fairroulette.funcForceReset ok"); + let f = ForceResetContext { + state: MutableFairRouletteState { + id: OBJ_ID_STATE, + }, + }; + func_force_reset(ctx, &f); + ctx.log("fairroulette.funcForceReset ok"); } pub struct PayWinnersContext { - state: MutableFairRouletteState, + state: MutableFairRouletteState, } fn func_pay_winners_thunk(ctx: &ScFuncContext) { - ctx.log("fairroulette.funcPayWinners"); + ctx.log("fairroulette.funcPayWinners"); // only SC itself can invoke this function - ctx.require(ctx.caller() == ctx.account_id(), "no permission"); + ctx.require(ctx.caller() == ctx.account_id(), "no permission"); - let f = PayWinnersContext { - state: MutableFairRouletteState { - id: OBJ_ID_STATE, - }, - }; - func_pay_winners(ctx, &f); - ctx.log("fairroulette.funcPayWinners ok"); + let f = PayWinnersContext { + state: MutableFairRouletteState { + id: OBJ_ID_STATE, + }, + }; + func_pay_winners(ctx, &f); + ctx.log("fairroulette.funcPayWinners ok"); } pub struct PlaceBetContext { - params: ImmutablePlaceBetParams, - state: MutableFairRouletteState, + params: ImmutablePlaceBetParams, + state: MutableFairRouletteState, } fn func_place_bet_thunk(ctx: &ScFuncContext) { - ctx.log("fairroulette.funcPlaceBet"); - let f = PlaceBetContext { - params: ImmutablePlaceBetParams { - id: OBJ_ID_PARAMS, - }, - state: MutableFairRouletteState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.number().exists(), "missing mandatory number"); - func_place_bet(ctx, &f); - ctx.log("fairroulette.funcPlaceBet ok"); + ctx.log("fairroulette.funcPlaceBet"); + let f = PlaceBetContext { + params: ImmutablePlaceBetParams { + id: OBJ_ID_PARAMS, + }, + state: MutableFairRouletteState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.number().exists(), "missing mandatory number"); + func_place_bet(ctx, &f); + ctx.log("fairroulette.funcPlaceBet ok"); } pub struct PlayPeriodContext { - params: ImmutablePlayPeriodParams, - state: MutableFairRouletteState, + params: ImmutablePlayPeriodParams, + state: MutableFairRouletteState, } fn func_play_period_thunk(ctx: &ScFuncContext) { - ctx.log("fairroulette.funcPlayPeriod"); + ctx.log("fairroulette.funcPlayPeriod"); // only SC creator can update the play period - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); - let f = PlayPeriodContext { - params: ImmutablePlayPeriodParams { - id: OBJ_ID_PARAMS, - }, - state: MutableFairRouletteState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.play_period().exists(), "missing mandatory playPeriod"); - func_play_period(ctx, &f); - ctx.log("fairroulette.funcPlayPeriod ok"); + let f = PlayPeriodContext { + params: ImmutablePlayPeriodParams { + id: OBJ_ID_PARAMS, + }, + state: MutableFairRouletteState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.play_period().exists(), "missing mandatory playPeriod"); + func_play_period(ctx, &f); + ctx.log("fairroulette.funcPlayPeriod ok"); } pub struct LastWinningNumberContext { - results: MutableLastWinningNumberResults, - state: ImmutableFairRouletteState, + results: MutableLastWinningNumberResults, + state: ImmutableFairRouletteState, } fn view_last_winning_number_thunk(ctx: &ScViewContext) { - ctx.log("fairroulette.viewLastWinningNumber"); - let f = LastWinningNumberContext { - results: MutableLastWinningNumberResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableFairRouletteState { - id: OBJ_ID_STATE, - }, - }; - view_last_winning_number(ctx, &f); - ctx.log("fairroulette.viewLastWinningNumber ok"); + ctx.log("fairroulette.viewLastWinningNumber"); + let f = LastWinningNumberContext { + results: MutableLastWinningNumberResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableFairRouletteState { + id: OBJ_ID_STATE, + }, + }; + view_last_winning_number(ctx, &f); + ctx.log("fairroulette.viewLastWinningNumber ok"); } pub struct RoundNumberContext { - results: MutableRoundNumberResults, - state: ImmutableFairRouletteState, + results: MutableRoundNumberResults, + state: ImmutableFairRouletteState, } fn view_round_number_thunk(ctx: &ScViewContext) { - ctx.log("fairroulette.viewRoundNumber"); - let f = RoundNumberContext { - results: MutableRoundNumberResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableFairRouletteState { - id: OBJ_ID_STATE, - }, - }; - view_round_number(ctx, &f); - ctx.log("fairroulette.viewRoundNumber ok"); + ctx.log("fairroulette.viewRoundNumber"); + let f = RoundNumberContext { + results: MutableRoundNumberResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableFairRouletteState { + id: OBJ_ID_STATE, + }, + }; + view_round_number(ctx, &f); + ctx.log("fairroulette.viewRoundNumber ok"); } pub struct RoundStartedAtContext { - results: MutableRoundStartedAtResults, - state: ImmutableFairRouletteState, + results: MutableRoundStartedAtResults, + state: ImmutableFairRouletteState, } fn view_round_started_at_thunk(ctx: &ScViewContext) { - ctx.log("fairroulette.viewRoundStartedAt"); - let f = RoundStartedAtContext { - results: MutableRoundStartedAtResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableFairRouletteState { - id: OBJ_ID_STATE, - }, - }; - view_round_started_at(ctx, &f); - ctx.log("fairroulette.viewRoundStartedAt ok"); + ctx.log("fairroulette.viewRoundStartedAt"); + let f = RoundStartedAtContext { + results: MutableRoundStartedAtResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableFairRouletteState { + id: OBJ_ID_STATE, + }, + }; + view_round_started_at(ctx, &f); + ctx.log("fairroulette.viewRoundStartedAt ok"); } pub struct RoundStatusContext { - results: MutableRoundStatusResults, - state: ImmutableFairRouletteState, + results: MutableRoundStatusResults, + state: ImmutableFairRouletteState, } fn view_round_status_thunk(ctx: &ScViewContext) { - ctx.log("fairroulette.viewRoundStatus"); - let f = RoundStatusContext { - results: MutableRoundStatusResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableFairRouletteState { - id: OBJ_ID_STATE, - }, - }; - view_round_status(ctx, &f); - ctx.log("fairroulette.viewRoundStatus ok"); + ctx.log("fairroulette.viewRoundStatus"); + let f = RoundStatusContext { + results: MutableRoundStatusResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableFairRouletteState { + id: OBJ_ID_STATE, + }, + }; + view_round_status(ctx, &f); + ctx.log("fairroulette.viewRoundStatus ok"); } // @formatter:on diff --git a/contracts/wasm/fairroulette/src/params.rs b/contracts/wasm/fairroulette/src/params.rs index c5457a29a3..6c1213d216 100644 --- a/contracts/wasm/fairroulette/src/params.rs +++ b/contracts/wasm/fairroulette/src/params.rs @@ -20,9 +20,10 @@ pub struct ImmutablePlaceBetParams { } impl ImmutablePlaceBetParams { + pub fn number(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_NUMBER)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_NUMBER)) + } } #[derive(Clone, Copy)] @@ -31,9 +32,10 @@ pub struct MutablePlaceBetParams { } impl MutablePlaceBetParams { + pub fn number(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_NUMBER)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_NUMBER)) + } } #[derive(Clone, Copy)] @@ -42,9 +44,10 @@ pub struct ImmutablePlayPeriodParams { } impl ImmutablePlayPeriodParams { + pub fn play_period(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_PLAY_PERIOD)) - } + ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_PLAY_PERIOD)) + } } #[derive(Clone, Copy)] @@ -53,7 +56,8 @@ pub struct MutablePlayPeriodParams { } impl MutablePlayPeriodParams { + pub fn play_period(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, idx_map(IDX_PARAM_PLAY_PERIOD)) - } + ScMutableInt32::new(self.id, idx_map(IDX_PARAM_PLAY_PERIOD)) + } } diff --git a/contracts/wasm/fairroulette/src/results.rs b/contracts/wasm/fairroulette/src/results.rs index ac407245b1..f0cc1508ab 100644 --- a/contracts/wasm/fairroulette/src/results.rs +++ b/contracts/wasm/fairroulette/src/results.rs @@ -21,9 +21,10 @@ pub struct ImmutableLastWinningNumberResults { } impl ImmutableLastWinningNumberResults { + pub fn last_winning_number(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_LAST_WINNING_NUMBER)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_LAST_WINNING_NUMBER)) + } } #[derive(Clone, Copy)] @@ -32,9 +33,10 @@ pub struct MutableLastWinningNumberResults { } impl MutableLastWinningNumberResults { + pub fn last_winning_number(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_LAST_WINNING_NUMBER)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_LAST_WINNING_NUMBER)) + } } #[derive(Clone, Copy)] @@ -43,9 +45,10 @@ pub struct ImmutableRoundNumberResults { } impl ImmutableRoundNumberResults { + pub fn round_number(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_ROUND_NUMBER)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_ROUND_NUMBER)) + } } #[derive(Clone, Copy)] @@ -54,9 +57,10 @@ pub struct MutableRoundNumberResults { } impl MutableRoundNumberResults { + pub fn round_number(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_ROUND_NUMBER)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_ROUND_NUMBER)) + } } #[derive(Clone, Copy)] @@ -65,9 +69,10 @@ pub struct ImmutableRoundStartedAtResults { } impl ImmutableRoundStartedAtResults { + pub fn round_started_at(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, idx_map(IDX_RESULT_ROUND_STARTED_AT)) - } + ScImmutableInt32::new(self.id, idx_map(IDX_RESULT_ROUND_STARTED_AT)) + } } #[derive(Clone, Copy)] @@ -76,9 +81,10 @@ pub struct MutableRoundStartedAtResults { } impl MutableRoundStartedAtResults { + pub fn round_started_at(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, idx_map(IDX_RESULT_ROUND_STARTED_AT)) - } + ScMutableInt32::new(self.id, idx_map(IDX_RESULT_ROUND_STARTED_AT)) + } } #[derive(Clone, Copy)] @@ -87,9 +93,10 @@ pub struct ImmutableRoundStatusResults { } impl ImmutableRoundStatusResults { + pub fn round_status(&self) -> ScImmutableInt16 { - ScImmutableInt16::new(self.id, idx_map(IDX_RESULT_ROUND_STATUS)) - } + ScImmutableInt16::new(self.id, idx_map(IDX_RESULT_ROUND_STATUS)) + } } #[derive(Clone, Copy)] @@ -98,7 +105,8 @@ pub struct MutableRoundStatusResults { } impl MutableRoundStatusResults { + pub fn round_status(&self) -> ScMutableInt16 { - ScMutableInt16::new(self.id, idx_map(IDX_RESULT_ROUND_STATUS)) - } + ScMutableInt16::new(self.id, idx_map(IDX_RESULT_ROUND_STATUS)) + } } diff --git a/contracts/wasm/fairroulette/src/state.rs b/contracts/wasm/fairroulette/src/state.rs index f67c00ce16..a9c95dd8ca 100644 --- a/contracts/wasm/fairroulette/src/state.rs +++ b/contracts/wasm/fairroulette/src/state.rs @@ -16,7 +16,7 @@ use crate::keys::*; use crate::structs::*; pub struct ArrayOfImmutableBet { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl ArrayOfImmutableBet { @@ -24,9 +24,9 @@ impl ArrayOfImmutableBet { get_length(self.obj_id) } - pub fn get_bet(&self, index: i32) -> ImmutableBet { - ImmutableBet { obj_id: self.obj_id, key_id: Key32(index) } - } + pub fn get_bet(&self, index: i32) -> ImmutableBet { + ImmutableBet { obj_id: self.obj_id, key_id: Key32(index) } + } } #[derive(Clone, Copy)] @@ -35,34 +35,35 @@ pub struct ImmutableFairRouletteState { } impl ImmutableFairRouletteState { + pub fn bets(&self) -> ArrayOfImmutableBet { - let arr_id = get_object_id(self.id, idx_map(IDX_STATE_BETS), TYPE_ARRAY | TYPE_BYTES); - ArrayOfImmutableBet { obj_id: arr_id } - } + let arr_id = get_object_id(self.id, idx_map(IDX_STATE_BETS), TYPE_ARRAY | TYPE_BYTES); + ArrayOfImmutableBet { obj_id: arr_id } + } pub fn last_winning_number(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_STATE_LAST_WINNING_NUMBER)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_STATE_LAST_WINNING_NUMBER)) + } pub fn play_period(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, idx_map(IDX_STATE_PLAY_PERIOD)) - } + ScImmutableInt32::new(self.id, idx_map(IDX_STATE_PLAY_PERIOD)) + } pub fn round_number(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_STATE_ROUND_NUMBER)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_STATE_ROUND_NUMBER)) + } pub fn round_started_at(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, idx_map(IDX_STATE_ROUND_STARTED_AT)) - } + ScImmutableInt32::new(self.id, idx_map(IDX_STATE_ROUND_STARTED_AT)) + } pub fn round_status(&self) -> ScImmutableInt16 { - ScImmutableInt16::new(self.id, idx_map(IDX_STATE_ROUND_STATUS)) - } + ScImmutableInt16::new(self.id, idx_map(IDX_STATE_ROUND_STATUS)) + } } pub struct ArrayOfMutableBet { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl ArrayOfMutableBet { @@ -74,9 +75,9 @@ impl ArrayOfMutableBet { get_length(self.obj_id) } - pub fn get_bet(&self, index: i32) -> MutableBet { - MutableBet { obj_id: self.obj_id, key_id: Key32(index) } - } + pub fn get_bet(&self, index: i32) -> MutableBet { + MutableBet { obj_id: self.obj_id, key_id: Key32(index) } + } } #[derive(Clone, Copy)] @@ -85,28 +86,29 @@ pub struct MutableFairRouletteState { } impl MutableFairRouletteState { + pub fn bets(&self) -> ArrayOfMutableBet { - let arr_id = get_object_id(self.id, idx_map(IDX_STATE_BETS), TYPE_ARRAY | TYPE_BYTES); - ArrayOfMutableBet { obj_id: arr_id } - } + let arr_id = get_object_id(self.id, idx_map(IDX_STATE_BETS), TYPE_ARRAY | TYPE_BYTES); + ArrayOfMutableBet { obj_id: arr_id } + } pub fn last_winning_number(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_STATE_LAST_WINNING_NUMBER)) - } + ScMutableInt64::new(self.id, idx_map(IDX_STATE_LAST_WINNING_NUMBER)) + } pub fn play_period(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, idx_map(IDX_STATE_PLAY_PERIOD)) - } + ScMutableInt32::new(self.id, idx_map(IDX_STATE_PLAY_PERIOD)) + } pub fn round_number(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_STATE_ROUND_NUMBER)) - } + ScMutableInt64::new(self.id, idx_map(IDX_STATE_ROUND_NUMBER)) + } pub fn round_started_at(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, idx_map(IDX_STATE_ROUND_STARTED_AT)) - } + ScMutableInt32::new(self.id, idx_map(IDX_STATE_ROUND_STARTED_AT)) + } pub fn round_status(&self) -> ScMutableInt16 { - ScMutableInt16::new(self.id, idx_map(IDX_STATE_ROUND_STATUS)) - } + ScMutableInt16::new(self.id, idx_map(IDX_STATE_ROUND_STATUS)) + } } diff --git a/contracts/wasm/fairroulette/src/structs.rs b/contracts/wasm/fairroulette/src/structs.rs index 335bea0497..8429eb3687 100644 --- a/contracts/wasm/fairroulette/src/structs.rs +++ b/contracts/wasm/fairroulette/src/structs.rs @@ -13,9 +13,9 @@ use wasmlib::*; use wasmlib::host::*; pub struct Bet { - pub amount: i64, - pub better: ScAgentID, - pub number: i64, + pub amount: i64, + pub better: ScAgentID, + pub number: i64, } impl Bet { @@ -30,9 +30,9 @@ impl Bet { pub fn to_bytes(&self) -> Vec { let mut encode = BytesEncoder::new(); - encode.int64(self.amount); - encode.agent_id(&self.better); - encode.int64(self.number); + encode.int64(self.amount); + encode.agent_id(&self.better); + encode.int64(self.number); return encode.data(); } } diff --git a/contracts/wasm/helloworld/src/consts.rs b/contracts/wasm/helloworld/src/consts.rs index bf53414060..d260e55488 100644 --- a/contracts/wasm/helloworld/src/consts.rs +++ b/contracts/wasm/helloworld/src/consts.rs @@ -17,10 +17,10 @@ pub const HSC_NAME: ScHname = ScHname(0x0683223c); pub const RESULT_HELLO_WORLD: &str = "helloWorld"; -pub const FUNC_HELLO_WORLD: &str = "helloWorld"; -pub const VIEW_GET_HELLO_WORLD: &str = "getHelloWorld"; +pub const FUNC_HELLO_WORLD: &str = "helloWorld"; +pub const VIEW_GET_HELLO_WORLD: &str = "getHelloWorld"; -pub const HFUNC_HELLO_WORLD: ScHname = ScHname(0x9d042e65); +pub const HFUNC_HELLO_WORLD: ScHname = ScHname(0x9d042e65); pub const HVIEW_GET_HELLO_WORLD: ScHname = ScHname(0x210439ce); // @formatter:on diff --git a/contracts/wasm/helloworld/src/contract.rs b/contracts/wasm/helloworld/src/contract.rs index 1a1534a38f..abafa9cda4 100644 --- a/contracts/wasm/helloworld/src/contract.rs +++ b/contracts/wasm/helloworld/src/contract.rs @@ -17,12 +17,12 @@ use crate::consts::*; use crate::results::*; pub struct HelloWorldCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct GetHelloWorldCall { - pub func: ScView, - pub results: ImmutableGetHelloWorldResults, + pub func: ScView, + pub results: ImmutableGetHelloWorldResults, } pub struct ScFuncs { @@ -36,7 +36,7 @@ impl ScFuncs { } pub fn get_hello_world(_ctx: & dyn ScViewCallContext) -> GetHelloWorldCall { let mut f = GetHelloWorldCall { - func: ScView::new(HSC_NAME, HVIEW_GET_HELLO_WORLD), + func: ScView::new(HSC_NAME, HVIEW_GET_HELLO_WORLD), results: ImmutableGetHelloWorldResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); diff --git a/contracts/wasm/helloworld/src/keys.rs b/contracts/wasm/helloworld/src/keys.rs index f536b56688..c7cc3df75d 100644 --- a/contracts/wasm/helloworld/src/keys.rs +++ b/contracts/wasm/helloworld/src/keys.rs @@ -18,7 +18,7 @@ pub(crate) const IDX_RESULT_HELLO_WORLD: usize = 0; pub const KEY_MAP_LEN: usize = 1; pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ - RESULT_HELLO_WORLD, + RESULT_HELLO_WORLD, ]; pub static mut IDX_MAP: [Key32; KEY_MAP_LEN] = [Key32(0); KEY_MAP_LEN]; diff --git a/contracts/wasm/helloworld/src/lib.rs b/contracts/wasm/helloworld/src/lib.rs index 931b312fdf..b5b13a3b9a 100644 --- a/contracts/wasm/helloworld/src/lib.rs +++ b/contracts/wasm/helloworld/src/lib.rs @@ -40,37 +40,37 @@ fn on_load() { } pub struct HelloWorldContext { - state: MutableHelloWorldState, + state: MutableHelloWorldState, } fn func_hello_world_thunk(ctx: &ScFuncContext) { - ctx.log("helloworld.funcHelloWorld"); - let f = HelloWorldContext { - state: MutableHelloWorldState { - id: OBJ_ID_STATE, - }, - }; - func_hello_world(ctx, &f); - ctx.log("helloworld.funcHelloWorld ok"); + ctx.log("helloworld.funcHelloWorld"); + let f = HelloWorldContext { + state: MutableHelloWorldState { + id: OBJ_ID_STATE, + }, + }; + func_hello_world(ctx, &f); + ctx.log("helloworld.funcHelloWorld ok"); } pub struct GetHelloWorldContext { - results: MutableGetHelloWorldResults, - state: ImmutableHelloWorldState, + results: MutableGetHelloWorldResults, + state: ImmutableHelloWorldState, } fn view_get_hello_world_thunk(ctx: &ScViewContext) { - ctx.log("helloworld.viewGetHelloWorld"); - let f = GetHelloWorldContext { - results: MutableGetHelloWorldResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableHelloWorldState { - id: OBJ_ID_STATE, - }, - }; - view_get_hello_world(ctx, &f); - ctx.log("helloworld.viewGetHelloWorld ok"); + ctx.log("helloworld.viewGetHelloWorld"); + let f = GetHelloWorldContext { + results: MutableGetHelloWorldResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableHelloWorldState { + id: OBJ_ID_STATE, + }, + }; + view_get_hello_world(ctx, &f); + ctx.log("helloworld.viewGetHelloWorld ok"); } // @formatter:on diff --git a/contracts/wasm/helloworld/src/results.rs b/contracts/wasm/helloworld/src/results.rs index 295e6b726b..ceeaf09a46 100644 --- a/contracts/wasm/helloworld/src/results.rs +++ b/contracts/wasm/helloworld/src/results.rs @@ -20,9 +20,10 @@ pub struct ImmutableGetHelloWorldResults { } impl ImmutableGetHelloWorldResults { + pub fn hello_world(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_RESULT_HELLO_WORLD)) - } + ScImmutableString::new(self.id, idx_map(IDX_RESULT_HELLO_WORLD)) + } } #[derive(Clone, Copy)] @@ -31,7 +32,8 @@ pub struct MutableGetHelloWorldResults { } impl MutableGetHelloWorldResults { + pub fn hello_world(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_RESULT_HELLO_WORLD)) - } + ScMutableString::new(self.id, idx_map(IDX_RESULT_HELLO_WORLD)) + } } diff --git a/contracts/wasm/inccounter/src/consts.rs b/contracts/wasm/inccounter/src/consts.rs index c39d066e5f..b8e8a1cc79 100644 --- a/contracts/wasm/inccounter/src/consts.rs +++ b/contracts/wasm/inccounter/src/consts.rs @@ -11,47 +11,48 @@ use wasmlib::*; -pub const SC_NAME: &str = "inccounter"; -pub const HSC_NAME: ScHname = ScHname(0xaf2438e9); +pub const SC_NAME: &str = "inccounter"; +pub const SC_DESCRIPTION: &str = ""; +pub const HSC_NAME: ScHname = ScHname(0xaf2438e9); -pub const PARAM_COUNTER: &str = "counter"; -pub const PARAM_DELAY: &str = "delay"; -pub const PARAM_DUMMY: &str = "dummy"; +pub const PARAM_COUNTER: &str = "counter"; +pub const PARAM_DELAY: &str = "delay"; +pub const PARAM_DUMMY: &str = "dummy"; pub const PARAM_NUM_REPEATS: &str = "numRepeats"; pub const RESULT_COUNTER: &str = "counter"; -pub const STATE_COUNTER: &str = "counter"; +pub const STATE_COUNTER: &str = "counter"; pub const STATE_NUM_REPEATS: &str = "numRepeats"; -pub const FUNC_CALL_INCREMENT: &str = "callIncrement"; +pub const FUNC_CALL_INCREMENT: &str = "callIncrement"; pub const FUNC_CALL_INCREMENT_RECURSE5X: &str = "callIncrementRecurse5x"; -pub const FUNC_ENDLESS_LOOP: &str = "endlessLoop"; -pub const FUNC_INCREMENT: &str = "increment"; -pub const FUNC_INCREMENT_WITH_DELAY: &str = "incrementWithDelay"; -pub const FUNC_INIT: &str = "init"; -pub const FUNC_LOCAL_STATE_INTERNAL_CALL: &str = "localStateInternalCall"; -pub const FUNC_LOCAL_STATE_POST: &str = "localStatePost"; +pub const FUNC_ENDLESS_LOOP: &str = "endlessLoop"; +pub const FUNC_INCREMENT: &str = "increment"; +pub const FUNC_INCREMENT_WITH_DELAY: &str = "incrementWithDelay"; +pub const FUNC_INIT: &str = "init"; +pub const FUNC_LOCAL_STATE_INTERNAL_CALL: &str = "localStateInternalCall"; +pub const FUNC_LOCAL_STATE_POST: &str = "localStatePost"; pub const FUNC_LOCAL_STATE_SANDBOX_CALL: &str = "localStateSandboxCall"; -pub const FUNC_POST_INCREMENT: &str = "postIncrement"; -pub const FUNC_REPEAT_MANY: &str = "repeatMany"; -pub const FUNC_TEST_LEB128: &str = "testLeb128"; -pub const FUNC_WHEN_MUST_INCREMENT: &str = "whenMustIncrement"; -pub const VIEW_GET_COUNTER: &str = "getCounter"; - -pub const HFUNC_CALL_INCREMENT: ScHname = ScHname(0xeb5dcacd); -pub const HFUNC_CALL_INCREMENT_RECURSE5X: ScHname = ScHname(0x8749fbff); -pub const HFUNC_ENDLESS_LOOP: ScHname = ScHname(0x365f0929); -pub const HFUNC_INCREMENT: ScHname = ScHname(0xd351bd12); -pub const HFUNC_INCREMENT_WITH_DELAY: ScHname = ScHname(0xa235bba7); -pub const HFUNC_INIT: ScHname = ScHname(0x1f44d644); +pub const FUNC_POST_INCREMENT: &str = "postIncrement"; +pub const FUNC_REPEAT_MANY: &str = "repeatMany"; +pub const FUNC_TEST_LEB128: &str = "testLeb128"; +pub const FUNC_WHEN_MUST_INCREMENT: &str = "whenMustIncrement"; +pub const VIEW_GET_COUNTER: &str = "getCounter"; + +pub const HFUNC_CALL_INCREMENT: ScHname = ScHname(0xeb5dcacd); +pub const HFUNC_CALL_INCREMENT_RECURSE5X: ScHname = ScHname(0x8749fbff); +pub const HFUNC_ENDLESS_LOOP: ScHname = ScHname(0x365f0929); +pub const HFUNC_INCREMENT: ScHname = ScHname(0xd351bd12); +pub const HFUNC_INCREMENT_WITH_DELAY: ScHname = ScHname(0xa235bba7); +pub const HFUNC_INIT: ScHname = ScHname(0x1f44d644); pub const HFUNC_LOCAL_STATE_INTERNAL_CALL: ScHname = ScHname(0xecfc5d33); -pub const HFUNC_LOCAL_STATE_POST: ScHname = ScHname(0x3fd54d13); -pub const HFUNC_LOCAL_STATE_SANDBOX_CALL: ScHname = ScHname(0x7bd22c53); -pub const HFUNC_POST_INCREMENT: ScHname = ScHname(0x81c772f5); -pub const HFUNC_REPEAT_MANY: ScHname = ScHname(0x4ff450d3); -pub const HFUNC_TEST_LEB128: ScHname = ScHname(0xd8364cb9); -pub const HFUNC_WHEN_MUST_INCREMENT: ScHname = ScHname(0xb4c3e7a6); -pub const HVIEW_GET_COUNTER: ScHname = ScHname(0xb423e607); +pub const HFUNC_LOCAL_STATE_POST: ScHname = ScHname(0x3fd54d13); +pub const HFUNC_LOCAL_STATE_SANDBOX_CALL: ScHname = ScHname(0x7bd22c53); +pub const HFUNC_POST_INCREMENT: ScHname = ScHname(0x81c772f5); +pub const HFUNC_REPEAT_MANY: ScHname = ScHname(0x4ff450d3); +pub const HFUNC_TEST_LEB128: ScHname = ScHname(0xd8364cb9); +pub const HFUNC_WHEN_MUST_INCREMENT: ScHname = ScHname(0xb4c3e7a6); +pub const HVIEW_GET_COUNTER: ScHname = ScHname(0xb423e607); // @formatter:on diff --git a/contracts/wasm/inccounter/src/contract.rs b/contracts/wasm/inccounter/src/contract.rs index d716771803..7129a92010 100644 --- a/contracts/wasm/inccounter/src/contract.rs +++ b/contracts/wasm/inccounter/src/contract.rs @@ -18,64 +18,64 @@ use crate::params::*; use crate::results::*; pub struct CallIncrementCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct CallIncrementRecurse5xCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct EndlessLoopCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct IncrementCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct IncrementWithDelayCall { - pub func: ScFunc, - pub params: MutableIncrementWithDelayParams, + pub func: ScFunc, + pub params: MutableIncrementWithDelayParams, } pub struct InitCall { - pub func: ScInitFunc, - pub params: MutableInitParams, + pub func: ScInitFunc, + pub params: MutableInitParams, } pub struct LocalStateInternalCallCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct LocalStatePostCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct LocalStateSandboxCallCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct PostIncrementCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct RepeatManyCall { - pub func: ScFunc, - pub params: MutableRepeatManyParams, + pub func: ScFunc, + pub params: MutableRepeatManyParams, } pub struct TestLeb128Call { - pub func: ScFunc, + pub func: ScFunc, } pub struct WhenMustIncrementCall { - pub func: ScFunc, - pub params: MutableWhenMustIncrementParams, + pub func: ScFunc, + pub params: MutableWhenMustIncrementParams, } pub struct GetCounterCall { - pub func: ScView, - pub results: ImmutableGetCounterResults, + pub func: ScView, + pub results: ImmutableGetCounterResults, } pub struct ScFuncs { @@ -104,7 +104,7 @@ impl ScFuncs { } pub fn increment_with_delay(_ctx: & dyn ScFuncCallContext) -> IncrementWithDelayCall { let mut f = IncrementWithDelayCall { - func: ScFunc::new(HSC_NAME, HFUNC_INCREMENT_WITH_DELAY), + func: ScFunc::new(HSC_NAME, HFUNC_INCREMENT_WITH_DELAY), params: MutableIncrementWithDelayParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -112,7 +112,7 @@ impl ScFuncs { } pub fn init(_ctx: & dyn ScFuncCallContext) -> InitCall { let mut f = InitCall { - func: ScInitFunc::new(HSC_NAME, HFUNC_INIT), + func: ScInitFunc::new(HSC_NAME, HFUNC_INIT), params: MutableInitParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -140,7 +140,7 @@ impl ScFuncs { } pub fn repeat_many(_ctx: & dyn ScFuncCallContext) -> RepeatManyCall { let mut f = RepeatManyCall { - func: ScFunc::new(HSC_NAME, HFUNC_REPEAT_MANY), + func: ScFunc::new(HSC_NAME, HFUNC_REPEAT_MANY), params: MutableRepeatManyParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -153,7 +153,7 @@ impl ScFuncs { } pub fn when_must_increment(_ctx: & dyn ScFuncCallContext) -> WhenMustIncrementCall { let mut f = WhenMustIncrementCall { - func: ScFunc::new(HSC_NAME, HFUNC_WHEN_MUST_INCREMENT), + func: ScFunc::new(HSC_NAME, HFUNC_WHEN_MUST_INCREMENT), params: MutableWhenMustIncrementParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -161,7 +161,7 @@ impl ScFuncs { } pub fn get_counter(_ctx: & dyn ScViewCallContext) -> GetCounterCall { let mut f = GetCounterCall { - func: ScView::new(HSC_NAME, HVIEW_GET_COUNTER), + func: ScView::new(HSC_NAME, HVIEW_GET_COUNTER), results: ImmutableGetCounterResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); diff --git a/contracts/wasm/inccounter/src/keys.rs b/contracts/wasm/inccounter/src/keys.rs index 8cf9bce6bf..9ef429d2e8 100644 --- a/contracts/wasm/inccounter/src/keys.rs +++ b/contracts/wasm/inccounter/src/keys.rs @@ -13,24 +13,24 @@ use wasmlib::*; use crate::*; -pub(crate) const IDX_PARAM_COUNTER: usize = 0; -pub(crate) const IDX_PARAM_DELAY: usize = 1; -pub(crate) const IDX_PARAM_DUMMY: usize = 2; +pub(crate) const IDX_PARAM_COUNTER: usize = 0; +pub(crate) const IDX_PARAM_DELAY: usize = 1; +pub(crate) const IDX_PARAM_DUMMY: usize = 2; pub(crate) const IDX_PARAM_NUM_REPEATS: usize = 3; -pub(crate) const IDX_RESULT_COUNTER: usize = 4; -pub(crate) const IDX_STATE_COUNTER: usize = 5; +pub(crate) const IDX_RESULT_COUNTER: usize = 4; +pub(crate) const IDX_STATE_COUNTER: usize = 5; pub(crate) const IDX_STATE_NUM_REPEATS: usize = 6; pub const KEY_MAP_LEN: usize = 7; pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ - PARAM_COUNTER, - PARAM_DELAY, - PARAM_DUMMY, - PARAM_NUM_REPEATS, - RESULT_COUNTER, - STATE_COUNTER, - STATE_NUM_REPEATS, + PARAM_COUNTER, + PARAM_DELAY, + PARAM_DUMMY, + PARAM_NUM_REPEATS, + RESULT_COUNTER, + STATE_COUNTER, + STATE_NUM_REPEATS, ]; pub static mut IDX_MAP: [Key32; KEY_MAP_LEN] = [Key32(0); KEY_MAP_LEN]; diff --git a/contracts/wasm/inccounter/src/lib.rs b/contracts/wasm/inccounter/src/lib.rs index 9b7e552473..f58f47fc17 100644 --- a/contracts/wasm/inccounter/src/lib.rs +++ b/contracts/wasm/inccounter/src/lib.rs @@ -54,234 +54,234 @@ fn on_load() { } pub struct CallIncrementContext { - state: MutableIncCounterState, + state: MutableIncCounterState, } fn func_call_increment_thunk(ctx: &ScFuncContext) { - ctx.log("inccounter.funcCallIncrement"); - let f = CallIncrementContext { - state: MutableIncCounterState { - id: OBJ_ID_STATE, - }, - }; - func_call_increment(ctx, &f); - ctx.log("inccounter.funcCallIncrement ok"); + ctx.log("inccounter.funcCallIncrement"); + let f = CallIncrementContext { + state: MutableIncCounterState { + id: OBJ_ID_STATE, + }, + }; + func_call_increment(ctx, &f); + ctx.log("inccounter.funcCallIncrement ok"); } pub struct CallIncrementRecurse5xContext { - state: MutableIncCounterState, + state: MutableIncCounterState, } fn func_call_increment_recurse5x_thunk(ctx: &ScFuncContext) { - ctx.log("inccounter.funcCallIncrementRecurse5x"); - let f = CallIncrementRecurse5xContext { - state: MutableIncCounterState { - id: OBJ_ID_STATE, - }, - }; - func_call_increment_recurse5x(ctx, &f); - ctx.log("inccounter.funcCallIncrementRecurse5x ok"); + ctx.log("inccounter.funcCallIncrementRecurse5x"); + let f = CallIncrementRecurse5xContext { + state: MutableIncCounterState { + id: OBJ_ID_STATE, + }, + }; + func_call_increment_recurse5x(ctx, &f); + ctx.log("inccounter.funcCallIncrementRecurse5x ok"); } pub struct EndlessLoopContext { - state: MutableIncCounterState, + state: MutableIncCounterState, } fn func_endless_loop_thunk(ctx: &ScFuncContext) { - ctx.log("inccounter.funcEndlessLoop"); - let f = EndlessLoopContext { - state: MutableIncCounterState { - id: OBJ_ID_STATE, - }, - }; - func_endless_loop(ctx, &f); - ctx.log("inccounter.funcEndlessLoop ok"); + ctx.log("inccounter.funcEndlessLoop"); + let f = EndlessLoopContext { + state: MutableIncCounterState { + id: OBJ_ID_STATE, + }, + }; + func_endless_loop(ctx, &f); + ctx.log("inccounter.funcEndlessLoop ok"); } pub struct IncrementContext { - state: MutableIncCounterState, + state: MutableIncCounterState, } fn func_increment_thunk(ctx: &ScFuncContext) { - ctx.log("inccounter.funcIncrement"); - let f = IncrementContext { - state: MutableIncCounterState { - id: OBJ_ID_STATE, - }, - }; - func_increment(ctx, &f); - ctx.log("inccounter.funcIncrement ok"); + ctx.log("inccounter.funcIncrement"); + let f = IncrementContext { + state: MutableIncCounterState { + id: OBJ_ID_STATE, + }, + }; + func_increment(ctx, &f); + ctx.log("inccounter.funcIncrement ok"); } pub struct IncrementWithDelayContext { - params: ImmutableIncrementWithDelayParams, - state: MutableIncCounterState, + params: ImmutableIncrementWithDelayParams, + state: MutableIncCounterState, } fn func_increment_with_delay_thunk(ctx: &ScFuncContext) { - ctx.log("inccounter.funcIncrementWithDelay"); - let f = IncrementWithDelayContext { - params: ImmutableIncrementWithDelayParams { - id: OBJ_ID_PARAMS, - }, - state: MutableIncCounterState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.delay().exists(), "missing mandatory delay"); - func_increment_with_delay(ctx, &f); - ctx.log("inccounter.funcIncrementWithDelay ok"); + ctx.log("inccounter.funcIncrementWithDelay"); + let f = IncrementWithDelayContext { + params: ImmutableIncrementWithDelayParams { + id: OBJ_ID_PARAMS, + }, + state: MutableIncCounterState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.delay().exists(), "missing mandatory delay"); + func_increment_with_delay(ctx, &f); + ctx.log("inccounter.funcIncrementWithDelay ok"); } pub struct InitContext { - params: ImmutableInitParams, - state: MutableIncCounterState, + params: ImmutableInitParams, + state: MutableIncCounterState, } fn func_init_thunk(ctx: &ScFuncContext) { - ctx.log("inccounter.funcInit"); - let f = InitContext { - params: ImmutableInitParams { - id: OBJ_ID_PARAMS, - }, - state: MutableIncCounterState { - id: OBJ_ID_STATE, - }, - }; - func_init(ctx, &f); - ctx.log("inccounter.funcInit ok"); + ctx.log("inccounter.funcInit"); + let f = InitContext { + params: ImmutableInitParams { + id: OBJ_ID_PARAMS, + }, + state: MutableIncCounterState { + id: OBJ_ID_STATE, + }, + }; + func_init(ctx, &f); + ctx.log("inccounter.funcInit ok"); } pub struct LocalStateInternalCallContext { - state: MutableIncCounterState, + state: MutableIncCounterState, } fn func_local_state_internal_call_thunk(ctx: &ScFuncContext) { - ctx.log("inccounter.funcLocalStateInternalCall"); - let f = LocalStateInternalCallContext { - state: MutableIncCounterState { - id: OBJ_ID_STATE, - }, - }; - func_local_state_internal_call(ctx, &f); - ctx.log("inccounter.funcLocalStateInternalCall ok"); + ctx.log("inccounter.funcLocalStateInternalCall"); + let f = LocalStateInternalCallContext { + state: MutableIncCounterState { + id: OBJ_ID_STATE, + }, + }; + func_local_state_internal_call(ctx, &f); + ctx.log("inccounter.funcLocalStateInternalCall ok"); } pub struct LocalStatePostContext { - state: MutableIncCounterState, + state: MutableIncCounterState, } fn func_local_state_post_thunk(ctx: &ScFuncContext) { - ctx.log("inccounter.funcLocalStatePost"); - let f = LocalStatePostContext { - state: MutableIncCounterState { - id: OBJ_ID_STATE, - }, - }; - func_local_state_post(ctx, &f); - ctx.log("inccounter.funcLocalStatePost ok"); + ctx.log("inccounter.funcLocalStatePost"); + let f = LocalStatePostContext { + state: MutableIncCounterState { + id: OBJ_ID_STATE, + }, + }; + func_local_state_post(ctx, &f); + ctx.log("inccounter.funcLocalStatePost ok"); } pub struct LocalStateSandboxCallContext { - state: MutableIncCounterState, + state: MutableIncCounterState, } fn func_local_state_sandbox_call_thunk(ctx: &ScFuncContext) { - ctx.log("inccounter.funcLocalStateSandboxCall"); - let f = LocalStateSandboxCallContext { - state: MutableIncCounterState { - id: OBJ_ID_STATE, - }, - }; - func_local_state_sandbox_call(ctx, &f); - ctx.log("inccounter.funcLocalStateSandboxCall ok"); + ctx.log("inccounter.funcLocalStateSandboxCall"); + let f = LocalStateSandboxCallContext { + state: MutableIncCounterState { + id: OBJ_ID_STATE, + }, + }; + func_local_state_sandbox_call(ctx, &f); + ctx.log("inccounter.funcLocalStateSandboxCall ok"); } pub struct PostIncrementContext { - state: MutableIncCounterState, + state: MutableIncCounterState, } fn func_post_increment_thunk(ctx: &ScFuncContext) { - ctx.log("inccounter.funcPostIncrement"); - let f = PostIncrementContext { - state: MutableIncCounterState { - id: OBJ_ID_STATE, - }, - }; - func_post_increment(ctx, &f); - ctx.log("inccounter.funcPostIncrement ok"); + ctx.log("inccounter.funcPostIncrement"); + let f = PostIncrementContext { + state: MutableIncCounterState { + id: OBJ_ID_STATE, + }, + }; + func_post_increment(ctx, &f); + ctx.log("inccounter.funcPostIncrement ok"); } pub struct RepeatManyContext { - params: ImmutableRepeatManyParams, - state: MutableIncCounterState, + params: ImmutableRepeatManyParams, + state: MutableIncCounterState, } fn func_repeat_many_thunk(ctx: &ScFuncContext) { - ctx.log("inccounter.funcRepeatMany"); - let f = RepeatManyContext { - params: ImmutableRepeatManyParams { - id: OBJ_ID_PARAMS, - }, - state: MutableIncCounterState { - id: OBJ_ID_STATE, - }, - }; - func_repeat_many(ctx, &f); - ctx.log("inccounter.funcRepeatMany ok"); + ctx.log("inccounter.funcRepeatMany"); + let f = RepeatManyContext { + params: ImmutableRepeatManyParams { + id: OBJ_ID_PARAMS, + }, + state: MutableIncCounterState { + id: OBJ_ID_STATE, + }, + }; + func_repeat_many(ctx, &f); + ctx.log("inccounter.funcRepeatMany ok"); } pub struct TestLeb128Context { - state: MutableIncCounterState, + state: MutableIncCounterState, } fn func_test_leb128_thunk(ctx: &ScFuncContext) { - ctx.log("inccounter.funcTestLeb128"); - let f = TestLeb128Context { - state: MutableIncCounterState { - id: OBJ_ID_STATE, - }, - }; - func_test_leb128(ctx, &f); - ctx.log("inccounter.funcTestLeb128 ok"); + ctx.log("inccounter.funcTestLeb128"); + let f = TestLeb128Context { + state: MutableIncCounterState { + id: OBJ_ID_STATE, + }, + }; + func_test_leb128(ctx, &f); + ctx.log("inccounter.funcTestLeb128 ok"); } pub struct WhenMustIncrementContext { - params: ImmutableWhenMustIncrementParams, - state: MutableIncCounterState, + params: ImmutableWhenMustIncrementParams, + state: MutableIncCounterState, } fn func_when_must_increment_thunk(ctx: &ScFuncContext) { - ctx.log("inccounter.funcWhenMustIncrement"); - let f = WhenMustIncrementContext { - params: ImmutableWhenMustIncrementParams { - id: OBJ_ID_PARAMS, - }, - state: MutableIncCounterState { - id: OBJ_ID_STATE, - }, - }; - func_when_must_increment(ctx, &f); - ctx.log("inccounter.funcWhenMustIncrement ok"); + ctx.log("inccounter.funcWhenMustIncrement"); + let f = WhenMustIncrementContext { + params: ImmutableWhenMustIncrementParams { + id: OBJ_ID_PARAMS, + }, + state: MutableIncCounterState { + id: OBJ_ID_STATE, + }, + }; + func_when_must_increment(ctx, &f); + ctx.log("inccounter.funcWhenMustIncrement ok"); } pub struct GetCounterContext { - results: MutableGetCounterResults, - state: ImmutableIncCounterState, + results: MutableGetCounterResults, + state: ImmutableIncCounterState, } fn view_get_counter_thunk(ctx: &ScViewContext) { - ctx.log("inccounter.viewGetCounter"); - let f = GetCounterContext { - results: MutableGetCounterResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableIncCounterState { - id: OBJ_ID_STATE, - }, - }; - view_get_counter(ctx, &f); - ctx.log("inccounter.viewGetCounter ok"); + ctx.log("inccounter.viewGetCounter"); + let f = GetCounterContext { + results: MutableGetCounterResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableIncCounterState { + id: OBJ_ID_STATE, + }, + }; + view_get_counter(ctx, &f); + ctx.log("inccounter.viewGetCounter ok"); } // @formatter:on diff --git a/contracts/wasm/inccounter/src/params.rs b/contracts/wasm/inccounter/src/params.rs index 9bb39748fd..d5f225eba1 100644 --- a/contracts/wasm/inccounter/src/params.rs +++ b/contracts/wasm/inccounter/src/params.rs @@ -20,9 +20,10 @@ pub struct ImmutableIncrementWithDelayParams { } impl ImmutableIncrementWithDelayParams { + pub fn delay(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_DELAY)) - } + ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_DELAY)) + } } #[derive(Clone, Copy)] @@ -31,9 +32,10 @@ pub struct MutableIncrementWithDelayParams { } impl MutableIncrementWithDelayParams { + pub fn delay(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, idx_map(IDX_PARAM_DELAY)) - } + ScMutableInt32::new(self.id, idx_map(IDX_PARAM_DELAY)) + } } #[derive(Clone, Copy)] @@ -42,9 +44,10 @@ pub struct ImmutableInitParams { } impl ImmutableInitParams { + pub fn counter(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_COUNTER)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_COUNTER)) + } } #[derive(Clone, Copy)] @@ -53,9 +56,10 @@ pub struct MutableInitParams { } impl MutableInitParams { + pub fn counter(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_COUNTER)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_COUNTER)) + } } #[derive(Clone, Copy)] @@ -64,9 +68,10 @@ pub struct ImmutableRepeatManyParams { } impl ImmutableRepeatManyParams { + pub fn num_repeats(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_NUM_REPEATS)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_NUM_REPEATS)) + } } #[derive(Clone, Copy)] @@ -75,9 +80,10 @@ pub struct MutableRepeatManyParams { } impl MutableRepeatManyParams { + pub fn num_repeats(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_NUM_REPEATS)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_NUM_REPEATS)) + } } #[derive(Clone, Copy)] @@ -86,9 +92,10 @@ pub struct ImmutableWhenMustIncrementParams { } impl ImmutableWhenMustIncrementParams { + pub fn dummy(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_DUMMY)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_DUMMY)) + } } #[derive(Clone, Copy)] @@ -97,7 +104,8 @@ pub struct MutableWhenMustIncrementParams { } impl MutableWhenMustIncrementParams { + pub fn dummy(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_DUMMY)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_DUMMY)) + } } diff --git a/contracts/wasm/inccounter/src/results.rs b/contracts/wasm/inccounter/src/results.rs index e0c8a90478..b61936d6ce 100644 --- a/contracts/wasm/inccounter/src/results.rs +++ b/contracts/wasm/inccounter/src/results.rs @@ -20,9 +20,10 @@ pub struct ImmutableGetCounterResults { } impl ImmutableGetCounterResults { + pub fn counter(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_COUNTER)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_COUNTER)) + } } #[derive(Clone, Copy)] @@ -31,7 +32,8 @@ pub struct MutableGetCounterResults { } impl MutableGetCounterResults { + pub fn counter(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_COUNTER)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_COUNTER)) + } } diff --git a/contracts/wasm/inccounter/src/state.rs b/contracts/wasm/inccounter/src/state.rs index 76f83ab4b9..09eb8231ee 100644 --- a/contracts/wasm/inccounter/src/state.rs +++ b/contracts/wasm/inccounter/src/state.rs @@ -20,13 +20,14 @@ pub struct ImmutableIncCounterState { } impl ImmutableIncCounterState { + pub fn counter(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_STATE_COUNTER)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_STATE_COUNTER)) + } pub fn num_repeats(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_STATE_NUM_REPEATS)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_STATE_NUM_REPEATS)) + } } #[derive(Clone, Copy)] @@ -35,11 +36,12 @@ pub struct MutableIncCounterState { } impl MutableIncCounterState { + pub fn counter(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_STATE_COUNTER)) - } + ScMutableInt64::new(self.id, idx_map(IDX_STATE_COUNTER)) + } pub fn num_repeats(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_STATE_NUM_REPEATS)) - } + ScMutableInt64::new(self.id, idx_map(IDX_STATE_NUM_REPEATS)) + } } diff --git a/contracts/wasm/testcore/src/consts.rs b/contracts/wasm/testcore/src/consts.rs index d4898fa9ae..2708b5d7ef 100644 --- a/contracts/wasm/testcore/src/consts.rs +++ b/contracts/wasm/testcore/src/consts.rs @@ -15,106 +15,108 @@ pub const SC_NAME: &str = "testcore"; pub const SC_DESCRIPTION: &str = "Core test for ISCP wasmlib Rust/Wasm library"; pub const HSC_NAME: ScHname = ScHname(0x370d33ad); -pub const PARAM_ADDRESS: &str = "address"; -pub const PARAM_AGENT_ID: &str = "agentID"; -pub const PARAM_CALLER: &str = "caller"; -pub const PARAM_CHAIN_ID: &str = "chainID"; -pub const PARAM_CHAIN_OWNER_ID: &str = "chainOwnerID"; +pub const PARAM_ADDRESS: &str = "address"; +pub const PARAM_AGENT_ID: &str = "agentID"; +pub const PARAM_CALLER: &str = "caller"; +pub const PARAM_CHAIN_ID: &str = "chainID"; +pub const PARAM_CHAIN_OWNER_ID: &str = "chainOwnerID"; pub const PARAM_CONTRACT_CREATOR: &str = "contractCreator"; -pub const PARAM_CONTRACT_ID: &str = "contractID"; -pub const PARAM_COUNTER: &str = "counter"; -pub const PARAM_FAIL: &str = "initFailParam"; -pub const PARAM_HASH: &str = "Hash"; -pub const PARAM_HNAME: &str = "Hname"; -pub const PARAM_HNAME_CONTRACT: &str = "hnameContract"; -pub const PARAM_HNAME_EP: &str = "hnameEP"; -pub const PARAM_HNAME_ZERO: &str = "Hname-0"; -pub const PARAM_INT64: &str = "int64"; -pub const PARAM_INT64_ZERO: &str = "int64-0"; -pub const PARAM_INT_VALUE: &str = "intParamValue"; -pub const PARAM_NAME: &str = "intParamName"; -pub const PARAM_PROG_HASH: &str = "progHash"; -pub const PARAM_STRING: &str = "string"; -pub const PARAM_STRING_ZERO: &str = "string-0"; -pub const PARAM_VAR_NAME: &str = "varName"; +pub const PARAM_CONTRACT_ID: &str = "contractID"; +pub const PARAM_COUNTER: &str = "counter"; +pub const PARAM_FAIL: &str = "initFailParam"; +pub const PARAM_HASH: &str = "Hash"; +pub const PARAM_HNAME: &str = "Hname"; +pub const PARAM_HNAME_CONTRACT: &str = "hnameContract"; +pub const PARAM_HNAME_EP: &str = "hnameEP"; +pub const PARAM_HNAME_ZERO: &str = "Hname-0"; +pub const PARAM_INT64: &str = "int64"; +pub const PARAM_INT64_ZERO: &str = "int64-0"; +pub const PARAM_INT_VALUE: &str = "intParamValue"; +pub const PARAM_NAME: &str = "intParamName"; +pub const PARAM_PROG_HASH: &str = "progHash"; +pub const PARAM_STRING: &str = "string"; +pub const PARAM_STRING_ZERO: &str = "string-0"; +pub const PARAM_VAR_NAME: &str = "varName"; pub const RESULT_CHAIN_OWNER_ID: &str = "chainOwnerID"; -pub const RESULT_COUNTER: &str = "counter"; -pub const RESULT_INT_VALUE: &str = "intParamValue"; -pub const RESULT_MINTED_COLOR: &str = "mintedColor"; -pub const RESULT_MINTED_SUPPLY: &str = "mintedSupply"; -pub const RESULT_SANDBOX_CALL: &str = "sandboxCall"; +pub const RESULT_COUNTER: &str = "counter"; +pub const RESULT_INT_VALUE: &str = "intParamValue"; +pub const RESULT_MINTED_COLOR: &str = "mintedColor"; +pub const RESULT_MINTED_SUPPLY: &str = "mintedSupply"; +pub const RESULT_SANDBOX_CALL: &str = "sandboxCall"; +pub const RESULT_VALUES: &str = "this"; +pub const RESULT_VARS: &str = "this"; -pub const STATE_COUNTER: &str = "counter"; -pub const STATE_HNAME_EP: &str = "hnameEP"; -pub const STATE_INTS: &str = "ints"; -pub const STATE_MINTED_COLOR: &str = "mintedColor"; +pub const STATE_COUNTER: &str = "counter"; +pub const STATE_HNAME_EP: &str = "hnameEP"; +pub const STATE_INTS: &str = "ints"; +pub const STATE_MINTED_COLOR: &str = "mintedColor"; pub const STATE_MINTED_SUPPLY: &str = "mintedSupply"; -pub const FUNC_CALL_ON_CHAIN: &str = "callOnChain"; -pub const FUNC_CHECK_CONTEXT_FROM_FULL_EP: &str = "checkContextFromFullEP"; -pub const FUNC_DO_NOTHING: &str = "doNothing"; -pub const FUNC_GET_MINTED_SUPPLY: &str = "getMintedSupply"; -pub const FUNC_INC_COUNTER: &str = "incCounter"; -pub const FUNC_INIT: &str = "init"; -pub const FUNC_PASS_TYPES_FULL: &str = "passTypesFull"; -pub const FUNC_RUN_RECURSION: &str = "runRecursion"; -pub const FUNC_SEND_TO_ADDRESS: &str = "sendToAddress"; -pub const FUNC_SET_INT: &str = "setInt"; -pub const FUNC_SPAWN: &str = "spawn"; -pub const FUNC_TEST_BLOCK_CONTEXT1: &str = "testBlockContext1"; -pub const FUNC_TEST_BLOCK_CONTEXT2: &str = "testBlockContext2"; -pub const FUNC_TEST_CALL_PANIC_FULL_EP: &str = "testCallPanicFullEP"; -pub const FUNC_TEST_CALL_PANIC_VIEW_EP_FROM_FULL: &str = "testCallPanicViewEPFromFull"; -pub const FUNC_TEST_CHAIN_OWNER_ID_FULL: &str = "testChainOwnerIDFull"; -pub const FUNC_TEST_EVENT_LOG_DEPLOY: &str = "testEventLogDeploy"; -pub const FUNC_TEST_EVENT_LOG_EVENT_DATA: &str = "testEventLogEventData"; -pub const FUNC_TEST_EVENT_LOG_GENERIC_DATA: &str = "testEventLogGenericData"; -pub const FUNC_TEST_PANIC_FULL_EP: &str = "testPanicFullEP"; -pub const FUNC_WITHDRAW_TO_CHAIN: &str = "withdrawToChain"; -pub const VIEW_CHECK_CONTEXT_FROM_VIEW_EP: &str = "checkContextFromViewEP"; -pub const VIEW_FIBONACCI: &str = "fibonacci"; -pub const VIEW_GET_COUNTER: &str = "getCounter"; -pub const VIEW_GET_INT: &str = "getInt"; -pub const VIEW_GET_STRING_VALUE: &str = "getStringValue"; -pub const VIEW_JUST_VIEW: &str = "justView"; -pub const VIEW_PASS_TYPES_VIEW: &str = "passTypesView"; -pub const VIEW_TEST_CALL_PANIC_VIEW_EP_FROM_VIEW: &str = "testCallPanicViewEPFromView"; -pub const VIEW_TEST_CHAIN_OWNER_ID_VIEW: &str = "testChainOwnerIDView"; -pub const VIEW_TEST_PANIC_VIEW_EP: &str = "testPanicViewEP"; -pub const VIEW_TEST_SANDBOX_CALL: &str = "testSandboxCall"; +pub const FUNC_CALL_ON_CHAIN: &str = "callOnChain"; +pub const FUNC_CHECK_CONTEXT_FROM_FULL_EP: &str = "checkContextFromFullEP"; +pub const FUNC_DO_NOTHING: &str = "doNothing"; +pub const FUNC_GET_MINTED_SUPPLY: &str = "getMintedSupply"; +pub const FUNC_INC_COUNTER: &str = "incCounter"; +pub const FUNC_INIT: &str = "init"; +pub const FUNC_PASS_TYPES_FULL: &str = "passTypesFull"; +pub const FUNC_RUN_RECURSION: &str = "runRecursion"; +pub const FUNC_SEND_TO_ADDRESS: &str = "sendToAddress"; +pub const FUNC_SET_INT: &str = "setInt"; +pub const FUNC_SPAWN: &str = "spawn"; +pub const FUNC_TEST_BLOCK_CONTEXT1: &str = "testBlockContext1"; +pub const FUNC_TEST_BLOCK_CONTEXT2: &str = "testBlockContext2"; +pub const FUNC_TEST_CALL_PANIC_FULL_EP: &str = "testCallPanicFullEP"; +pub const FUNC_TEST_CALL_PANIC_VIEW_EP_FROM_FULL: &str = "testCallPanicViewEPFromFull"; +pub const FUNC_TEST_CHAIN_OWNER_ID_FULL: &str = "testChainOwnerIDFull"; +pub const FUNC_TEST_EVENT_LOG_DEPLOY: &str = "testEventLogDeploy"; +pub const FUNC_TEST_EVENT_LOG_EVENT_DATA: &str = "testEventLogEventData"; +pub const FUNC_TEST_EVENT_LOG_GENERIC_DATA: &str = "testEventLogGenericData"; +pub const FUNC_TEST_PANIC_FULL_EP: &str = "testPanicFullEP"; +pub const FUNC_WITHDRAW_TO_CHAIN: &str = "withdrawToChain"; +pub const VIEW_CHECK_CONTEXT_FROM_VIEW_EP: &str = "checkContextFromViewEP"; +pub const VIEW_FIBONACCI: &str = "fibonacci"; +pub const VIEW_GET_COUNTER: &str = "getCounter"; +pub const VIEW_GET_INT: &str = "getInt"; +pub const VIEW_GET_STRING_VALUE: &str = "getStringValue"; +pub const VIEW_JUST_VIEW: &str = "justView"; +pub const VIEW_PASS_TYPES_VIEW: &str = "passTypesView"; +pub const VIEW_TEST_CALL_PANIC_VIEW_EP_FROM_VIEW: &str = "testCallPanicViewEPFromView"; +pub const VIEW_TEST_CHAIN_OWNER_ID_VIEW: &str = "testChainOwnerIDView"; +pub const VIEW_TEST_PANIC_VIEW_EP: &str = "testPanicViewEP"; +pub const VIEW_TEST_SANDBOX_CALL: &str = "testSandboxCall"; -pub const HFUNC_CALL_ON_CHAIN: ScHname = ScHname(0x95a3d123); -pub const HFUNC_CHECK_CONTEXT_FROM_FULL_EP: ScHname = ScHname(0xa56c24ba); -pub const HFUNC_DO_NOTHING: ScHname = ScHname(0xdda4a6de); -pub const HFUNC_GET_MINTED_SUPPLY: ScHname = ScHname(0x0c2d113c); -pub const HFUNC_INC_COUNTER: ScHname = ScHname(0x7b287419); -pub const HFUNC_INIT: ScHname = ScHname(0x1f44d644); -pub const HFUNC_PASS_TYPES_FULL: ScHname = ScHname(0x733ea0ea); -pub const HFUNC_RUN_RECURSION: ScHname = ScHname(0x833425fd); -pub const HFUNC_SEND_TO_ADDRESS: ScHname = ScHname(0x63ce4634); -pub const HFUNC_SET_INT: ScHname = ScHname(0x62056f74); -pub const HFUNC_SPAWN: ScHname = ScHname(0xec929d12); -pub const HFUNC_TEST_BLOCK_CONTEXT1: ScHname = ScHname(0x796d4136); -pub const HFUNC_TEST_BLOCK_CONTEXT2: ScHname = ScHname(0x758b0452); -pub const HFUNC_TEST_CALL_PANIC_FULL_EP: ScHname = ScHname(0x4c878834); +pub const HFUNC_CALL_ON_CHAIN: ScHname = ScHname(0x95a3d123); +pub const HFUNC_CHECK_CONTEXT_FROM_FULL_EP: ScHname = ScHname(0xa56c24ba); +pub const HFUNC_DO_NOTHING: ScHname = ScHname(0xdda4a6de); +pub const HFUNC_GET_MINTED_SUPPLY: ScHname = ScHname(0x0c2d113c); +pub const HFUNC_INC_COUNTER: ScHname = ScHname(0x7b287419); +pub const HFUNC_INIT: ScHname = ScHname(0x1f44d644); +pub const HFUNC_PASS_TYPES_FULL: ScHname = ScHname(0x733ea0ea); +pub const HFUNC_RUN_RECURSION: ScHname = ScHname(0x833425fd); +pub const HFUNC_SEND_TO_ADDRESS: ScHname = ScHname(0x63ce4634); +pub const HFUNC_SET_INT: ScHname = ScHname(0x62056f74); +pub const HFUNC_SPAWN: ScHname = ScHname(0xec929d12); +pub const HFUNC_TEST_BLOCK_CONTEXT1: ScHname = ScHname(0x796d4136); +pub const HFUNC_TEST_BLOCK_CONTEXT2: ScHname = ScHname(0x758b0452); +pub const HFUNC_TEST_CALL_PANIC_FULL_EP: ScHname = ScHname(0x4c878834); pub const HFUNC_TEST_CALL_PANIC_VIEW_EP_FROM_FULL: ScHname = ScHname(0xfd7e8c1d); -pub const HFUNC_TEST_CHAIN_OWNER_ID_FULL: ScHname = ScHname(0x2aff1167); -pub const HFUNC_TEST_EVENT_LOG_DEPLOY: ScHname = ScHname(0x96ff760a); -pub const HFUNC_TEST_EVENT_LOG_EVENT_DATA: ScHname = ScHname(0x0efcf939); -pub const HFUNC_TEST_EVENT_LOG_GENERIC_DATA: ScHname = ScHname(0x6a16629d); -pub const HFUNC_TEST_PANIC_FULL_EP: ScHname = ScHname(0x24fdef07); -pub const HFUNC_WITHDRAW_TO_CHAIN: ScHname = ScHname(0x437bc026); -pub const HVIEW_CHECK_CONTEXT_FROM_VIEW_EP: ScHname = ScHname(0x88ff0167); -pub const HVIEW_FIBONACCI: ScHname = ScHname(0x7940873c); -pub const HVIEW_GET_COUNTER: ScHname = ScHname(0xb423e607); -pub const HVIEW_GET_INT: ScHname = ScHname(0x1887e5ef); -pub const HVIEW_GET_STRING_VALUE: ScHname = ScHname(0xcf0a4d32); -pub const HVIEW_JUST_VIEW: ScHname = ScHname(0x33b8972e); -pub const HVIEW_PASS_TYPES_VIEW: ScHname = ScHname(0x1a5b87ea); +pub const HFUNC_TEST_CHAIN_OWNER_ID_FULL: ScHname = ScHname(0x2aff1167); +pub const HFUNC_TEST_EVENT_LOG_DEPLOY: ScHname = ScHname(0x96ff760a); +pub const HFUNC_TEST_EVENT_LOG_EVENT_DATA: ScHname = ScHname(0x0efcf939); +pub const HFUNC_TEST_EVENT_LOG_GENERIC_DATA: ScHname = ScHname(0x6a16629d); +pub const HFUNC_TEST_PANIC_FULL_EP: ScHname = ScHname(0x24fdef07); +pub const HFUNC_WITHDRAW_TO_CHAIN: ScHname = ScHname(0x437bc026); +pub const HVIEW_CHECK_CONTEXT_FROM_VIEW_EP: ScHname = ScHname(0x88ff0167); +pub const HVIEW_FIBONACCI: ScHname = ScHname(0x7940873c); +pub const HVIEW_GET_COUNTER: ScHname = ScHname(0xb423e607); +pub const HVIEW_GET_INT: ScHname = ScHname(0x1887e5ef); +pub const HVIEW_GET_STRING_VALUE: ScHname = ScHname(0xcf0a4d32); +pub const HVIEW_JUST_VIEW: ScHname = ScHname(0x33b8972e); +pub const HVIEW_PASS_TYPES_VIEW: ScHname = ScHname(0x1a5b87ea); pub const HVIEW_TEST_CALL_PANIC_VIEW_EP_FROM_VIEW: ScHname = ScHname(0x91b10c99); -pub const HVIEW_TEST_CHAIN_OWNER_ID_VIEW: ScHname = ScHname(0x26586c33); -pub const HVIEW_TEST_PANIC_VIEW_EP: ScHname = ScHname(0x22bc4d72); -pub const HVIEW_TEST_SANDBOX_CALL: ScHname = ScHname(0x42d72b63); +pub const HVIEW_TEST_CHAIN_OWNER_ID_VIEW: ScHname = ScHname(0x26586c33); +pub const HVIEW_TEST_PANIC_VIEW_EP: ScHname = ScHname(0x22bc4d72); +pub const HVIEW_TEST_SANDBOX_CALL: ScHname = ScHname(0x42d72b63); // @formatter:on diff --git a/contracts/wasm/testcore/src/contract.rs b/contracts/wasm/testcore/src/contract.rs index f8d4384296..4319013ea1 100644 --- a/contracts/wasm/testcore/src/contract.rs +++ b/contracts/wasm/testcore/src/contract.rs @@ -18,156 +18,156 @@ use crate::params::*; use crate::results::*; pub struct CallOnChainCall { - pub func: ScFunc, - pub params: MutableCallOnChainParams, - pub results: ImmutableCallOnChainResults, + pub func: ScFunc, + pub params: MutableCallOnChainParams, + pub results: ImmutableCallOnChainResults, } pub struct CheckContextFromFullEPCall { - pub func: ScFunc, - pub params: MutableCheckContextFromFullEPParams, + pub func: ScFunc, + pub params: MutableCheckContextFromFullEPParams, } pub struct DoNothingCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct GetMintedSupplyCall { - pub func: ScFunc, - pub results: ImmutableGetMintedSupplyResults, + pub func: ScFunc, + pub results: ImmutableGetMintedSupplyResults, } pub struct IncCounterCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct InitCall { - pub func: ScInitFunc, - pub params: MutableInitParams, + pub func: ScInitFunc, + pub params: MutableInitParams, } pub struct PassTypesFullCall { - pub func: ScFunc, - pub params: MutablePassTypesFullParams, + pub func: ScFunc, + pub params: MutablePassTypesFullParams, } pub struct RunRecursionCall { - pub func: ScFunc, - pub params: MutableRunRecursionParams, - pub results: ImmutableRunRecursionResults, + pub func: ScFunc, + pub params: MutableRunRecursionParams, + pub results: ImmutableRunRecursionResults, } pub struct SendToAddressCall { - pub func: ScFunc, - pub params: MutableSendToAddressParams, + pub func: ScFunc, + pub params: MutableSendToAddressParams, } pub struct SetIntCall { - pub func: ScFunc, - pub params: MutableSetIntParams, + pub func: ScFunc, + pub params: MutableSetIntParams, } pub struct SpawnCall { - pub func: ScFunc, - pub params: MutableSpawnParams, + pub func: ScFunc, + pub params: MutableSpawnParams, } pub struct TestBlockContext1Call { - pub func: ScFunc, + pub func: ScFunc, } pub struct TestBlockContext2Call { - pub func: ScFunc, + pub func: ScFunc, } pub struct TestCallPanicFullEPCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct TestCallPanicViewEPFromFullCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct TestChainOwnerIDFullCall { - pub func: ScFunc, - pub results: ImmutableTestChainOwnerIDFullResults, + pub func: ScFunc, + pub results: ImmutableTestChainOwnerIDFullResults, } pub struct TestEventLogDeployCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct TestEventLogEventDataCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct TestEventLogGenericDataCall { - pub func: ScFunc, - pub params: MutableTestEventLogGenericDataParams, + pub func: ScFunc, + pub params: MutableTestEventLogGenericDataParams, } pub struct TestPanicFullEPCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct WithdrawToChainCall { - pub func: ScFunc, - pub params: MutableWithdrawToChainParams, + pub func: ScFunc, + pub params: MutableWithdrawToChainParams, } pub struct CheckContextFromViewEPCall { - pub func: ScView, - pub params: MutableCheckContextFromViewEPParams, + pub func: ScView, + pub params: MutableCheckContextFromViewEPParams, } pub struct FibonacciCall { - pub func: ScView, - pub params: MutableFibonacciParams, - pub results: ImmutableFibonacciResults, + pub func: ScView, + pub params: MutableFibonacciParams, + pub results: ImmutableFibonacciResults, } pub struct GetCounterCall { - pub func: ScView, - pub results: ImmutableGetCounterResults, + pub func: ScView, + pub results: ImmutableGetCounterResults, } pub struct GetIntCall { - pub func: ScView, - pub params: MutableGetIntParams, - pub results: ImmutableGetIntResults, + pub func: ScView, + pub params: MutableGetIntParams, + pub results: ImmutableGetIntResults, } pub struct GetStringValueCall { - pub func: ScView, - pub params: MutableGetStringValueParams, - pub results: ImmutableGetStringValueResults, + pub func: ScView, + pub params: MutableGetStringValueParams, + pub results: ImmutableGetStringValueResults, } pub struct JustViewCall { - pub func: ScView, + pub func: ScView, } pub struct PassTypesViewCall { - pub func: ScView, - pub params: MutablePassTypesViewParams, + pub func: ScView, + pub params: MutablePassTypesViewParams, } pub struct TestCallPanicViewEPFromViewCall { - pub func: ScView, + pub func: ScView, } pub struct TestChainOwnerIDViewCall { - pub func: ScView, - pub results: ImmutableTestChainOwnerIDViewResults, + pub func: ScView, + pub results: ImmutableTestChainOwnerIDViewResults, } pub struct TestPanicViewEPCall { - pub func: ScView, + pub func: ScView, } pub struct TestSandboxCallCall { - pub func: ScView, - pub results: ImmutableTestSandboxCallResults, + pub func: ScView, + pub results: ImmutableTestSandboxCallResults, } pub struct ScFuncs { @@ -176,8 +176,8 @@ pub struct ScFuncs { impl ScFuncs { pub fn call_on_chain(_ctx: & dyn ScFuncCallContext) -> CallOnChainCall { let mut f = CallOnChainCall { - func: ScFunc::new(HSC_NAME, HFUNC_CALL_ON_CHAIN), - params: MutableCallOnChainParams { id: 0 }, + func: ScFunc::new(HSC_NAME, HFUNC_CALL_ON_CHAIN), + params: MutableCallOnChainParams { id: 0 }, results: ImmutableCallOnChainResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -185,7 +185,7 @@ impl ScFuncs { } pub fn check_context_from_full_ep(_ctx: & dyn ScFuncCallContext) -> CheckContextFromFullEPCall { let mut f = CheckContextFromFullEPCall { - func: ScFunc::new(HSC_NAME, HFUNC_CHECK_CONTEXT_FROM_FULL_EP), + func: ScFunc::new(HSC_NAME, HFUNC_CHECK_CONTEXT_FROM_FULL_EP), params: MutableCheckContextFromFullEPParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -198,7 +198,7 @@ impl ScFuncs { } pub fn get_minted_supply(_ctx: & dyn ScFuncCallContext) -> GetMintedSupplyCall { let mut f = GetMintedSupplyCall { - func: ScFunc::new(HSC_NAME, HFUNC_GET_MINTED_SUPPLY), + func: ScFunc::new(HSC_NAME, HFUNC_GET_MINTED_SUPPLY), results: ImmutableGetMintedSupplyResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); @@ -211,7 +211,7 @@ impl ScFuncs { } pub fn init(_ctx: & dyn ScFuncCallContext) -> InitCall { let mut f = InitCall { - func: ScInitFunc::new(HSC_NAME, HFUNC_INIT), + func: ScInitFunc::new(HSC_NAME, HFUNC_INIT), params: MutableInitParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -219,7 +219,7 @@ impl ScFuncs { } pub fn pass_types_full(_ctx: & dyn ScFuncCallContext) -> PassTypesFullCall { let mut f = PassTypesFullCall { - func: ScFunc::new(HSC_NAME, HFUNC_PASS_TYPES_FULL), + func: ScFunc::new(HSC_NAME, HFUNC_PASS_TYPES_FULL), params: MutablePassTypesFullParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -227,8 +227,8 @@ impl ScFuncs { } pub fn run_recursion(_ctx: & dyn ScFuncCallContext) -> RunRecursionCall { let mut f = RunRecursionCall { - func: ScFunc::new(HSC_NAME, HFUNC_RUN_RECURSION), - params: MutableRunRecursionParams { id: 0 }, + func: ScFunc::new(HSC_NAME, HFUNC_RUN_RECURSION), + params: MutableRunRecursionParams { id: 0 }, results: ImmutableRunRecursionResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -236,7 +236,7 @@ impl ScFuncs { } pub fn send_to_address(_ctx: & dyn ScFuncCallContext) -> SendToAddressCall { let mut f = SendToAddressCall { - func: ScFunc::new(HSC_NAME, HFUNC_SEND_TO_ADDRESS), + func: ScFunc::new(HSC_NAME, HFUNC_SEND_TO_ADDRESS), params: MutableSendToAddressParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -244,7 +244,7 @@ impl ScFuncs { } pub fn set_int(_ctx: & dyn ScFuncCallContext) -> SetIntCall { let mut f = SetIntCall { - func: ScFunc::new(HSC_NAME, HFUNC_SET_INT), + func: ScFunc::new(HSC_NAME, HFUNC_SET_INT), params: MutableSetIntParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -252,7 +252,7 @@ impl ScFuncs { } pub fn spawn(_ctx: & dyn ScFuncCallContext) -> SpawnCall { let mut f = SpawnCall { - func: ScFunc::new(HSC_NAME, HFUNC_SPAWN), + func: ScFunc::new(HSC_NAME, HFUNC_SPAWN), params: MutableSpawnParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -280,7 +280,7 @@ impl ScFuncs { } pub fn test_chain_owner_id_full(_ctx: & dyn ScFuncCallContext) -> TestChainOwnerIDFullCall { let mut f = TestChainOwnerIDFullCall { - func: ScFunc::new(HSC_NAME, HFUNC_TEST_CHAIN_OWNER_ID_FULL), + func: ScFunc::new(HSC_NAME, HFUNC_TEST_CHAIN_OWNER_ID_FULL), results: ImmutableTestChainOwnerIDFullResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); @@ -298,7 +298,7 @@ impl ScFuncs { } pub fn test_event_log_generic_data(_ctx: & dyn ScFuncCallContext) -> TestEventLogGenericDataCall { let mut f = TestEventLogGenericDataCall { - func: ScFunc::new(HSC_NAME, HFUNC_TEST_EVENT_LOG_GENERIC_DATA), + func: ScFunc::new(HSC_NAME, HFUNC_TEST_EVENT_LOG_GENERIC_DATA), params: MutableTestEventLogGenericDataParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -311,7 +311,7 @@ impl ScFuncs { } pub fn withdraw_to_chain(_ctx: & dyn ScFuncCallContext) -> WithdrawToChainCall { let mut f = WithdrawToChainCall { - func: ScFunc::new(HSC_NAME, HFUNC_WITHDRAW_TO_CHAIN), + func: ScFunc::new(HSC_NAME, HFUNC_WITHDRAW_TO_CHAIN), params: MutableWithdrawToChainParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -319,7 +319,7 @@ impl ScFuncs { } pub fn check_context_from_view_ep(_ctx: & dyn ScViewCallContext) -> CheckContextFromViewEPCall { let mut f = CheckContextFromViewEPCall { - func: ScView::new(HSC_NAME, HVIEW_CHECK_CONTEXT_FROM_VIEW_EP), + func: ScView::new(HSC_NAME, HVIEW_CHECK_CONTEXT_FROM_VIEW_EP), params: MutableCheckContextFromViewEPParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -327,8 +327,8 @@ impl ScFuncs { } pub fn fibonacci(_ctx: & dyn ScViewCallContext) -> FibonacciCall { let mut f = FibonacciCall { - func: ScView::new(HSC_NAME, HVIEW_FIBONACCI), - params: MutableFibonacciParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_FIBONACCI), + params: MutableFibonacciParams { id: 0 }, results: ImmutableFibonacciResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -336,7 +336,7 @@ impl ScFuncs { } pub fn get_counter(_ctx: & dyn ScViewCallContext) -> GetCounterCall { let mut f = GetCounterCall { - func: ScView::new(HSC_NAME, HVIEW_GET_COUNTER), + func: ScView::new(HSC_NAME, HVIEW_GET_COUNTER), results: ImmutableGetCounterResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); @@ -344,8 +344,8 @@ impl ScFuncs { } pub fn get_int(_ctx: & dyn ScViewCallContext) -> GetIntCall { let mut f = GetIntCall { - func: ScView::new(HSC_NAME, HVIEW_GET_INT), - params: MutableGetIntParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_GET_INT), + params: MutableGetIntParams { id: 0 }, results: ImmutableGetIntResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -353,8 +353,8 @@ impl ScFuncs { } pub fn get_string_value(_ctx: & dyn ScViewCallContext) -> GetStringValueCall { let mut f = GetStringValueCall { - func: ScView::new(HSC_NAME, HVIEW_GET_STRING_VALUE), - params: MutableGetStringValueParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_GET_STRING_VALUE), + params: MutableGetStringValueParams { id: 0 }, results: ImmutableGetStringValueResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -367,7 +367,7 @@ impl ScFuncs { } pub fn pass_types_view(_ctx: & dyn ScViewCallContext) -> PassTypesViewCall { let mut f = PassTypesViewCall { - func: ScView::new(HSC_NAME, HVIEW_PASS_TYPES_VIEW), + func: ScView::new(HSC_NAME, HVIEW_PASS_TYPES_VIEW), params: MutablePassTypesViewParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -380,7 +380,7 @@ impl ScFuncs { } pub fn test_chain_owner_id_view(_ctx: & dyn ScViewCallContext) -> TestChainOwnerIDViewCall { let mut f = TestChainOwnerIDViewCall { - func: ScView::new(HSC_NAME, HVIEW_TEST_CHAIN_OWNER_ID_VIEW), + func: ScView::new(HSC_NAME, HVIEW_TEST_CHAIN_OWNER_ID_VIEW), results: ImmutableTestChainOwnerIDViewResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); @@ -393,7 +393,7 @@ impl ScFuncs { } pub fn test_sandbox_call(_ctx: & dyn ScViewCallContext) -> TestSandboxCallCall { let mut f = TestSandboxCallCall { - func: ScView::new(HSC_NAME, HVIEW_TEST_SANDBOX_CALL), + func: ScView::new(HSC_NAME, HVIEW_TEST_SANDBOX_CALL), results: ImmutableTestSandboxCallResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); diff --git a/contracts/wasm/testcore/src/keys.rs b/contracts/wasm/testcore/src/keys.rs index 9d7429fc93..38556d158a 100644 --- a/contracts/wasm/testcore/src/keys.rs +++ b/contracts/wasm/testcore/src/keys.rs @@ -13,76 +13,80 @@ use wasmlib::*; use crate::*; -pub(crate) const IDX_PARAM_ADDRESS: usize = 0; -pub(crate) const IDX_PARAM_AGENT_ID: usize = 1; -pub(crate) const IDX_PARAM_CALLER: usize = 2; -pub(crate) const IDX_PARAM_CHAIN_ID: usize = 3; -pub(crate) const IDX_PARAM_CHAIN_OWNER_ID: usize = 4; +pub(crate) const IDX_PARAM_ADDRESS: usize = 0; +pub(crate) const IDX_PARAM_AGENT_ID: usize = 1; +pub(crate) const IDX_PARAM_CALLER: usize = 2; +pub(crate) const IDX_PARAM_CHAIN_ID: usize = 3; +pub(crate) const IDX_PARAM_CHAIN_OWNER_ID: usize = 4; pub(crate) const IDX_PARAM_CONTRACT_CREATOR: usize = 5; -pub(crate) const IDX_PARAM_CONTRACT_ID: usize = 6; -pub(crate) const IDX_PARAM_COUNTER: usize = 7; -pub(crate) const IDX_PARAM_FAIL: usize = 8; -pub(crate) const IDX_PARAM_HASH: usize = 9; -pub(crate) const IDX_PARAM_HNAME: usize = 10; -pub(crate) const IDX_PARAM_HNAME_CONTRACT: usize = 11; -pub(crate) const IDX_PARAM_HNAME_EP: usize = 12; -pub(crate) const IDX_PARAM_HNAME_ZERO: usize = 13; -pub(crate) const IDX_PARAM_INT64: usize = 14; -pub(crate) const IDX_PARAM_INT64_ZERO: usize = 15; -pub(crate) const IDX_PARAM_INT_VALUE: usize = 16; -pub(crate) const IDX_PARAM_NAME: usize = 17; -pub(crate) const IDX_PARAM_PROG_HASH: usize = 18; -pub(crate) const IDX_PARAM_STRING: usize = 19; -pub(crate) const IDX_PARAM_STRING_ZERO: usize = 20; -pub(crate) const IDX_PARAM_VAR_NAME: usize = 21; -pub(crate) const IDX_RESULT_CHAIN_OWNER_ID: usize = 22; -pub(crate) const IDX_RESULT_COUNTER: usize = 23; -pub(crate) const IDX_RESULT_INT_VALUE: usize = 24; -pub(crate) const IDX_RESULT_MINTED_COLOR: usize = 25; -pub(crate) const IDX_RESULT_MINTED_SUPPLY: usize = 26; -pub(crate) const IDX_RESULT_SANDBOX_CALL: usize = 27; -pub(crate) const IDX_STATE_COUNTER: usize = 28; -pub(crate) const IDX_STATE_HNAME_EP: usize = 29; -pub(crate) const IDX_STATE_INTS: usize = 30; -pub(crate) const IDX_STATE_MINTED_COLOR: usize = 31; -pub(crate) const IDX_STATE_MINTED_SUPPLY: usize = 32; +pub(crate) const IDX_PARAM_CONTRACT_ID: usize = 6; +pub(crate) const IDX_PARAM_COUNTER: usize = 7; +pub(crate) const IDX_PARAM_FAIL: usize = 8; +pub(crate) const IDX_PARAM_HASH: usize = 9; +pub(crate) const IDX_PARAM_HNAME: usize = 10; +pub(crate) const IDX_PARAM_HNAME_CONTRACT: usize = 11; +pub(crate) const IDX_PARAM_HNAME_EP: usize = 12; +pub(crate) const IDX_PARAM_HNAME_ZERO: usize = 13; +pub(crate) const IDX_PARAM_INT64: usize = 14; +pub(crate) const IDX_PARAM_INT64_ZERO: usize = 15; +pub(crate) const IDX_PARAM_INT_VALUE: usize = 16; +pub(crate) const IDX_PARAM_NAME: usize = 17; +pub(crate) const IDX_PARAM_PROG_HASH: usize = 18; +pub(crate) const IDX_PARAM_STRING: usize = 19; +pub(crate) const IDX_PARAM_STRING_ZERO: usize = 20; +pub(crate) const IDX_PARAM_VAR_NAME: usize = 21; +pub(crate) const IDX_RESULT_CHAIN_OWNER_ID: usize = 22; +pub(crate) const IDX_RESULT_COUNTER: usize = 23; +pub(crate) const IDX_RESULT_INT_VALUE: usize = 24; +pub(crate) const IDX_RESULT_MINTED_COLOR: usize = 25; +pub(crate) const IDX_RESULT_MINTED_SUPPLY: usize = 26; +pub(crate) const IDX_RESULT_SANDBOX_CALL: usize = 27; +pub(crate) const IDX_RESULT_VALUES: usize = 28; +pub(crate) const IDX_RESULT_VARS: usize = 29; +pub(crate) const IDX_STATE_COUNTER: usize = 30; +pub(crate) const IDX_STATE_HNAME_EP: usize = 31; +pub(crate) const IDX_STATE_INTS: usize = 32; +pub(crate) const IDX_STATE_MINTED_COLOR: usize = 33; +pub(crate) const IDX_STATE_MINTED_SUPPLY: usize = 34; -pub const KEY_MAP_LEN: usize = 33; +pub const KEY_MAP_LEN: usize = 35; pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ - PARAM_ADDRESS, - PARAM_AGENT_ID, - PARAM_CALLER, - PARAM_CHAIN_ID, - PARAM_CHAIN_OWNER_ID, - PARAM_CONTRACT_CREATOR, - PARAM_CONTRACT_ID, - PARAM_COUNTER, - PARAM_FAIL, - PARAM_HASH, - PARAM_HNAME, - PARAM_HNAME_CONTRACT, - PARAM_HNAME_EP, - PARAM_HNAME_ZERO, - PARAM_INT64, - PARAM_INT64_ZERO, - PARAM_INT_VALUE, - PARAM_NAME, - PARAM_PROG_HASH, - PARAM_STRING, - PARAM_STRING_ZERO, - PARAM_VAR_NAME, - RESULT_CHAIN_OWNER_ID, - RESULT_COUNTER, - RESULT_INT_VALUE, - RESULT_MINTED_COLOR, - RESULT_MINTED_SUPPLY, - RESULT_SANDBOX_CALL, - STATE_COUNTER, - STATE_HNAME_EP, - STATE_INTS, - STATE_MINTED_COLOR, - STATE_MINTED_SUPPLY, + PARAM_ADDRESS, + PARAM_AGENT_ID, + PARAM_CALLER, + PARAM_CHAIN_ID, + PARAM_CHAIN_OWNER_ID, + PARAM_CONTRACT_CREATOR, + PARAM_CONTRACT_ID, + PARAM_COUNTER, + PARAM_FAIL, + PARAM_HASH, + PARAM_HNAME, + PARAM_HNAME_CONTRACT, + PARAM_HNAME_EP, + PARAM_HNAME_ZERO, + PARAM_INT64, + PARAM_INT64_ZERO, + PARAM_INT_VALUE, + PARAM_NAME, + PARAM_PROG_HASH, + PARAM_STRING, + PARAM_STRING_ZERO, + PARAM_VAR_NAME, + RESULT_CHAIN_OWNER_ID, + RESULT_COUNTER, + RESULT_INT_VALUE, + RESULT_MINTED_COLOR, + RESULT_MINTED_SUPPLY, + RESULT_SANDBOX_CALL, + RESULT_VALUES, + RESULT_VARS, + STATE_COUNTER, + STATE_HNAME_EP, + STATE_INTS, + STATE_MINTED_COLOR, + STATE_MINTED_SUPPLY, ]; pub static mut IDX_MAP: [Key32; KEY_MAP_LEN] = [Key32(0); KEY_MAP_LEN]; diff --git a/contracts/wasm/testcore/src/lib.rs b/contracts/wasm/testcore/src/lib.rs index e114448688..46ed315a60 100644 --- a/contracts/wasm/testcore/src/lib.rs +++ b/contracts/wasm/testcore/src/lib.rs @@ -72,627 +72,627 @@ fn on_load() { } pub struct CallOnChainContext { - params: ImmutableCallOnChainParams, - results: MutableCallOnChainResults, - state: MutableTestCoreState, + params: ImmutableCallOnChainParams, + results: MutableCallOnChainResults, + state: MutableTestCoreState, } fn func_call_on_chain_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcCallOnChain"); - let f = CallOnChainContext { - params: ImmutableCallOnChainParams { - id: OBJ_ID_PARAMS, - }, - results: MutableCallOnChainResults { - id: OBJ_ID_RESULTS, - }, - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.int_value().exists(), "missing mandatory intValue"); - func_call_on_chain(ctx, &f); - ctx.log("testcore.funcCallOnChain ok"); + ctx.log("testcore.funcCallOnChain"); + let f = CallOnChainContext { + params: ImmutableCallOnChainParams { + id: OBJ_ID_PARAMS, + }, + results: MutableCallOnChainResults { + id: OBJ_ID_RESULTS, + }, + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.int_value().exists(), "missing mandatory intValue"); + func_call_on_chain(ctx, &f); + ctx.log("testcore.funcCallOnChain ok"); } pub struct CheckContextFromFullEPContext { - params: ImmutableCheckContextFromFullEPParams, - state: MutableTestCoreState, + params: ImmutableCheckContextFromFullEPParams, + state: MutableTestCoreState, } fn func_check_context_from_full_ep_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcCheckContextFromFullEP"); - let f = CheckContextFromFullEPContext { - params: ImmutableCheckContextFromFullEPParams { - id: OBJ_ID_PARAMS, - }, - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.agent_id().exists(), "missing mandatory agentID"); - ctx.require(f.params.caller().exists(), "missing mandatory caller"); - ctx.require(f.params.chain_id().exists(), "missing mandatory chainID"); - ctx.require(f.params.chain_owner_id().exists(), "missing mandatory chainOwnerID"); - ctx.require(f.params.contract_creator().exists(), "missing mandatory contractCreator"); - func_check_context_from_full_ep(ctx, &f); - ctx.log("testcore.funcCheckContextFromFullEP ok"); + ctx.log("testcore.funcCheckContextFromFullEP"); + let f = CheckContextFromFullEPContext { + params: ImmutableCheckContextFromFullEPParams { + id: OBJ_ID_PARAMS, + }, + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.agent_id().exists(), "missing mandatory agentID"); + ctx.require(f.params.caller().exists(), "missing mandatory caller"); + ctx.require(f.params.chain_id().exists(), "missing mandatory chainID"); + ctx.require(f.params.chain_owner_id().exists(), "missing mandatory chainOwnerID"); + ctx.require(f.params.contract_creator().exists(), "missing mandatory contractCreator"); + func_check_context_from_full_ep(ctx, &f); + ctx.log("testcore.funcCheckContextFromFullEP ok"); } pub struct DoNothingContext { - state: MutableTestCoreState, + state: MutableTestCoreState, } fn func_do_nothing_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcDoNothing"); - let f = DoNothingContext { - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - func_do_nothing(ctx, &f); - ctx.log("testcore.funcDoNothing ok"); + ctx.log("testcore.funcDoNothing"); + let f = DoNothingContext { + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + func_do_nothing(ctx, &f); + ctx.log("testcore.funcDoNothing ok"); } pub struct GetMintedSupplyContext { - results: MutableGetMintedSupplyResults, - state: MutableTestCoreState, + results: MutableGetMintedSupplyResults, + state: MutableTestCoreState, } fn func_get_minted_supply_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcGetMintedSupply"); - let f = GetMintedSupplyContext { - results: MutableGetMintedSupplyResults { - id: OBJ_ID_RESULTS, - }, - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - func_get_minted_supply(ctx, &f); - ctx.log("testcore.funcGetMintedSupply ok"); + ctx.log("testcore.funcGetMintedSupply"); + let f = GetMintedSupplyContext { + results: MutableGetMintedSupplyResults { + id: OBJ_ID_RESULTS, + }, + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + func_get_minted_supply(ctx, &f); + ctx.log("testcore.funcGetMintedSupply ok"); } pub struct IncCounterContext { - state: MutableTestCoreState, + state: MutableTestCoreState, } fn func_inc_counter_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcIncCounter"); - let f = IncCounterContext { - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - func_inc_counter(ctx, &f); - ctx.log("testcore.funcIncCounter ok"); + ctx.log("testcore.funcIncCounter"); + let f = IncCounterContext { + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + func_inc_counter(ctx, &f); + ctx.log("testcore.funcIncCounter ok"); } pub struct InitContext { - params: ImmutableInitParams, - state: MutableTestCoreState, + params: ImmutableInitParams, + state: MutableTestCoreState, } fn func_init_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcInit"); - let f = InitContext { - params: ImmutableInitParams { - id: OBJ_ID_PARAMS, - }, - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - func_init(ctx, &f); - ctx.log("testcore.funcInit ok"); + ctx.log("testcore.funcInit"); + let f = InitContext { + params: ImmutableInitParams { + id: OBJ_ID_PARAMS, + }, + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + func_init(ctx, &f); + ctx.log("testcore.funcInit ok"); } pub struct PassTypesFullContext { - params: ImmutablePassTypesFullParams, - state: MutableTestCoreState, + params: ImmutablePassTypesFullParams, + state: MutableTestCoreState, } fn func_pass_types_full_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcPassTypesFull"); - let f = PassTypesFullContext { - params: ImmutablePassTypesFullParams { - id: OBJ_ID_PARAMS, - }, - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.address().exists(), "missing mandatory address"); - ctx.require(f.params.agent_id().exists(), "missing mandatory agentID"); - ctx.require(f.params.chain_id().exists(), "missing mandatory chainID"); - ctx.require(f.params.contract_id().exists(), "missing mandatory contractID"); - ctx.require(f.params.hash().exists(), "missing mandatory hash"); - ctx.require(f.params.hname().exists(), "missing mandatory hname"); - ctx.require(f.params.hname_zero().exists(), "missing mandatory hnameZero"); - ctx.require(f.params.int64().exists(), "missing mandatory int64"); - ctx.require(f.params.int64_zero().exists(), "missing mandatory int64Zero"); - ctx.require(f.params.string().exists(), "missing mandatory string"); - ctx.require(f.params.string_zero().exists(), "missing mandatory stringZero"); - func_pass_types_full(ctx, &f); - ctx.log("testcore.funcPassTypesFull ok"); + ctx.log("testcore.funcPassTypesFull"); + let f = PassTypesFullContext { + params: ImmutablePassTypesFullParams { + id: OBJ_ID_PARAMS, + }, + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.address().exists(), "missing mandatory address"); + ctx.require(f.params.agent_id().exists(), "missing mandatory agentID"); + ctx.require(f.params.chain_id().exists(), "missing mandatory chainID"); + ctx.require(f.params.contract_id().exists(), "missing mandatory contractID"); + ctx.require(f.params.hash().exists(), "missing mandatory hash"); + ctx.require(f.params.hname().exists(), "missing mandatory hname"); + ctx.require(f.params.hname_zero().exists(), "missing mandatory hnameZero"); + ctx.require(f.params.int64().exists(), "missing mandatory int64"); + ctx.require(f.params.int64_zero().exists(), "missing mandatory int64Zero"); + ctx.require(f.params.string().exists(), "missing mandatory string"); + ctx.require(f.params.string_zero().exists(), "missing mandatory stringZero"); + func_pass_types_full(ctx, &f); + ctx.log("testcore.funcPassTypesFull ok"); } pub struct RunRecursionContext { - params: ImmutableRunRecursionParams, - results: MutableRunRecursionResults, - state: MutableTestCoreState, + params: ImmutableRunRecursionParams, + results: MutableRunRecursionResults, + state: MutableTestCoreState, } fn func_run_recursion_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcRunRecursion"); - let f = RunRecursionContext { - params: ImmutableRunRecursionParams { - id: OBJ_ID_PARAMS, - }, - results: MutableRunRecursionResults { - id: OBJ_ID_RESULTS, - }, - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.int_value().exists(), "missing mandatory intValue"); - func_run_recursion(ctx, &f); - ctx.log("testcore.funcRunRecursion ok"); + ctx.log("testcore.funcRunRecursion"); + let f = RunRecursionContext { + params: ImmutableRunRecursionParams { + id: OBJ_ID_PARAMS, + }, + results: MutableRunRecursionResults { + id: OBJ_ID_RESULTS, + }, + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.int_value().exists(), "missing mandatory intValue"); + func_run_recursion(ctx, &f); + ctx.log("testcore.funcRunRecursion ok"); } pub struct SendToAddressContext { - params: ImmutableSendToAddressParams, - state: MutableTestCoreState, + params: ImmutableSendToAddressParams, + state: MutableTestCoreState, } fn func_send_to_address_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcSendToAddress"); - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); - - let f = SendToAddressContext { - params: ImmutableSendToAddressParams { - id: OBJ_ID_PARAMS, - }, - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.address().exists(), "missing mandatory address"); - func_send_to_address(ctx, &f); - ctx.log("testcore.funcSendToAddress ok"); + ctx.log("testcore.funcSendToAddress"); + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + + let f = SendToAddressContext { + params: ImmutableSendToAddressParams { + id: OBJ_ID_PARAMS, + }, + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.address().exists(), "missing mandatory address"); + func_send_to_address(ctx, &f); + ctx.log("testcore.funcSendToAddress ok"); } pub struct SetIntContext { - params: ImmutableSetIntParams, - state: MutableTestCoreState, + params: ImmutableSetIntParams, + state: MutableTestCoreState, } fn func_set_int_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcSetInt"); - let f = SetIntContext { - params: ImmutableSetIntParams { - id: OBJ_ID_PARAMS, - }, - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.int_value().exists(), "missing mandatory intValue"); - ctx.require(f.params.name().exists(), "missing mandatory name"); - func_set_int(ctx, &f); - ctx.log("testcore.funcSetInt ok"); + ctx.log("testcore.funcSetInt"); + let f = SetIntContext { + params: ImmutableSetIntParams { + id: OBJ_ID_PARAMS, + }, + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.int_value().exists(), "missing mandatory intValue"); + ctx.require(f.params.name().exists(), "missing mandatory name"); + func_set_int(ctx, &f); + ctx.log("testcore.funcSetInt ok"); } pub struct SpawnContext { - params: ImmutableSpawnParams, - state: MutableTestCoreState, + params: ImmutableSpawnParams, + state: MutableTestCoreState, } fn func_spawn_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcSpawn"); - let f = SpawnContext { - params: ImmutableSpawnParams { - id: OBJ_ID_PARAMS, - }, - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.prog_hash().exists(), "missing mandatory progHash"); - func_spawn(ctx, &f); - ctx.log("testcore.funcSpawn ok"); + ctx.log("testcore.funcSpawn"); + let f = SpawnContext { + params: ImmutableSpawnParams { + id: OBJ_ID_PARAMS, + }, + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.prog_hash().exists(), "missing mandatory progHash"); + func_spawn(ctx, &f); + ctx.log("testcore.funcSpawn ok"); } pub struct TestBlockContext1Context { - state: MutableTestCoreState, + state: MutableTestCoreState, } fn func_test_block_context1_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcTestBlockContext1"); - let f = TestBlockContext1Context { - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - func_test_block_context1(ctx, &f); - ctx.log("testcore.funcTestBlockContext1 ok"); + ctx.log("testcore.funcTestBlockContext1"); + let f = TestBlockContext1Context { + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + func_test_block_context1(ctx, &f); + ctx.log("testcore.funcTestBlockContext1 ok"); } pub struct TestBlockContext2Context { - state: MutableTestCoreState, + state: MutableTestCoreState, } fn func_test_block_context2_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcTestBlockContext2"); - let f = TestBlockContext2Context { - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - func_test_block_context2(ctx, &f); - ctx.log("testcore.funcTestBlockContext2 ok"); + ctx.log("testcore.funcTestBlockContext2"); + let f = TestBlockContext2Context { + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + func_test_block_context2(ctx, &f); + ctx.log("testcore.funcTestBlockContext2 ok"); } pub struct TestCallPanicFullEPContext { - state: MutableTestCoreState, + state: MutableTestCoreState, } fn func_test_call_panic_full_ep_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcTestCallPanicFullEP"); - let f = TestCallPanicFullEPContext { - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - func_test_call_panic_full_ep(ctx, &f); - ctx.log("testcore.funcTestCallPanicFullEP ok"); + ctx.log("testcore.funcTestCallPanicFullEP"); + let f = TestCallPanicFullEPContext { + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + func_test_call_panic_full_ep(ctx, &f); + ctx.log("testcore.funcTestCallPanicFullEP ok"); } pub struct TestCallPanicViewEPFromFullContext { - state: MutableTestCoreState, + state: MutableTestCoreState, } fn func_test_call_panic_view_ep_from_full_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcTestCallPanicViewEPFromFull"); - let f = TestCallPanicViewEPFromFullContext { - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - func_test_call_panic_view_ep_from_full(ctx, &f); - ctx.log("testcore.funcTestCallPanicViewEPFromFull ok"); + ctx.log("testcore.funcTestCallPanicViewEPFromFull"); + let f = TestCallPanicViewEPFromFullContext { + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + func_test_call_panic_view_ep_from_full(ctx, &f); + ctx.log("testcore.funcTestCallPanicViewEPFromFull ok"); } pub struct TestChainOwnerIDFullContext { - results: MutableTestChainOwnerIDFullResults, - state: MutableTestCoreState, + results: MutableTestChainOwnerIDFullResults, + state: MutableTestCoreState, } fn func_test_chain_owner_id_full_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcTestChainOwnerIDFull"); - let f = TestChainOwnerIDFullContext { - results: MutableTestChainOwnerIDFullResults { - id: OBJ_ID_RESULTS, - }, - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - func_test_chain_owner_id_full(ctx, &f); - ctx.log("testcore.funcTestChainOwnerIDFull ok"); + ctx.log("testcore.funcTestChainOwnerIDFull"); + let f = TestChainOwnerIDFullContext { + results: MutableTestChainOwnerIDFullResults { + id: OBJ_ID_RESULTS, + }, + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + func_test_chain_owner_id_full(ctx, &f); + ctx.log("testcore.funcTestChainOwnerIDFull ok"); } pub struct TestEventLogDeployContext { - state: MutableTestCoreState, + state: MutableTestCoreState, } fn func_test_event_log_deploy_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcTestEventLogDeploy"); - let f = TestEventLogDeployContext { - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - func_test_event_log_deploy(ctx, &f); - ctx.log("testcore.funcTestEventLogDeploy ok"); + ctx.log("testcore.funcTestEventLogDeploy"); + let f = TestEventLogDeployContext { + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + func_test_event_log_deploy(ctx, &f); + ctx.log("testcore.funcTestEventLogDeploy ok"); } pub struct TestEventLogEventDataContext { - state: MutableTestCoreState, + state: MutableTestCoreState, } fn func_test_event_log_event_data_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcTestEventLogEventData"); - let f = TestEventLogEventDataContext { - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - func_test_event_log_event_data(ctx, &f); - ctx.log("testcore.funcTestEventLogEventData ok"); + ctx.log("testcore.funcTestEventLogEventData"); + let f = TestEventLogEventDataContext { + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + func_test_event_log_event_data(ctx, &f); + ctx.log("testcore.funcTestEventLogEventData ok"); } pub struct TestEventLogGenericDataContext { - params: ImmutableTestEventLogGenericDataParams, - state: MutableTestCoreState, + params: ImmutableTestEventLogGenericDataParams, + state: MutableTestCoreState, } fn func_test_event_log_generic_data_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcTestEventLogGenericData"); - let f = TestEventLogGenericDataContext { - params: ImmutableTestEventLogGenericDataParams { - id: OBJ_ID_PARAMS, - }, - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.counter().exists(), "missing mandatory counter"); - func_test_event_log_generic_data(ctx, &f); - ctx.log("testcore.funcTestEventLogGenericData ok"); + ctx.log("testcore.funcTestEventLogGenericData"); + let f = TestEventLogGenericDataContext { + params: ImmutableTestEventLogGenericDataParams { + id: OBJ_ID_PARAMS, + }, + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.counter().exists(), "missing mandatory counter"); + func_test_event_log_generic_data(ctx, &f); + ctx.log("testcore.funcTestEventLogGenericData ok"); } pub struct TestPanicFullEPContext { - state: MutableTestCoreState, + state: MutableTestCoreState, } fn func_test_panic_full_ep_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcTestPanicFullEP"); - let f = TestPanicFullEPContext { - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - func_test_panic_full_ep(ctx, &f); - ctx.log("testcore.funcTestPanicFullEP ok"); + ctx.log("testcore.funcTestPanicFullEP"); + let f = TestPanicFullEPContext { + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + func_test_panic_full_ep(ctx, &f); + ctx.log("testcore.funcTestPanicFullEP ok"); } pub struct WithdrawToChainContext { - params: ImmutableWithdrawToChainParams, - state: MutableTestCoreState, + params: ImmutableWithdrawToChainParams, + state: MutableTestCoreState, } fn func_withdraw_to_chain_thunk(ctx: &ScFuncContext) { - ctx.log("testcore.funcWithdrawToChain"); - let f = WithdrawToChainContext { - params: ImmutableWithdrawToChainParams { - id: OBJ_ID_PARAMS, - }, - state: MutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.chain_id().exists(), "missing mandatory chainID"); - func_withdraw_to_chain(ctx, &f); - ctx.log("testcore.funcWithdrawToChain ok"); + ctx.log("testcore.funcWithdrawToChain"); + let f = WithdrawToChainContext { + params: ImmutableWithdrawToChainParams { + id: OBJ_ID_PARAMS, + }, + state: MutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.chain_id().exists(), "missing mandatory chainID"); + func_withdraw_to_chain(ctx, &f); + ctx.log("testcore.funcWithdrawToChain ok"); } pub struct CheckContextFromViewEPContext { - params: ImmutableCheckContextFromViewEPParams, - state: ImmutableTestCoreState, + params: ImmutableCheckContextFromViewEPParams, + state: ImmutableTestCoreState, } fn view_check_context_from_view_ep_thunk(ctx: &ScViewContext) { - ctx.log("testcore.viewCheckContextFromViewEP"); - let f = CheckContextFromViewEPContext { - params: ImmutableCheckContextFromViewEPParams { - id: OBJ_ID_PARAMS, - }, - state: ImmutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.agent_id().exists(), "missing mandatory agentID"); - ctx.require(f.params.chain_id().exists(), "missing mandatory chainID"); - ctx.require(f.params.chain_owner_id().exists(), "missing mandatory chainOwnerID"); - ctx.require(f.params.contract_creator().exists(), "missing mandatory contractCreator"); - view_check_context_from_view_ep(ctx, &f); - ctx.log("testcore.viewCheckContextFromViewEP ok"); + ctx.log("testcore.viewCheckContextFromViewEP"); + let f = CheckContextFromViewEPContext { + params: ImmutableCheckContextFromViewEPParams { + id: OBJ_ID_PARAMS, + }, + state: ImmutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.agent_id().exists(), "missing mandatory agentID"); + ctx.require(f.params.chain_id().exists(), "missing mandatory chainID"); + ctx.require(f.params.chain_owner_id().exists(), "missing mandatory chainOwnerID"); + ctx.require(f.params.contract_creator().exists(), "missing mandatory contractCreator"); + view_check_context_from_view_ep(ctx, &f); + ctx.log("testcore.viewCheckContextFromViewEP ok"); } pub struct FibonacciContext { - params: ImmutableFibonacciParams, - results: MutableFibonacciResults, - state: ImmutableTestCoreState, + params: ImmutableFibonacciParams, + results: MutableFibonacciResults, + state: ImmutableTestCoreState, } fn view_fibonacci_thunk(ctx: &ScViewContext) { - ctx.log("testcore.viewFibonacci"); - let f = FibonacciContext { - params: ImmutableFibonacciParams { - id: OBJ_ID_PARAMS, - }, - results: MutableFibonacciResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.int_value().exists(), "missing mandatory intValue"); - view_fibonacci(ctx, &f); - ctx.log("testcore.viewFibonacci ok"); + ctx.log("testcore.viewFibonacci"); + let f = FibonacciContext { + params: ImmutableFibonacciParams { + id: OBJ_ID_PARAMS, + }, + results: MutableFibonacciResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.int_value().exists(), "missing mandatory intValue"); + view_fibonacci(ctx, &f); + ctx.log("testcore.viewFibonacci ok"); } pub struct GetCounterContext { - results: MutableGetCounterResults, - state: ImmutableTestCoreState, + results: MutableGetCounterResults, + state: ImmutableTestCoreState, } fn view_get_counter_thunk(ctx: &ScViewContext) { - ctx.log("testcore.viewGetCounter"); - let f = GetCounterContext { - results: MutableGetCounterResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - view_get_counter(ctx, &f); - ctx.log("testcore.viewGetCounter ok"); + ctx.log("testcore.viewGetCounter"); + let f = GetCounterContext { + results: MutableGetCounterResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + view_get_counter(ctx, &f); + ctx.log("testcore.viewGetCounter ok"); } pub struct GetIntContext { - params: ImmutableGetIntParams, - results: MutableGetIntResults, - state: ImmutableTestCoreState, + params: ImmutableGetIntParams, + results: MutableGetIntResults, + state: ImmutableTestCoreState, } fn view_get_int_thunk(ctx: &ScViewContext) { - ctx.log("testcore.viewGetInt"); - let f = GetIntContext { - params: ImmutableGetIntParams { - id: OBJ_ID_PARAMS, - }, - results: MutableGetIntResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.name().exists(), "missing mandatory name"); - view_get_int(ctx, &f); - ctx.log("testcore.viewGetInt ok"); + ctx.log("testcore.viewGetInt"); + let f = GetIntContext { + params: ImmutableGetIntParams { + id: OBJ_ID_PARAMS, + }, + results: MutableGetIntResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.name().exists(), "missing mandatory name"); + view_get_int(ctx, &f); + ctx.log("testcore.viewGetInt ok"); } pub struct GetStringValueContext { - params: ImmutableGetStringValueParams, - results: MutableGetStringValueResults, - state: ImmutableTestCoreState, + params: ImmutableGetStringValueParams, + results: MutableGetStringValueResults, + state: ImmutableTestCoreState, } fn view_get_string_value_thunk(ctx: &ScViewContext) { - ctx.log("testcore.viewGetStringValue"); - let f = GetStringValueContext { - params: ImmutableGetStringValueParams { - id: OBJ_ID_PARAMS, - }, - results: MutableGetStringValueResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.var_name().exists(), "missing mandatory varName"); - view_get_string_value(ctx, &f); - ctx.log("testcore.viewGetStringValue ok"); + ctx.log("testcore.viewGetStringValue"); + let f = GetStringValueContext { + params: ImmutableGetStringValueParams { + id: OBJ_ID_PARAMS, + }, + results: MutableGetStringValueResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.var_name().exists(), "missing mandatory varName"); + view_get_string_value(ctx, &f); + ctx.log("testcore.viewGetStringValue ok"); } pub struct JustViewContext { - state: ImmutableTestCoreState, + state: ImmutableTestCoreState, } fn view_just_view_thunk(ctx: &ScViewContext) { - ctx.log("testcore.viewJustView"); - let f = JustViewContext { - state: ImmutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - view_just_view(ctx, &f); - ctx.log("testcore.viewJustView ok"); + ctx.log("testcore.viewJustView"); + let f = JustViewContext { + state: ImmutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + view_just_view(ctx, &f); + ctx.log("testcore.viewJustView ok"); } pub struct PassTypesViewContext { - params: ImmutablePassTypesViewParams, - state: ImmutableTestCoreState, + params: ImmutablePassTypesViewParams, + state: ImmutableTestCoreState, } fn view_pass_types_view_thunk(ctx: &ScViewContext) { - ctx.log("testcore.viewPassTypesView"); - let f = PassTypesViewContext { - params: ImmutablePassTypesViewParams { - id: OBJ_ID_PARAMS, - }, - state: ImmutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.address().exists(), "missing mandatory address"); - ctx.require(f.params.agent_id().exists(), "missing mandatory agentID"); - ctx.require(f.params.chain_id().exists(), "missing mandatory chainID"); - ctx.require(f.params.contract_id().exists(), "missing mandatory contractID"); - ctx.require(f.params.hash().exists(), "missing mandatory hash"); - ctx.require(f.params.hname().exists(), "missing mandatory hname"); - ctx.require(f.params.hname_zero().exists(), "missing mandatory hnameZero"); - ctx.require(f.params.int64().exists(), "missing mandatory int64"); - ctx.require(f.params.int64_zero().exists(), "missing mandatory int64Zero"); - ctx.require(f.params.string().exists(), "missing mandatory string"); - ctx.require(f.params.string_zero().exists(), "missing mandatory stringZero"); - view_pass_types_view(ctx, &f); - ctx.log("testcore.viewPassTypesView ok"); + ctx.log("testcore.viewPassTypesView"); + let f = PassTypesViewContext { + params: ImmutablePassTypesViewParams { + id: OBJ_ID_PARAMS, + }, + state: ImmutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.address().exists(), "missing mandatory address"); + ctx.require(f.params.agent_id().exists(), "missing mandatory agentID"); + ctx.require(f.params.chain_id().exists(), "missing mandatory chainID"); + ctx.require(f.params.contract_id().exists(), "missing mandatory contractID"); + ctx.require(f.params.hash().exists(), "missing mandatory hash"); + ctx.require(f.params.hname().exists(), "missing mandatory hname"); + ctx.require(f.params.hname_zero().exists(), "missing mandatory hnameZero"); + ctx.require(f.params.int64().exists(), "missing mandatory int64"); + ctx.require(f.params.int64_zero().exists(), "missing mandatory int64Zero"); + ctx.require(f.params.string().exists(), "missing mandatory string"); + ctx.require(f.params.string_zero().exists(), "missing mandatory stringZero"); + view_pass_types_view(ctx, &f); + ctx.log("testcore.viewPassTypesView ok"); } pub struct TestCallPanicViewEPFromViewContext { - state: ImmutableTestCoreState, + state: ImmutableTestCoreState, } fn view_test_call_panic_view_ep_from_view_thunk(ctx: &ScViewContext) { - ctx.log("testcore.viewTestCallPanicViewEPFromView"); - let f = TestCallPanicViewEPFromViewContext { - state: ImmutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - view_test_call_panic_view_ep_from_view(ctx, &f); - ctx.log("testcore.viewTestCallPanicViewEPFromView ok"); + ctx.log("testcore.viewTestCallPanicViewEPFromView"); + let f = TestCallPanicViewEPFromViewContext { + state: ImmutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + view_test_call_panic_view_ep_from_view(ctx, &f); + ctx.log("testcore.viewTestCallPanicViewEPFromView ok"); } pub struct TestChainOwnerIDViewContext { - results: MutableTestChainOwnerIDViewResults, - state: ImmutableTestCoreState, + results: MutableTestChainOwnerIDViewResults, + state: ImmutableTestCoreState, } fn view_test_chain_owner_id_view_thunk(ctx: &ScViewContext) { - ctx.log("testcore.viewTestChainOwnerIDView"); - let f = TestChainOwnerIDViewContext { - results: MutableTestChainOwnerIDViewResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - view_test_chain_owner_id_view(ctx, &f); - ctx.log("testcore.viewTestChainOwnerIDView ok"); + ctx.log("testcore.viewTestChainOwnerIDView"); + let f = TestChainOwnerIDViewContext { + results: MutableTestChainOwnerIDViewResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + view_test_chain_owner_id_view(ctx, &f); + ctx.log("testcore.viewTestChainOwnerIDView ok"); } pub struct TestPanicViewEPContext { - state: ImmutableTestCoreState, + state: ImmutableTestCoreState, } fn view_test_panic_view_ep_thunk(ctx: &ScViewContext) { - ctx.log("testcore.viewTestPanicViewEP"); - let f = TestPanicViewEPContext { - state: ImmutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - view_test_panic_view_ep(ctx, &f); - ctx.log("testcore.viewTestPanicViewEP ok"); + ctx.log("testcore.viewTestPanicViewEP"); + let f = TestPanicViewEPContext { + state: ImmutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + view_test_panic_view_ep(ctx, &f); + ctx.log("testcore.viewTestPanicViewEP ok"); } pub struct TestSandboxCallContext { - results: MutableTestSandboxCallResults, - state: ImmutableTestCoreState, + results: MutableTestSandboxCallResults, + state: ImmutableTestCoreState, } fn view_test_sandbox_call_thunk(ctx: &ScViewContext) { - ctx.log("testcore.viewTestSandboxCall"); - let f = TestSandboxCallContext { - results: MutableTestSandboxCallResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableTestCoreState { - id: OBJ_ID_STATE, - }, - }; - view_test_sandbox_call(ctx, &f); - ctx.log("testcore.viewTestSandboxCall ok"); + ctx.log("testcore.viewTestSandboxCall"); + let f = TestSandboxCallContext { + results: MutableTestSandboxCallResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableTestCoreState { + id: OBJ_ID_STATE, + }, + }; + view_test_sandbox_call(ctx, &f); + ctx.log("testcore.viewTestSandboxCall ok"); } // @formatter:on diff --git a/contracts/wasm/testcore/src/params.rs b/contracts/wasm/testcore/src/params.rs index 559caf1d68..e361105afd 100644 --- a/contracts/wasm/testcore/src/params.rs +++ b/contracts/wasm/testcore/src/params.rs @@ -20,17 +20,18 @@ pub struct ImmutableCallOnChainParams { } impl ImmutableCallOnChainParams { + pub fn hname_contract(&self) -> ScImmutableHname { - ScImmutableHname::new(self.id, idx_map(IDX_PARAM_HNAME_CONTRACT)) - } + ScImmutableHname::new(self.id, idx_map(IDX_PARAM_HNAME_CONTRACT)) + } pub fn hname_ep(&self) -> ScImmutableHname { - ScImmutableHname::new(self.id, idx_map(IDX_PARAM_HNAME_EP)) - } + ScImmutableHname::new(self.id, idx_map(IDX_PARAM_HNAME_EP)) + } pub fn int_value(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) + } } #[derive(Clone, Copy)] @@ -39,17 +40,18 @@ pub struct MutableCallOnChainParams { } impl MutableCallOnChainParams { + pub fn hname_contract(&self) -> ScMutableHname { - ScMutableHname::new(self.id, idx_map(IDX_PARAM_HNAME_CONTRACT)) - } + ScMutableHname::new(self.id, idx_map(IDX_PARAM_HNAME_CONTRACT)) + } pub fn hname_ep(&self) -> ScMutableHname { - ScMutableHname::new(self.id, idx_map(IDX_PARAM_HNAME_EP)) - } + ScMutableHname::new(self.id, idx_map(IDX_PARAM_HNAME_EP)) + } pub fn int_value(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) + } } #[derive(Clone, Copy)] @@ -58,25 +60,26 @@ pub struct ImmutableCheckContextFromFullEPParams { } impl ImmutableCheckContextFromFullEPParams { + pub fn agent_id(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) + } pub fn caller(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_CALLER)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_CALLER)) + } pub fn chain_id(&self) -> ScImmutableChainID { - ScImmutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) - } + ScImmutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) + } pub fn chain_owner_id(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_CHAIN_OWNER_ID)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_CHAIN_OWNER_ID)) + } pub fn contract_creator(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_CONTRACT_CREATOR)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_CONTRACT_CREATOR)) + } } #[derive(Clone, Copy)] @@ -85,25 +88,26 @@ pub struct MutableCheckContextFromFullEPParams { } impl MutableCheckContextFromFullEPParams { + pub fn agent_id(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) + } pub fn caller(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_CALLER)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_CALLER)) + } pub fn chain_id(&self) -> ScMutableChainID { - ScMutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) - } + ScMutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) + } pub fn chain_owner_id(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_CHAIN_OWNER_ID)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_CHAIN_OWNER_ID)) + } pub fn contract_creator(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_CONTRACT_CREATOR)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_CONTRACT_CREATOR)) + } } #[derive(Clone, Copy)] @@ -112,9 +116,10 @@ pub struct ImmutableInitParams { } impl ImmutableInitParams { + pub fn fail(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_FAIL)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_FAIL)) + } } #[derive(Clone, Copy)] @@ -123,9 +128,10 @@ pub struct MutableInitParams { } impl MutableInitParams { + pub fn fail(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_FAIL)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_FAIL)) + } } #[derive(Clone, Copy)] @@ -134,49 +140,50 @@ pub struct ImmutablePassTypesFullParams { } impl ImmutablePassTypesFullParams { + pub fn address(&self) -> ScImmutableAddress { - ScImmutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) - } + ScImmutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) + } pub fn agent_id(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) + } pub fn chain_id(&self) -> ScImmutableChainID { - ScImmutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) - } + ScImmutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) + } pub fn contract_id(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_CONTRACT_ID)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_CONTRACT_ID)) + } pub fn hash(&self) -> ScImmutableHash { - ScImmutableHash::new(self.id, idx_map(IDX_PARAM_HASH)) - } + ScImmutableHash::new(self.id, idx_map(IDX_PARAM_HASH)) + } pub fn hname(&self) -> ScImmutableHname { - ScImmutableHname::new(self.id, idx_map(IDX_PARAM_HNAME)) - } + ScImmutableHname::new(self.id, idx_map(IDX_PARAM_HNAME)) + } pub fn hname_zero(&self) -> ScImmutableHname { - ScImmutableHname::new(self.id, idx_map(IDX_PARAM_HNAME_ZERO)) - } + ScImmutableHname::new(self.id, idx_map(IDX_PARAM_HNAME_ZERO)) + } pub fn int64(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT64)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT64)) + } pub fn int64_zero(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT64_ZERO)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT64_ZERO)) + } pub fn string(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_PARAM_STRING)) - } + ScImmutableString::new(self.id, idx_map(IDX_PARAM_STRING)) + } pub fn string_zero(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_PARAM_STRING_ZERO)) - } + ScImmutableString::new(self.id, idx_map(IDX_PARAM_STRING_ZERO)) + } } #[derive(Clone, Copy)] @@ -185,49 +192,50 @@ pub struct MutablePassTypesFullParams { } impl MutablePassTypesFullParams { + pub fn address(&self) -> ScMutableAddress { - ScMutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) - } + ScMutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) + } pub fn agent_id(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) + } pub fn chain_id(&self) -> ScMutableChainID { - ScMutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) - } + ScMutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) + } pub fn contract_id(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_CONTRACT_ID)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_CONTRACT_ID)) + } pub fn hash(&self) -> ScMutableHash { - ScMutableHash::new(self.id, idx_map(IDX_PARAM_HASH)) - } + ScMutableHash::new(self.id, idx_map(IDX_PARAM_HASH)) + } pub fn hname(&self) -> ScMutableHname { - ScMutableHname::new(self.id, idx_map(IDX_PARAM_HNAME)) - } + ScMutableHname::new(self.id, idx_map(IDX_PARAM_HNAME)) + } pub fn hname_zero(&self) -> ScMutableHname { - ScMutableHname::new(self.id, idx_map(IDX_PARAM_HNAME_ZERO)) - } + ScMutableHname::new(self.id, idx_map(IDX_PARAM_HNAME_ZERO)) + } pub fn int64(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT64)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT64)) + } pub fn int64_zero(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT64_ZERO)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT64_ZERO)) + } pub fn string(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_PARAM_STRING)) - } + ScMutableString::new(self.id, idx_map(IDX_PARAM_STRING)) + } pub fn string_zero(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_PARAM_STRING_ZERO)) - } + ScMutableString::new(self.id, idx_map(IDX_PARAM_STRING_ZERO)) + } } #[derive(Clone, Copy)] @@ -236,9 +244,10 @@ pub struct ImmutableRunRecursionParams { } impl ImmutableRunRecursionParams { + pub fn int_value(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) + } } #[derive(Clone, Copy)] @@ -247,9 +256,10 @@ pub struct MutableRunRecursionParams { } impl MutableRunRecursionParams { + pub fn int_value(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) + } } #[derive(Clone, Copy)] @@ -258,9 +268,10 @@ pub struct ImmutableSendToAddressParams { } impl ImmutableSendToAddressParams { + pub fn address(&self) -> ScImmutableAddress { - ScImmutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) - } + ScImmutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) + } } #[derive(Clone, Copy)] @@ -269,9 +280,10 @@ pub struct MutableSendToAddressParams { } impl MutableSendToAddressParams { + pub fn address(&self) -> ScMutableAddress { - ScMutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) - } + ScMutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) + } } #[derive(Clone, Copy)] @@ -280,13 +292,14 @@ pub struct ImmutableSetIntParams { } impl ImmutableSetIntParams { + pub fn int_value(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) + } pub fn name(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_PARAM_NAME)) - } + ScImmutableString::new(self.id, idx_map(IDX_PARAM_NAME)) + } } #[derive(Clone, Copy)] @@ -295,13 +308,14 @@ pub struct MutableSetIntParams { } impl MutableSetIntParams { + pub fn int_value(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) + } pub fn name(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_PARAM_NAME)) - } + ScMutableString::new(self.id, idx_map(IDX_PARAM_NAME)) + } } #[derive(Clone, Copy)] @@ -310,9 +324,10 @@ pub struct ImmutableSpawnParams { } impl ImmutableSpawnParams { + pub fn prog_hash(&self) -> ScImmutableHash { - ScImmutableHash::new(self.id, idx_map(IDX_PARAM_PROG_HASH)) - } + ScImmutableHash::new(self.id, idx_map(IDX_PARAM_PROG_HASH)) + } } #[derive(Clone, Copy)] @@ -321,9 +336,10 @@ pub struct MutableSpawnParams { } impl MutableSpawnParams { + pub fn prog_hash(&self) -> ScMutableHash { - ScMutableHash::new(self.id, idx_map(IDX_PARAM_PROG_HASH)) - } + ScMutableHash::new(self.id, idx_map(IDX_PARAM_PROG_HASH)) + } } #[derive(Clone, Copy)] @@ -332,9 +348,10 @@ pub struct ImmutableTestEventLogGenericDataParams { } impl ImmutableTestEventLogGenericDataParams { + pub fn counter(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_COUNTER)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_COUNTER)) + } } #[derive(Clone, Copy)] @@ -343,9 +360,10 @@ pub struct MutableTestEventLogGenericDataParams { } impl MutableTestEventLogGenericDataParams { + pub fn counter(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_COUNTER)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_COUNTER)) + } } #[derive(Clone, Copy)] @@ -354,9 +372,10 @@ pub struct ImmutableWithdrawToChainParams { } impl ImmutableWithdrawToChainParams { + pub fn chain_id(&self) -> ScImmutableChainID { - ScImmutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) - } + ScImmutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) + } } #[derive(Clone, Copy)] @@ -365,9 +384,10 @@ pub struct MutableWithdrawToChainParams { } impl MutableWithdrawToChainParams { + pub fn chain_id(&self) -> ScMutableChainID { - ScMutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) - } + ScMutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) + } } #[derive(Clone, Copy)] @@ -376,21 +396,22 @@ pub struct ImmutableCheckContextFromViewEPParams { } impl ImmutableCheckContextFromViewEPParams { + pub fn agent_id(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) + } pub fn chain_id(&self) -> ScImmutableChainID { - ScImmutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) - } + ScImmutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) + } pub fn chain_owner_id(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_CHAIN_OWNER_ID)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_CHAIN_OWNER_ID)) + } pub fn contract_creator(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_CONTRACT_CREATOR)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_CONTRACT_CREATOR)) + } } #[derive(Clone, Copy)] @@ -399,21 +420,22 @@ pub struct MutableCheckContextFromViewEPParams { } impl MutableCheckContextFromViewEPParams { + pub fn agent_id(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) + } pub fn chain_id(&self) -> ScMutableChainID { - ScMutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) - } + ScMutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) + } pub fn chain_owner_id(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_CHAIN_OWNER_ID)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_CHAIN_OWNER_ID)) + } pub fn contract_creator(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_CONTRACT_CREATOR)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_CONTRACT_CREATOR)) + } } #[derive(Clone, Copy)] @@ -422,9 +444,10 @@ pub struct ImmutableFibonacciParams { } impl ImmutableFibonacciParams { + pub fn int_value(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) + } } #[derive(Clone, Copy)] @@ -433,9 +456,10 @@ pub struct MutableFibonacciParams { } impl MutableFibonacciParams { + pub fn int_value(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) + } } #[derive(Clone, Copy)] @@ -444,9 +468,10 @@ pub struct ImmutableGetIntParams { } impl ImmutableGetIntParams { + pub fn name(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_PARAM_NAME)) - } + ScImmutableString::new(self.id, idx_map(IDX_PARAM_NAME)) + } } #[derive(Clone, Copy)] @@ -455,9 +480,10 @@ pub struct MutableGetIntParams { } impl MutableGetIntParams { + pub fn name(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_PARAM_NAME)) - } + ScMutableString::new(self.id, idx_map(IDX_PARAM_NAME)) + } } #[derive(Clone, Copy)] @@ -466,9 +492,10 @@ pub struct ImmutableGetStringValueParams { } impl ImmutableGetStringValueParams { + pub fn var_name(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_PARAM_VAR_NAME)) - } + ScImmutableString::new(self.id, idx_map(IDX_PARAM_VAR_NAME)) + } } #[derive(Clone, Copy)] @@ -477,9 +504,10 @@ pub struct MutableGetStringValueParams { } impl MutableGetStringValueParams { + pub fn var_name(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_PARAM_VAR_NAME)) - } + ScMutableString::new(self.id, idx_map(IDX_PARAM_VAR_NAME)) + } } #[derive(Clone, Copy)] @@ -488,49 +516,50 @@ pub struct ImmutablePassTypesViewParams { } impl ImmutablePassTypesViewParams { + pub fn address(&self) -> ScImmutableAddress { - ScImmutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) - } + ScImmutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) + } pub fn agent_id(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) + } pub fn chain_id(&self) -> ScImmutableChainID { - ScImmutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) - } + ScImmutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) + } pub fn contract_id(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_CONTRACT_ID)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_CONTRACT_ID)) + } pub fn hash(&self) -> ScImmutableHash { - ScImmutableHash::new(self.id, idx_map(IDX_PARAM_HASH)) - } + ScImmutableHash::new(self.id, idx_map(IDX_PARAM_HASH)) + } pub fn hname(&self) -> ScImmutableHname { - ScImmutableHname::new(self.id, idx_map(IDX_PARAM_HNAME)) - } + ScImmutableHname::new(self.id, idx_map(IDX_PARAM_HNAME)) + } pub fn hname_zero(&self) -> ScImmutableHname { - ScImmutableHname::new(self.id, idx_map(IDX_PARAM_HNAME_ZERO)) - } + ScImmutableHname::new(self.id, idx_map(IDX_PARAM_HNAME_ZERO)) + } pub fn int64(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT64)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT64)) + } pub fn int64_zero(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT64_ZERO)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT64_ZERO)) + } pub fn string(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_PARAM_STRING)) - } + ScImmutableString::new(self.id, idx_map(IDX_PARAM_STRING)) + } pub fn string_zero(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_PARAM_STRING_ZERO)) - } + ScImmutableString::new(self.id, idx_map(IDX_PARAM_STRING_ZERO)) + } } #[derive(Clone, Copy)] @@ -539,47 +568,48 @@ pub struct MutablePassTypesViewParams { } impl MutablePassTypesViewParams { + pub fn address(&self) -> ScMutableAddress { - ScMutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) - } + ScMutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) + } pub fn agent_id(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) + } pub fn chain_id(&self) -> ScMutableChainID { - ScMutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) - } + ScMutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) + } pub fn contract_id(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_CONTRACT_ID)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_CONTRACT_ID)) + } pub fn hash(&self) -> ScMutableHash { - ScMutableHash::new(self.id, idx_map(IDX_PARAM_HASH)) - } + ScMutableHash::new(self.id, idx_map(IDX_PARAM_HASH)) + } pub fn hname(&self) -> ScMutableHname { - ScMutableHname::new(self.id, idx_map(IDX_PARAM_HNAME)) - } + ScMutableHname::new(self.id, idx_map(IDX_PARAM_HNAME)) + } pub fn hname_zero(&self) -> ScMutableHname { - ScMutableHname::new(self.id, idx_map(IDX_PARAM_HNAME_ZERO)) - } + ScMutableHname::new(self.id, idx_map(IDX_PARAM_HNAME_ZERO)) + } pub fn int64(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT64)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT64)) + } pub fn int64_zero(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT64_ZERO)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT64_ZERO)) + } pub fn string(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_PARAM_STRING)) - } + ScMutableString::new(self.id, idx_map(IDX_PARAM_STRING)) + } pub fn string_zero(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_PARAM_STRING_ZERO)) - } + ScMutableString::new(self.id, idx_map(IDX_PARAM_STRING_ZERO)) + } } diff --git a/contracts/wasm/testcore/src/results.rs b/contracts/wasm/testcore/src/results.rs index 6c038b65fe..7f65107ec9 100644 --- a/contracts/wasm/testcore/src/results.rs +++ b/contracts/wasm/testcore/src/results.rs @@ -20,9 +20,10 @@ pub struct ImmutableCallOnChainResults { } impl ImmutableCallOnChainResults { + pub fn int_value(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_INT_VALUE)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_INT_VALUE)) + } } #[derive(Clone, Copy)] @@ -31,9 +32,10 @@ pub struct MutableCallOnChainResults { } impl MutableCallOnChainResults { + pub fn int_value(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_INT_VALUE)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_INT_VALUE)) + } } #[derive(Clone, Copy)] @@ -42,13 +44,14 @@ pub struct ImmutableGetMintedSupplyResults { } impl ImmutableGetMintedSupplyResults { + pub fn minted_color(&self) -> ScImmutableColor { - ScImmutableColor::new(self.id, idx_map(IDX_RESULT_MINTED_COLOR)) - } + ScImmutableColor::new(self.id, idx_map(IDX_RESULT_MINTED_COLOR)) + } pub fn minted_supply(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_MINTED_SUPPLY)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_MINTED_SUPPLY)) + } } #[derive(Clone, Copy)] @@ -57,13 +60,14 @@ pub struct MutableGetMintedSupplyResults { } impl MutableGetMintedSupplyResults { + pub fn minted_color(&self) -> ScMutableColor { - ScMutableColor::new(self.id, idx_map(IDX_RESULT_MINTED_COLOR)) - } + ScMutableColor::new(self.id, idx_map(IDX_RESULT_MINTED_COLOR)) + } pub fn minted_supply(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_MINTED_SUPPLY)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_MINTED_SUPPLY)) + } } #[derive(Clone, Copy)] @@ -72,9 +76,10 @@ pub struct ImmutableRunRecursionResults { } impl ImmutableRunRecursionResults { + pub fn int_value(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_INT_VALUE)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_INT_VALUE)) + } } #[derive(Clone, Copy)] @@ -83,9 +88,10 @@ pub struct MutableRunRecursionResults { } impl MutableRunRecursionResults { + pub fn int_value(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_INT_VALUE)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_INT_VALUE)) + } } #[derive(Clone, Copy)] @@ -94,9 +100,10 @@ pub struct ImmutableTestChainOwnerIDFullResults { } impl ImmutableTestChainOwnerIDFullResults { + pub fn chain_owner_id(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_RESULT_CHAIN_OWNER_ID)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_RESULT_CHAIN_OWNER_ID)) + } } #[derive(Clone, Copy)] @@ -105,9 +112,10 @@ pub struct MutableTestChainOwnerIDFullResults { } impl MutableTestChainOwnerIDFullResults { + pub fn chain_owner_id(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_RESULT_CHAIN_OWNER_ID)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_RESULT_CHAIN_OWNER_ID)) + } } #[derive(Clone, Copy)] @@ -116,9 +124,10 @@ pub struct ImmutableFibonacciResults { } impl ImmutableFibonacciResults { + pub fn int_value(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_INT_VALUE)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_INT_VALUE)) + } } #[derive(Clone, Copy)] @@ -127,9 +136,10 @@ pub struct MutableFibonacciResults { } impl MutableFibonacciResults { + pub fn int_value(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_INT_VALUE)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_INT_VALUE)) + } } #[derive(Clone, Copy)] @@ -138,9 +148,10 @@ pub struct ImmutableGetCounterResults { } impl ImmutableGetCounterResults { + pub fn counter(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_COUNTER)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_COUNTER)) + } } #[derive(Clone, Copy)] @@ -149,13 +160,14 @@ pub struct MutableGetCounterResults { } impl MutableGetCounterResults { + pub fn counter(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_COUNTER)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_COUNTER)) + } } pub struct MapStringToImmutableInt64 { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapStringToImmutableInt64 { @@ -170,18 +182,19 @@ pub struct ImmutableGetIntResults { } impl ImmutableGetIntResults { + pub fn values(&self) -> MapStringToImmutableInt64 { - MapStringToImmutableInt64 { obj_id: self.id } - } + MapStringToImmutableInt64 { obj_id: self.id } + } } pub struct MapStringToMutableInt64 { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapStringToMutableInt64 { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_int64(&self, key: &str) -> ScMutableInt64 { @@ -195,13 +208,14 @@ pub struct MutableGetIntResults { } impl MutableGetIntResults { + pub fn values(&self) -> MapStringToMutableInt64 { - MapStringToMutableInt64 { obj_id: self.id } - } + MapStringToMutableInt64 { obj_id: self.id } + } } pub struct MapStringToImmutableString { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapStringToImmutableString { @@ -216,18 +230,19 @@ pub struct ImmutableGetStringValueResults { } impl ImmutableGetStringValueResults { + pub fn vars(&self) -> MapStringToImmutableString { - MapStringToImmutableString { obj_id: self.id } - } + MapStringToImmutableString { obj_id: self.id } + } } pub struct MapStringToMutableString { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapStringToMutableString { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_string(&self, key: &str) -> ScMutableString { @@ -241,9 +256,10 @@ pub struct MutableGetStringValueResults { } impl MutableGetStringValueResults { + pub fn vars(&self) -> MapStringToMutableString { - MapStringToMutableString { obj_id: self.id } - } + MapStringToMutableString { obj_id: self.id } + } } #[derive(Clone, Copy)] @@ -252,9 +268,10 @@ pub struct ImmutableTestChainOwnerIDViewResults { } impl ImmutableTestChainOwnerIDViewResults { + pub fn chain_owner_id(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_RESULT_CHAIN_OWNER_ID)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_RESULT_CHAIN_OWNER_ID)) + } } #[derive(Clone, Copy)] @@ -263,9 +280,10 @@ pub struct MutableTestChainOwnerIDViewResults { } impl MutableTestChainOwnerIDViewResults { + pub fn chain_owner_id(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_RESULT_CHAIN_OWNER_ID)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_RESULT_CHAIN_OWNER_ID)) + } } #[derive(Clone, Copy)] @@ -274,9 +292,10 @@ pub struct ImmutableTestSandboxCallResults { } impl ImmutableTestSandboxCallResults { + pub fn sandbox_call(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_RESULT_SANDBOX_CALL)) - } + ScImmutableString::new(self.id, idx_map(IDX_RESULT_SANDBOX_CALL)) + } } #[derive(Clone, Copy)] @@ -285,7 +304,8 @@ pub struct MutableTestSandboxCallResults { } impl MutableTestSandboxCallResults { + pub fn sandbox_call(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_RESULT_SANDBOX_CALL)) - } + ScMutableString::new(self.id, idx_map(IDX_RESULT_SANDBOX_CALL)) + } } diff --git a/contracts/wasm/testcore/src/state.rs b/contracts/wasm/testcore/src/state.rs index 55d9caa8c8..f59ea788fe 100644 --- a/contracts/wasm/testcore/src/state.rs +++ b/contracts/wasm/testcore/src/state.rs @@ -20,26 +20,27 @@ pub struct ImmutableTestCoreState { } impl ImmutableTestCoreState { + pub fn counter(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_STATE_COUNTER)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_STATE_COUNTER)) + } pub fn hname_ep(&self) -> ScImmutableHname { - ScImmutableHname::new(self.id, idx_map(IDX_STATE_HNAME_EP)) - } + ScImmutableHname::new(self.id, idx_map(IDX_STATE_HNAME_EP)) + } pub fn ints(&self) -> MapStringToImmutableInt64 { - let map_id = get_object_id(self.id, idx_map(IDX_STATE_INTS), TYPE_MAP); - MapStringToImmutableInt64 { obj_id: map_id } - } + let map_id = get_object_id(self.id, idx_map(IDX_STATE_INTS), TYPE_MAP); + MapStringToImmutableInt64 { obj_id: map_id } + } pub fn minted_color(&self) -> ScImmutableColor { - ScImmutableColor::new(self.id, idx_map(IDX_STATE_MINTED_COLOR)) - } + ScImmutableColor::new(self.id, idx_map(IDX_STATE_MINTED_COLOR)) + } pub fn minted_supply(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_STATE_MINTED_SUPPLY)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_STATE_MINTED_SUPPLY)) + } } #[derive(Clone, Copy)] @@ -48,24 +49,25 @@ pub struct MutableTestCoreState { } impl MutableTestCoreState { + pub fn counter(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_STATE_COUNTER)) - } + ScMutableInt64::new(self.id, idx_map(IDX_STATE_COUNTER)) + } pub fn hname_ep(&self) -> ScMutableHname { - ScMutableHname::new(self.id, idx_map(IDX_STATE_HNAME_EP)) - } + ScMutableHname::new(self.id, idx_map(IDX_STATE_HNAME_EP)) + } pub fn ints(&self) -> MapStringToMutableInt64 { - let map_id = get_object_id(self.id, idx_map(IDX_STATE_INTS), TYPE_MAP); - MapStringToMutableInt64 { obj_id: map_id } - } + let map_id = get_object_id(self.id, idx_map(IDX_STATE_INTS), TYPE_MAP); + MapStringToMutableInt64 { obj_id: map_id } + } pub fn minted_color(&self) -> ScMutableColor { - ScMutableColor::new(self.id, idx_map(IDX_STATE_MINTED_COLOR)) - } + ScMutableColor::new(self.id, idx_map(IDX_STATE_MINTED_COLOR)) + } pub fn minted_supply(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_STATE_MINTED_SUPPLY)) - } + ScMutableInt64::new(self.id, idx_map(IDX_STATE_MINTED_SUPPLY)) + } } diff --git a/contracts/wasm/testwasmlib/src/consts.rs b/contracts/wasm/testwasmlib/src/consts.rs index 375988caee..00f9d53a40 100644 --- a/contracts/wasm/testwasmlib/src/consts.rs +++ b/contracts/wasm/testwasmlib/src/consts.rs @@ -15,50 +15,51 @@ pub const SC_NAME: &str = "testwasmlib"; pub const SC_DESCRIPTION: &str = "Exercise all aspects of WasmLib"; pub const HSC_NAME: ScHname = ScHname(0x89703a45); -pub const PARAM_ADDRESS: &str = "address"; -pub const PARAM_AGENT_ID: &str = "agentID"; -pub const PARAM_BLOCK_INDEX: &str = "blockIndex"; -pub const PARAM_BYTES: &str = "bytes"; -pub const PARAM_CHAIN_ID: &str = "chainID"; -pub const PARAM_COLOR: &str = "color"; -pub const PARAM_HASH: &str = "hash"; -pub const PARAM_HNAME: &str = "hname"; -pub const PARAM_INDEX: &str = "index"; -pub const PARAM_INT16: &str = "int16"; -pub const PARAM_INT32: &str = "int32"; -pub const PARAM_INT64: &str = "int64"; -pub const PARAM_NAME: &str = "name"; +pub const PARAM_ADDRESS: &str = "address"; +pub const PARAM_AGENT_ID: &str = "agentID"; +pub const PARAM_BLOCK_INDEX: &str = "blockIndex"; +pub const PARAM_BYTES: &str = "bytes"; +pub const PARAM_CHAIN_ID: &str = "chainID"; +pub const PARAM_COLOR: &str = "color"; +pub const PARAM_HASH: &str = "hash"; +pub const PARAM_HNAME: &str = "hname"; +pub const PARAM_INDEX: &str = "index"; +pub const PARAM_INT16: &str = "int16"; +pub const PARAM_INT32: &str = "int32"; +pub const PARAM_INT64: &str = "int64"; +pub const PARAM_NAME: &str = "name"; +pub const PARAM_PARAM: &str = "this"; pub const PARAM_RECORD_INDEX: &str = "recordIndex"; -pub const PARAM_REQUEST_ID: &str = "requestID"; -pub const PARAM_STRING: &str = "string"; -pub const PARAM_VALUE: &str = "value"; +pub const PARAM_REQUEST_ID: &str = "requestID"; +pub const PARAM_STRING: &str = "string"; +pub const PARAM_VALUE: &str = "value"; -pub const RESULT_COUNT: &str = "count"; -pub const RESULT_IOTAS: &str = "iotas"; +pub const RESULT_COUNT: &str = "count"; +pub const RESULT_IOTAS: &str = "iotas"; pub const RESULT_LENGTH: &str = "length"; pub const RESULT_RECORD: &str = "record"; -pub const RESULT_VALUE: &str = "value"; +pub const RESULT_VALUE: &str = "value"; pub const STATE_ARRAYS: &str = "arrays"; -pub const FUNC_ARRAY_CLEAR: &str = "arrayClear"; +pub const FUNC_ARRAY_CLEAR: &str = "arrayClear"; pub const FUNC_ARRAY_CREATE: &str = "arrayCreate"; -pub const FUNC_ARRAY_SET: &str = "arraySet"; -pub const FUNC_PARAM_TYPES: &str = "paramTypes"; +pub const FUNC_ARRAY_SET: &str = "arraySet"; +pub const FUNC_PARAM_TYPES: &str = "paramTypes"; pub const VIEW_ARRAY_LENGTH: &str = "arrayLength"; -pub const VIEW_ARRAY_VALUE: &str = "arrayValue"; +pub const VIEW_ARRAY_VALUE: &str = "arrayValue"; pub const VIEW_BLOCK_RECORD: &str = "blockRecord"; -pub const VIEW_BLOCK_RECORDS: &str = "blockRecords"; +pub const VIEW_BLOCK_RECORDS: &str = "blockRecords"; pub const VIEW_IOTA_BALANCE: &str = "iotaBalance"; -pub const HFUNC_ARRAY_CLEAR: ScHname = ScHname(0x88021821); -pub const HFUNC_ARRAY_CREATE: ScHname = ScHname(0x1ed5b23b); -pub const HFUNC_ARRAY_SET: ScHname = ScHname(0x2c4150b3); -pub const HFUNC_PARAM_TYPES: ScHname = ScHname(0x6921c4cd); -pub const HVIEW_ARRAY_LENGTH: ScHname = ScHname(0x3a831021); -pub const HVIEW_ARRAY_VALUE: ScHname = ScHname(0x662dbd81); -pub const HVIEW_BLOCK_RECORD: ScHname = ScHname(0xad13b2f8); +pub const HFUNC_ARRAY_CLEAR: ScHname = ScHname(0x88021821); +pub const HFUNC_ARRAY_CREATE: ScHname = ScHname(0x1ed5b23b); +pub const HFUNC_ARRAY_SET: ScHname = ScHname(0x2c4150b3); +pub const HFUNC_PARAM_TYPES: ScHname = ScHname(0x6921c4cd); +pub const HVIEW_ARRAY_LENGTH: ScHname = ScHname(0x3a831021); +pub const HVIEW_ARRAY_VALUE: ScHname = ScHname(0x662dbd81); +pub const HVIEW_BLOCK_RECORD: ScHname = ScHname(0xad13b2f8); pub const HVIEW_BLOCK_RECORDS: ScHname = ScHname(0x16e249ea); -pub const HVIEW_IOTA_BALANCE: ScHname = ScHname(0x9d3920bd); +pub const HVIEW_IOTA_BALANCE: ScHname = ScHname(0x9d3920bd); // @formatter:on diff --git a/contracts/wasm/testwasmlib/src/contract.rs b/contracts/wasm/testwasmlib/src/contract.rs index 52ec39daff..3bb521e0db 100644 --- a/contracts/wasm/testwasmlib/src/contract.rs +++ b/contracts/wasm/testwasmlib/src/contract.rs @@ -18,52 +18,52 @@ use crate::params::*; use crate::results::*; pub struct ArrayClearCall { - pub func: ScFunc, - pub params: MutableArrayClearParams, + pub func: ScFunc, + pub params: MutableArrayClearParams, } pub struct ArrayCreateCall { - pub func: ScFunc, - pub params: MutableArrayCreateParams, + pub func: ScFunc, + pub params: MutableArrayCreateParams, } pub struct ArraySetCall { - pub func: ScFunc, - pub params: MutableArraySetParams, + pub func: ScFunc, + pub params: MutableArraySetParams, } pub struct ParamTypesCall { - pub func: ScFunc, - pub params: MutableParamTypesParams, + pub func: ScFunc, + pub params: MutableParamTypesParams, } pub struct ArrayLengthCall { - pub func: ScView, - pub params: MutableArrayLengthParams, - pub results: ImmutableArrayLengthResults, + pub func: ScView, + pub params: MutableArrayLengthParams, + pub results: ImmutableArrayLengthResults, } pub struct ArrayValueCall { - pub func: ScView, - pub params: MutableArrayValueParams, - pub results: ImmutableArrayValueResults, + pub func: ScView, + pub params: MutableArrayValueParams, + pub results: ImmutableArrayValueResults, } pub struct BlockRecordCall { - pub func: ScView, - pub params: MutableBlockRecordParams, - pub results: ImmutableBlockRecordResults, + pub func: ScView, + pub params: MutableBlockRecordParams, + pub results: ImmutableBlockRecordResults, } pub struct BlockRecordsCall { - pub func: ScView, - pub params: MutableBlockRecordsParams, - pub results: ImmutableBlockRecordsResults, + pub func: ScView, + pub params: MutableBlockRecordsParams, + pub results: ImmutableBlockRecordsResults, } pub struct IotaBalanceCall { - pub func: ScView, - pub results: ImmutableIotaBalanceResults, + pub func: ScView, + pub results: ImmutableIotaBalanceResults, } pub struct ScFuncs { @@ -72,7 +72,7 @@ pub struct ScFuncs { impl ScFuncs { pub fn array_clear(_ctx: & dyn ScFuncCallContext) -> ArrayClearCall { let mut f = ArrayClearCall { - func: ScFunc::new(HSC_NAME, HFUNC_ARRAY_CLEAR), + func: ScFunc::new(HSC_NAME, HFUNC_ARRAY_CLEAR), params: MutableArrayClearParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -80,7 +80,7 @@ impl ScFuncs { } pub fn array_create(_ctx: & dyn ScFuncCallContext) -> ArrayCreateCall { let mut f = ArrayCreateCall { - func: ScFunc::new(HSC_NAME, HFUNC_ARRAY_CREATE), + func: ScFunc::new(HSC_NAME, HFUNC_ARRAY_CREATE), params: MutableArrayCreateParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -88,7 +88,7 @@ impl ScFuncs { } pub fn array_set(_ctx: & dyn ScFuncCallContext) -> ArraySetCall { let mut f = ArraySetCall { - func: ScFunc::new(HSC_NAME, HFUNC_ARRAY_SET), + func: ScFunc::new(HSC_NAME, HFUNC_ARRAY_SET), params: MutableArraySetParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -96,7 +96,7 @@ impl ScFuncs { } pub fn param_types(_ctx: & dyn ScFuncCallContext) -> ParamTypesCall { let mut f = ParamTypesCall { - func: ScFunc::new(HSC_NAME, HFUNC_PARAM_TYPES), + func: ScFunc::new(HSC_NAME, HFUNC_PARAM_TYPES), params: MutableParamTypesParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -104,8 +104,8 @@ impl ScFuncs { } pub fn array_length(_ctx: & dyn ScViewCallContext) -> ArrayLengthCall { let mut f = ArrayLengthCall { - func: ScView::new(HSC_NAME, HVIEW_ARRAY_LENGTH), - params: MutableArrayLengthParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_ARRAY_LENGTH), + params: MutableArrayLengthParams { id: 0 }, results: ImmutableArrayLengthResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -113,8 +113,8 @@ impl ScFuncs { } pub fn array_value(_ctx: & dyn ScViewCallContext) -> ArrayValueCall { let mut f = ArrayValueCall { - func: ScView::new(HSC_NAME, HVIEW_ARRAY_VALUE), - params: MutableArrayValueParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_ARRAY_VALUE), + params: MutableArrayValueParams { id: 0 }, results: ImmutableArrayValueResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -122,8 +122,8 @@ impl ScFuncs { } pub fn block_record(_ctx: & dyn ScViewCallContext) -> BlockRecordCall { let mut f = BlockRecordCall { - func: ScView::new(HSC_NAME, HVIEW_BLOCK_RECORD), - params: MutableBlockRecordParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_BLOCK_RECORD), + params: MutableBlockRecordParams { id: 0 }, results: ImmutableBlockRecordResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -131,8 +131,8 @@ impl ScFuncs { } pub fn block_records(_ctx: & dyn ScViewCallContext) -> BlockRecordsCall { let mut f = BlockRecordsCall { - func: ScView::new(HSC_NAME, HVIEW_BLOCK_RECORDS), - params: MutableBlockRecordsParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_BLOCK_RECORDS), + params: MutableBlockRecordsParams { id: 0 }, results: ImmutableBlockRecordsResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -140,7 +140,7 @@ impl ScFuncs { } pub fn iota_balance(_ctx: & dyn ScViewCallContext) -> IotaBalanceCall { let mut f = IotaBalanceCall { - func: ScView::new(HSC_NAME, HVIEW_IOTA_BALANCE), + func: ScView::new(HSC_NAME, HVIEW_IOTA_BALANCE), results: ImmutableIotaBalanceResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); diff --git a/contracts/wasm/testwasmlib/src/keys.rs b/contracts/wasm/testwasmlib/src/keys.rs index 99b969a6a1..641d73f3ec 100644 --- a/contracts/wasm/testwasmlib/src/keys.rs +++ b/contracts/wasm/testwasmlib/src/keys.rs @@ -13,56 +13,58 @@ use wasmlib::*; use crate::*; -pub(crate) const IDX_PARAM_ADDRESS: usize = 0; -pub(crate) const IDX_PARAM_AGENT_ID: usize = 1; -pub(crate) const IDX_PARAM_BLOCK_INDEX: usize = 2; -pub(crate) const IDX_PARAM_BYTES: usize = 3; -pub(crate) const IDX_PARAM_CHAIN_ID: usize = 4; -pub(crate) const IDX_PARAM_COLOR: usize = 5; -pub(crate) const IDX_PARAM_HASH: usize = 6; -pub(crate) const IDX_PARAM_HNAME: usize = 7; -pub(crate) const IDX_PARAM_INDEX: usize = 8; -pub(crate) const IDX_PARAM_INT16: usize = 9; -pub(crate) const IDX_PARAM_INT32: usize = 10; -pub(crate) const IDX_PARAM_INT64: usize = 11; -pub(crate) const IDX_PARAM_NAME: usize = 12; -pub(crate) const IDX_PARAM_RECORD_INDEX: usize = 13; -pub(crate) const IDX_PARAM_REQUEST_ID: usize = 14; -pub(crate) const IDX_PARAM_STRING: usize = 15; -pub(crate) const IDX_PARAM_VALUE: usize = 16; -pub(crate) const IDX_RESULT_COUNT: usize = 17; -pub(crate) const IDX_RESULT_IOTAS: usize = 18; -pub(crate) const IDX_RESULT_LENGTH: usize = 19; -pub(crate) const IDX_RESULT_RECORD: usize = 20; -pub(crate) const IDX_RESULT_VALUE: usize = 21; -pub(crate) const IDX_STATE_ARRAYS: usize = 22; +pub(crate) const IDX_PARAM_ADDRESS: usize = 0; +pub(crate) const IDX_PARAM_AGENT_ID: usize = 1; +pub(crate) const IDX_PARAM_BLOCK_INDEX: usize = 2; +pub(crate) const IDX_PARAM_BYTES: usize = 3; +pub(crate) const IDX_PARAM_CHAIN_ID: usize = 4; +pub(crate) const IDX_PARAM_COLOR: usize = 5; +pub(crate) const IDX_PARAM_HASH: usize = 6; +pub(crate) const IDX_PARAM_HNAME: usize = 7; +pub(crate) const IDX_PARAM_INDEX: usize = 8; +pub(crate) const IDX_PARAM_INT16: usize = 9; +pub(crate) const IDX_PARAM_INT32: usize = 10; +pub(crate) const IDX_PARAM_INT64: usize = 11; +pub(crate) const IDX_PARAM_NAME: usize = 12; +pub(crate) const IDX_PARAM_PARAM: usize = 13; +pub(crate) const IDX_PARAM_RECORD_INDEX: usize = 14; +pub(crate) const IDX_PARAM_REQUEST_ID: usize = 15; +pub(crate) const IDX_PARAM_STRING: usize = 16; +pub(crate) const IDX_PARAM_VALUE: usize = 17; +pub(crate) const IDX_RESULT_COUNT: usize = 18; +pub(crate) const IDX_RESULT_IOTAS: usize = 19; +pub(crate) const IDX_RESULT_LENGTH: usize = 20; +pub(crate) const IDX_RESULT_RECORD: usize = 21; +pub(crate) const IDX_RESULT_VALUE: usize = 22; +pub(crate) const IDX_STATE_ARRAYS: usize = 23; -pub const KEY_MAP_LEN: usize = 23; +pub const KEY_MAP_LEN: usize = 24; pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ - PARAM_ADDRESS, - PARAM_AGENT_ID, - PARAM_BLOCK_INDEX, - PARAM_BYTES, - PARAM_CHAIN_ID, - PARAM_COLOR, - PARAM_HASH, - PARAM_HNAME, - PARAM_INDEX, - PARAM_INT16, - PARAM_INT32, - PARAM_INT64, - PARAM_NAME, - PARAM_RECORD_INDEX, - PARAM_REQUEST_ID, - PARAM_STRING, - PARAM_VALUE, - RESULT_COUNT, - RESULT_IOTAS, - RESULT_LENGTH, - RESULT_RECORD, - RESULT_VALUE, - STATE_ARRAYS, + PARAM_ADDRESS, + PARAM_AGENT_ID, + PARAM_BLOCK_INDEX, + PARAM_BYTES, + PARAM_CHAIN_ID, + PARAM_COLOR, + PARAM_HASH, + PARAM_HNAME, + PARAM_INDEX, + PARAM_INT16, + PARAM_INT32, + PARAM_INT64, + PARAM_NAME, + PARAM_PARAM, + PARAM_RECORD_INDEX, + PARAM_REQUEST_ID, + PARAM_STRING, + PARAM_VALUE, + RESULT_COUNT, + RESULT_IOTAS, + RESULT_LENGTH, + RESULT_RECORD, + RESULT_VALUE, + STATE_ARRAYS, ]; pub static mut IDX_MAP: [Key32; KEY_MAP_LEN] = [Key32(0); KEY_MAP_LEN]; diff --git a/contracts/wasm/testwasmlib/src/lib.rs b/contracts/wasm/testwasmlib/src/lib.rs index e24d7b3394..fcafaf1385 100644 --- a/contracts/wasm/testwasmlib/src/lib.rs +++ b/contracts/wasm/testwasmlib/src/lib.rs @@ -50,201 +50,201 @@ fn on_load() { } pub struct ArrayClearContext { - params: ImmutableArrayClearParams, - state: MutableTestWasmLibState, + params: ImmutableArrayClearParams, + state: MutableTestWasmLibState, } fn func_array_clear_thunk(ctx: &ScFuncContext) { - ctx.log("testwasmlib.funcArrayClear"); - let f = ArrayClearContext { - params: ImmutableArrayClearParams { - id: OBJ_ID_PARAMS, - }, - state: MutableTestWasmLibState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.name().exists(), "missing mandatory name"); - func_array_clear(ctx, &f); - ctx.log("testwasmlib.funcArrayClear ok"); + ctx.log("testwasmlib.funcArrayClear"); + let f = ArrayClearContext { + params: ImmutableArrayClearParams { + id: OBJ_ID_PARAMS, + }, + state: MutableTestWasmLibState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.name().exists(), "missing mandatory name"); + func_array_clear(ctx, &f); + ctx.log("testwasmlib.funcArrayClear ok"); } pub struct ArrayCreateContext { - params: ImmutableArrayCreateParams, - state: MutableTestWasmLibState, + params: ImmutableArrayCreateParams, + state: MutableTestWasmLibState, } fn func_array_create_thunk(ctx: &ScFuncContext) { - ctx.log("testwasmlib.funcArrayCreate"); - let f = ArrayCreateContext { - params: ImmutableArrayCreateParams { - id: OBJ_ID_PARAMS, - }, - state: MutableTestWasmLibState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.name().exists(), "missing mandatory name"); - func_array_create(ctx, &f); - ctx.log("testwasmlib.funcArrayCreate ok"); + ctx.log("testwasmlib.funcArrayCreate"); + let f = ArrayCreateContext { + params: ImmutableArrayCreateParams { + id: OBJ_ID_PARAMS, + }, + state: MutableTestWasmLibState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.name().exists(), "missing mandatory name"); + func_array_create(ctx, &f); + ctx.log("testwasmlib.funcArrayCreate ok"); } pub struct ArraySetContext { - params: ImmutableArraySetParams, - state: MutableTestWasmLibState, + params: ImmutableArraySetParams, + state: MutableTestWasmLibState, } fn func_array_set_thunk(ctx: &ScFuncContext) { - ctx.log("testwasmlib.funcArraySet"); - let f = ArraySetContext { - params: ImmutableArraySetParams { - id: OBJ_ID_PARAMS, - }, - state: MutableTestWasmLibState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.index().exists(), "missing mandatory index"); - ctx.require(f.params.name().exists(), "missing mandatory name"); - ctx.require(f.params.value().exists(), "missing mandatory value"); - func_array_set(ctx, &f); - ctx.log("testwasmlib.funcArraySet ok"); + ctx.log("testwasmlib.funcArraySet"); + let f = ArraySetContext { + params: ImmutableArraySetParams { + id: OBJ_ID_PARAMS, + }, + state: MutableTestWasmLibState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.index().exists(), "missing mandatory index"); + ctx.require(f.params.name().exists(), "missing mandatory name"); + ctx.require(f.params.value().exists(), "missing mandatory value"); + func_array_set(ctx, &f); + ctx.log("testwasmlib.funcArraySet ok"); } pub struct ParamTypesContext { - params: ImmutableParamTypesParams, - state: MutableTestWasmLibState, + params: ImmutableParamTypesParams, + state: MutableTestWasmLibState, } fn func_param_types_thunk(ctx: &ScFuncContext) { - ctx.log("testwasmlib.funcParamTypes"); - let f = ParamTypesContext { - params: ImmutableParamTypesParams { - id: OBJ_ID_PARAMS, - }, - state: MutableTestWasmLibState { - id: OBJ_ID_STATE, - }, - }; - func_param_types(ctx, &f); - ctx.log("testwasmlib.funcParamTypes ok"); + ctx.log("testwasmlib.funcParamTypes"); + let f = ParamTypesContext { + params: ImmutableParamTypesParams { + id: OBJ_ID_PARAMS, + }, + state: MutableTestWasmLibState { + id: OBJ_ID_STATE, + }, + }; + func_param_types(ctx, &f); + ctx.log("testwasmlib.funcParamTypes ok"); } pub struct ArrayLengthContext { - params: ImmutableArrayLengthParams, - results: MutableArrayLengthResults, - state: ImmutableTestWasmLibState, + params: ImmutableArrayLengthParams, + results: MutableArrayLengthResults, + state: ImmutableTestWasmLibState, } fn view_array_length_thunk(ctx: &ScViewContext) { - ctx.log("testwasmlib.viewArrayLength"); - let f = ArrayLengthContext { - params: ImmutableArrayLengthParams { - id: OBJ_ID_PARAMS, - }, - results: MutableArrayLengthResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableTestWasmLibState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.name().exists(), "missing mandatory name"); - view_array_length(ctx, &f); - ctx.log("testwasmlib.viewArrayLength ok"); + ctx.log("testwasmlib.viewArrayLength"); + let f = ArrayLengthContext { + params: ImmutableArrayLengthParams { + id: OBJ_ID_PARAMS, + }, + results: MutableArrayLengthResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableTestWasmLibState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.name().exists(), "missing mandatory name"); + view_array_length(ctx, &f); + ctx.log("testwasmlib.viewArrayLength ok"); } pub struct ArrayValueContext { - params: ImmutableArrayValueParams, - results: MutableArrayValueResults, - state: ImmutableTestWasmLibState, + params: ImmutableArrayValueParams, + results: MutableArrayValueResults, + state: ImmutableTestWasmLibState, } fn view_array_value_thunk(ctx: &ScViewContext) { - ctx.log("testwasmlib.viewArrayValue"); - let f = ArrayValueContext { - params: ImmutableArrayValueParams { - id: OBJ_ID_PARAMS, - }, - results: MutableArrayValueResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableTestWasmLibState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.index().exists(), "missing mandatory index"); - ctx.require(f.params.name().exists(), "missing mandatory name"); - view_array_value(ctx, &f); - ctx.log("testwasmlib.viewArrayValue ok"); + ctx.log("testwasmlib.viewArrayValue"); + let f = ArrayValueContext { + params: ImmutableArrayValueParams { + id: OBJ_ID_PARAMS, + }, + results: MutableArrayValueResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableTestWasmLibState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.index().exists(), "missing mandatory index"); + ctx.require(f.params.name().exists(), "missing mandatory name"); + view_array_value(ctx, &f); + ctx.log("testwasmlib.viewArrayValue ok"); } pub struct BlockRecordContext { - params: ImmutableBlockRecordParams, - results: MutableBlockRecordResults, - state: ImmutableTestWasmLibState, + params: ImmutableBlockRecordParams, + results: MutableBlockRecordResults, + state: ImmutableTestWasmLibState, } fn view_block_record_thunk(ctx: &ScViewContext) { - ctx.log("testwasmlib.viewBlockRecord"); - let f = BlockRecordContext { - params: ImmutableBlockRecordParams { - id: OBJ_ID_PARAMS, - }, - results: MutableBlockRecordResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableTestWasmLibState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.block_index().exists(), "missing mandatory blockIndex"); - ctx.require(f.params.record_index().exists(), "missing mandatory recordIndex"); - view_block_record(ctx, &f); - ctx.log("testwasmlib.viewBlockRecord ok"); + ctx.log("testwasmlib.viewBlockRecord"); + let f = BlockRecordContext { + params: ImmutableBlockRecordParams { + id: OBJ_ID_PARAMS, + }, + results: MutableBlockRecordResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableTestWasmLibState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.block_index().exists(), "missing mandatory blockIndex"); + ctx.require(f.params.record_index().exists(), "missing mandatory recordIndex"); + view_block_record(ctx, &f); + ctx.log("testwasmlib.viewBlockRecord ok"); } pub struct BlockRecordsContext { - params: ImmutableBlockRecordsParams, - results: MutableBlockRecordsResults, - state: ImmutableTestWasmLibState, + params: ImmutableBlockRecordsParams, + results: MutableBlockRecordsResults, + state: ImmutableTestWasmLibState, } fn view_block_records_thunk(ctx: &ScViewContext) { - ctx.log("testwasmlib.viewBlockRecords"); - let f = BlockRecordsContext { - params: ImmutableBlockRecordsParams { - id: OBJ_ID_PARAMS, - }, - results: MutableBlockRecordsResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableTestWasmLibState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.block_index().exists(), "missing mandatory blockIndex"); - view_block_records(ctx, &f); - ctx.log("testwasmlib.viewBlockRecords ok"); + ctx.log("testwasmlib.viewBlockRecords"); + let f = BlockRecordsContext { + params: ImmutableBlockRecordsParams { + id: OBJ_ID_PARAMS, + }, + results: MutableBlockRecordsResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableTestWasmLibState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.block_index().exists(), "missing mandatory blockIndex"); + view_block_records(ctx, &f); + ctx.log("testwasmlib.viewBlockRecords ok"); } pub struct IotaBalanceContext { - results: MutableIotaBalanceResults, - state: ImmutableTestWasmLibState, + results: MutableIotaBalanceResults, + state: ImmutableTestWasmLibState, } fn view_iota_balance_thunk(ctx: &ScViewContext) { - ctx.log("testwasmlib.viewIotaBalance"); - let f = IotaBalanceContext { - results: MutableIotaBalanceResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableTestWasmLibState { - id: OBJ_ID_STATE, - }, - }; - view_iota_balance(ctx, &f); - ctx.log("testwasmlib.viewIotaBalance ok"); + ctx.log("testwasmlib.viewIotaBalance"); + let f = IotaBalanceContext { + results: MutableIotaBalanceResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableTestWasmLibState { + id: OBJ_ID_STATE, + }, + }; + view_iota_balance(ctx, &f); + ctx.log("testwasmlib.viewIotaBalance ok"); } // @formatter:on diff --git a/contracts/wasm/testwasmlib/src/params.rs b/contracts/wasm/testwasmlib/src/params.rs index 2356f21b0d..ae7362202f 100644 --- a/contracts/wasm/testwasmlib/src/params.rs +++ b/contracts/wasm/testwasmlib/src/params.rs @@ -20,9 +20,10 @@ pub struct ImmutableArrayClearParams { } impl ImmutableArrayClearParams { + pub fn name(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_PARAM_NAME)) - } + ScImmutableString::new(self.id, idx_map(IDX_PARAM_NAME)) + } } #[derive(Clone, Copy)] @@ -31,9 +32,10 @@ pub struct MutableArrayClearParams { } impl MutableArrayClearParams { + pub fn name(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_PARAM_NAME)) - } + ScMutableString::new(self.id, idx_map(IDX_PARAM_NAME)) + } } #[derive(Clone, Copy)] @@ -42,9 +44,10 @@ pub struct ImmutableArrayCreateParams { } impl ImmutableArrayCreateParams { + pub fn name(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_PARAM_NAME)) - } + ScImmutableString::new(self.id, idx_map(IDX_PARAM_NAME)) + } } #[derive(Clone, Copy)] @@ -53,9 +56,10 @@ pub struct MutableArrayCreateParams { } impl MutableArrayCreateParams { + pub fn name(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_PARAM_NAME)) - } + ScMutableString::new(self.id, idx_map(IDX_PARAM_NAME)) + } } #[derive(Clone, Copy)] @@ -64,17 +68,18 @@ pub struct ImmutableArraySetParams { } impl ImmutableArraySetParams { + pub fn index(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_INDEX)) - } + ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_INDEX)) + } pub fn name(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_PARAM_NAME)) - } + ScImmutableString::new(self.id, idx_map(IDX_PARAM_NAME)) + } pub fn value(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_PARAM_VALUE)) - } + ScImmutableString::new(self.id, idx_map(IDX_PARAM_VALUE)) + } } #[derive(Clone, Copy)] @@ -83,21 +88,22 @@ pub struct MutableArraySetParams { } impl MutableArraySetParams { + pub fn index(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, idx_map(IDX_PARAM_INDEX)) - } + ScMutableInt32::new(self.id, idx_map(IDX_PARAM_INDEX)) + } pub fn name(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_PARAM_NAME)) - } + ScMutableString::new(self.id, idx_map(IDX_PARAM_NAME)) + } pub fn value(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_PARAM_VALUE)) - } + ScMutableString::new(self.id, idx_map(IDX_PARAM_VALUE)) + } } pub struct MapStringToImmutableBytes { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapStringToImmutableBytes { @@ -112,66 +118,67 @@ pub struct ImmutableParamTypesParams { } impl ImmutableParamTypesParams { + pub fn address(&self) -> ScImmutableAddress { - ScImmutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) - } + ScImmutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) + } pub fn agent_id(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) - } + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) + } pub fn bytes(&self) -> ScImmutableBytes { - ScImmutableBytes::new(self.id, idx_map(IDX_PARAM_BYTES)) - } + ScImmutableBytes::new(self.id, idx_map(IDX_PARAM_BYTES)) + } pub fn chain_id(&self) -> ScImmutableChainID { - ScImmutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) - } + ScImmutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) + } pub fn color(&self) -> ScImmutableColor { - ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) - } + ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) + } pub fn hash(&self) -> ScImmutableHash { - ScImmutableHash::new(self.id, idx_map(IDX_PARAM_HASH)) - } + ScImmutableHash::new(self.id, idx_map(IDX_PARAM_HASH)) + } pub fn hname(&self) -> ScImmutableHname { - ScImmutableHname::new(self.id, idx_map(IDX_PARAM_HNAME)) - } + ScImmutableHname::new(self.id, idx_map(IDX_PARAM_HNAME)) + } pub fn int16(&self) -> ScImmutableInt16 { - ScImmutableInt16::new(self.id, idx_map(IDX_PARAM_INT16)) - } + ScImmutableInt16::new(self.id, idx_map(IDX_PARAM_INT16)) + } pub fn int32(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_INT32)) - } + ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_INT32)) + } pub fn int64(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT64)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT64)) + } pub fn param(&self) -> MapStringToImmutableBytes { - MapStringToImmutableBytes { obj_id: self.id } - } + MapStringToImmutableBytes { obj_id: self.id } + } pub fn request_id(&self) -> ScImmutableRequestID { - ScImmutableRequestID::new(self.id, idx_map(IDX_PARAM_REQUEST_ID)) - } + ScImmutableRequestID::new(self.id, idx_map(IDX_PARAM_REQUEST_ID)) + } pub fn string(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_PARAM_STRING)) - } + ScImmutableString::new(self.id, idx_map(IDX_PARAM_STRING)) + } } pub struct MapStringToMutableBytes { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapStringToMutableBytes { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_bytes(&self, key: &str) -> ScMutableBytes { @@ -185,57 +192,58 @@ pub struct MutableParamTypesParams { } impl MutableParamTypesParams { + pub fn address(&self) -> ScMutableAddress { - ScMutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) - } + ScMutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) + } pub fn agent_id(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) - } + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) + } pub fn bytes(&self) -> ScMutableBytes { - ScMutableBytes::new(self.id, idx_map(IDX_PARAM_BYTES)) - } + ScMutableBytes::new(self.id, idx_map(IDX_PARAM_BYTES)) + } pub fn chain_id(&self) -> ScMutableChainID { - ScMutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) - } + ScMutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) + } pub fn color(&self) -> ScMutableColor { - ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) - } + ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) + } pub fn hash(&self) -> ScMutableHash { - ScMutableHash::new(self.id, idx_map(IDX_PARAM_HASH)) - } + ScMutableHash::new(self.id, idx_map(IDX_PARAM_HASH)) + } pub fn hname(&self) -> ScMutableHname { - ScMutableHname::new(self.id, idx_map(IDX_PARAM_HNAME)) - } + ScMutableHname::new(self.id, idx_map(IDX_PARAM_HNAME)) + } pub fn int16(&self) -> ScMutableInt16 { - ScMutableInt16::new(self.id, idx_map(IDX_PARAM_INT16)) - } + ScMutableInt16::new(self.id, idx_map(IDX_PARAM_INT16)) + } pub fn int32(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, idx_map(IDX_PARAM_INT32)) - } + ScMutableInt32::new(self.id, idx_map(IDX_PARAM_INT32)) + } pub fn int64(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT64)) - } + ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT64)) + } pub fn param(&self) -> MapStringToMutableBytes { - MapStringToMutableBytes { obj_id: self.id } - } + MapStringToMutableBytes { obj_id: self.id } + } pub fn request_id(&self) -> ScMutableRequestID { - ScMutableRequestID::new(self.id, idx_map(IDX_PARAM_REQUEST_ID)) - } + ScMutableRequestID::new(self.id, idx_map(IDX_PARAM_REQUEST_ID)) + } pub fn string(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_PARAM_STRING)) - } + ScMutableString::new(self.id, idx_map(IDX_PARAM_STRING)) + } } #[derive(Clone, Copy)] @@ -244,9 +252,10 @@ pub struct ImmutableArrayLengthParams { } impl ImmutableArrayLengthParams { + pub fn name(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_PARAM_NAME)) - } + ScImmutableString::new(self.id, idx_map(IDX_PARAM_NAME)) + } } #[derive(Clone, Copy)] @@ -255,9 +264,10 @@ pub struct MutableArrayLengthParams { } impl MutableArrayLengthParams { + pub fn name(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_PARAM_NAME)) - } + ScMutableString::new(self.id, idx_map(IDX_PARAM_NAME)) + } } #[derive(Clone, Copy)] @@ -266,13 +276,14 @@ pub struct ImmutableArrayValueParams { } impl ImmutableArrayValueParams { + pub fn index(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_INDEX)) - } + ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_INDEX)) + } pub fn name(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_PARAM_NAME)) - } + ScImmutableString::new(self.id, idx_map(IDX_PARAM_NAME)) + } } #[derive(Clone, Copy)] @@ -281,13 +292,14 @@ pub struct MutableArrayValueParams { } impl MutableArrayValueParams { + pub fn index(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, idx_map(IDX_PARAM_INDEX)) - } + ScMutableInt32::new(self.id, idx_map(IDX_PARAM_INDEX)) + } pub fn name(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_PARAM_NAME)) - } + ScMutableString::new(self.id, idx_map(IDX_PARAM_NAME)) + } } #[derive(Clone, Copy)] @@ -296,13 +308,14 @@ pub struct ImmutableBlockRecordParams { } impl ImmutableBlockRecordParams { + pub fn block_index(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_BLOCK_INDEX)) - } + ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_BLOCK_INDEX)) + } pub fn record_index(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_RECORD_INDEX)) - } + ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_RECORD_INDEX)) + } } #[derive(Clone, Copy)] @@ -311,13 +324,14 @@ pub struct MutableBlockRecordParams { } impl MutableBlockRecordParams { + pub fn block_index(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, idx_map(IDX_PARAM_BLOCK_INDEX)) - } + ScMutableInt32::new(self.id, idx_map(IDX_PARAM_BLOCK_INDEX)) + } pub fn record_index(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, idx_map(IDX_PARAM_RECORD_INDEX)) - } + ScMutableInt32::new(self.id, idx_map(IDX_PARAM_RECORD_INDEX)) + } } #[derive(Clone, Copy)] @@ -326,9 +340,10 @@ pub struct ImmutableBlockRecordsParams { } impl ImmutableBlockRecordsParams { + pub fn block_index(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_BLOCK_INDEX)) - } + ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_BLOCK_INDEX)) + } } #[derive(Clone, Copy)] @@ -337,7 +352,8 @@ pub struct MutableBlockRecordsParams { } impl MutableBlockRecordsParams { + pub fn block_index(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, idx_map(IDX_PARAM_BLOCK_INDEX)) - } + ScMutableInt32::new(self.id, idx_map(IDX_PARAM_BLOCK_INDEX)) + } } diff --git a/contracts/wasm/testwasmlib/src/results.rs b/contracts/wasm/testwasmlib/src/results.rs index f0f2c0adae..f548fabae4 100644 --- a/contracts/wasm/testwasmlib/src/results.rs +++ b/contracts/wasm/testwasmlib/src/results.rs @@ -20,9 +20,10 @@ pub struct ImmutableArrayLengthResults { } impl ImmutableArrayLengthResults { + pub fn length(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, idx_map(IDX_RESULT_LENGTH)) - } + ScImmutableInt32::new(self.id, idx_map(IDX_RESULT_LENGTH)) + } } #[derive(Clone, Copy)] @@ -31,9 +32,10 @@ pub struct MutableArrayLengthResults { } impl MutableArrayLengthResults { + pub fn length(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, idx_map(IDX_RESULT_LENGTH)) - } + ScMutableInt32::new(self.id, idx_map(IDX_RESULT_LENGTH)) + } } #[derive(Clone, Copy)] @@ -42,9 +44,10 @@ pub struct ImmutableArrayValueResults { } impl ImmutableArrayValueResults { + pub fn value(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_RESULT_VALUE)) - } + ScImmutableString::new(self.id, idx_map(IDX_RESULT_VALUE)) + } } #[derive(Clone, Copy)] @@ -53,9 +56,10 @@ pub struct MutableArrayValueResults { } impl MutableArrayValueResults { + pub fn value(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_RESULT_VALUE)) - } + ScMutableString::new(self.id, idx_map(IDX_RESULT_VALUE)) + } } #[derive(Clone, Copy)] @@ -64,9 +68,10 @@ pub struct ImmutableBlockRecordResults { } impl ImmutableBlockRecordResults { + pub fn record(&self) -> ScImmutableBytes { - ScImmutableBytes::new(self.id, idx_map(IDX_RESULT_RECORD)) - } + ScImmutableBytes::new(self.id, idx_map(IDX_RESULT_RECORD)) + } } #[derive(Clone, Copy)] @@ -75,9 +80,10 @@ pub struct MutableBlockRecordResults { } impl MutableBlockRecordResults { + pub fn record(&self) -> ScMutableBytes { - ScMutableBytes::new(self.id, idx_map(IDX_RESULT_RECORD)) - } + ScMutableBytes::new(self.id, idx_map(IDX_RESULT_RECORD)) + } } #[derive(Clone, Copy)] @@ -86,9 +92,10 @@ pub struct ImmutableBlockRecordsResults { } impl ImmutableBlockRecordsResults { + pub fn count(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, idx_map(IDX_RESULT_COUNT)) - } + ScImmutableInt32::new(self.id, idx_map(IDX_RESULT_COUNT)) + } } #[derive(Clone, Copy)] @@ -97,9 +104,10 @@ pub struct MutableBlockRecordsResults { } impl MutableBlockRecordsResults { + pub fn count(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, idx_map(IDX_RESULT_COUNT)) - } + ScMutableInt32::new(self.id, idx_map(IDX_RESULT_COUNT)) + } } #[derive(Clone, Copy)] @@ -108,9 +116,10 @@ pub struct ImmutableIotaBalanceResults { } impl ImmutableIotaBalanceResults { + pub fn iotas(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_IOTAS)) - } + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_IOTAS)) + } } #[derive(Clone, Copy)] @@ -119,7 +128,8 @@ pub struct MutableIotaBalanceResults { } impl MutableIotaBalanceResults { + pub fn iotas(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, idx_map(IDX_RESULT_IOTAS)) - } + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_IOTAS)) + } } diff --git a/contracts/wasm/testwasmlib/src/state.rs b/contracts/wasm/testwasmlib/src/state.rs index aa62142b2b..b1839a8c56 100644 --- a/contracts/wasm/testwasmlib/src/state.rs +++ b/contracts/wasm/testwasmlib/src/state.rs @@ -16,7 +16,7 @@ use crate::keys::*; use crate::typedefs::*; pub struct MapStringToImmutableStringArray { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapStringToImmutableStringArray { @@ -32,19 +32,20 @@ pub struct ImmutableTestWasmLibState { } impl ImmutableTestWasmLibState { + pub fn arrays(&self) -> MapStringToImmutableStringArray { - let map_id = get_object_id(self.id, idx_map(IDX_STATE_ARRAYS), TYPE_MAP); - MapStringToImmutableStringArray { obj_id: map_id } - } + let map_id = get_object_id(self.id, idx_map(IDX_STATE_ARRAYS), TYPE_MAP); + MapStringToImmutableStringArray { obj_id: map_id } + } } pub struct MapStringToMutableStringArray { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapStringToMutableStringArray { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_string_array(&self, key: &str) -> MutableStringArray { @@ -59,8 +60,9 @@ pub struct MutableTestWasmLibState { } impl MutableTestWasmLibState { + pub fn arrays(&self) -> MapStringToMutableStringArray { - let map_id = get_object_id(self.id, idx_map(IDX_STATE_ARRAYS), TYPE_MAP); - MapStringToMutableStringArray { obj_id: map_id } - } + let map_id = get_object_id(self.id, idx_map(IDX_STATE_ARRAYS), TYPE_MAP); + MapStringToMutableStringArray { obj_id: map_id } + } } diff --git a/contracts/wasm/testwasmlib/src/typedefs.rs b/contracts/wasm/testwasmlib/src/typedefs.rs index aa1dff8c02..efc5d9f0bb 100644 --- a/contracts/wasm/testwasmlib/src/typedefs.rs +++ b/contracts/wasm/testwasmlib/src/typedefs.rs @@ -13,7 +13,7 @@ use wasmlib::*; use wasmlib::host::*; pub struct ArrayOfImmutableString { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl ArrayOfImmutableString { @@ -29,7 +29,7 @@ impl ArrayOfImmutableString { pub type ImmutableStringArray = ArrayOfImmutableString; pub struct ArrayOfMutableString { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl ArrayOfMutableString { diff --git a/contracts/wasm/tokenregistry/src/consts.rs b/contracts/wasm/tokenregistry/src/consts.rs index c29728984e..55db606e64 100644 --- a/contracts/wasm/tokenregistry/src/consts.rs +++ b/contracts/wasm/tokenregistry/src/consts.rs @@ -11,24 +11,25 @@ use wasmlib::*; -pub const SC_NAME: &str = "tokenregistry"; -pub const HSC_NAME: ScHname = ScHname(0xe1ba0c78); +pub const SC_NAME: &str = "tokenregistry"; +pub const SC_DESCRIPTION: &str = ""; +pub const HSC_NAME: ScHname = ScHname(0xe1ba0c78); -pub const PARAM_COLOR: &str = "color"; -pub const PARAM_DESCRIPTION: &str = "description"; +pub const PARAM_COLOR: &str = "color"; +pub const PARAM_DESCRIPTION: &str = "description"; pub const PARAM_USER_DEFINED: &str = "userDefined"; pub const STATE_COLOR_LIST: &str = "colorList"; -pub const STATE_REGISTRY: &str = "registry"; +pub const STATE_REGISTRY: &str = "registry"; -pub const FUNC_MINT_SUPPLY: &str = "mintSupply"; -pub const FUNC_TRANSFER_OWNERSHIP: &str = "transferOwnership"; -pub const FUNC_UPDATE_METADATA: &str = "updateMetadata"; -pub const VIEW_GET_INFO: &str = "getInfo"; +pub const FUNC_MINT_SUPPLY: &str = "mintSupply"; +pub const FUNC_TRANSFER_OWNERSHIP: &str = "transferOwnership"; +pub const FUNC_UPDATE_METADATA: &str = "updateMetadata"; +pub const VIEW_GET_INFO: &str = "getInfo"; -pub const HFUNC_MINT_SUPPLY: ScHname = ScHname(0x564349a7); +pub const HFUNC_MINT_SUPPLY: ScHname = ScHname(0x564349a7); pub const HFUNC_TRANSFER_OWNERSHIP: ScHname = ScHname(0xbb9eb5af); -pub const HFUNC_UPDATE_METADATA: ScHname = ScHname(0xa26b23b6); -pub const HVIEW_GET_INFO: ScHname = ScHname(0xcfedba5f); +pub const HFUNC_UPDATE_METADATA: ScHname = ScHname(0xa26b23b6); +pub const HVIEW_GET_INFO: ScHname = ScHname(0xcfedba5f); // @formatter:on diff --git a/contracts/wasm/tokenregistry/src/contract.rs b/contracts/wasm/tokenregistry/src/contract.rs index e6fb2016c3..9e3889c0a8 100644 --- a/contracts/wasm/tokenregistry/src/contract.rs +++ b/contracts/wasm/tokenregistry/src/contract.rs @@ -17,23 +17,23 @@ use crate::consts::*; use crate::params::*; pub struct MintSupplyCall { - pub func: ScFunc, - pub params: MutableMintSupplyParams, + pub func: ScFunc, + pub params: MutableMintSupplyParams, } pub struct TransferOwnershipCall { - pub func: ScFunc, - pub params: MutableTransferOwnershipParams, + pub func: ScFunc, + pub params: MutableTransferOwnershipParams, } pub struct UpdateMetadataCall { - pub func: ScFunc, - pub params: MutableUpdateMetadataParams, + pub func: ScFunc, + pub params: MutableUpdateMetadataParams, } pub struct GetInfoCall { - pub func: ScView, - pub params: MutableGetInfoParams, + pub func: ScView, + pub params: MutableGetInfoParams, } pub struct ScFuncs { @@ -42,7 +42,7 @@ pub struct ScFuncs { impl ScFuncs { pub fn mint_supply(_ctx: & dyn ScFuncCallContext) -> MintSupplyCall { let mut f = MintSupplyCall { - func: ScFunc::new(HSC_NAME, HFUNC_MINT_SUPPLY), + func: ScFunc::new(HSC_NAME, HFUNC_MINT_SUPPLY), params: MutableMintSupplyParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -50,7 +50,7 @@ impl ScFuncs { } pub fn transfer_ownership(_ctx: & dyn ScFuncCallContext) -> TransferOwnershipCall { let mut f = TransferOwnershipCall { - func: ScFunc::new(HSC_NAME, HFUNC_TRANSFER_OWNERSHIP), + func: ScFunc::new(HSC_NAME, HFUNC_TRANSFER_OWNERSHIP), params: MutableTransferOwnershipParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -58,7 +58,7 @@ impl ScFuncs { } pub fn update_metadata(_ctx: & dyn ScFuncCallContext) -> UpdateMetadataCall { let mut f = UpdateMetadataCall { - func: ScFunc::new(HSC_NAME, HFUNC_UPDATE_METADATA), + func: ScFunc::new(HSC_NAME, HFUNC_UPDATE_METADATA), params: MutableUpdateMetadataParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -66,7 +66,7 @@ impl ScFuncs { } pub fn get_info(_ctx: & dyn ScViewCallContext) -> GetInfoCall { let mut f = GetInfoCall { - func: ScView::new(HSC_NAME, HVIEW_GET_INFO), + func: ScView::new(HSC_NAME, HVIEW_GET_INFO), params: MutableGetInfoParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); diff --git a/contracts/wasm/tokenregistry/src/keys.rs b/contracts/wasm/tokenregistry/src/keys.rs index 30995b9ff8..3579998671 100644 --- a/contracts/wasm/tokenregistry/src/keys.rs +++ b/contracts/wasm/tokenregistry/src/keys.rs @@ -13,20 +13,20 @@ use wasmlib::*; use crate::*; -pub(crate) const IDX_PARAM_COLOR: usize = 0; -pub(crate) const IDX_PARAM_DESCRIPTION: usize = 1; +pub(crate) const IDX_PARAM_COLOR: usize = 0; +pub(crate) const IDX_PARAM_DESCRIPTION: usize = 1; pub(crate) const IDX_PARAM_USER_DEFINED: usize = 2; -pub(crate) const IDX_STATE_COLOR_LIST: usize = 3; -pub(crate) const IDX_STATE_REGISTRY: usize = 4; +pub(crate) const IDX_STATE_COLOR_LIST: usize = 3; +pub(crate) const IDX_STATE_REGISTRY: usize = 4; pub const KEY_MAP_LEN: usize = 5; pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ - PARAM_COLOR, - PARAM_DESCRIPTION, - PARAM_USER_DEFINED, - STATE_COLOR_LIST, - STATE_REGISTRY, + PARAM_COLOR, + PARAM_DESCRIPTION, + PARAM_USER_DEFINED, + STATE_COLOR_LIST, + STATE_REGISTRY, ]; pub static mut IDX_MAP: [Key32; KEY_MAP_LEN] = [Key32(0); KEY_MAP_LEN]; diff --git a/contracts/wasm/tokenregistry/src/lib.rs b/contracts/wasm/tokenregistry/src/lib.rs index 64d86e35f5..7d743c54fd 100644 --- a/contracts/wasm/tokenregistry/src/lib.rs +++ b/contracts/wasm/tokenregistry/src/lib.rs @@ -43,88 +43,88 @@ fn on_load() { } pub struct MintSupplyContext { - params: ImmutableMintSupplyParams, - state: MutableTokenRegistryState, + params: ImmutableMintSupplyParams, + state: MutableTokenRegistryState, } fn func_mint_supply_thunk(ctx: &ScFuncContext) { - ctx.log("tokenregistry.funcMintSupply"); - let f = MintSupplyContext { - params: ImmutableMintSupplyParams { - id: OBJ_ID_PARAMS, - }, - state: MutableTokenRegistryState { - id: OBJ_ID_STATE, - }, - }; - func_mint_supply(ctx, &f); - ctx.log("tokenregistry.funcMintSupply ok"); + ctx.log("tokenregistry.funcMintSupply"); + let f = MintSupplyContext { + params: ImmutableMintSupplyParams { + id: OBJ_ID_PARAMS, + }, + state: MutableTokenRegistryState { + id: OBJ_ID_STATE, + }, + }; + func_mint_supply(ctx, &f); + ctx.log("tokenregistry.funcMintSupply ok"); } pub struct TransferOwnershipContext { - params: ImmutableTransferOwnershipParams, - state: MutableTokenRegistryState, + params: ImmutableTransferOwnershipParams, + state: MutableTokenRegistryState, } fn func_transfer_ownership_thunk(ctx: &ScFuncContext) { - ctx.log("tokenregistry.funcTransferOwnership"); + ctx.log("tokenregistry.funcTransferOwnership"); // TODO the one who can transfer token ownership - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); - - let f = TransferOwnershipContext { - params: ImmutableTransferOwnershipParams { - id: OBJ_ID_PARAMS, - }, - state: MutableTokenRegistryState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.color().exists(), "missing mandatory color"); - func_transfer_ownership(ctx, &f); - ctx.log("tokenregistry.funcTransferOwnership ok"); + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + + let f = TransferOwnershipContext { + params: ImmutableTransferOwnershipParams { + id: OBJ_ID_PARAMS, + }, + state: MutableTokenRegistryState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.color().exists(), "missing mandatory color"); + func_transfer_ownership(ctx, &f); + ctx.log("tokenregistry.funcTransferOwnership ok"); } pub struct UpdateMetadataContext { - params: ImmutableUpdateMetadataParams, - state: MutableTokenRegistryState, + params: ImmutableUpdateMetadataParams, + state: MutableTokenRegistryState, } fn func_update_metadata_thunk(ctx: &ScFuncContext) { - ctx.log("tokenregistry.funcUpdateMetadata"); + ctx.log("tokenregistry.funcUpdateMetadata"); // TODO the one who can change the token info - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); - - let f = UpdateMetadataContext { - params: ImmutableUpdateMetadataParams { - id: OBJ_ID_PARAMS, - }, - state: MutableTokenRegistryState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.color().exists(), "missing mandatory color"); - func_update_metadata(ctx, &f); - ctx.log("tokenregistry.funcUpdateMetadata ok"); + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + + let f = UpdateMetadataContext { + params: ImmutableUpdateMetadataParams { + id: OBJ_ID_PARAMS, + }, + state: MutableTokenRegistryState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.color().exists(), "missing mandatory color"); + func_update_metadata(ctx, &f); + ctx.log("tokenregistry.funcUpdateMetadata ok"); } pub struct GetInfoContext { - params: ImmutableGetInfoParams, - state: ImmutableTokenRegistryState, + params: ImmutableGetInfoParams, + state: ImmutableTokenRegistryState, } fn view_get_info_thunk(ctx: &ScViewContext) { - ctx.log("tokenregistry.viewGetInfo"); - let f = GetInfoContext { - params: ImmutableGetInfoParams { - id: OBJ_ID_PARAMS, - }, - state: ImmutableTokenRegistryState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.color().exists(), "missing mandatory color"); - view_get_info(ctx, &f); - ctx.log("tokenregistry.viewGetInfo ok"); + ctx.log("tokenregistry.viewGetInfo"); + let f = GetInfoContext { + params: ImmutableGetInfoParams { + id: OBJ_ID_PARAMS, + }, + state: ImmutableTokenRegistryState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.color().exists(), "missing mandatory color"); + view_get_info(ctx, &f); + ctx.log("tokenregistry.viewGetInfo ok"); } // @formatter:on diff --git a/contracts/wasm/tokenregistry/src/params.rs b/contracts/wasm/tokenregistry/src/params.rs index 5229406f17..a5161c9435 100644 --- a/contracts/wasm/tokenregistry/src/params.rs +++ b/contracts/wasm/tokenregistry/src/params.rs @@ -20,13 +20,14 @@ pub struct ImmutableMintSupplyParams { } impl ImmutableMintSupplyParams { + pub fn description(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_PARAM_DESCRIPTION)) - } + ScImmutableString::new(self.id, idx_map(IDX_PARAM_DESCRIPTION)) + } pub fn user_defined(&self) -> ScImmutableString { - ScImmutableString::new(self.id, idx_map(IDX_PARAM_USER_DEFINED)) - } + ScImmutableString::new(self.id, idx_map(IDX_PARAM_USER_DEFINED)) + } } #[derive(Clone, Copy)] @@ -35,13 +36,14 @@ pub struct MutableMintSupplyParams { } impl MutableMintSupplyParams { + pub fn description(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_PARAM_DESCRIPTION)) - } + ScMutableString::new(self.id, idx_map(IDX_PARAM_DESCRIPTION)) + } pub fn user_defined(&self) -> ScMutableString { - ScMutableString::new(self.id, idx_map(IDX_PARAM_USER_DEFINED)) - } + ScMutableString::new(self.id, idx_map(IDX_PARAM_USER_DEFINED)) + } } #[derive(Clone, Copy)] @@ -50,9 +52,10 @@ pub struct ImmutableTransferOwnershipParams { } impl ImmutableTransferOwnershipParams { + pub fn color(&self) -> ScImmutableColor { - ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) - } + ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) + } } #[derive(Clone, Copy)] @@ -61,9 +64,10 @@ pub struct MutableTransferOwnershipParams { } impl MutableTransferOwnershipParams { + pub fn color(&self) -> ScMutableColor { - ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) - } + ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) + } } #[derive(Clone, Copy)] @@ -72,9 +76,10 @@ pub struct ImmutableUpdateMetadataParams { } impl ImmutableUpdateMetadataParams { + pub fn color(&self) -> ScImmutableColor { - ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) - } + ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) + } } #[derive(Clone, Copy)] @@ -83,9 +88,10 @@ pub struct MutableUpdateMetadataParams { } impl MutableUpdateMetadataParams { + pub fn color(&self) -> ScMutableColor { - ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) - } + ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) + } } #[derive(Clone, Copy)] @@ -94,9 +100,10 @@ pub struct ImmutableGetInfoParams { } impl ImmutableGetInfoParams { + pub fn color(&self) -> ScImmutableColor { - ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) - } + ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) + } } #[derive(Clone, Copy)] @@ -105,7 +112,8 @@ pub struct MutableGetInfoParams { } impl MutableGetInfoParams { + pub fn color(&self) -> ScMutableColor { - ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) - } + ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) + } } diff --git a/contracts/wasm/tokenregistry/src/state.rs b/contracts/wasm/tokenregistry/src/state.rs index d879c8403d..b1debc3005 100644 --- a/contracts/wasm/tokenregistry/src/state.rs +++ b/contracts/wasm/tokenregistry/src/state.rs @@ -16,7 +16,7 @@ use crate::keys::*; use crate::structs::*; pub struct ArrayOfImmutableColor { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl ArrayOfImmutableColor { @@ -30,7 +30,7 @@ impl ArrayOfImmutableColor { } pub struct MapColorToImmutableToken { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapColorToImmutableToken { @@ -45,19 +45,20 @@ pub struct ImmutableTokenRegistryState { } impl ImmutableTokenRegistryState { + pub fn color_list(&self) -> ArrayOfImmutableColor { - let arr_id = get_object_id(self.id, idx_map(IDX_STATE_COLOR_LIST), TYPE_ARRAY | TYPE_COLOR); - ArrayOfImmutableColor { obj_id: arr_id } - } + let arr_id = get_object_id(self.id, idx_map(IDX_STATE_COLOR_LIST), TYPE_ARRAY | TYPE_COLOR); + ArrayOfImmutableColor { obj_id: arr_id } + } pub fn registry(&self) -> MapColorToImmutableToken { - let map_id = get_object_id(self.id, idx_map(IDX_STATE_REGISTRY), TYPE_MAP); - MapColorToImmutableToken { obj_id: map_id } - } + let map_id = get_object_id(self.id, idx_map(IDX_STATE_REGISTRY), TYPE_MAP); + MapColorToImmutableToken { obj_id: map_id } + } } pub struct ArrayOfMutableColor { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl ArrayOfMutableColor { @@ -75,12 +76,12 @@ impl ArrayOfMutableColor { } pub struct MapColorToMutableToken { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapColorToMutableToken { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_token(&self, key: &ScColor) -> MutableToken { @@ -94,13 +95,14 @@ pub struct MutableTokenRegistryState { } impl MutableTokenRegistryState { + pub fn color_list(&self) -> ArrayOfMutableColor { - let arr_id = get_object_id(self.id, idx_map(IDX_STATE_COLOR_LIST), TYPE_ARRAY | TYPE_COLOR); - ArrayOfMutableColor { obj_id: arr_id } - } + let arr_id = get_object_id(self.id, idx_map(IDX_STATE_COLOR_LIST), TYPE_ARRAY | TYPE_COLOR); + ArrayOfMutableColor { obj_id: arr_id } + } pub fn registry(&self) -> MapColorToMutableToken { - let map_id = get_object_id(self.id, idx_map(IDX_STATE_REGISTRY), TYPE_MAP); - MapColorToMutableToken { obj_id: map_id } - } + let map_id = get_object_id(self.id, idx_map(IDX_STATE_REGISTRY), TYPE_MAP); + MapColorToMutableToken { obj_id: map_id } + } } diff --git a/contracts/wasm/tokenregistry/src/structs.rs b/contracts/wasm/tokenregistry/src/structs.rs index 2394462603..416ed9bde8 100644 --- a/contracts/wasm/tokenregistry/src/structs.rs +++ b/contracts/wasm/tokenregistry/src/structs.rs @@ -13,13 +13,13 @@ use wasmlib::*; use wasmlib::host::*; pub struct Token { - pub created: i64, // creation timestamp - pub description: String, // description what minted token represents - pub minted_by: ScAgentID, // original minter - pub owner: ScAgentID, // current owner - pub supply: i64, // amount of tokens originally minted - pub updated: i64, // last update timestamp - pub user_defined: String, // any user defined text + pub created: i64, // creation timestamp + pub description: String, // description what minted token represents + pub minted_by: ScAgentID, // original minter + pub owner: ScAgentID, // current owner + pub supply: i64, // amount of tokens originally minted + pub updated: i64, // last update timestamp + pub user_defined: String, // any user defined text } impl Token { @@ -38,13 +38,13 @@ impl Token { pub fn to_bytes(&self) -> Vec { let mut encode = BytesEncoder::new(); - encode.int64(self.created); - encode.string(&self.description); - encode.agent_id(&self.minted_by); - encode.agent_id(&self.owner); - encode.int64(self.supply); - encode.int64(self.updated); - encode.string(&self.user_defined); + encode.int64(self.created); + encode.string(&self.description); + encode.agent_id(&self.minted_by); + encode.agent_id(&self.owner); + encode.int64(self.supply); + encode.int64(self.updated); + encode.string(&self.user_defined); return encode.data(); } } diff --git a/tools/schema/generator/generator.go b/tools/schema/generator/generator.go index 3fd461ec54..5dcff196e8 100644 --- a/tools/schema/generator/generator.go +++ b/tools/schema/generator/generator.go @@ -22,7 +22,6 @@ const ( AccessCreator = "creator" AccessSelf = "self" AliasThis = "this" - constPrefix = "constPrefix" InitFunc = "Init" KeyArray = "array" KeyBaseType = "basetype" @@ -43,12 +42,10 @@ const ( KeyStructs = "structs" KeyThis = "this" KeyTypeDef = "typedef" + KeyTypeDefs = "typedefs" KeyView = "view" KindFunc = "Func" KindView = "View" - PrefixParam = "Param" - PrefixResult = "Result" - PrefixState = "State" PropImmutable = "Immutable" PropMutable = "Mutable" SpecialFuncInit = "funcInit" @@ -69,6 +66,8 @@ type Generator interface { generateProxyArray(field *Field, mutability, arrayType, proxyType string) generateProxyMap(field *Field, mutability, mapType, proxyType string) generateProxyReference(field *Field, mutability, typeName string) + setFieldKeys() + setFuncKeys() writeConsts() writeContract() writeInitialFuncs() @@ -108,6 +107,7 @@ func (g *GenBase) init(s *Schema) { g.templates = map[string]string{} g.addTemplates(templates) g.setKeys() + g.emitters["funcSignature"] = emitterFuncSignature } func (g *GenBase) addTemplates(t map[string]string) { @@ -125,7 +125,7 @@ func (g *GenBase) create(path string) (err error) { return err } -func (g *GenBase) createSourceFile(name string, generator func()) error { +func (g *GenBase) createSourceFile(name string, generator ...func()) error { err := g.create(g.folder + name + g.extension) if err != nil { return err @@ -140,15 +140,19 @@ func (g *GenBase) createSourceFile(name string, generator func()) error { g.emit("warning") } g.skipWarning = false - generator() + g.s.KeyID = 0 + if len(generator) != 0 { + generator[0]() + return nil + } + g.emit(name + g.extension) return nil } var emitKeyRegExp = regexp.MustCompile(`\$[a-zA-Z_]+`) func (g *GenBase) emit(template string) { - template = g.templates[template] - lines := strings.Split(template, "\n") + lines := strings.Split(g.templates[template], "\n") for i := 1; i < len(lines)-1; i++ { line := lines[i] @@ -207,7 +211,7 @@ func (g *GenBase) emitEach(key string) { switch parts[0] { case KeyFunc: for _, g.currentFunc = range g.s.Funcs { - g.setFuncKeys() + g.gen.setFuncKeys() g.emit(template) } case KeyMandatory: @@ -221,15 +225,12 @@ func (g *GenBase) emitEach(key string) { case KeyParam: g.emitFields(g.currentFunc.Params, template) case KeyParams: - g.keys[constPrefix] = PrefixParam g.emitFields(g.s.Params, template) case KeyResult: g.emitFields(g.currentFunc.Results, template) case KeyResults: - g.keys[constPrefix] = PrefixResult g.emitFields(g.s.Results, template) case KeyState: - g.keys[constPrefix] = PrefixState g.emitFields(g.s.StateVars, template) case KeyStruct: g.emitFields(g.currentStruct.Fields, template) @@ -250,7 +251,7 @@ func (g *GenBase) emitFields(fields []*Field, template string) { //if g.currentField.Alias == KeyThis { // continue //} - g.setFieldKeys() + g.gen.setFieldKeys() g.emit(template) } } @@ -301,10 +302,14 @@ func (g *GenBase) emitIf(key string) { condition = len(g.s.Results) != 0 case KeyState: condition = len(g.s.StateVars) != 0 + case KeyStructs: + condition = len(g.s.Structs) != 0 case KeyThis: condition = g.currentField.Alias == KeyThis case KeyTypeDef: condition = g.fieldIsTypeDef() + case KeyTypeDefs: + condition = len(g.s.Typedefs) != 0 case KeyPtrs: condition = len(g.currentFunc.Params) != 0 || len(g.currentFunc.Results) != 0 default: @@ -328,7 +333,7 @@ func (g *GenBase) fieldIsTypeDef() bool { for _, typeDef := range g.s.Typedefs { if typeDef.Name == g.currentField.Type { g.currentField = typeDef - g.setFieldKeys() + g.gen.setFieldKeys() return true } } @@ -356,14 +361,6 @@ func (g *GenBase) exists(path string) (err error) { return err } -func (g *GenBase) formatter(on bool) { - if on { - g.printf("\n// @formatter:%s\n", "on") - return - } - g.printf("// @formatter:%s\n\n", "off") -} - func (g *GenBase) Generate(s *Schema) error { g.gen.init(s) @@ -597,62 +594,27 @@ func (g *GenBase) scanExistingCode() ([]string, StringMap, error) { return lines, existing, nil } -func (g *GenBase) setFuncKeys() { - g.setKeyValues("funcName", g.currentFunc.FuncName[4:]) - g.setKeyValues("kind", g.currentFunc.FuncName[:4]) - g.keys["funcHName"] = iscp.Hn(g.keys["funcName"]).String() - - paramsID := "nil" - if len(g.currentFunc.Params) != 0 { - paramsID = "&f.Params.id" - } - g.keys["paramsID"] = paramsID - - resultsID := "nil" - if len(g.currentFunc.Results) != 0 { - resultsID = "&f.Results.id" - } - g.keys["resultsID"] = resultsID - - initFunc := "" - initMap := "" - if g.currentFunc.Type == InitFunc { - initFunc = InitFunc - initMap = ", keyMap[:], idxMap[:]" - } - g.keys["initFunc"] = initFunc - g.keys["initMap"] = initMap -} - func (g *GenBase) setFieldKeys() { g.setKeyValues("fldName", g.currentField.Name) + g.setKeyValues("fldType", g.currentField.Type) g.keys["fldAlias"] = g.currentField.Alias g.keys["FldComment"] = g.currentField.Comment - g.keys["FldType"] = g.currentField.Type - fldTypeID := goTypeIds[g.currentField.Type] - if fldTypeID == "" { - fldTypeID = goTypeBytes - } - g.keys["FldTypeID"] = fldTypeID - g.keys["FldTypeKey"] = goKeys[g.currentField.Type] - g.keys["FldLangType"] = goTypes[g.currentField.Type] g.keys["FldMapKey"] = g.currentField.MapKey - g.keys["FldMapKeyLangType"] = goTypes[g.currentField.MapKey] - g.keys["FldMapKeyKey"] = goKeys[g.currentField.MapKey] + g.keys["fldIndex"] = strconv.Itoa(g.s.KeyID) g.s.KeyID++ g.keys["maxIndex"] = strconv.Itoa(g.s.KeyID) +} - // native core contracts use Array16 instead of our nested array type - arrayTypeID := "wasmlib.TYPE_ARRAY" - if g.s.CoreContracts { - arrayTypeID = "wasmlib.TYPE_ARRAY16" - } - g.keys["ArrayTypeID"] = arrayTypeID +func (g *GenBase) setFuncKeys() { + g.setKeyValues("funcName", g.currentFunc.FuncName[4:]) + g.setKeyValues("kind", g.currentFunc.FuncName[:4]) + g.keys["funcHName"] = iscp.Hn(g.keys["funcName"]).String() } func (g *GenBase) setKeys() { + g.keys["space"] = " " g.keys["package"] = g.s.Name g.keys["Package"] = g.s.FullName g.keys["module"] = ModuleName + strings.Replace(ModuleCwd[len(ModulePath):], "\\", "/", -1) @@ -673,3 +635,14 @@ func (g *GenBase) setKeyValues(key, value string) { g.keys[snake(key)] = snake(value) g.keys[upper(snake(key))] = upper(snake(value)) } + +func emitterFuncSignature(g *GenBase) { + switch g.currentFunc.FuncName { + case SpecialFuncInit: + case SpecialFuncSetOwner: + case SpecialViewGetOwner: + default: + return + } + g.emit(g.currentFunc.FuncName) +} diff --git a/tools/schema/generator/generator_go.go b/tools/schema/generator/generator_go.go index 7fd0ac9554..f1759c8a09 100644 --- a/tools/schema/generator/generator_go.go +++ b/tools/schema/generator/generator_go.go @@ -52,10 +52,6 @@ var goTypeIds = StringMap{ "String": "wasmlib.TYPE_STRING", } -const ( - goTypeBytes = "wasmlib.TYPE_BYTES" -) - type GoGenerator struct { GenBase } @@ -75,8 +71,7 @@ func (g *GoGenerator) init(s *Schema) { for _, template := range gotemplates.GoTemplates { g.addTemplates(template) } - g.emitters["accessCheck"] = emitterAccessCheck - g.emitters["funcSignature"] = emitterFuncSignature + g.emitters["accessCheck"] = emitterGoAccessCheck } func (g *GoGenerator) funcName(f *Func) string { @@ -115,7 +110,6 @@ func (g *GoGenerator) writeInitialFuncs() { } func (g *GoGenerator) writeKeys() { - g.s.KeyID = 0 g.emit("keys.go") } @@ -145,14 +139,9 @@ func (g *GoGenerator) writeStructs() { func (g *GoGenerator) writeTypeDefs() { g.emit("typedefs.go") - - //for _, subtype := range g.s.Typedefs { - // g.generateProxy(subtype, PropImmutable) - // g.generateProxy(subtype, PropMutable) - //} } -func emitterAccessCheck(g *GenBase) { +func emitterGoAccessCheck(g *GenBase) { if g.currentFunc.Access == "" { return } @@ -178,13 +167,48 @@ func emitterAccessCheck(g *GenBase) { g.emit("grantRequire") } -func emitterFuncSignature(g *GenBase) { - switch g.currentFunc.FuncName { - case SpecialFuncInit: - case SpecialFuncSetOwner: - case SpecialViewGetOwner: - default: - return +func (g *GoGenerator) setFieldKeys() { + g.GenBase.setFieldKeys() + + fldTypeID := goTypeIds[g.currentField.Type] + if fldTypeID == "" { + fldTypeID = "wasmlib.TYPE_BYTES" + } + g.keys["FldTypeID"] = fldTypeID + g.keys["FldTypeKey"] = goKeys[g.currentField.Type] + g.keys["FldLangType"] = goTypes[g.currentField.Type] + g.keys["FldMapKeyLangType"] = goTypes[g.currentField.MapKey] + g.keys["FldMapKeyKey"] = goKeys[g.currentField.MapKey] + + // native core contracts use Array16 instead of our nested array type + arrayTypeID := "wasmlib.TYPE_ARRAY" + if g.s.CoreContracts { + arrayTypeID = "wasmlib.TYPE_ARRAY16" + } + g.keys["ArrayTypeID"] = arrayTypeID +} + +func (g *GoGenerator) setFuncKeys() { + g.GenBase.setFuncKeys() + + paramsID := "nil" + if len(g.currentFunc.Params) != 0 { + paramsID = "&f.Params.id" + } + g.keys["paramsID"] = paramsID + + resultsID := "nil" + if len(g.currentFunc.Results) != 0 { + resultsID = "&f.Results.id" + } + g.keys["resultsID"] = resultsID + + initFunc := "" + initMap := "" + if g.currentFunc.Type == InitFunc { + initFunc = InitFunc + initMap = ", keyMap[:], idxMap[:]" } - g.emit(g.currentFunc.FuncName) + g.keys["initFunc"] = initFunc + g.keys["initMap"] = initMap } diff --git a/tools/schema/generator/generator_rust.go b/tools/schema/generator/generator_rust.go index c3c2e987e1..d025adbe7e 100644 --- a/tools/schema/generator/generator_rust.go +++ b/tools/schema/generator/generator_rust.go @@ -5,22 +5,14 @@ package generator import ( "regexp" - "strconv" "strings" - "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/tools/schema/generator/rstemplates" ) const ( - allowDeadCode = "#![allow(dead_code)]" allowUnusedImports = "#![allow(unused_imports)]" - useConsts = "use crate::consts::*;" useCrate = "use crate::*;" - useKeys = "use crate::keys::*;" - useParams = "use crate::params::*;" - useResults = "use crate::results::*;" - useState = "use crate::state::*;" - useStdPtr = "use std::ptr;" useStructs = "use crate::structs::*;" useTypeDefs = "use crate::typedefs::*;" useWasmLib = "use wasmlib::*;" @@ -84,8 +76,7 @@ var rustTypeIds = StringMap{ } const ( - rustTypeBytes = "TYPE_BYTES" - rustTypeMap = "TYPE_MAP" + rustTypeMap = "TYPE_MAP" ) type RustGenerator struct { @@ -104,7 +95,10 @@ func NewRustGenerator() *RustGenerator { func (g *RustGenerator) init(s *Schema) { g.GenBase.init(s) - // g.templates["exportLine"] = goExportLine + for _, template := range rstemplates.RsTemplates { + g.addTemplates(template) + } + g.emitters["accessCheck"] = emitterRsAccessCheck } func (g *RustGenerator) crateOrWasmLib(withContract, withHost bool) string { @@ -125,21 +119,6 @@ func (g *RustGenerator) crateOrWasmLib(withContract, withHost bool) string { return retVal } -func (g *RustGenerator) flushConsts(crateOnly bool) { - if len(g.s.ConstNames) == 0 { - return - } - - crate := "" - if crateOnly { - crate = "(crate)" - } - g.println() - g.s.flushConsts(func(name string, value string, padLen int) { - g.printf("pub%s const %s %s;\n", crate, pad(name+":", padLen+1), value) - }) -} - func (g *RustGenerator) funcName(f *Func) string { return snake(f.FuncName) } @@ -152,61 +131,6 @@ func (g *RustGenerator) generateArrayType(varType string) string { return "TYPE_ARRAY | " + varType } -func (g *RustGenerator) generateConstsFields(fields []*Field, prefix string) { - if len(fields) != 0 { - for _, field := range fields { - if field.Alias == AliasThis { - continue - } - name := prefix + upper(snake(field.Name)) - value := "&str = \"" + field.Alias + "\"" - g.s.appendConst(name, value) - } - g.flushConsts(g.s.CoreContracts) - } -} - -func (g *RustGenerator) generateContractFuncs() { - g.println("\npub struct ScFuncs {") - g.println("}") - g.println("\nimpl ScFuncs {") - - for _, f := range g.s.Funcs { - nameLen := f.nameLen(4) + 1 - funcName := g.funcName(f) - constName := upper(funcName) - letMut := "" - if len(f.Params) != 0 || len(f.Results) != 0 { - letMut = "let mut f = " - } - kind := f.Kind - if f.Type == InitFunc { - kind = f.Type + f.Kind - } - g.printf(" pub fn %s(_ctx: & dyn Sc%sCallContext) -> %sCall {\n", funcName[5:], f.Kind, f.Type) - g.printf(" %s%sCall {\n", letMut, f.Type) - g.printf(" %s Sc%s::new(HSC_NAME, H%s),\n", pad("func:", nameLen), kind, constName) - paramsID := "ptr::null_mut()" - if len(f.Params) != 0 { - paramsID = "&mut f.params.id" - g.printf(" %s Mutable%sParams { id: 0 },\n", pad("params:", nameLen), f.Type) - } - resultsID := "ptr::null_mut()" - if len(f.Results) != 0 { - resultsID = "&mut f.results.id" - g.printf(" results: Immutable%sResults { id: 0 },\n", f.Type) - } - g.printf(" }") - if len(f.Params) != 0 || len(f.Results) != 0 { - g.printf(";\n") - g.printf(" f.func.set_ptrs(%s, %s);\n", paramsID, resultsID) - g.printf(" f") - } - g.printf("\n }\n") - } - g.printf("}\n") -} - func (g *RustGenerator) generateFuncSignature(f *Func) { switch f.FuncName { case SpecialFuncInit: @@ -228,30 +152,6 @@ func (g *RustGenerator) generateFuncSignature(f *Func) { g.printf("}\n") } -func (g *RustGenerator) generateKeysArray(fields []*Field, prefix string) { - for _, field := range fields { - if field.Alias == AliasThis { - continue - } - name := prefix + upper(snake(field.Name)) - g.printf(" %s,\n", name) - g.s.KeyID++ - } -} - -func (g *RustGenerator) generateKeysIndexes(fields []*Field, prefix string) { - for _, field := range fields { - if field.Alias == AliasThis { - continue - } - name := "IDX_" + prefix + upper(snake(field.Name)) - field.KeyID = g.s.KeyID - value := "usize = " + strconv.Itoa(field.KeyID) - g.s.KeyID++ - g.s.appendConst(name, value) - } -} - func (g *RustGenerator) generateLanguageSpecificFiles() error { if g.s.CoreContracts { return g.createSourceFile("mod", g.writeSpecialMod) @@ -328,7 +228,7 @@ func (g *RustGenerator) generateProxyArrayNewType(field *Field, proxyType string if subtype.Array { varType = rustTypeIds[subtype.Type] if varType == "" { - varType = rustTypeBytes + varType = "TYPE_BYTES" } varType = g.generateArrayType(varType) } @@ -381,7 +281,7 @@ func (g *RustGenerator) generateProxyMapNewType(field *Field, proxyType, keyType if subtype.Array { varType = rustTypeIds[subtype.Type] if varType == "" { - varType = rustTypeBytes + varType = "TYPE_BYTES" } varType = g.generateArrayType(varType) } @@ -403,302 +303,12 @@ func (g *RustGenerator) generateProxyReference(field *Field, mutability, typeNam } } -func (g *RustGenerator) generateProxyStruct(fields []*Field, mutability, typeName, kind string) { - typeName = mutability + typeName + kind - kind = strings.TrimSuffix(kind, "s") - kind = upper(kind) + "_" - - // first generate necessary array and map types - for _, field := range fields { - g.generateProxy(field, mutability) - } - - g.printf("\n#[derive(Clone, Copy)]\n") - g.printf("pub struct %s {\n", typeName) - g.printf(" pub(crate) id: i32,\n") - g.printf("}\n") - - if len(fields) != 0 { - g.printf("\nimpl %s {", typeName) - defer g.printf("}\n") - } - - for _, field := range fields { - varName := snake(field.Name) - varID := "idx_map(IDX_" + kind + upper(varName) + ")" - if g.s.CoreContracts { - varID = kind + upper(varName) + ".get_key_id()" - } - varType := rustTypeIds[field.Type] - if varType == "" { - varType = rustTypeBytes - } - if field.Array { - varType = g.generateArrayType(varType) - arrayType := "ArrayOf" + mutability + field.Type - g.printf("\n pub fn %s(&self) -> %s {\n", varName, arrayType) - g.printf(" let arr_id = get_object_id(self.id, %s, %s);\n", varID, varType) - g.printf(" %s { obj_id: arr_id }\n", arrayType) - g.printf(" }\n") - continue - } - if field.MapKey != "" { - varType = rustTypeMap - mapType := "Map" + field.MapKey + "To" + mutability + field.Type - g.printf("\n pub fn %s(&self) -> %s {\n", varName, mapType) - mapID := "self.id" - if field.Alias != AliasThis { - mapID = "map_id" - g.printf(" let map_id = get_object_id(self.id, %s, %s);\n", varID, varType) - } - g.printf(" %s { obj_id: %s }\n", mapType, mapID) - g.printf(" }\n") - continue - } - - proxyType := mutability + field.Type - if field.TypeID == 0 { - g.printf("\n pub fn %s(&self) -> %s {\n", varName, proxyType) - g.printf(" %s { obj_id: self.id, key_id: %s }\n", proxyType, varID) - g.printf(" }\n") - continue - } - - g.printf("\n pub fn %s(&self) -> Sc%s {\n", varName, proxyType) - g.printf(" Sc%s::new(self.id, %s)\n", proxyType, varID) - g.printf(" }\n") - } -} - -func (g *RustGenerator) generateStruct(typeDef *Struct) { - nameLen, typeLen := calculatePadding(typeDef.Fields, rustTypes, true) - - g.printf("\npub struct %s {\n", typeDef.Name) - for _, field := range typeDef.Fields { - fldName := pad(snake(field.Name)+":", nameLen+1) - fldType := rustTypes[field.Type] + "," - if field.Comment != "" { - fldType = pad(fldType, typeLen+1) - } - g.printf(" pub %s %s%s\n", fldName, fldType, field.Comment) - } - g.printf("}\n") - - // write encoder and decoder for struct - g.printf("\nimpl %s {", typeDef.Name) - - g.printf("\n pub fn from_bytes(bytes: &[u8]) -> %s {\n", typeDef.Name) - g.printf(" let mut decode = BytesDecoder::new(bytes);\n") - g.printf(" %s {\n", typeDef.Name) - for _, field := range typeDef.Fields { - name := snake(field.Name) - g.printf(" %s: decode.%s(),\n", name, snake(field.Type)) - } - g.printf(" }\n") - g.printf(" }\n") - - g.printf("\n pub fn to_bytes(&self) -> Vec {\n") - g.printf(" let mut encode = BytesEncoder::new();\n") - for _, field := range typeDef.Fields { - name := snake(field.Name) - ref := "&" - if field.Type == "Hname" || field.Type == "Int64" || field.Type == "Int32" || field.Type == "Int16" { - ref = "" - } - g.printf(" encode.%s(%sself.%s);\n", snake(field.Type), ref, name) - } - g.printf(" return encode.data();\n") - g.printf(" }\n") - g.printf("}\n") - - g.generateStructProxy(typeDef, false) - g.generateStructProxy(typeDef, true) -} - -func (g *RustGenerator) generateStructProxy(typeDef *Struct, mutable bool) { - typeName := PropImmutable + typeDef.Name - if mutable { - typeName = PropMutable + typeDef.Name - } - - g.printf("\npub struct %s {\n", typeName) - g.printf(" pub(crate) obj_id: i32,\n") - g.printf(" pub(crate) key_id: Key32,\n") - g.printf("}\n") - - g.printf("\nimpl %s {", typeName) - - g.printf("\n pub fn exists(&self) -> bool {\n") - g.printf(" exists(self.obj_id, self.key_id, TYPE_BYTES)\n") - g.printf(" }\n") - - if mutable { - g.printf("\n pub fn set_value(&self, value: &%s) {\n", typeDef.Name) - g.printf(" set_bytes(self.obj_id, self.key_id, TYPE_BYTES, &value.to_bytes());\n") - g.printf(" }\n") - } - - g.printf("\n pub fn value(&self) -> %s {\n", typeDef.Name) - g.printf(" %s::from_bytes(&get_bytes(self.obj_id, self.key_id, TYPE_BYTES))\n", typeDef.Name) - g.printf(" }\n") - - g.printf("}\n") -} - -func (g *RustGenerator) generateThunk(f *Func) { - nameLen := f.nameLen(5) + 1 - mutability := PropMutable - if f.Kind == KindView { - mutability = PropImmutable - } - g.printf("\npub struct %sContext {\n", f.Type) - if len(f.Params) != 0 { - g.printf(" %s Immutable%sParams,\n", pad("params:", nameLen), f.Type) - } - if len(f.Results) != 0 { - g.printf(" results: Mutable%sResults,\n", f.Type) - } - g.printf(" %s %s%sState,\n", pad("state:", nameLen), mutability, g.s.FullName) - g.printf("}\n") - - g.printf("\nfn %s_thunk(ctx: &Sc%sContext) {\n", g.funcName(f), f.Kind) - g.printf(" ctx.log(\"%s.%s\");\n", g.s.Name, f.FuncName) - - if f.Access != "" { - g.generateThunkAccessCheck(f) - } - - g.printf(" let f = %sContext {\n", f.Type) - - if len(f.Params) != 0 { - g.printf(" params: Immutable%sParams {\n", f.Type) - g.printf(" id: OBJ_ID_PARAMS,\n") - g.printf(" },\n") - } - - if len(f.Results) != 0 { - g.printf(" results: Mutable%sResults {\n", f.Type) - g.printf(" id: OBJ_ID_RESULTS,\n") - g.printf(" },\n") - } - - g.printf(" state: %s%sState {\n", mutability, g.s.FullName) - g.printf(" id: OBJ_ID_STATE,\n") - g.printf(" },\n") - - g.printf(" };\n") - - for _, param := range f.Params { - if !param.Optional { - name := snake(param.Name) - g.printf(" ctx.require(f.params.%s().exists(), \"missing mandatory %s\");\n", name, param.Name) - } - } - - g.printf(" %s(ctx, &f);\n", g.funcName(f)) - g.printf(" ctx.log(\"%s.%s ok\");\n", g.s.Name, f.FuncName) - g.printf("}\n") -} - -func (g *RustGenerator) generateThunkAccessCheck(f *Func) { - grant := f.Access - index := strings.Index(grant, "//") - if index >= 0 { - g.printf(" %s\n", grant[index:]) - grant = strings.TrimSpace(grant[:index]) - } - switch grant { - case AccessSelf: - grant = "ctx.account_id()" - case AccessChain: - grant = "ctx.chain_owner_id()" - case AccessCreator: - grant = "ctx.contract_creator()" - default: - g.printf(" let access = ctx.state().get_agent_id(\"%s\");\n", grant) - g.printf(" ctx.require(access.exists(), \"access not set: %s\");\n", grant) - grant = "access.value()" - } - g.printf(" ctx.require(ctx.caller() == %s, \"no permission\");\n\n", grant) -} - func (g *RustGenerator) writeConsts() { - g.formatter(false) - g.println(allowDeadCode) - g.println() - g.println(g.crateOrWasmLib(false, false)) - - scName := g.s.Name - if g.s.CoreContracts { - // remove 'core' prefix - scName = scName[4:] - } - g.s.appendConst("SC_NAME", "&str = \""+scName+"\"") - if g.s.Description != "" { - g.s.appendConst("SC_DESCRIPTION", "&str = \""+g.s.Description+"\"") - } - hName := iscp.Hn(scName) - g.s.appendConst("HSC_NAME", "ScHname = ScHname(0x"+hName.String()+")") - g.flushConsts(false) - - g.generateConstsFields(g.s.Params, "PARAM_") - g.generateConstsFields(g.s.Results, "RESULT_") - g.generateConstsFields(g.s.StateVars, "STATE_") - - if len(g.s.Funcs) != 0 { - for _, f := range g.s.Funcs { - constName := upper(g.funcName(f)) - g.s.appendConst(constName, "&str = \""+f.String+"\"") - } - g.flushConsts(g.s.CoreContracts) - - for _, f := range g.s.Funcs { - constHname := "H" + upper(g.funcName(f)) - g.s.appendConst(constHname, "ScHname = ScHname(0x"+f.Hname.String()+")") - } - g.flushConsts(g.s.CoreContracts) - } - - g.formatter(true) + g.emit("consts.rs") } func (g *RustGenerator) writeContract() { - g.formatter(false) - g.println(allowDeadCode) - g.println() - g.println(useStdPtr) - g.println() - g.println(g.crateOrWasmLib(true, false)) - if !g.s.CoreContracts { - g.println() - g.println(useConsts) - if len(g.s.Params) != 0 { - g.println(useParams) - } - if len(g.s.Results) != 0 { - g.println(useResults) - } - } - - for _, f := range g.s.Funcs { - nameLen := f.nameLen(4) + 1 - kind := f.Kind - if f.Type == InitFunc { - kind = f.Type + f.Kind - } - g.printf("\npub struct %sCall {\n", f.Type) - g.printf(" pub %s Sc%s,\n", pad("func:", nameLen), kind) - if len(f.Params) != 0 { - g.printf(" pub %s Mutable%sParams,\n", pad("params:", nameLen), f.Type) - } - if len(f.Results) != 0 { - g.printf(" pub results: Immutable%sResults,\n", f.Type) - } - g.printf("}\n") - } - - g.generateContractFuncs() - g.formatter(true) + g.emit("contract.rs") } func (g *RustGenerator) writeInitialFuncs() { @@ -718,143 +328,19 @@ func (g *RustGenerator) writeInitialFuncs() { } func (g *RustGenerator) writeKeys() { - g.formatter(false) - g.println(allowDeadCode) - g.println() - g.println(useWasmLib) - g.println() - g.println(useCrate) - - g.s.KeyID = 0 - g.generateKeysIndexes(g.s.Params, "PARAM_") - g.generateKeysIndexes(g.s.Results, "RESULT_") - g.generateKeysIndexes(g.s.StateVars, "STATE_") - g.flushConsts(true) - - size := g.s.KeyID - g.printf("\npub const KEY_MAP_LEN: usize = %d;\n", size) - g.printf("\npub const KEY_MAP: [&str; KEY_MAP_LEN] = [\n") - g.generateKeysArray(g.s.Params, "PARAM_") - g.generateKeysArray(g.s.Results, "RESULT_") - g.generateKeysArray(g.s.StateVars, "STATE_") - g.printf("];\n") - - g.printf("\npub static mut IDX_MAP: [Key32; KEY_MAP_LEN] = [Key32(0); KEY_MAP_LEN];\n") - - g.printf("\npub fn idx_map(idx: usize) -> Key32 {\n") - g.printf(" unsafe {\n") - g.printf(" IDX_MAP[idx]\n") - g.printf(" }\n") - g.printf("}\n") - - g.formatter(true) + g.emit("keys.rs") } func (g *RustGenerator) writeLib() { - g.formatter(false) - g.println(allowDeadCode) - g.println(allowUnusedImports) - g.println() - g.printf("use %s::*;\n", g.s.Name) - g.println(useWasmLib) - g.println(useWasmLibHost) - g.println() - g.println(useConsts) - g.println(useKeys) - if len(g.s.Params) != 0 { - g.println(useParams) - } - if len(g.s.Results) != 0 { - g.println(useResults) - } - g.println(useState) - g.println() - - g.println("mod consts;") - g.println("mod contract;") - g.println("mod keys;") - if len(g.s.Params) != 0 { - g.println("mod params;") - } - if len(g.s.Results) != 0 { - g.println("mod results;") - } - g.println("mod state;") - if len(g.s.Structs) != 0 { - g.println("mod structs;") - } - if len(g.s.Typedefs) != 0 { - g.println("mod typedefs;") - } - g.printf("mod %s;\n", g.s.Name) - - g.println("\n#[no_mangle]") - g.println("fn on_load() {") - if len(g.s.Funcs) != 0 { - g.printf(" let exports = ScExports::new();\n") - } - for _, f := range g.s.Funcs { - name := g.funcName(f) - g.printf(" exports.add_%s(%s, %s_thunk);\n", lower(f.Kind), upper(name), name) - } - - g.printf("\n unsafe {\n") - g.printf(" for i in 0..KEY_MAP_LEN {\n") - g.printf(" IDX_MAP[i] = get_key_id_from_string(KEY_MAP[i]);\n") - g.printf(" }\n") - g.printf(" }\n") - - g.printf("}\n") - - // generate parameter structs and thunks to set up and check parameters - for _, f := range g.s.Funcs { - g.generateThunk(f) - } - - g.formatter(true) + g.emit("lib.rs") } func (g *RustGenerator) writeParams() { - g.println(allowDeadCode) - g.println(allowUnusedImports) - g.println() - g.println(g.crateOrWasmLib(true, true)) - if !g.s.CoreContracts { - g.println() - g.println(useCrate) - g.println(useKeys) - } - - for _, f := range g.s.Funcs { - if len(f.Params) == 0 { - continue - } - g.generateProxyStruct(f.Params, PropImmutable, f.Type, "Params") - g.generateProxyStruct(f.Params, PropMutable, f.Type, "Params") - } + g.emit("params.rs") } func (g *RustGenerator) writeResults() { - g.println(allowDeadCode) - g.println(allowUnusedImports) - g.println() - g.println(g.crateOrWasmLib(true, true)) - if !g.s.CoreContracts { - g.println() - g.println(useCrate) - g.println(useKeys) - if len(g.s.Structs) != 0 { - g.println(useStructs) - } - } - - for _, f := range g.s.Funcs { - if len(f.Results) == 0 { - continue - } - g.generateProxyStruct(f.Results, PropImmutable, f.Type, "Results") - g.generateProxyStruct(f.Results, PropMutable, f.Type, "Results") - } + g.emit("results.rs") } func (g *RustGenerator) writeSpecialCargoToml() error { @@ -899,54 +385,89 @@ func (g *RustGenerator) writeSpecialMod() { } func (g *RustGenerator) writeState() { - g.println(allowDeadCode) - g.println(allowUnusedImports) - g.println() - g.println(useWasmLib) - g.println(useWasmLibHost) - g.println() - g.println(useCrate) - g.println(useKeys) - if len(g.s.Structs) != 0 { - g.println(useStructs) + g.emit("state.rs") +} + +func (g *RustGenerator) writeStructs() { + g.emit("structs.rs") +} + +func (g *RustGenerator) writeTypeDefs() { + g.emit("typedefs.rs") +} + +func emitterRsAccessCheck(g *GenBase) { + if g.currentFunc.Access == "" { + return } - if len(g.s.Typedefs) != 0 { - g.println(useTypeDefs) + grant := g.currentFunc.Access + index := strings.Index(grant, "//") + if index >= 0 { + g.printf(" %s\n", grant[index:]) + grant = strings.TrimSpace(grant[:index]) } - - g.generateProxyStruct(g.s.StateVars, PropImmutable, g.s.FullName, "State") - g.generateProxyStruct(g.s.StateVars, PropMutable, g.s.FullName, "State") + switch grant { + case AccessSelf: + grant = "ctx.account_id()" + case AccessChain: + grant = "ctx.chain_owner_id()" + case AccessCreator: + grant = "ctx.contract_creator()" + default: + g.keys["grant"] = grant + g.emit("grantForKey") + grant = "access.value()" + } + g.keys["grant"] = grant + g.emit("grantRequire") } -func (g *RustGenerator) writeStructs() { - g.formatter(false) - g.println(allowDeadCode) - g.println() - g.println(useWasmLib) - g.println(useWasmLibHost) +func (g *RustGenerator) setFieldKeys() { + g.GenBase.setFieldKeys() + + field := g.currentField + fldRef := "&" + if field.Type == "Hname" || field.Type == "Int64" || field.Type == "Int32" || field.Type == "Int16" { + fldRef = "" + } + g.keys["ref"] = fldRef - for _, typeDef := range g.s.Structs { - g.generateStruct(typeDef) + fldTypeID := rustTypeIds[field.Type] + if fldTypeID == "" { + fldTypeID = "TYPE_BYTES" } + g.keys["FldTypeID"] = fldTypeID + g.keys["FldTypeKey"] = rustKeys[field.Type] + g.keys["FldLangType"] = rustTypes[field.Type] + g.keys["FldMapKeyLangType"] = rustKeyTypes[field.MapKey] + g.keys["FldMapKeyKey"] = rustKeys[field.MapKey] - g.formatter(true) + // native core contracts use Array16 instead of our nested array type + arrayTypeID := "TYPE_ARRAY" + if g.s.CoreContracts { + arrayTypeID = "TYPE_ARRAY16" + } + g.keys["ArrayTypeID"] = arrayTypeID } -func (g *RustGenerator) writeTypeDefs() { - g.formatter(false) - g.println(allowDeadCode) - g.println() - g.println(useWasmLib) - g.println(useWasmLibHost) - if len(g.s.Structs) != 0 { - g.println() - g.println(useStructs) +func (g *RustGenerator) setFuncKeys() { + g.GenBase.setFuncKeys() + + paramsID := "ptr::null_mut()" + if len(g.currentFunc.Params) != 0 { + paramsID = "&mut f.params.id" } + g.keys["paramsID"] = paramsID - for _, subtype := range g.s.Typedefs { - g.generateProxy(subtype, PropImmutable) - g.generateProxy(subtype, PropMutable) + resultsID := "ptr::null_mut()" + if len(g.currentFunc.Results) != 0 { + resultsID = "&mut f.results.id" } + g.keys["resultsID"] = resultsID - g.formatter(true) + initFunc := "" + if g.currentFunc.Type == InitFunc { + initFunc = InitFunc + } + g.keys["initFunc"] = initFunc } diff --git a/tools/schema/generator/generator_ts.go b/tools/schema/generator/generator_ts.go index c780e9c48c..8dc16b3024 100644 --- a/tools/schema/generator/generator_ts.go +++ b/tools/schema/generator/generator_ts.go @@ -737,3 +737,49 @@ func (g *TypeScriptGenerator) writeTypeDefs() { g.generateProxy(subtype, PropMutable) } } + +func (g *TypeScriptGenerator) setFieldKeys() { + g.GenBase.setFieldKeys() + + fldTypeID := rustTypeIds[g.currentField.Type] + if fldTypeID == "" { + fldTypeID = "TYPE_BYTES" + } + g.keys["FldTypeID"] = fldTypeID + g.keys["FldTypeKey"] = rustKeys[g.currentField.Type] + g.keys["FldLangType"] = rustTypes[g.currentField.Type] + g.keys["FldMapKeyLangType"] = rustTypes[g.currentField.MapKey] + g.keys["FldMapKeyKey"] = rustKeys[g.currentField.MapKey] + + // native core contracts use Array16 instead of our nested array type + arrayTypeID := "TYPE_ARRAY" + if g.s.CoreContracts { + arrayTypeID = "TYPE_ARRAY16" + } + g.keys["ArrayTypeID"] = arrayTypeID +} + +func (g *TypeScriptGenerator) setFuncKeys() { + g.GenBase.setFuncKeys() + + paramsID := "nil" + if len(g.currentFunc.Params) != 0 { + paramsID = "&f.Params.id" + } + g.keys["paramsID"] = paramsID + + resultsID := "nil" + if len(g.currentFunc.Results) != 0 { + resultsID = "&f.Results.id" + } + g.keys["resultsID"] = resultsID + + initFunc := "" + initMap := "" + if g.currentFunc.Type == InitFunc { + initFunc = InitFunc + initMap = ", keyMap[:], idxMap[:]" + } + g.keys["initFunc"] = initFunc + g.keys["initMap"] = initMap +} diff --git a/tools/schema/generator/gotemplates/consts.go b/tools/schema/generator/gotemplates/consts.go index 2092aa0335..957d537fbb 100644 --- a/tools/schema/generator/gotemplates/consts.go +++ b/tools/schema/generator/gotemplates/consts.go @@ -26,6 +26,7 @@ $#each func constHFunc "constParams": ` const ( +$#set constPrefix Param $#each params constField ) `, @@ -33,6 +34,7 @@ $#each params constField "constResults": ` const ( +$#set constPrefix Result $#each results constField ) `, @@ -40,6 +42,7 @@ $#each results constField "constState": ` const ( +$#set constPrefix State $#each state constField ) `, diff --git a/tools/schema/generator/gotemplates/keys.go b/tools/schema/generator/gotemplates/keys.go index 58b26968c2..f448894864 100644 --- a/tools/schema/generator/gotemplates/keys.go +++ b/tools/schema/generator/gotemplates/keys.go @@ -6,16 +6,22 @@ var keysGo = map[string]string{ $#emit goHeader const ( +$#set constPrefix Param $#each params constFieldIdx +$#set constPrefix Result $#each results constFieldIdx +$#set constPrefix State $#each state constFieldIdx ) const keyMapLen = $maxIndex var keyMap = [keyMapLen]wasmlib.Key{ +$#set constPrefix Param $#each params constFieldKey +$#set constPrefix Result $#each results constFieldKey +$#set constPrefix State $#each state constFieldKey } diff --git a/tools/schema/generator/gotemplates/typedefs.go b/tools/schema/generator/gotemplates/typedefs.go index ef15327d28..4fcdb950d4 100644 --- a/tools/schema/generator/gotemplates/typedefs.go +++ b/tools/schema/generator/gotemplates/typedefs.go @@ -27,7 +27,7 @@ type $mut$FldName = $proxy // ******************************* "typedefProxyArray": ` $#set proxy ArrayOf$mut$FldType -$#if exist nil typedefProxyArrayNew +$#if exist else typedefProxyArrayNew `, // ******************************* "typedefProxyArrayNew": ` @@ -82,7 +82,7 @@ func (a $proxy) Get$FldType(index int32) $mut$FldType { // ******************************* "typedefProxyMap": ` $#set proxy Map$FldMapKey$+To$mut$FldType -$#if exist nil typedefProxyMapNew +$#if exist else typedefProxyMapNew `, // ******************************* "typedefProxyMapNew": ` diff --git a/tools/schema/generator/rstemplates/alltemplates.go b/tools/schema/generator/rstemplates/alltemplates.go new file mode 100644 index 0000000000..0d59b20ae3 --- /dev/null +++ b/tools/schema/generator/rstemplates/alltemplates.go @@ -0,0 +1,64 @@ +package rstemplates + +var rsCommon = map[string]string{ + // ******************************* + "rsHeader": ` +$#if core useCore useWasmLib +`, + // ******************************* + "modParams": ` +mod params; +`, + // ******************************* + "modResults": ` +mod results; +`, + // ******************************* + "modStructs": ` +mod structs; +`, + // ******************************* + "modTypeDefs": ` +mod typedefs; +`, + // ******************************* + "useCore": ` +use core::*; +`, + // ******************************* + "useParams": ` +use crate::params::*; +`, + // ******************************* + "useResults": ` +use crate::results::*; +`, + // ******************************* + "useStructs": ` +use crate::structs::*; +`, + // ******************************* + "useTypeDefs": ` +use crate::typedefs::*; +`, + // ******************************* + "useWasmLib": ` +use wasmlib::*; +`, +} + +var RsTemplates = []map[string]string{ + rsCommon, + constsRs, + contractRs, + funcsRs, + keysRs, + libRs, + mainRs, + paramsRs, + proxyRs, + resultsRs, + stateRs, + structsRs, + typedefsRs, +} diff --git a/tools/schema/generator/rstemplates/consts.go b/tools/schema/generator/rstemplates/consts.go new file mode 100644 index 0000000000..b66d878ea4 --- /dev/null +++ b/tools/schema/generator/rstemplates/consts.go @@ -0,0 +1,55 @@ +package rstemplates + +var constsRs = map[string]string{ + // ******************************* + "consts.rs": ` +// @formatter:off + +#![allow(dead_code)] + +$#emit rsHeader + +pub const SC_NAME: &str = "$scName"; +pub const SC_DESCRIPTION: &str = "$scDesc"; +pub const HSC_NAME: ScHname = ScHname(0x$hscName); +$#if params constParams +$#if results constResults +$#if state constState + +$#each func constFunc + +$#each func constHFunc + +// @formatter:on +`, + // ******************************* + "constParams": ` + +$#set constPrefix PARAM_ +$#each params constField +`, + // ******************************* + "constResults": ` + +$#set constPrefix RESULT_ +$#each results constField +`, + // ******************************* + "constState": ` + +$#set constPrefix STATE_ +$#each state constField +`, + // ******************************* + "constField": ` +pub const $constPrefix$FLD_NAME: &str = "$fldAlias"; +`, + // ******************************* + "constFunc": ` +pub const $KIND$+_$FUNC_NAME: &str = "$funcName"; +`, + // ******************************* + "constHFunc": ` +pub const H$KIND$+_$FUNC_NAME: ScHname = ScHname(0x$funcHName); +`, +} diff --git a/tools/schema/generator/rstemplates/contract.go b/tools/schema/generator/rstemplates/contract.go new file mode 100644 index 0000000000..0409aee771 --- /dev/null +++ b/tools/schema/generator/rstemplates/contract.go @@ -0,0 +1,79 @@ +package rstemplates + +var contractRs = map[string]string{ + // ******************************* + "contract.rs": ` +// @formatter:off + +#![allow(dead_code)] + +use std::ptr; + +use wasmlib::*; +$#if core else ContractUses +$#each func FuncNameCall + +pub struct ScFuncs { +} + +impl ScFuncs { +$#each func FuncNameForCall +} + +// @formatter:on +`, + // ******************************* + "ContractUses": ` + +use crate::consts::*; +$#if params useParams +$#if results useResults +`, + // ******************************* + "FuncNameCall": ` + +pub struct $FuncName$+Call { + pub func: Sc$initFunc$Kind, +$#if param MutableFuncNameParams +$#if result ImmutableFuncNameResults +} +`, + // ******************************* + "MutableFuncNameParams": ` + pub params: Mutable$FuncName$+Params, +`, + // ******************************* + "ImmutableFuncNameResults": ` + pub results: Immutable$FuncName$+Results, +`, + // ******************************* + "FuncNameForCall": ` + pub fn $func_name(_ctx: & dyn Sc$Kind$+CallContext) -> $FuncName$+Call { +$#if ptrs setPtrs noPtrs + } +`, + // ******************************* + "setPtrs": ` + let mut f = $FuncName$+Call { + func: Sc$initFunc$Kind::new(HSC_NAME, H$KIND$+_$FUNC_NAME), +$#if param FuncNameParamsInit +$#if result FuncNameResultsInit + }; + f.func.set_ptrs($paramsID, $resultsID); + f +`, + // ******************************* + "FuncNameParamsInit": ` + params: Mutable$FuncName$+Params { id: 0 }, +`, + // ******************************* + "FuncNameResultsInit": ` + results: Immutable$FuncName$+Results { id: 0 }, +`, + // ******************************* + "noPtrs": ` + $FuncName$+Call { + func: Sc$initFunc$Kind::new(HSC_NAME, H$KIND$+_$FUNC_NAME), + } +`, +} diff --git a/tools/schema/generator/rstemplates/funcs.go b/tools/schema/generator/rstemplates/funcs.go new file mode 100644 index 0000000000..ce9d4c13e4 --- /dev/null +++ b/tools/schema/generator/rstemplates/funcs.go @@ -0,0 +1,37 @@ +package rstemplates + +var funcsRs = map[string]string{ + // ******************************* + "funcs.rs": ` +use wasmlib::*; + +use crate::*; +use crate::contract::*; +$#if structs useStructs +$#if typedefs useTypeDefs +$#each func funcSignature +`, + // ******************************* + "funcSignature": ` + +pub fn $kind&+_$func_name(ctx: &Sc$Kind$+Context, f: &$FuncName$+Context) { +$#func funcSignature +} +`, + // ******************************* + "funcInit": ` + if f.params.owner().exists() { + f.state.owner().set_value(&f.params.owner().value()); + return; + } + f.state.owner().set_value(&ctx.contract_creator()); +`, + // ******************************* + "getOwner": ` + f.results.owner().set_value(&f.state.owner().value()); +`, + // ******************************* + "setOwner": ` + f.state.owner().set_value(&f.params.owner().value()); +`, +} diff --git a/tools/schema/generator/rstemplates/keys.go b/tools/schema/generator/rstemplates/keys.go new file mode 100644 index 0000000000..367e64cfc1 --- /dev/null +++ b/tools/schema/generator/rstemplates/keys.go @@ -0,0 +1,50 @@ +package rstemplates + +var keysRs = map[string]string{ + // ******************************* + "keys.rs": ` +// @formatter:off + +#![allow(dead_code)] + +use wasmlib::*; + +use crate::*; + +$#set constPrefix PARAM_ +$#each params constFieldIdx +$#set constPrefix RESULT_ +$#each results constFieldIdx +$#set constPrefix STATE_ +$#each state constFieldIdx + +pub const KEY_MAP_LEN: usize = $maxIndex; + +pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ +$#set constPrefix PARAM_ +$#each params constFieldKey +$#set constPrefix RESULT_ +$#each results constFieldKey +$#set constPrefix STATE_ +$#each state constFieldKey +]; + +pub static mut IDX_MAP: [Key32; KEY_MAP_LEN] = [Key32(0); KEY_MAP_LEN]; + +pub fn idx_map(idx: usize) -> Key32 { + unsafe { + IDX_MAP[idx] + } +} + +// @formatter:on +`, + // ******************************* + "constFieldIdx": ` +pub(crate) const IDX_$constPrefix$FLD_NAME: usize = $fldIndex; +`, + // ******************************* + "constFieldKey": ` + $constPrefix$FLD_NAME, +`, +} diff --git a/tools/schema/generator/rstemplates/lib.go b/tools/schema/generator/rstemplates/lib.go new file mode 100644 index 0000000000..20714a6d47 --- /dev/null +++ b/tools/schema/generator/rstemplates/lib.go @@ -0,0 +1,128 @@ +package rstemplates + +var libRs = map[string]string{ + // ******************************* + "lib.rs": ` +// @formatter:off + +#![allow(dead_code)] +#![allow(unused_imports)] + +use $package::*; +use wasmlib::*; +use wasmlib::host::*; + +use crate::consts::*; +use crate::keys::*; +$#if params useParams +$#if results useResults +use crate::state::*; + +mod consts; +mod contract; +mod keys; +$#if params modParams +$#if results modResults +mod state; +$#if structs modStructs +$#if typedefs modTypeDefs +mod $package; + +#[no_mangle] +fn on_load() { + let exports = ScExports::new(); +$#each func libExportFunc + + unsafe { + for i in 0..KEY_MAP_LEN { + IDX_MAP[i] = get_key_id_from_string(KEY_MAP[i]); + } + } +} +$#each func libThunk + +// @formatter:on +`, + // ******************************* + "libExportFunc": ` + exports.add_$kind($KIND$+_$FUNC_NAME, $kind$+_$func_name$+_thunk); +`, + // ******************************* + "libThunk": ` + +pub struct $FuncName$+Context { +$#if param ImmutableFuncNameParams +$#if result MutableFuncNameResults +$#if func MutablePackageState +$#if view ImmutablePackageState +} + +fn $kind$+_$func_name$+_thunk(ctx: &Sc$Kind$+Context) { + ctx.log("$package.$kind$FuncName"); +$#func accessCheck + let f = $FuncName$+Context { +$#if param ImmutableFuncNameParamsInit +$#if result MutableFuncNameResultsInit +$#if func MutablePackageStateInit +$#if view ImmutablePackageStateInit + }; +$#each mandatory requireMandatory + $kind$+_$func_name(ctx, &f); + ctx.log("$package.$kind$FuncName ok"); +} +`, + // ******************************* + "ImmutableFuncNameParams": ` + params: Immutable$FuncName$+Params, +`, + // ******************************* + "ImmutableFuncNameParamsInit": ` + params: Immutable$FuncName$+Params { + id: OBJ_ID_PARAMS, + }, +`, + // ******************************* + "MutableFuncNameResults": ` + results: Mutable$FuncName$+Results, +`, + // ******************************* + "MutableFuncNameResultsInit": ` + results: Mutable$FuncName$+Results { + id: OBJ_ID_RESULTS, + }, +`, + // ******************************* + "MutablePackageState": ` + state: Mutable$Package$+State, +`, + // ******************************* + "MutablePackageStateInit": ` + state: Mutable$Package$+State { + id: OBJ_ID_STATE, + }, +`, + // ******************************* + "ImmutablePackageState": ` + state: Immutable$Package$+State, +`, + // ******************************* + "ImmutablePackageStateInit": ` + state: Immutable$Package$+State { + id: OBJ_ID_STATE, + }, +`, + // ******************************* + "requireMandatory": ` + ctx.require(f.params.$fld_name().exists(), "missing mandatory $fldName"); +`, + // ******************************* + "grantForKey": ` + let access = ctx.state().get_agent_id("$grant"); + ctx.require(access.exists(), "access not set: $grant"); +`, + // ******************************* + "grantRequire": ` + ctx.require(ctx.caller() == $grant, "no permission"); + +`, +} diff --git a/tools/schema/generator/rstemplates/main.go b/tools/schema/generator/rstemplates/main.go new file mode 100644 index 0000000000..0c88cb23c2 --- /dev/null +++ b/tools/schema/generator/rstemplates/main.go @@ -0,0 +1,24 @@ +package rstemplates + +var mainRs = map[string]string{ + // ******************************* + "main.rs": ` +// +build wasm + +package main + +import "github.com/iotaledger/wasp/packages/vm/wasmclient" + +import "$module/rs/$package" + +func main() { +} + +//export on_load +func onLoad() { + h := &wasmclient.WasmVMHost{} + h.ConnectWasmHost() + $package.OnLoad() +} +`, +} diff --git a/tools/schema/generator/rstemplates/params.go b/tools/schema/generator/rstemplates/params.go new file mode 100644 index 0000000000..095e722d7a --- /dev/null +++ b/tools/schema/generator/rstemplates/params.go @@ -0,0 +1,47 @@ +package rstemplates + +var paramsRs = map[string]string{ + // ******************************* + "params.rs": ` +#![allow(dead_code)] +#![allow(unused_imports)] + +use wasmlib::*; +use wasmlib::host::*; +$#if core else paramsUses +$#each func paramsFunc +`, + // ******************************* + "paramsUses": ` + +use crate::*; +use crate::keys::*; +`, + // ******************************* + "paramsFunc": ` +$#if params paramsFuncParams +`, + // ******************************* + "paramsFuncParams": ` +$#set Kind PARAM_ +$#set mut Immutable +$#if param paramsProxyStruct +$#set mut Mutable +$#if param paramsProxyStruct +`, + // ******************************* + "paramsProxyStruct": ` +$#set TypeName $mut$FuncName$+Params +$#each param proxyContainers + +#[derive(Clone, Copy)] +pub struct $TypeName { + pub(crate) id: i32, +} + +impl $TypeName { +$#each param proxyMethods +} +`, +} + diff --git a/tools/schema/generator/rstemplates/proxy.go b/tools/schema/generator/rstemplates/proxy.go new file mode 100644 index 0000000000..b4aad9020b --- /dev/null +++ b/tools/schema/generator/rstemplates/proxy.go @@ -0,0 +1,68 @@ +package rstemplates + +var proxyRs = map[string]string{ + // ******************************* + "proxyContainers": ` +$#if array typedefProxyArray +$#if map typedefProxyMap +`, + // ******************************* + "proxyMethods": ` +$#set varID idx_map(IDX_$Kind$FLD_NAME) +$#if core setCoreVarID +$#if array proxyArray proxyMethods2 +`, + // ******************************* + "proxyMethods2": ` +$#if map proxyMap proxyMethods3 +`, + // ******************************* + "proxyMethods3": ` +$#if basetype proxyBaseType proxyNewType +`, + // ******************************* + "setCoreVarID": ` +$#set varID $Kind$FLD_NAME.KeyID() +`, + // ******************************* + "proxyArray": ` + + pub fn $fld_name(&self) -> ArrayOf$mut$FldType { + let arr_id = get_object_id(self.id, $varID, $ArrayTypeID | $FldTypeID); + ArrayOf$mut$FldType { obj_id: arr_id } + } +`, + // ******************************* + "proxyMap": ` +$#if this proxyMapThis proxyMapOther +`, + // ******************************* + "proxyMapThis": ` + + pub fn $fld_name(&self) -> Map$FldMapKey$+To$mut$FldType { + Map$FldMapKey$+To$mut$FldType { obj_id: self.id } + } +`, + // ******************************* + "proxyMapOther": `55544444.0 + + pub fn $fld_name(&self) -> Map$FldMapKey$+To$mut$FldType { + let map_id = get_object_id(self.id, $varID, TYPE_MAP); + Map$FldMapKey$+To$mut$FldType { obj_id: map_id } + } +`, + // ******************************* + "proxyBaseType": ` + + pub fn $fld_name(&self) -> Sc$mut$FldType { + Sc$mut$FldType::new(self.id, $varID) + } +`, + // ******************************* + "proxyNewType": ` + + pub fn $fld_name(&self) -> $mut$FldType { + $mut$FldType { obj_id: self.id, key_id: $varID } + } +`, +} diff --git a/tools/schema/generator/rstemplates/results.go b/tools/schema/generator/rstemplates/results.go new file mode 100644 index 0000000000..55a90a531e --- /dev/null +++ b/tools/schema/generator/rstemplates/results.go @@ -0,0 +1,48 @@ +package rstemplates + +var resultsRs = map[string]string{ + // ******************************* + "results.rs": ` +#![allow(dead_code)] +#![allow(unused_imports)] + +use wasmlib::*; +use wasmlib::host::*; +$#if core else resultsUses +$#each func resultsFunc +`, + // ******************************* + "resultsUses": ` + +use crate::*; +use crate::keys::*; +$#if structs useStructs +`, + // ******************************* + "resultsFunc": ` +$#if results resultsFuncResults +`, + // ******************************* + "resultsFuncResults": ` +$#set Kind RESULT_ +$#set mut Immutable +$#if result resultsProxyStruct +$#set mut Mutable +$#if result resultsProxyStruct +`, + // ******************************* + "resultsProxyStruct": ` +$#set TypeName $mut$FuncName$+Results +$#each result proxyContainers + +#[derive(Clone, Copy)] +pub struct $TypeName { + pub(crate) id: i32, +} + +impl $TypeName { +$#each result proxyMethods +} +`, +} + diff --git a/tools/schema/generator/rstemplates/state.go b/tools/schema/generator/rstemplates/state.go new file mode 100644 index 0000000000..33cb2dd7d3 --- /dev/null +++ b/tools/schema/generator/rstemplates/state.go @@ -0,0 +1,41 @@ +package rstemplates + +var stateRs = map[string]string{ + // ******************************* + "state.rs": ` +#![allow(dead_code)] +#![allow(unused_imports)] + +use wasmlib::*; +use wasmlib::host::*; + +use crate::*; +use crate::keys::*; +$#if structs useStructs +$#if typedefs useTypeDefs +$#set Kind STATE_ +$#set mut Immutable +$#emit stateProxyStruct +$#set mut Mutable +$#emit stateProxyStruct +`, + // ******************************* + "stateProxyStruct": ` +$#set TypeName $mut$Package$+State +$#each state proxyContainers + +#[derive(Clone, Copy)] +pub struct $TypeName { + pub(crate) id: i32, +} +$#if state stateProxyImpl +`, + // ******************************* + "stateProxyImpl": ` + +impl $TypeName { +$#each state proxyMethods +} +`, +} + diff --git a/tools/schema/generator/rstemplates/structs.go b/tools/schema/generator/rstemplates/structs.go new file mode 100644 index 0000000000..b9a983013f --- /dev/null +++ b/tools/schema/generator/rstemplates/structs.go @@ -0,0 +1,80 @@ +package rstemplates + +var structsRs = map[string]string{ + // ******************************* + "structs.rs": ` +// @formatter:off + +#![allow(dead_code)] + +use wasmlib::*; +use wasmlib::host::*; +$#each structs structType + +// @formatter:on +`, + // ******************************* + "structType": ` + +pub struct $StrName { +$#each struct structField +} + +impl $StrName { + pub fn from_bytes(bytes: &[u8]) -> $StrName { + let mut decode = BytesDecoder::new(bytes); + $StrName { +$#each struct structDecode + } + } + + pub fn to_bytes(&self) -> Vec { + let mut encode = BytesEncoder::new(); +$#each struct structEncode + return encode.data(); + } +} +$#set mut Immutable +$#emit structMethods +$#set mut Mutable +$#emit structMethods +`, + // ******************************* + "structField": ` + pub $fld_name: $FldLangType, $FldComment +`, + // ******************************* + "structDecode": ` + $fld_name: decode.$fld_type(), +`, + // ******************************* + "structEncode": ` + encode.$fld_type($ref$+self.$fld_name); +`, + // ******************************* + "structMethods": ` + +pub struct $mut$StrName { + pub(crate) obj_id: i32, + pub(crate) key_id: Key32, +} + +impl $mut$StrName { + pub fn exists(&self) -> bool { + exists(self.obj_id, self.key_id, TYPE_BYTES) + } +$#if mut structMethodSetValue + + pub fn value(&self) -> $StrName { + $StrName::from_bytes(&get_bytes(self.obj_id, self.key_id, TYPE_BYTES)) + } +} +`, + // ******************************* + "structMethodSetValue": ` + + pub fn set_value(&self, value: &$StrName) { + set_bytes(self.obj_id, self.key_id, TYPE_BYTES, &value.to_bytes()); + } +`, +} diff --git a/tools/schema/generator/rstemplates/typedefs.go b/tools/schema/generator/rstemplates/typedefs.go new file mode 100644 index 0000000000..ca5fe2bd91 --- /dev/null +++ b/tools/schema/generator/rstemplates/typedefs.go @@ -0,0 +1,149 @@ +package rstemplates + +var typedefsRs = map[string]string{ + // ******************************* + "typedefs.rs": ` +// @formatter:off + +#![allow(dead_code)] + +use wasmlib::*; +use wasmlib::host::*; +$#if structs useStructs +$#each typedef typedefProxy + +// @formatter:on +`, + // ******************************* + "typedefProxy": ` +$#set mut Immutable +$#if array typedefProxyArray +$#if array typedefProxyAlias +$#if map typedefProxyMap +$#if map typedefProxyAlias +$#set mut Mutable +$#if array typedefProxyArray +$#if array typedefProxyAlias +$#if map typedefProxyMap +$#if map typedefProxyAlias +`, + // ******************************* + "typedefProxyAlias": ` + +pub type $mut$FldName = $proxy; +`, + // ******************************* + "typedefProxyArray": ` +$#set proxy ArrayOf$mut$FldType +$#if exist else typedefProxyArrayNew +`, + // ******************************* + "typedefProxyArrayNew": ` + +pub struct $proxy { + pub(crate) obj_id: i32, +} + +impl $proxy { +$#if mut typedefProxyArrayClear + pub fn length(&self) -> i32 { + get_length(self.obj_id) + } + +$#if basetype typedefProxyArrayNewBaseType typedefProxyArrayNewOtherType +} +$#set exist $proxy +`, + // ******************************* + "typedefProxyArrayClear": ` + pub fn clear(&self) { + clear(self.obj_id); + } + +`, + // ******************************* + "typedefProxyArrayNewBaseType": ` + pub fn get_$fld_type(&self, index: i32) -> Sc$mut$FldType { + Sc$mut$FldType::new(self.obj_id, Key32(index)) + } +`, + // ******************************* + "typedefProxyArrayNewOtherType": ` +$#set OldType $FldType +$#if typedef typedefProxyArrayNewOtherTypeTypeDef typedefProxyArrayNewOtherTypeStruct +`, + // ******************************* + "typedefProxyArrayNewOtherTypeTypeDef": ` +$#set varType TYPE_MAP +$#if array setVarTypeArray + + pub fn Get$OldType(&self, index: i32) -> $mut$OldType { + let sub_id = get_object_id(self.obj_id, Key32(index), $varType); + $mut$OldType { obj_id: sub_id } + } +`, + // ******************************* + "typedefProxyArrayNewOtherTypeStruct": ` + pub fn get_$fld_type(&self, index: i32) -> $mut$FldType { + $mut$FldType { obj_id: self.obj_id, key_id: Key32(index) } + } +`, + // ******************************* + "typedefProxyMap": ` +$#set proxy Map$FldMapKey$+To$mut$FldType +$#if exist else typedefProxyMapNew +`, + // ******************************* + "typedefProxyMapNew": ` + +pub struct $proxy { + pub(crate) obj_id: i32, +} + +impl $proxy { +$#if mut typedefProxyMapClear +$#if basetype typedefProxyMapNewBaseType typedefProxyMapNewOtherType +} +$#set exist $proxy +`, + // ******************************* + "typedefProxyMapClear": ` + pub fn clear(&self) { + clear(self.obj_id); + } + +`, + // ******************************* + "typedefProxyMapNewBaseType": ` + pub fn get_$fld_type(&self, key: $FldMapKeyLangType) -> Sc$mut$FldType { + Sc$mut$FldType::new(self.obj_id, key.get_key_id()) + } +`, + // ******************************* + "typedefProxyMapNewOtherType": ` +$#set old_type $fld_type +$#set OldType $FldType +$#set OldMapKeyLangType $FldMapKeyLangType +$#set OldMapKeyKey $FldMapKeyKey +$#if typedef typedefProxyMapNewOtherTypeTypeDef typedefProxyMapNewOtherTypeStruct +`, + // ******************************* + "typedefProxyMapNewOtherTypeTypeDef": ` +$#set varType TYPE_MAP +$#if array setVarTypeArray + pub fn get_$old_type(&self, key: $OldMapKeyLangType) -> $mut$OldType { + let sub_id = get_object_id(self.obj_id, key.get_key_id(), $varType); + $mut$OldType { obj_id: sub_id } + } +`, + // ******************************* + "typedefProxyMapNewOtherTypeStruct": ` + pub fn get_$old_type(&self, key: $OldMapKeyLangType) -> $mut$OldType { + $mut$OldType { obj_id: self.obj_id, key_id: key.get_key_id() } + } +`, + // ******************************* + "setVarTypeArray": ` +$#set varType $ArrayTypeID$space|$space$FldTypeID +`, +} diff --git a/tools/schema/generator/templates.go b/tools/schema/generator/templates.go index 1e4ddffe07..337e51d74a 100644 --- a/tools/schema/generator/templates.go +++ b/tools/schema/generator/templates.go @@ -1,6 +1,9 @@ package generator var templates = map[string]string{ + // ******************************* + "else": ` +`, // ******************************* "nil": ` `, diff --git a/tools/schema/generator/tstemplates/alltemplates.go b/tools/schema/generator/tstemplates/alltemplates.go new file mode 100644 index 0000000000..ea02445e51 --- /dev/null +++ b/tools/schema/generator/tstemplates/alltemplates.go @@ -0,0 +1,34 @@ +package tstemplates + +var tsCommon = map[string]string{ + // ******************************* + "tsPackage": ` +package $package +`, + // ******************************* + "importWasmLib": ` + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/ts/wasmlib" +`, + // ******************************* + "tsHeader": ` +$#emit tsPackage +$#emit importWasmLib +`, +} + +var TsTemplates = []map[string]string{ + tsCommon, + constsTs, + contractTs, + funcsTs, + keysTs, + libTs, + mainTs, + paramsTs, + proxyTs, + resultsTs, + stateTs, + structsTs, + typedefsTs, +} diff --git a/tools/schema/generator/tstemplates/consts.go b/tools/schema/generator/tstemplates/consts.go new file mode 100644 index 0000000000..d8bc710ca3 --- /dev/null +++ b/tools/schema/generator/tstemplates/consts.go @@ -0,0 +1,61 @@ +package tstemplates + +var constsTs = map[string]string{ + // ******************************* + "consts.ts": ` +$#emit tsHeader + +const ( + ScName = "$scName" + ScDescription = "$scDesc" + HScName = wasmlib.ScHname(0x$hscName) +) +$#if params constParams +$#if results constResults +$#if state constState + +const ( +$#each func constFunc +) + +const ( +$#each func constHFunc +) +`, + // ******************************* + "constParams": ` + +const ( +$#set constPrefix "Param" +$#each params constField +) +`, + // ******************************* + "constResults": ` + +const ( +$#set constPrefix "Result" +$#each results constField +) +`, + // ******************************* + "constState": ` + +const ( +$#set constPrefix "State" +$#each state constField +) +`, + // ******************************* + "constField": ` + $constPrefix$FldName = wasmlib.Key("$fldAlias") +`, + // ******************************* + "constFunc": ` + $Kind$FuncName = "$funcName" +`, + // ******************************* + "constHFunc": ` + H$Kind$FuncName = wasmlib.ScHname(0x$funcHName) +`, +} diff --git a/tools/schema/generator/tstemplates/contract.go b/tools/schema/generator/tstemplates/contract.go new file mode 100644 index 0000000000..8077e440b4 --- /dev/null +++ b/tools/schema/generator/tstemplates/contract.go @@ -0,0 +1,61 @@ +package tstemplates + +var contractTs = map[string]string{ + // ******************************* + "contract.ts": ` +$#emit tsHeader +$#each func FuncNameCall + +type Funcs struct{} + +var ScFuncs Funcs +$#each func FuncNameForCall +$#if core coreOnload +`, + // ******************************* + "FuncNameCall": ` + +type $FuncName$+Call struct { + Func *wasmlib.Sc$initFunc$Kind +$#if param MutableFuncNameParams +$#if result ImmutableFuncNameResults +} +`, + // ******************************* + "MutableFuncNameParams": ` + Params Mutable$FuncName$+Params +`, + // ******************************* + "ImmutableFuncNameResults": ` + Results Immutable$FuncName$+Results +`, + // ******************************* + "FuncNameForCall": ` + +func (sc Funcs) $FuncName(ctx wasmlib.Sc$Kind$+CallContext) *$FuncName$+Call { +$#if ptrs setPtrs noPtrs +} +`, + // ******************************* + "coreOnload": ` + +func OnLoad() { + exports := wasmlib.NewScExports() +$#each func coreExportFunc +} +`, + // ******************************* + "coreExportFunc": ` + exports.Add$Kind($Kind$FuncName, wasmlib.$Kind$+Error) +`, + // ******************************* + "setPtrs": ` + f := &$FuncName$+Call{Func: wasmlib.NewSc$initFunc$Kind(ctx, HScName, H$Kind$FuncName$initMap)} + f.Func.SetPtrs($paramsID, $resultsID) + return f +`, + // ******************************* + "noPtrs": ` + return &$FuncName$+Call{Func: wasmlib.NewSc$initFunc$Kind(ctx, HScName, H$Kind$FuncName$initMap)} +`, +} diff --git a/tools/schema/generator/tstemplates/funcs.go b/tools/schema/generator/tstemplates/funcs.go new file mode 100644 index 0000000000..d2e5b629dd --- /dev/null +++ b/tools/schema/generator/tstemplates/funcs.go @@ -0,0 +1,32 @@ +package tstemplates + +var funcsTs = map[string]string{ + // ******************************* + "funcs.ts": ` +$#emit tsHeader +$#each func funcSignature +`, + // ******************************* + "funcSignature": ` + +func $kind$FuncName(ctx wasmlib.Sc$Kind$+Context, f *$FuncName$+Context) { +$#func funcSignature +} +`, + // ******************************* + "funcInit": ` + if f.Params.Owner().Exists() { + f.State.Owner().SetValue(f.Params.Owner().Value()) + return + } + f.State.Owner().SetValue(ctx.ContractCreator()) +`, + // ******************************* + "getOwner": ` + f.Results.Owner().SetValue(f.State.Owner().Value()) +`, + // ******************************* + "setOwner": ` + f.State.Owner().SetValue(f.Params.Owner().Value()) +`, +} diff --git a/tools/schema/generator/tstemplates/keys.go b/tools/schema/generator/tstemplates/keys.go new file mode 100644 index 0000000000..cbf2a090b6 --- /dev/null +++ b/tools/schema/generator/tstemplates/keys.go @@ -0,0 +1,38 @@ +package tstemplates + +var keysTs = map[string]string{ + // ******************************* + "keys.ts": ` +$#emit tsHeader + +const ( +$#set constPrefix "Param" +$#each params constFieldIdx +$#set constPrefix "Result" +$#each results constFieldIdx +$#set constPrefix "State" +$#each state constFieldIdx +) + +const keyMapLen = $maxIndex + +var keyMap = [keyMapLen]wasmlib.Key{ +$#set constPrefix "Param" +$#each params constFieldKey +$#set constPrefix "Result" +$#each results constFieldKey +$#set constPrefix "State" +$#each state constFieldKey +} + +var idxMap [keyMapLen]wasmlib.Key32 +`, + // ******************************* + "constFieldIdx": ` + Idx$constPrefix$FldName = $fldIndex +`, + // ******************************* + "constFieldKey": ` + $constPrefix$FldName, +`, +} diff --git a/tools/schema/generator/tstemplates/lib.go b/tools/schema/generator/tstemplates/lib.go new file mode 100644 index 0000000000..df911aa435 --- /dev/null +++ b/tools/schema/generator/tstemplates/lib.go @@ -0,0 +1,101 @@ +package tstemplates + +var libTs = map[string]string{ + // ******************************* + "lib.ts": ` +//nolint:dupl +$#emit tsHeader + +func OnLoad() { + exports := wasmlib.NewScExports() +$#each func libExportFunc + + for i, key := range keyMap { + idxMap[i] = key.KeyID() + } +} +$#each func libThunk +`, + // ******************************* + "libExportFunc": ` + exports.Add$Kind($Kind$FuncName, $kind$FuncName$+Thunk) +`, + // ******************************* + "libThunk": ` + +type $FuncName$+Context struct { +$#if param ImmutableFuncNameParams +$#if result MutableFuncNameResults +$#if func MutablePackageState +$#if view ImmutablePackageState +} + +func $kind$FuncName$+Thunk(ctx wasmlib.Sc$Kind$+Context) { + ctx.Log("$package.$kind$FuncName") +$#func accessCheck + f := &$FuncName$+Context{ +$#if param ImmutableFuncNameParamsInit +$#if result MutableFuncNameResultsInit +$#if func MutablePackageStateInit +$#if view ImmutablePackageStateInit + } +$#each mandatory requireMandatory + $kind$FuncName(ctx, f) + ctx.Log("$package.$kind$FuncName ok") +} +`, + // ******************************* + "ImmutableFuncNameParams": ` + Params Immutable$FuncName$+Params +`, + // ******************************* + "ImmutableFuncNameParamsInit": ` + Params: Immutable$FuncName$+Params{ + id: wasmlib.OBJ_ID_PARAMS, + }, +`, + // ******************************* + "MutableFuncNameResults": ` + Results Mutable$FuncName$+Results +`, + // ******************************* + "MutableFuncNameResultsInit": ` + Results: Mutable$FuncName$+Results{ + id: wasmlib.OBJ_ID_RESULTS, + }, +`, + // ******************************* + "MutablePackageState": ` + State Mutable$Package$+State +`, + // ******************************* + "MutablePackageStateInit": ` + State: Mutable$Package$+State{ + id: wasmlib.OBJ_ID_STATE, + }, +`, + // ******************************* + "ImmutablePackageState": ` + State Immutable$Package$+State +`, + // ******************************* + "ImmutablePackageStateInit": ` + State: Immutable$Package$+State{ + id: wasmlib.OBJ_ID_STATE, + }, +`, + // ******************************* + "requireMandatory": ` + ctx.Require(f.Params.$FldName().Exists(), "missing mandatory $fldName") +`, + // ******************************* + "grantForKey": ` + access := ctx.State().GetAgentID(wasmlib.Key("$grant")) + ctx.Require(access.Exists(), "access not set: $grant") +`, + // ******************************* + "grantRequire": ` + ctx.Require(ctx.Caller() == $grant, "no permission") + +`, +} diff --git a/tools/schema/generator/tstemplates/main.go b/tools/schema/generator/tstemplates/main.go new file mode 100644 index 0000000000..6e28a60dd3 --- /dev/null +++ b/tools/schema/generator/tstemplates/main.go @@ -0,0 +1,24 @@ +package tstemplates + +var mainTs = map[string]string{ + // ******************************* + "main.ts": ` +// +build wasm + +package main + +import "github.com/iotaledger/wasp/packages/vm/wasmclient" + +import "$module/ts/$package" + +func main() { +} + +//export on_load +func onLoad() { + h := &wasmclient.WasmVMHost{} + h.ConnectWasmHost() + $package.OnLoad() +} +`, +} diff --git a/tools/schema/generator/tstemplates/params.go b/tools/schema/generator/tstemplates/params.go new file mode 100644 index 0000000000..2058c719c3 --- /dev/null +++ b/tools/schema/generator/tstemplates/params.go @@ -0,0 +1,32 @@ +package tstemplates + +var paramsTs = map[string]string{ + // ******************************* + "params.ts": ` +$#emit tsHeader +$#each func paramsFunc +`, + // ******************************* + "paramsFunc": ` +$#if params paramsFuncParams +`, + // ******************************* + "paramsFuncParams": ` +$#set Kind Param +$#set mut Immutable +$#if param paramsProxyStruct +$#set mut Mutable +$#if param paramsProxyStruct +`, + // ******************************* + "paramsProxyStruct": ` +$#set TypeName $mut$FuncName$+Params +$#each param proxyContainers + +type $TypeName struct { + id int32 +} +$#each param proxyMethods +`, +} + diff --git a/tools/schema/generator/tstemplates/proxy.go b/tools/schema/generator/tstemplates/proxy.go new file mode 100644 index 0000000000..1eedce3ee8 --- /dev/null +++ b/tools/schema/generator/tstemplates/proxy.go @@ -0,0 +1,68 @@ +package tstemplates + +var proxyTs = map[string]string{ + // ******************************* + "proxyContainers": ` +$#if array typedefProxyArray +$#if map typedefProxyMap +`, + // ******************************* + "proxyMethods": ` +$#set varID idxMap[Idx$Kind$FldName] +$#if core setCoreVarID +$#if array proxyArray proxyMethods2 +`, + // ******************************* + "proxyMethods2": ` +$#if map proxyMap proxyMethods3 +`, + // ******************************* + "proxyMethods3": ` +$#if basetype proxyBaseType proxyNewType +`, + // ******************************* + "setCoreVarID": ` +$#set varID $Kind$FldName.KeyID() +`, + // ******************************* + "proxyArray": ` + +func (s $TypeName) $FldName() ArrayOf$mut$FldType { + arrID := wasmlib.GetObjectID(s.id, $varID, $ArrayTypeID|$FldTypeID) + return ArrayOf$mut$FldType{objID: arrID} +} +`, + // ******************************* + "proxyMap": ` +$#if this proxyMapThis proxyMapOther +`, + // ******************************* + "proxyMapThis": ` + +func (s $TypeName) $FldName() Map$FldMapKey$+To$mut$FldType { + return Map$FldMapKey$+To$mut$FldType{objID: s.id} +} +`, + // ******************************* + "proxyMapOther": `55544444.0 + +func (s $TypeName) $FldName() Map$FldMapKey$+To$mut$FldType { + mapID := wasmlib.GetObjectID(s.id, $varID, wasmlib.TYPE_MAP) + return Map$FldMapKey$+To$mut$FldType{objID: mapID} +} +`, + // ******************************* + "proxyBaseType": ` + +func (s $TypeName) $FldName() wasmlib.Sc$mut$FldType { + return wasmlib.NewSc$mut$FldType(s.id, $varID) +} +`, + // ******************************* + "proxyNewType": ` + +func (s $TypeName) $FldName() $mut$FldType { + return $mut$FldType{objID: s.id, keyID: $varID} +} +`, +} diff --git a/tools/schema/generator/tstemplates/results.go b/tools/schema/generator/tstemplates/results.go new file mode 100644 index 0000000000..e852b40712 --- /dev/null +++ b/tools/schema/generator/tstemplates/results.go @@ -0,0 +1,32 @@ +package tstemplates + +var resultsTs = map[string]string{ + // ******************************* + "results.ts": ` +$#emit tsHeader +$#each func resultsFunc +`, + // ******************************* + "resultsFunc": ` +$#if results resultsFuncResults +`, + // ******************************* + "resultsFuncResults": ` +$#set Kind Result +$#set mut Immutable +$#if result resultsProxyStruct +$#set mut Mutable +$#if result resultsProxyStruct +`, + // ******************************* + "resultsProxyStruct": ` +$#set TypeName $mut$FuncName$+Results +$#each result proxyContainers + +type $TypeName struct { + id int32 +} +$#each result proxyMethods +`, +} + diff --git a/tools/schema/generator/tstemplates/state.go b/tools/schema/generator/tstemplates/state.go new file mode 100644 index 0000000000..3dc4431ad6 --- /dev/null +++ b/tools/schema/generator/tstemplates/state.go @@ -0,0 +1,25 @@ +package tstemplates + +var stateTs = map[string]string{ + // ******************************* + "state.ts": ` +$#emit tsPackage +$#if state importWasmLib +$#set Kind State +$#set mut Immutable +$#emit stateProxyStruct +$#set mut Mutable +$#emit stateProxyStruct +`, + // ******************************* + "stateProxyStruct": ` +$#set TypeName $mut$Package$+State +$#each state proxyContainers + +type $TypeName struct { + id int32 +} +$#each state proxyMethods +`, +} + diff --git a/tools/schema/generator/tstemplates/structs.go b/tools/schema/generator/tstemplates/structs.go new file mode 100644 index 0000000000..3212f39de9 --- /dev/null +++ b/tools/schema/generator/tstemplates/structs.go @@ -0,0 +1,70 @@ +package tstemplates + +var structsTs = map[string]string{ + // ******************************* + "structs.ts": ` +$#emit tsHeader +$#each structs structType +`, + // ******************************* + "structType": ` + +type $StrName struct { +$#each struct structField +} + +func New$StrName$+FromBytes(bytes []byte) *$StrName { + decode := wasmlib.NewBytesDecoder(bytes) + data := &$StrName$+{} +$#each struct structDecode + decode.Close() + return data +} + +func (o *$StrName) Bytes() []byte { + return wasmlib.NewBytesEncoder(). +$#each struct structEncode + Data() +} +$#set mut Immutable +$#emit structMethods +$#set mut Mutable +$#emit structMethods +`, + // ******************************* + "structField": ` + $FldName $FldLangType $FldComment +`, + // ******************************* + "structDecode": ` + data.$FldName = decode.$FldType() +`, + // ******************************* + "structEncode": ` + $FldType(o.$FldName). +`, + // ******************************* + "structMethods": ` + +type $mut$StrName struct { + objID int32 + keyID wasmlib.Key32 +} + +func (o $mut$StrName) Exists() bool { + return wasmlib.Exists(o.objID, o.keyID, wasmlib.TYPE_BYTES) +} +$#if mut structMethodSetValue + +func (o $mut$StrName) Value() *$StrName { + return New$StrName$+FromBytes(wasmlib.GetBytes(o.objID, o.keyID, wasmlib.TYPE_BYTES)) +} +`, + // ******************************* + "structMethodSetValue": ` + +func (o $mut$StrName) SetValue(value *$StrName) { + wasmlib.SetBytes(o.objID, o.keyID, wasmlib.TYPE_BYTES, value.Bytes()) +} +`, +} diff --git a/tools/schema/generator/tstemplates/typedefs.go b/tools/schema/generator/tstemplates/typedefs.go new file mode 100644 index 0000000000..a64b2eaa99 --- /dev/null +++ b/tools/schema/generator/tstemplates/typedefs.go @@ -0,0 +1,139 @@ +package tstemplates + +var typedefsTs = map[string]string{ + // ******************************* + "typedefs.ts": ` +$#emit tsHeader +$#each typedef typedefProxy +`, + // ******************************* + "typedefProxy": ` +$#set mut Immutable +$#if array typedefProxyArray +$#if array typedefProxyAlias +$#if map typedefProxyMap +$#if map typedefProxyAlias +$#set mut Mutable +$#if array typedefProxyArray +$#if array typedefProxyAlias +$#if map typedefProxyMap +$#if map typedefProxyAlias +`, + // ******************************* + "typedefProxyAlias": ` + +type $mut$FldName = $proxy +`, + // ******************************* + "typedefProxyArray": ` +$#set proxy ArrayOf$mut$FldType +$#if exist else typedefProxyArrayNew +`, + // ******************************* + "typedefProxyArrayNew": ` + +type $proxy struct { + objID int32 +} +$#if mut typedefProxyArrayClear + +func (a $proxy) Length() int32 { + return wasmlib.GetLength(a.objID) +} +$#if basetype typedefProxyArrayNewBaseType typedefProxyArrayNewOtherType +$#set exist $proxy +`, + // ******************************* + "typedefProxyArrayClear": ` + +func (a $proxy) Clear() { + wasmlib.Clear(a.objID) +} +`, + // ******************************* + "typedefProxyArrayNewBaseType": ` + +func (a $proxy) Get$FldType(index int32) wasmlib.Sc$mut$FldType { + return wasmlib.NewSc$mut$FldType(a.objID, wasmlib.Key32(index)) +} +`, + // ******************************* + "typedefProxyArrayNewOtherType": ` +$#set OldType $FldType +$#if typedef typedefProxyArrayNewOtherTypeTypeDef typedefProxyArrayNewOtherTypeStruct +`, + // ******************************* + "typedefProxyArrayNewOtherTypeTypeDef": ` +$#set varType wasmlib.TYPE_MAP +$#if array setVarTypeArray + +func (a $proxy) Get$OldType(index int32) $mut$OldType { + subID := wasmlib.GetObjectID(a.objID, wasmlib.Key32(index), $varType) + return $mut$OldType{objID: subID} +} +`, + // ******************************* + "typedefProxyArrayNewOtherTypeStruct": ` + +func (a $proxy) Get$FldType(index int32) $mut$FldType { + return $mut$FldType{objID: a.objID, keyID: wasmlib.Key32(index)} +} +`, + // ******************************* + "typedefProxyMap": ` +$#set proxy Map$FldMapKey$+To$mut$FldType +$#if exist else typedefProxyMapNew +`, + // ******************************* + "typedefProxyMapNew": ` + +type $proxy struct { + objID int32 +} +$#if mut typedefProxyMapClear +$#if basetype typedefProxyMapNewBaseType typedefProxyMapNewOtherType +$#set exist $proxy +`, + // ******************************* + "typedefProxyMapClear": ` + +func (m $proxy) Clear() { + wasmlib.Clear(m.objID) +} +`, + // ******************************* + "typedefProxyMapNewBaseType": ` + +func (m $proxy) Get$FldType(key $FldMapKeyLangType) wasmlib.Sc$mut$FldType { + return wasmlib.NewSc$mut$FldType(m.objID, $FldMapKeyKey.KeyID()) +} +`, + // ******************************* + "typedefProxyMapNewOtherType": ` +$#set OldType $FldType +$#set OldMapKeyLangType $FldMapKeyLangType +$#set OldMapKeyKey $FldMapKeyKey +$#if typedef typedefProxyMapNewOtherTypeTypeDef typedefProxyMapNewOtherTypeStruct +`, + // ******************************* + "typedefProxyMapNewOtherTypeTypeDef": ` +$#set varType wasmlib.TYPE_MAP +$#if array setVarTypeArray + +func (m $proxy) Get$OldType(key $OldMapKeyLangType) $mut$OldType { + subID := wasmlib.GetObjectID(m.objID, $OldMapKeyKey.KeyID(), $varType) + return $mut$OldType{objID: subID} +} +`, + // ******************************* + "typedefProxyMapNewOtherTypeStruct": ` + +func (m $proxy) Get$FldType(key $FldMapKeyLangType) $mut$FldType { + return $mut$FldType{objID: m.objID, keyID: $FldMapKeyKey.KeyID()} +} +`, + // ******************************* + "setVarTypeArray": ` +$#set varType $ArrayTypeID|$FldTypeID +`, +} From 08187a6d85c355c80459e32699f4140a8e79fb5e Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Fri, 5 Nov 2021 13:07:46 -0700 Subject: [PATCH 028/198] Small bug fixes and added timestamp server demo --- contracts/wasm/Cargo.lock | 39 +++- contracts/wasm/Cargo.toml | 1 + contracts/wasm/dividend/src/state.rs | 2 +- contracts/wasm/erc20/src/state.rs | 2 +- contracts/wasm/erc20/src/typedefs.rs | 2 +- contracts/wasm/fairauction/src/state.rs | 6 +- contracts/wasm/fairauction/src/typedefs.rs | 2 +- contracts/wasm/testcore/src/results.rs | 4 +- contracts/wasm/testwasmlib/src/params.rs | 2 +- contracts/wasm/testwasmlib/src/state.rs | 2 +- contracts/wasm/timestamp/Cargo.toml | 22 ++ contracts/wasm/timestamp/LICENSE | 216 ++++++++++++++++++ contracts/wasm/timestamp/README.md | 5 + contracts/wasm/timestamp/go/main.go | 24 ++ .../wasm/timestamp/go/timestamp/consts.go | 30 +++ .../wasm/timestamp/go/timestamp/contract.go | 33 +++ contracts/wasm/timestamp/go/timestamp/keys.go | 24 ++ contracts/wasm/timestamp/go/timestamp/lib.go | 54 +++++ .../wasm/timestamp/go/timestamp/results.go | 26 +++ .../wasm/timestamp/go/timestamp/state.go | 26 +++ .../wasm/timestamp/go/timestamp/timestamp.go | 14 ++ contracts/wasm/timestamp/schema.yaml | 12 + contracts/wasm/timestamp/src/consts.rs | 28 +++ contracts/wasm/timestamp/src/contract.rs | 47 ++++ contracts/wasm/timestamp/src/keys.rs | 34 +++ contracts/wasm/timestamp/src/lib.rs | 76 ++++++ contracts/wasm/timestamp/src/params.rs | 59 +++++ contracts/wasm/timestamp/src/results.rs | 37 +++ contracts/wasm/timestamp/src/state.rs | 37 +++ contracts/wasm/timestamp/src/timestamp.rs | 14 ++ .../wasm/timestamp/test/timestamp_bg.wasm | Bin 0 -> 28126 bytes .../wasm/timestamp/test/timestamp_test.go | 14 ++ .../wasm/timestamp/ts/timestamp/consts.ts | 22 ++ .../wasm/timestamp/ts/timestamp/contract.ts | 41 ++++ .../wasm/timestamp/ts/timestamp/index.ts | 15 ++ contracts/wasm/timestamp/ts/timestamp/keys.ts | 19 ++ contracts/wasm/timestamp/ts/timestamp/lib.ts | 40 ++++ .../wasm/timestamp/ts/timestamp/params.ts | 37 +++ .../wasm/timestamp/ts/timestamp/results.ts | 23 ++ .../wasm/timestamp/ts/timestamp/state.ts | 23 ++ .../wasm/timestamp/ts/timestamp/timestamp.ts | 13 ++ .../wasm/timestamp/ts/timestamp/tsconfig.json | 4 + contracts/wasm/tokenregistry/src/state.rs | 2 +- .../vm/wasmlib/src/coreaccounts/results.rs | 4 +- packages/vm/wasmlib/src/coreblob/params.rs | 2 +- packages/vm/wasmlib/src/coreblob/results.rs | 4 +- packages/vm/wasmlib/src/coreroot/results.rs | 2 +- packages/vm/wasmsolo/solocontext.go | 16 +- tools/schema/generator/generator.go | 13 +- tools/schema/generator/generator_rust.go | 2 +- tools/schema/generator/schema.go | 3 + 51 files changed, 1139 insertions(+), 40 deletions(-) create mode 100644 contracts/wasm/timestamp/Cargo.toml create mode 100644 contracts/wasm/timestamp/LICENSE create mode 100644 contracts/wasm/timestamp/README.md create mode 100644 contracts/wasm/timestamp/go/main.go create mode 100644 contracts/wasm/timestamp/go/timestamp/consts.go create mode 100644 contracts/wasm/timestamp/go/timestamp/contract.go create mode 100644 contracts/wasm/timestamp/go/timestamp/keys.go create mode 100644 contracts/wasm/timestamp/go/timestamp/lib.go create mode 100644 contracts/wasm/timestamp/go/timestamp/results.go create mode 100644 contracts/wasm/timestamp/go/timestamp/state.go create mode 100644 contracts/wasm/timestamp/go/timestamp/timestamp.go create mode 100644 contracts/wasm/timestamp/schema.yaml create mode 100644 contracts/wasm/timestamp/src/consts.rs create mode 100644 contracts/wasm/timestamp/src/contract.rs create mode 100644 contracts/wasm/timestamp/src/keys.rs create mode 100644 contracts/wasm/timestamp/src/lib.rs create mode 100644 contracts/wasm/timestamp/src/params.rs create mode 100644 contracts/wasm/timestamp/src/results.rs create mode 100644 contracts/wasm/timestamp/src/state.rs create mode 100644 contracts/wasm/timestamp/src/timestamp.rs create mode 100644 contracts/wasm/timestamp/test/timestamp_bg.wasm create mode 100644 contracts/wasm/timestamp/test/timestamp_test.go create mode 100644 contracts/wasm/timestamp/ts/timestamp/consts.ts create mode 100644 contracts/wasm/timestamp/ts/timestamp/contract.ts create mode 100644 contracts/wasm/timestamp/ts/timestamp/index.ts create mode 100644 contracts/wasm/timestamp/ts/timestamp/keys.ts create mode 100644 contracts/wasm/timestamp/ts/timestamp/lib.ts create mode 100644 contracts/wasm/timestamp/ts/timestamp/params.ts create mode 100644 contracts/wasm/timestamp/ts/timestamp/results.ts create mode 100644 contracts/wasm/timestamp/ts/timestamp/state.ts create mode 100644 contracts/wasm/timestamp/ts/timestamp/timestamp.ts create mode 100644 contracts/wasm/timestamp/ts/timestamp/tsconfig.json diff --git a/contracts/wasm/Cargo.lock b/contracts/wasm/Cargo.lock index e8ccdfca85..107782c9da 100644 --- a/contracts/wasm/Cargo.lock +++ b/contracts/wasm/Cargo.lock @@ -34,7 +34,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib", + "wasmlib 0.1.0", "wee_alloc", ] @@ -44,7 +44,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib", + "wasmlib 0.1.0", "wee_alloc", ] @@ -54,7 +54,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib", + "wasmlib 0.1.0", "wee_alloc", ] @@ -64,7 +64,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib", + "wasmlib 0.1.0", "wee_alloc", ] @@ -74,7 +74,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib", + "wasmlib 0.1.0", "wee_alloc", ] @@ -84,7 +84,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib", + "wasmlib 0.1.0", "wee_alloc", ] @@ -94,7 +94,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib", + "wasmlib 0.1.0", "wee_alloc", ] @@ -175,7 +175,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib", + "wasmlib 0.1.0", "wee_alloc", ] @@ -185,7 +185,17 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib", + "wasmlib 0.1.0", + "wee_alloc", +] + +[[package]] +name = "timestamp" +version = "0.1.0" +dependencies = [ + "console_error_panic_hook", + "wasm-bindgen-test", + "wasmlib 0.1.0 (git+https://github.com/iotaledger/wasp?branch=develop)", "wee_alloc", ] @@ -195,7 +205,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib", + "wasmlib 0.1.0", "wee_alloc", ] @@ -303,6 +313,15 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "wasmlib" +version = "0.1.0" +source = "git+https://github.com/iotaledger/wasp?branch=develop#5a3a452307070ea2895e7c4da2f05989c662aad1" +dependencies = [ + "console_error_panic_hook", + "wasm-bindgen", +] + [[package]] name = "web-sys" version = "0.3.47" diff --git a/contracts/wasm/Cargo.toml b/contracts/wasm/Cargo.toml index 3c67490556..6bab15ed67 100644 --- a/contracts/wasm/Cargo.toml +++ b/contracts/wasm/Cargo.toml @@ -12,6 +12,7 @@ members = [ "inccounter", "testcore", "testwasmlib", + "timestamp", "tokenregistry", ] diff --git a/contracts/wasm/dividend/src/state.rs b/contracts/wasm/dividend/src/state.rs index b2334301a0..9f64495e08 100644 --- a/contracts/wasm/dividend/src/state.rs +++ b/contracts/wasm/dividend/src/state.rs @@ -87,7 +87,7 @@ pub struct MapAddressToMutableInt64 { impl MapAddressToMutableInt64 { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_int64(&self, key: &ScAddress) -> ScMutableInt64 { diff --git a/contracts/wasm/erc20/src/state.rs b/contracts/wasm/erc20/src/state.rs index 53e02ccc72..be0d8b17b3 100644 --- a/contracts/wasm/erc20/src/state.rs +++ b/contracts/wasm/erc20/src/state.rs @@ -53,7 +53,7 @@ pub struct MapAgentIDToMutableAllowancesForAgent { impl MapAgentIDToMutableAllowancesForAgent { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_allowances_for_agent(&self, key: &ScAgentID) -> MutableAllowancesForAgent { diff --git a/contracts/wasm/erc20/src/typedefs.rs b/contracts/wasm/erc20/src/typedefs.rs index 406956ec5e..fb7fd2ef39 100644 --- a/contracts/wasm/erc20/src/typedefs.rs +++ b/contracts/wasm/erc20/src/typedefs.rs @@ -30,7 +30,7 @@ pub struct MapAgentIDToMutableInt64 { impl MapAgentIDToMutableInt64 { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_int64(&self, key: &ScAgentID) -> ScMutableInt64 { diff --git a/contracts/wasm/fairauction/src/state.rs b/contracts/wasm/fairauction/src/state.rs index 6201943eb4..a92a7414d5 100644 --- a/contracts/wasm/fairauction/src/state.rs +++ b/contracts/wasm/fairauction/src/state.rs @@ -80,7 +80,7 @@ pub struct MapColorToMutableAuction { impl MapColorToMutableAuction { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_auction(&self, key: &ScColor) -> MutableAuction { @@ -94,7 +94,7 @@ pub struct MapColorToMutableBidderList { impl MapColorToMutableBidderList { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_bidder_list(&self, key: &ScColor) -> MutableBidderList { @@ -109,7 +109,7 @@ pub struct MapColorToMutableBids { impl MapColorToMutableBids { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_bids(&self, key: &ScColor) -> MutableBids { diff --git a/contracts/wasm/fairauction/src/typedefs.rs b/contracts/wasm/fairauction/src/typedefs.rs index 260aaebe7c..3083260ca5 100644 --- a/contracts/wasm/fairauction/src/typedefs.rs +++ b/contracts/wasm/fairauction/src/typedefs.rs @@ -68,7 +68,7 @@ pub struct MapAgentIDToMutableBid { impl MapAgentIDToMutableBid { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_bid(&self, key: &ScAgentID) -> MutableBid { diff --git a/contracts/wasm/testcore/src/results.rs b/contracts/wasm/testcore/src/results.rs index 6c038b65fe..cde29ff864 100644 --- a/contracts/wasm/testcore/src/results.rs +++ b/contracts/wasm/testcore/src/results.rs @@ -181,7 +181,7 @@ pub struct MapStringToMutableInt64 { impl MapStringToMutableInt64 { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_int64(&self, key: &str) -> ScMutableInt64 { @@ -227,7 +227,7 @@ pub struct MapStringToMutableString { impl MapStringToMutableString { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_string(&self, key: &str) -> ScMutableString { diff --git a/contracts/wasm/testwasmlib/src/params.rs b/contracts/wasm/testwasmlib/src/params.rs index 2356f21b0d..b49cefa772 100644 --- a/contracts/wasm/testwasmlib/src/params.rs +++ b/contracts/wasm/testwasmlib/src/params.rs @@ -171,7 +171,7 @@ pub struct MapStringToMutableBytes { impl MapStringToMutableBytes { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_bytes(&self, key: &str) -> ScMutableBytes { diff --git a/contracts/wasm/testwasmlib/src/state.rs b/contracts/wasm/testwasmlib/src/state.rs index aa62142b2b..5aea95e28d 100644 --- a/contracts/wasm/testwasmlib/src/state.rs +++ b/contracts/wasm/testwasmlib/src/state.rs @@ -44,7 +44,7 @@ pub struct MapStringToMutableStringArray { impl MapStringToMutableStringArray { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_string_array(&self, key: &str) -> MutableStringArray { diff --git a/contracts/wasm/timestamp/Cargo.toml b/contracts/wasm/timestamp/Cargo.toml new file mode 100644 index 0000000000..b2d4fb23c1 --- /dev/null +++ b/contracts/wasm/timestamp/Cargo.toml @@ -0,0 +1,22 @@ +[package] +name = "timestamp" +description = "Extremely simple timestamp server" +license = "Apache-2.0" +version = "0.1.0" +authors = ["John Doe "] +edition = "2018" +repository = "https://github.com/iotaledger/wasp" + +[lib] +crate-type = ["cdylib", "rlib"] + +[features] +default = ["console_error_panic_hook"] + +[dependencies] +wasmlib = { git = "https://github.com/iotaledger/wasp", branch = "develop" } +console_error_panic_hook = { version = "0.1.6", optional = true } +wee_alloc = { version = "0.4.5", optional = true } + +[dev-dependencies] +wasm-bindgen-test = "0.3.13" diff --git a/contracts/wasm/timestamp/LICENSE b/contracts/wasm/timestamp/LICENSE new file mode 100644 index 0000000000..d22c90e122 --- /dev/null +++ b/contracts/wasm/timestamp/LICENSE @@ -0,0 +1,216 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2019 IOTA Foundation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +For the errors package: + +Copyright (c) 2015, Dave Cheney +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/contracts/wasm/timestamp/README.md b/contracts/wasm/timestamp/README.md new file mode 100644 index 0000000000..5f93881307 --- /dev/null +++ b/contracts/wasm/timestamp/README.md @@ -0,0 +1,5 @@ +## timestamp + +Sample smart contract + + Extremely simple timestamp server. diff --git a/contracts/wasm/timestamp/go/main.go b/contracts/wasm/timestamp/go/main.go new file mode 100644 index 0000000000..24e856e140 --- /dev/null +++ b/contracts/wasm/timestamp/go/main.go @@ -0,0 +1,24 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +// +build wasm + +package main + +import "github.com/iotaledger/wasp/packages/vm/wasmclient" + +import "github.com/iotaledger/wasp/contracts/wasm/timestamp/go/timestamp" + +func main() { +} + +//export on_load +func onLoad() { + h := &wasmclient.WasmVMHost{} + h.ConnectWasmHost() + timestamp.OnLoad() +} diff --git a/contracts/wasm/timestamp/go/timestamp/consts.go b/contracts/wasm/timestamp/go/timestamp/consts.go new file mode 100644 index 0000000000..5c70770241 --- /dev/null +++ b/contracts/wasm/timestamp/go/timestamp/consts.go @@ -0,0 +1,30 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package timestamp + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +const ( + ScName = "timestamp" + ScDescription = "Extremely simple timestamp server" + HScName = wasmlib.ScHname(0x3988002e) +) + +const ResultTimestamp = wasmlib.Key("timestamp") + +const StateTimestamp = wasmlib.Key("timestamp") + +const ( + FuncNow = "now" + ViewGetTimestamp = "getTimestamp" +) + +const ( + HFuncNow = wasmlib.ScHname(0xd73b7fc9) + HViewGetTimestamp = wasmlib.ScHname(0x40c6376a) +) diff --git a/contracts/wasm/timestamp/go/timestamp/contract.go b/contracts/wasm/timestamp/go/timestamp/contract.go new file mode 100644 index 0000000000..e58a562fbd --- /dev/null +++ b/contracts/wasm/timestamp/go/timestamp/contract.go @@ -0,0 +1,33 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package timestamp + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +type NowCall struct { + Func *wasmlib.ScFunc +} + +type GetTimestampCall struct { + Func *wasmlib.ScView + Results ImmutableGetTimestampResults +} + +type Funcs struct{} + +var ScFuncs Funcs + +func (sc Funcs) Now(ctx wasmlib.ScFuncCallContext) *NowCall { + return &NowCall{Func: wasmlib.NewScFunc(ctx, HScName, HFuncNow)} +} + +func (sc Funcs) GetTimestamp(ctx wasmlib.ScViewCallContext) *GetTimestampCall { + f := &GetTimestampCall{Func: wasmlib.NewScView(ctx, HScName, HViewGetTimestamp)} + f.Func.SetPtrs(nil, &f.Results.id) + return f +} diff --git a/contracts/wasm/timestamp/go/timestamp/keys.go b/contracts/wasm/timestamp/go/timestamp/keys.go new file mode 100644 index 0000000000..f386ce7bf5 --- /dev/null +++ b/contracts/wasm/timestamp/go/timestamp/keys.go @@ -0,0 +1,24 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package timestamp + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +const ( + IdxResultTimestamp = 0 + IdxStateTimestamp = 1 +) + +const keyMapLen = 2 + +var keyMap = [keyMapLen]wasmlib.Key{ + ResultTimestamp, + StateTimestamp, +} + +var idxMap [keyMapLen]wasmlib.Key32 diff --git a/contracts/wasm/timestamp/go/timestamp/lib.go b/contracts/wasm/timestamp/go/timestamp/lib.go new file mode 100644 index 0000000000..bc42403aa1 --- /dev/null +++ b/contracts/wasm/timestamp/go/timestamp/lib.go @@ -0,0 +1,54 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package timestamp + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +func OnLoad() { + exports := wasmlib.NewScExports() + exports.AddFunc(FuncNow, funcNowThunk) + exports.AddView(ViewGetTimestamp, viewGetTimestampThunk) + + for i, key := range keyMap { + idxMap[i] = key.KeyID() + } +} + +type NowContext struct { + State MutabletimestampState +} + +func funcNowThunk(ctx wasmlib.ScFuncContext) { + ctx.Log("timestamp.funcNow") + f := &NowContext{ + State: MutabletimestampState{ + id: wasmlib.OBJ_ID_STATE, + }, + } + funcNow(ctx, f) + ctx.Log("timestamp.funcNow ok") +} + +type GetTimestampContext struct { + Results MutableGetTimestampResults + State ImmutabletimestampState +} + +func viewGetTimestampThunk(ctx wasmlib.ScViewContext) { + ctx.Log("timestamp.viewGetTimestamp") + f := &GetTimestampContext{ + Results: MutableGetTimestampResults{ + id: wasmlib.OBJ_ID_RESULTS, + }, + State: ImmutabletimestampState{ + id: wasmlib.OBJ_ID_STATE, + }, + } + viewGetTimestamp(ctx, f) + ctx.Log("timestamp.viewGetTimestamp ok") +} diff --git a/contracts/wasm/timestamp/go/timestamp/results.go b/contracts/wasm/timestamp/go/timestamp/results.go new file mode 100644 index 0000000000..cb8989f123 --- /dev/null +++ b/contracts/wasm/timestamp/go/timestamp/results.go @@ -0,0 +1,26 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package timestamp + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +type ImmutableGetTimestampResults struct { + id int32 +} + +func (s ImmutableGetTimestampResults) Timestamp() wasmlib.ScImmutableInt64 { + return wasmlib.NewScImmutableInt64(s.id, idxMap[IdxResultTimestamp]) +} + +type MutableGetTimestampResults struct { + id int32 +} + +func (s MutableGetTimestampResults) Timestamp() wasmlib.ScMutableInt64 { + return wasmlib.NewScMutableInt64(s.id, idxMap[IdxResultTimestamp]) +} diff --git a/contracts/wasm/timestamp/go/timestamp/state.go b/contracts/wasm/timestamp/go/timestamp/state.go new file mode 100644 index 0000000000..d57540232e --- /dev/null +++ b/contracts/wasm/timestamp/go/timestamp/state.go @@ -0,0 +1,26 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package timestamp + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +type ImmutabletimestampState struct { + id int32 +} + +func (s ImmutabletimestampState) Timestamp() wasmlib.ScImmutableInt64 { + return wasmlib.NewScImmutableInt64(s.id, idxMap[IdxStateTimestamp]) +} + +type MutabletimestampState struct { + id int32 +} + +func (s MutabletimestampState) Timestamp() wasmlib.ScMutableInt64 { + return wasmlib.NewScMutableInt64(s.id, idxMap[IdxStateTimestamp]) +} diff --git a/contracts/wasm/timestamp/go/timestamp/timestamp.go b/contracts/wasm/timestamp/go/timestamp/timestamp.go new file mode 100644 index 0000000000..f8af6b9764 --- /dev/null +++ b/contracts/wasm/timestamp/go/timestamp/timestamp.go @@ -0,0 +1,14 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +package timestamp + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +func funcNow(ctx wasmlib.ScFuncContext, f *NowContext) { + f.State.Timestamp().SetValue(ctx.Timestamp()) +} + +func viewGetTimestamp(ctx wasmlib.ScViewContext, f *GetTimestampContext) { + f.Results.Timestamp().SetValue(f.State.Timestamp().Value()) +} diff --git a/contracts/wasm/timestamp/schema.yaml b/contracts/wasm/timestamp/schema.yaml new file mode 100644 index 0000000000..aaad197bea --- /dev/null +++ b/contracts/wasm/timestamp/schema.yaml @@ -0,0 +1,12 @@ +name: timestamp +description: Extremely simple timestamp server +structs: {} +typedefs: {} +state: + timestamp: Int64 // last official timestamp generated +funcs: + now: +views: + getTimestamp: + results: + timestamp: Int64 // last official timestamp generated diff --git a/contracts/wasm/timestamp/src/consts.rs b/contracts/wasm/timestamp/src/consts.rs new file mode 100644 index 0000000000..276f261fc2 --- /dev/null +++ b/contracts/wasm/timestamp/src/consts.rs @@ -0,0 +1,28 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +// @formatter:off + +#![allow(dead_code)] + +use wasmlib::*; + +pub const SC_NAME: &str = "timestamp"; +pub const SC_DESCRIPTION: &str = "Extremely simple timestamp server"; +pub const HSC_NAME: ScHname = ScHname(0x3988002e); + +pub const RESULT_TIMESTAMP: &str = "timestamp"; + +pub const STATE_TIMESTAMP: &str = "timestamp"; + +pub const FUNC_NOW: &str = "now"; +pub const VIEW_GET_TIMESTAMP: &str = "getTimestamp"; + +pub const HFUNC_NOW: ScHname = ScHname(0xd73b7fc9); +pub const HVIEW_GET_TIMESTAMP: ScHname = ScHname(0x40c6376a); + +// @formatter:on diff --git a/contracts/wasm/timestamp/src/contract.rs b/contracts/wasm/timestamp/src/contract.rs new file mode 100644 index 0000000000..7b4b5e0a6b --- /dev/null +++ b/contracts/wasm/timestamp/src/contract.rs @@ -0,0 +1,47 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +// @formatter:off + +#![allow(dead_code)] + +use std::ptr; + +use wasmlib::*; + +use crate::consts::*; +use crate::results::*; + +pub struct NowCall { + pub func: ScFunc, +} + +pub struct GetTimestampCall { + pub func: ScView, + pub results: ImmutableGetTimestampResults, +} + +pub struct ScFuncs { +} + +impl ScFuncs { + pub fn now(_ctx: & dyn ScFuncCallContext) -> NowCall { + NowCall { + func: ScFunc::new(HSC_NAME, HFUNC_NOW), + } + } + pub fn get_timestamp(_ctx: & dyn ScViewCallContext) -> GetTimestampCall { + let mut f = GetTimestampCall { + func: ScView::new(HSC_NAME, HVIEW_GET_TIMESTAMP), + results: ImmutableGetTimestampResults { id: 0 }, + }; + f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); + f + } +} + +// @formatter:on diff --git a/contracts/wasm/timestamp/src/keys.rs b/contracts/wasm/timestamp/src/keys.rs new file mode 100644 index 0000000000..cb770de25a --- /dev/null +++ b/contracts/wasm/timestamp/src/keys.rs @@ -0,0 +1,34 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +// @formatter:off + +#![allow(dead_code)] + +use wasmlib::*; + +use crate::*; + +pub(crate) const IDX_RESULT_TIMESTAMP: usize = 0; +pub(crate) const IDX_STATE_TIMESTAMP: usize = 1; + +pub const KEY_MAP_LEN: usize = 2; + +pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ + RESULT_TIMESTAMP, + STATE_TIMESTAMP, +]; + +pub static mut IDX_MAP: [Key32; KEY_MAP_LEN] = [Key32(0); KEY_MAP_LEN]; + +pub fn idx_map(idx: usize) -> Key32 { + unsafe { + IDX_MAP[idx] + } +} + +// @formatter:on diff --git a/contracts/wasm/timestamp/src/lib.rs b/contracts/wasm/timestamp/src/lib.rs new file mode 100644 index 0000000000..9575f5bf11 --- /dev/null +++ b/contracts/wasm/timestamp/src/lib.rs @@ -0,0 +1,76 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +// @formatter:off + +#![allow(dead_code)] +#![allow(unused_imports)] + +use timestamp::*; +use wasmlib::*; +use wasmlib::host::*; + +use crate::consts::*; +use crate::keys::*; +use crate::results::*; +use crate::state::*; + +mod consts; +mod contract; +mod keys; +mod results; +mod state; +mod timestamp; + +#[no_mangle] +fn on_load() { + let exports = ScExports::new(); + exports.add_func(FUNC_NOW, func_now_thunk); + exports.add_view(VIEW_GET_TIMESTAMP, view_get_timestamp_thunk); + + unsafe { + for i in 0..KEY_MAP_LEN { + IDX_MAP[i] = get_key_id_from_string(KEY_MAP[i]); + } + } +} + +pub struct NowContext { + state: MutabletimestampState, +} + +fn func_now_thunk(ctx: &ScFuncContext) { + ctx.log("timestamp.funcNow"); + let f = NowContext { + state: MutabletimestampState { + id: OBJ_ID_STATE, + }, + }; + func_now(ctx, &f); + ctx.log("timestamp.funcNow ok"); +} + +pub struct GetTimestampContext { + results: MutableGetTimestampResults, + state: ImmutabletimestampState, +} + +fn view_get_timestamp_thunk(ctx: &ScViewContext) { + ctx.log("timestamp.viewGetTimestamp"); + let f = GetTimestampContext { + results: MutableGetTimestampResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutabletimestampState { + id: OBJ_ID_STATE, + }, + }; + view_get_timestamp(ctx, &f); + ctx.log("timestamp.viewGetTimestamp ok"); +} + +// @formatter:on diff --git a/contracts/wasm/timestamp/src/params.rs b/contracts/wasm/timestamp/src/params.rs new file mode 100644 index 0000000000..cbe28e2593 --- /dev/null +++ b/contracts/wasm/timestamp/src/params.rs @@ -0,0 +1,59 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] +#![allow(unused_imports)] + +use wasmlib::*; +use wasmlib::host::*; + +use crate::*; +use crate::keys::*; + +#[derive(Clone, Copy)] +pub struct ImmutableInitParams { + pub(crate) id: i32, +} + +impl ImmutableInitParams { + pub fn owner(&self) -> ScImmutableAgentID { + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableInitParams { + pub(crate) id: i32, +} + +impl MutableInitParams { + pub fn owner(&self) -> ScMutableAgentID { + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableSetOwnerParams { + pub(crate) id: i32, +} + +impl ImmutableSetOwnerParams { + pub fn owner(&self) -> ScImmutableAgentID { + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableSetOwnerParams { + pub(crate) id: i32, +} + +impl MutableSetOwnerParams { + pub fn owner(&self) -> ScMutableAgentID { + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) + } +} diff --git a/contracts/wasm/timestamp/src/results.rs b/contracts/wasm/timestamp/src/results.rs new file mode 100644 index 0000000000..92986808a7 --- /dev/null +++ b/contracts/wasm/timestamp/src/results.rs @@ -0,0 +1,37 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] +#![allow(unused_imports)] + +use wasmlib::*; +use wasmlib::host::*; + +use crate::*; +use crate::keys::*; + +#[derive(Clone, Copy)] +pub struct ImmutableGetTimestampResults { + pub(crate) id: i32, +} + +impl ImmutableGetTimestampResults { + pub fn timestamp(&self) -> ScImmutableInt64 { + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_TIMESTAMP)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableGetTimestampResults { + pub(crate) id: i32, +} + +impl MutableGetTimestampResults { + pub fn timestamp(&self) -> ScMutableInt64 { + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_TIMESTAMP)) + } +} diff --git a/contracts/wasm/timestamp/src/state.rs b/contracts/wasm/timestamp/src/state.rs new file mode 100644 index 0000000000..f899a37c51 --- /dev/null +++ b/contracts/wasm/timestamp/src/state.rs @@ -0,0 +1,37 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] +#![allow(unused_imports)] + +use wasmlib::*; +use wasmlib::host::*; + +use crate::*; +use crate::keys::*; + +#[derive(Clone, Copy)] +pub struct ImmutabletimestampState { + pub(crate) id: i32, +} + +impl ImmutabletimestampState { + pub fn timestamp(&self) -> ScImmutableInt64 { + ScImmutableInt64::new(self.id, idx_map(IDX_STATE_TIMESTAMP)) + } +} + +#[derive(Clone, Copy)] +pub struct MutabletimestampState { + pub(crate) id: i32, +} + +impl MutabletimestampState { + pub fn timestamp(&self) -> ScMutableInt64 { + ScMutableInt64::new(self.id, idx_map(IDX_STATE_TIMESTAMP)) + } +} diff --git a/contracts/wasm/timestamp/src/timestamp.rs b/contracts/wasm/timestamp/src/timestamp.rs new file mode 100644 index 0000000000..1ca7585bd1 --- /dev/null +++ b/contracts/wasm/timestamp/src/timestamp.rs @@ -0,0 +1,14 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +use wasmlib::*; + +use crate::*; + +pub fn func_now(ctx: &ScFuncContext, f: &NowContext) { + f.state.timestamp().set_value(ctx.timestamp()); +} + +pub fn view_get_timestamp(_ctx: &ScViewContext, f: &GetTimestampContext) { + f.results.timestamp().set_value(f.state.timestamp().value()); +} diff --git a/contracts/wasm/timestamp/test/timestamp_bg.wasm b/contracts/wasm/timestamp/test/timestamp_bg.wasm new file mode 100644 index 0000000000000000000000000000000000000000..2e287139bc7cccd58754b687bc1e1b5423c56518 GIT binary patch literal 28126 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 literal 0 HcmV?d00001 diff --git a/contracts/wasm/timestamp/test/timestamp_test.go b/contracts/wasm/timestamp/test/timestamp_test.go new file mode 100644 index 0000000000..5dbf04649e --- /dev/null +++ b/contracts/wasm/timestamp/test/timestamp_test.go @@ -0,0 +1,14 @@ +package test + +import ( + "testing" + + "github.com/iotaledger/wasp/contracts/wasm/timestamp/go/timestamp" + "github.com/iotaledger/wasp/packages/vm/wasmsolo" + "github.com/stretchr/testify/require" +) + +func TestDeploy(t *testing.T) { + ctx := wasmsolo.NewSoloContext(t, timestamp.ScName, timestamp.OnLoad) + require.NoError(t, ctx.ContractExists(timestamp.ScName)) +} diff --git a/contracts/wasm/timestamp/ts/timestamp/consts.ts b/contracts/wasm/timestamp/ts/timestamp/consts.ts new file mode 100644 index 0000000000..1cde5f4df7 --- /dev/null +++ b/contracts/wasm/timestamp/ts/timestamp/consts.ts @@ -0,0 +1,22 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "wasmlib" + +export const ScName = "timestamp"; +export const ScDescription = "Extremely simple timestamp server"; +export const HScName = new wasmlib.ScHname(0x3988002e); + +export const ResultTimestamp = "timestamp"; + +export const StateTimestamp = "timestamp"; + +export const FuncNow = "now"; +export const ViewGetTimestamp = "getTimestamp"; + +export const HFuncNow = new wasmlib.ScHname(0xd73b7fc9); +export const HViewGetTimestamp = new wasmlib.ScHname(0x40c6376a); diff --git a/contracts/wasm/timestamp/ts/timestamp/contract.ts b/contracts/wasm/timestamp/ts/timestamp/contract.ts new file mode 100644 index 0000000000..64f7585d93 --- /dev/null +++ b/contracts/wasm/timestamp/ts/timestamp/contract.ts @@ -0,0 +1,41 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "wasmlib" +import * as sc from "./index"; + +export class NowCall { + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncNow); +} + +export class NowContext { + state: sc.MutabletimestampState = new sc.MutabletimestampState(); +} + +export class GetTimestampCall { + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetTimestamp); + results: sc.ImmutableGetTimestampResults = new sc.ImmutableGetTimestampResults(); +} + +export class GetTimestampContext { + results: sc.MutableGetTimestampResults = new sc.MutableGetTimestampResults(); + state: sc.ImmutabletimestampState = new sc.ImmutabletimestampState(); +} + +export class ScFuncs { + + static now(ctx: wasmlib.ScFuncCallContext): NowCall { + let f = new NowCall(); + return f; + } + + static getTimestamp(ctx: wasmlib.ScViewCallContext): GetTimestampCall { + let f = new GetTimestampCall(); + f.func.setPtrs(null, f.results); + return f; + } +} diff --git a/contracts/wasm/timestamp/ts/timestamp/index.ts b/contracts/wasm/timestamp/ts/timestamp/index.ts new file mode 100644 index 0000000000..0b905cf8fd --- /dev/null +++ b/contracts/wasm/timestamp/ts/timestamp/index.ts @@ -0,0 +1,15 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +export * from "./timestamp"; + +export * from "./consts"; +export * from "./contract"; +export * from "./keys"; +export * from "./lib"; +export * from "./results"; +export * from "./state"; diff --git a/contracts/wasm/timestamp/ts/timestamp/keys.ts b/contracts/wasm/timestamp/ts/timestamp/keys.ts new file mode 100644 index 0000000000..d7418a0179 --- /dev/null +++ b/contracts/wasm/timestamp/ts/timestamp/keys.ts @@ -0,0 +1,19 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "wasmlib" +import * as sc from "./index"; + +export const IdxResultTimestamp = 0; +export const IdxStateTimestamp = 1; + +export let keyMap: string[] = [ + sc.ResultTimestamp, + sc.StateTimestamp, +]; + +export let idxMap: wasmlib.Key32[] = new Array(keyMap.length); diff --git a/contracts/wasm/timestamp/ts/timestamp/lib.ts b/contracts/wasm/timestamp/ts/timestamp/lib.ts new file mode 100644 index 0000000000..748d0c79ee --- /dev/null +++ b/contracts/wasm/timestamp/ts/timestamp/lib.ts @@ -0,0 +1,40 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "wasmlib" +import * as sc from "./index"; + +export function on_call(index: i32): void { + return wasmlib.onCall(index); +} + +export function on_load(): void { + let exports = new wasmlib.ScExports(); + exports.addFunc(sc.FuncNow, funcNowThunk); + exports.addView(sc.ViewGetTimestamp, viewGetTimestampThunk); + + for (let i = 0; i < sc.keyMap.length; i++) { + sc.idxMap[i] = wasmlib.Key32.fromString(sc.keyMap[i]); + } +} + +function funcNowThunk(ctx: wasmlib.ScFuncContext): void { + ctx.log("timestamp.funcNow"); + let f = new sc.NowContext(); + f.state.mapID = wasmlib.OBJ_ID_STATE; + sc.funcNow(ctx, f); + ctx.log("timestamp.funcNow ok"); +} + +function viewGetTimestampThunk(ctx: wasmlib.ScViewContext): void { + ctx.log("timestamp.viewGetTimestamp"); + let f = new sc.GetTimestampContext(); + f.results.mapID = wasmlib.OBJ_ID_RESULTS; + f.state.mapID = wasmlib.OBJ_ID_STATE; + sc.viewGetTimestamp(ctx, f); + ctx.log("timestamp.viewGetTimestamp ok"); +} diff --git a/contracts/wasm/timestamp/ts/timestamp/params.ts b/contracts/wasm/timestamp/ts/timestamp/params.ts new file mode 100644 index 0000000000..a10b506919 --- /dev/null +++ b/contracts/wasm/timestamp/ts/timestamp/params.ts @@ -0,0 +1,37 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "wasmlib" +import * as sc from "./index"; + +export class ImmutableInitParams extends wasmlib.ScMapID { + + owner(): wasmlib.ScImmutableAgentID { + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); + } +} + +export class MutableInitParams extends wasmlib.ScMapID { + + owner(): wasmlib.ScMutableAgentID { + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); + } +} + +export class ImmutableSetOwnerParams extends wasmlib.ScMapID { + + owner(): wasmlib.ScImmutableAgentID { + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); + } +} + +export class MutableSetOwnerParams extends wasmlib.ScMapID { + + owner(): wasmlib.ScMutableAgentID { + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); + } +} diff --git a/contracts/wasm/timestamp/ts/timestamp/results.ts b/contracts/wasm/timestamp/ts/timestamp/results.ts new file mode 100644 index 0000000000..45040bc359 --- /dev/null +++ b/contracts/wasm/timestamp/ts/timestamp/results.ts @@ -0,0 +1,23 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "wasmlib" +import * as sc from "./index"; + +export class ImmutableGetTimestampResults extends wasmlib.ScMapID { + + timestamp(): wasmlib.ScImmutableInt64 { + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultTimestamp]); + } +} + +export class MutableGetTimestampResults extends wasmlib.ScMapID { + + timestamp(): wasmlib.ScMutableInt64 { + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultTimestamp]); + } +} diff --git a/contracts/wasm/timestamp/ts/timestamp/state.ts b/contracts/wasm/timestamp/ts/timestamp/state.ts new file mode 100644 index 0000000000..1137c63325 --- /dev/null +++ b/contracts/wasm/timestamp/ts/timestamp/state.ts @@ -0,0 +1,23 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "wasmlib" +import * as sc from "./index"; + +export class ImmutabletimestampState extends wasmlib.ScMapID { + + timestamp(): wasmlib.ScImmutableInt64 { + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateTimestamp]); + } +} + +export class MutabletimestampState extends wasmlib.ScMapID { + + timestamp(): wasmlib.ScMutableInt64 { + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateTimestamp]); + } +} diff --git a/contracts/wasm/timestamp/ts/timestamp/timestamp.ts b/contracts/wasm/timestamp/ts/timestamp/timestamp.ts new file mode 100644 index 0000000000..5c232cf49a --- /dev/null +++ b/contracts/wasm/timestamp/ts/timestamp/timestamp.ts @@ -0,0 +1,13 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +import * as wasmlib from "wasmlib" +import * as sc from "./index"; + +export function funcNow(ctx: wasmlib.ScFuncContext, f: sc.NowContext): void { + f.state.timestamp().setValue(ctx.timestamp()); +} + +export function viewGetTimestamp(ctx: wasmlib.ScViewContext, f: sc.GetTimestampContext): void { + f.results.timestamp().setValue(f.state.timestamp().value()); +} diff --git a/contracts/wasm/timestamp/ts/timestamp/tsconfig.json b/contracts/wasm/timestamp/ts/timestamp/tsconfig.json new file mode 100644 index 0000000000..6fb4265c72 --- /dev/null +++ b/contracts/wasm/timestamp/ts/timestamp/tsconfig.json @@ -0,0 +1,4 @@ +{ + "extends": "assemblyscript/std/assembly.json", + "include": ["./*.ts"] +} diff --git a/contracts/wasm/tokenregistry/src/state.rs b/contracts/wasm/tokenregistry/src/state.rs index d879c8403d..282cb8bd1a 100644 --- a/contracts/wasm/tokenregistry/src/state.rs +++ b/contracts/wasm/tokenregistry/src/state.rs @@ -80,7 +80,7 @@ pub struct MapColorToMutableToken { impl MapColorToMutableToken { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_token(&self, key: &ScColor) -> MutableToken { diff --git a/packages/vm/wasmlib/src/coreaccounts/results.rs b/packages/vm/wasmlib/src/coreaccounts/results.rs index 21a3fae179..8fc4fa2f99 100644 --- a/packages/vm/wasmlib/src/coreaccounts/results.rs +++ b/packages/vm/wasmlib/src/coreaccounts/results.rs @@ -39,7 +39,7 @@ pub struct MapAgentIDToMutableBytes { impl MapAgentIDToMutableBytes { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_bytes(&self, key: &ScAgentID) -> ScMutableBytes { @@ -85,7 +85,7 @@ pub struct MapColorToMutableInt64 { impl MapColorToMutableInt64 { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_int64(&self, key: &ScColor) -> ScMutableInt64 { diff --git a/packages/vm/wasmlib/src/coreblob/params.rs b/packages/vm/wasmlib/src/coreblob/params.rs index e2ecd927fa..5fb2e10bba 100644 --- a/packages/vm/wasmlib/src/coreblob/params.rs +++ b/packages/vm/wasmlib/src/coreblob/params.rs @@ -39,7 +39,7 @@ pub struct MapStringToMutableBytes { impl MapStringToMutableBytes { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_bytes(&self, key: &str) -> ScMutableBytes { diff --git a/packages/vm/wasmlib/src/coreblob/results.rs b/packages/vm/wasmlib/src/coreblob/results.rs index a4e6be96a6..f464ba938f 100644 --- a/packages/vm/wasmlib/src/coreblob/results.rs +++ b/packages/vm/wasmlib/src/coreblob/results.rs @@ -83,7 +83,7 @@ pub struct MapStringToMutableInt32 { impl MapStringToMutableInt32 { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_int32(&self, key: &str) -> ScMutableInt32 { @@ -129,7 +129,7 @@ pub struct MapHashToMutableInt32 { impl MapHashToMutableInt32 { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_int32(&self, key: &ScHash) -> ScMutableInt32 { diff --git a/packages/vm/wasmlib/src/coreroot/results.rs b/packages/vm/wasmlib/src/coreroot/results.rs index 4529c608a5..93d8520992 100644 --- a/packages/vm/wasmlib/src/coreroot/results.rs +++ b/packages/vm/wasmlib/src/coreroot/results.rs @@ -70,7 +70,7 @@ pub struct MapHnameToMutableBytes { impl MapHnameToMutableBytes { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_bytes(&self, key: &ScHname) -> ScMutableBytes { diff --git a/packages/vm/wasmsolo/solocontext.go b/packages/vm/wasmsolo/solocontext.go index 3cec105f40..b0bb22a68d 100644 --- a/packages/vm/wasmsolo/solocontext.go +++ b/packages/vm/wasmsolo/solocontext.go @@ -328,19 +328,19 @@ func (ctx *SoloContext) upload(keyPair *ed25519.KeyPair) { wasmFile = "../pkg/" + wasmFile } - if *GoWasm { - wasmFile = ctx.scName + "_go.wasm" - exists, _ = util.ExistsFilePath("../go/pkg/" + wasmFile) + if *GoWasm || !exists { + goPath := "../go/pkg/" + ctx.scName + "_go.wasm" + exists, _ = util.ExistsFilePath(goPath) if exists { - wasmFile = "../go/pkg/" + wasmFile + wasmFile = goPath } } - if *TsWasm { - wasmFile = ctx.scName + "_ts.wasm" - exists, _ = util.ExistsFilePath("../ts/pkg/" + wasmFile) + if *TsWasm || !exists { + tsPath := "../ts/pkg/" + ctx.scName + "_ts.wasm" + exists, _ = util.ExistsFilePath(tsPath) if exists { - wasmFile = "../ts/pkg/" + wasmFile + wasmFile = tsPath } } diff --git a/tools/schema/generator/generator.go b/tools/schema/generator/generator.go index b6746acdfa..396c341bd5 100644 --- a/tools/schema/generator/generator.go +++ b/tools/schema/generator/generator.go @@ -25,8 +25,8 @@ const ( PropImmutable = "Immutable" PropMutable = "Mutable" SpecialFuncInit = "funcInit" - SpecialFuncSetOwner = "setOwner" - SpecialViewGetOwner = "getOwner" + SpecialFuncSetOwner = "funcSetOwner" + SpecialViewGetOwner = "viewGetOwner" ) var ( @@ -89,7 +89,14 @@ func (g *GenBase) create(path string) (err error) { } func (g *GenBase) createSourceFile(name string, generator func()) error { - err := g.create(g.Folder + name + g.extension) + path := g.Folder + name + g.extension + if g.exists(path) == nil { + err := os.Remove(path) + if err != nil { + return err + } + } + err := g.create(path) if err != nil { return err } diff --git a/tools/schema/generator/generator_rust.go b/tools/schema/generator/generator_rust.go index 0eb330e612..95238d28fc 100644 --- a/tools/schema/generator/generator_rust.go +++ b/tools/schema/generator/generator_rust.go @@ -352,7 +352,7 @@ func (g *RustGenerator) generateProxyMap(field *Field, mutability, mapType, prox if mutability == PropMutable { g.printf("\n pub fn clear(&self) {\n") - g.printf(" clear(self.obj_id)\n") + g.printf(" clear(self.obj_id);\n") g.printf(" }\n") } diff --git a/tools/schema/generator/schema.go b/tools/schema/generator/schema.go index 07ad36c581..bf55103e29 100644 --- a/tools/schema/generator/schema.go +++ b/tools/schema/generator/schema.go @@ -149,6 +149,9 @@ func (s *Schema) compileFuncs(schemaDef *SchemaDef, params, results *FieldMap, v return fmt.Errorf("duplicate func/view name: %s", funcName) } funcDesc := templateFuncs[funcName] + if funcDesc == nil { + funcDesc = &FuncDef{} + } f := &Func{} f.String = funcName f.Hname = iscp.Hn(funcName) From 70ed9339c90969d0f1166947816e12bf9f66921d Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Fri, 5 Nov 2021 13:15:34 -0700 Subject: [PATCH 029/198] Updated docu image --- documentation/static/img/wasm_vm/WasmVM.png | Bin 14899 -> 18546 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/documentation/static/img/wasm_vm/WasmVM.png b/documentation/static/img/wasm_vm/WasmVM.png index f43c78ac5da70bd8708d28a3cb09860fc4e34de5..acfbe087ab4efc4484ba2c6b4360ae575bd5d429 100644 GIT binary patch literal 18546 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 literal 14899 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 From ae5a4cc8c64dbbf905358495a93d99e511ad2aef Mon Sep 17 00:00:00 2001 From: Diego Essaya Date: Fri, 5 Nov 2021 17:23:58 -0300 Subject: [PATCH 030/198] wasp-cli: add support for evm block time --- contracts/native/evm/README.md | 5 +++-- tools/evm/evmcli/deploy.go | 9 +++++++++ tools/evm/evmemulator/main.go | 27 +++++++++++++++++++++++++-- tools/wasp-cli/chain/evm.go | 21 +++++++++++++++++++++ 4 files changed, 58 insertions(+), 4 deletions(-) diff --git a/contracts/native/evm/README.md b/contracts/native/evm/README.md index d1949c2e75..21ee749f5d 100644 --- a/contracts/native/evm/README.md +++ b/contracts/native/evm/README.md @@ -118,8 +118,9 @@ transaction. In other words, by default no EVM blocks will be minted until an EVM transaction is received. However, the `evmlight` implementation supports emulating predictable block -times. To enable this feature, call the `setBlockTime` function with parameter -`FieldBlockTime (uint32)` as the average amount of seconds between blocks. +times. To enable this feature, just pass the `--block-time n` flag when +deploying the EVM chain with `wasp-cli chain evm deploy`, where `n` is +the desired average amount of seconds between blocks. Note that this may change the behavior of JSON-RPC functions that query the EVM state (e.g. `getBalance`), since `evmlight` is not able to store the state diff --git a/tools/evm/evmcli/deploy.go b/tools/evm/evmcli/deploy.go index 6ddeb9351b..427cf483c8 100644 --- a/tools/evm/evmcli/deploy.go +++ b/tools/evm/evmcli/deploy.go @@ -27,6 +27,7 @@ type DeployParams struct { alloc []string allocBase64 string GasPerIOTA uint64 + blockTime uint32 } func (d *DeployParams) InitFlags(cmd *cobra.Command) { @@ -37,6 +38,7 @@ func (d *DeployParams) InitFlags(cmd *cobra.Command) { cmd.Flags().StringSliceVarP(&d.alloc, "alloc", "", nil, "Genesis allocation (format:
:,
:,...)") cmd.Flags().StringVarP(&d.allocBase64, "alloc-bytes", "", "", "Genesis allocation (base64-encoded)") cmd.Flags().Uint64VarP(&d.GasPerIOTA, "gas-per-iota", "", evm.DefaultGasPerIota, "Gas per IOTA charged as fee") + cmd.Flags().Uint32VarP(&d.blockTime, "block-time", "", 0, "Average block time (0: disabled) (only supported by evmlight)") } func (d *DeployParams) Name() string { @@ -61,6 +63,13 @@ func (d *DeployParams) EVMFlavor() *coreutil.ContractInfo { return r } +func (d *DeployParams) BlockTime() uint32 { + if d.blockTime > 0 && d.evmFlavor != "evmlight" { + log.Fatalf("block time is only supported by evmlight flavor") + } + return d.blockTime +} + func (d *DeployParams) GetGenesis(def core.GenesisAlloc) core.GenesisAlloc { if len(d.alloc) != 0 && d.allocBase64 != "" { log.Fatalf("--alloc and --alloc-bytes are mutually exclusive") diff --git a/tools/evm/evmemulator/main.go b/tools/evm/evmemulator/main.go index 378acf6204..319b36efa5 100644 --- a/tools/evm/evmemulator/main.go +++ b/tools/evm/evmemulator/main.go @@ -6,10 +6,12 @@ package main import ( "encoding/hex" "fmt" + "time" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" "github.com/iotaledger/wasp/contracts/native/evm" + "github.com/iotaledger/wasp/packages/evm/evmflavors" "github.com/iotaledger/wasp/packages/evm/evmtest" "github.com/iotaledger/wasp/packages/evm/evmtypes" "github.com/iotaledger/wasp/packages/evm/jsonrpc" @@ -66,11 +68,15 @@ By default the server has no unlocked accounts. To send transactions, either: } func start(cmd *cobra.Command, args []string) { - env := solo.New(nil, log.DebugFlag, log.DebugFlag) + blockTime := deployParams.BlockTime() + evmFlavor := deployParams.EVMFlavor() + + env := solo.New(solo.NewTestContext("evmemulator"), log.DebugFlag, log.DebugFlag). + WithNativeContract(evmflavors.Processors[evmFlavor.Name]) chainOwner, _ := env.NewKeyPairWithFunds() chain := env.NewChain(chainOwner, "iscpchain") - err := chain.DeployContract(chainOwner, deployParams.Name(), deployParams.EVMFlavor().ProgramHash, + err := chain.DeployContract(chainOwner, deployParams.Name(), evmFlavor.ProgramHash, evm.FieldChainID, codec.EncodeUint16(uint16(deployParams.ChainID)), evm.FieldGenesisAlloc, evmtypes.EncodeGenesisAlloc(deployParams.GetGenesis(core.GenesisAlloc{ evmtest.FaucetAddress: {Balance: evmtest.FaucetSupply}, @@ -79,6 +85,23 @@ func start(cmd *cobra.Command, args []string) { ) log.Check(err) + if blockTime > 0 { + _, err := chain.PostRequestSync( + solo.NewCallParams(deployParams.Name(), evm.FuncSetBlockTime.Name, + evm.FieldBlockTime, blockTime, + ).WithIotas(1), + chain.OriginatorKeyPair, + ) + log.Check(err) + go func() { + const step = 1 * time.Second + for { + time.Sleep(step) + env.AdvanceClockBy(step) + } + }() + } + signer, _ := env.NewKeyPairWithFunds() backend := jsonrpc.NewSoloBackend(env, chain, signer) diff --git a/tools/wasp-cli/chain/evm.go b/tools/wasp-cli/chain/evm.go index 2145a3c817..5187306435 100644 --- a/tools/wasp-cli/chain/evm.go +++ b/tools/wasp-cli/chain/evm.go @@ -4,14 +4,19 @@ package chain import ( + "github.com/iotaledger/goshimmer/packages/ledgerstate" + "github.com/iotaledger/wasp/client/chainclient" "github.com/iotaledger/wasp/contracts/native/evm" "github.com/iotaledger/wasp/contracts/native/evm/evmchain" "github.com/iotaledger/wasp/packages/evm/evmtypes" "github.com/iotaledger/wasp/packages/evm/jsonrpc" + "github.com/iotaledger/wasp/packages/iscp/colored" + "github.com/iotaledger/wasp/packages/iscp/requestargs" "github.com/iotaledger/wasp/packages/kv/codec" "github.com/iotaledger/wasp/packages/kv/dict" "github.com/iotaledger/wasp/tools/evm/evmcli" "github.com/iotaledger/wasp/tools/wasp-cli/log" + "github.com/iotaledger/wasp/tools/wasp-cli/util" "github.com/spf13/cobra" ) @@ -38,11 +43,27 @@ func initEVMDeploy(evmCmd *cobra.Command) { Use: "deploy", Short: "Deploy the evmchain/evmlight contract (i.e. create a new EVM chain)", Run: func(cmd *cobra.Command, args []string) { + blockTime := deployParams.BlockTime() deployContract(deployParams.Name(), deployParams.Description(), deployParams.EVMFlavor().ProgramHash, dict.Dict{ evm.FieldChainID: codec.EncodeUint16(uint16(deployParams.ChainID)), evm.FieldGenesisAlloc: evmtypes.EncodeGenesisAlloc(deployParams.GetGenesis(nil)), }) log.Printf("%s contract successfully deployed.\n", deployParams.Name()) + + if blockTime > 0 { + log.Printf("Setting block time to %ds...\n", blockTime) + util.WithSCTransaction(GetCurrentChainID(), func() (*ledgerstate.Transaction, error) { + return SCClient(deployParams.EVMFlavor().Hname()).PostRequest( + evm.FuncSetBlockTime.Name, + chainclient.PostRequestParams{ + Transfer: colored.NewBalancesForIotas(1), + Args: requestargs.New().AddEncodeSimple( + evm.FieldBlockTime, codec.EncodeUint32(blockTime), + ), + }, + ) + }) + } }, } evmCmd.AddCommand(evmDeployCmd) From a242be87240e4978d7acaa1860de091201f0f578 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Fri, 5 Nov 2021 17:57:33 -0700 Subject: [PATCH 031/198] New core generator --- .../wasmlib/go/wasmlib/coreaccounts/consts.go | 6 +- .../vm/wasmlib/go/wasmlib/coreblob/consts.go | 6 +- .../vm/wasmlib/src/coreaccounts/consts.rs | 36 +-- .../vm/wasmlib/src/coreaccounts/contract.rs | 46 ++-- .../vm/wasmlib/src/coreaccounts/params.rs | 48 ++-- .../vm/wasmlib/src/coreaccounts/results.rs | 52 +++-- packages/vm/wasmlib/src/coreblob/consts.rs | 18 +- packages/vm/wasmlib/src/coreblob/contract.rs | 36 +-- packages/vm/wasmlib/src/coreblob/params.rs | 44 ++-- packages/vm/wasmlib/src/coreblob/results.rs | 52 +++-- .../vm/wasmlib/src/coreblocklog/consts.rs | 66 +++--- .../vm/wasmlib/src/coreblocklog/contract.rs | 92 ++++---- .../vm/wasmlib/src/coreblocklog/params.rs | 96 ++++---- .../vm/wasmlib/src/coreblocklog/results.rs | 168 +++++++------ .../vm/wasmlib/src/coregovernance/consts.rs | 82 +++---- .../vm/wasmlib/src/coregovernance/contract.rs | 72 +++--- .../vm/wasmlib/src/coregovernance/params.rs | 152 ++++++------ .../vm/wasmlib/src/coregovernance/results.rs | 128 +++++----- packages/vm/wasmlib/src/coreroot/consts.rs | 26 +-- packages/vm/wasmlib/src/coreroot/contract.rs | 34 +-- packages/vm/wasmlib/src/coreroot/params.rs | 56 +++-- packages/vm/wasmlib/src/coreroot/results.rs | 38 +-- tools/schema/generator/generator.go | 92 ++++---- tools/schema/generator/generator_go.go | 19 -- tools/schema/generator/generator_rust.go | 221 +----------------- tools/schema/generator/generator_ts.go | 2 +- .../generator/gotemplates/alltemplates.go | 41 ++-- .../schema/generator/gotemplates/contract.go | 12 + tools/schema/generator/gotemplates/funcs.go | 8 +- tools/schema/generator/gotemplates/params.go | 1 - tools/schema/generator/gotemplates/proxy.go | 2 +- tools/schema/generator/gotemplates/results.go | 1 - tools/schema/generator/gotemplates/state.go | 1 - .../schema/generator/gotemplates/typedefs.go | 2 +- .../generator/rstemplates/alltemplates.go | 57 +++-- .../schema/generator/rstemplates/cargotoml.go | 32 +++ tools/schema/generator/rstemplates/consts.go | 8 +- .../schema/generator/rstemplates/contract.go | 18 +- tools/schema/generator/rstemplates/funcs.go | 9 +- tools/schema/generator/rstemplates/main.go | 24 -- tools/schema/generator/rstemplates/params.go | 8 +- tools/schema/generator/rstemplates/proxy.go | 4 +- tools/schema/generator/rstemplates/results.go | 8 +- tools/schema/generator/rstemplates/state.go | 1 - .../schema/generator/rstemplates/typedefs.go | 2 +- tools/schema/generator/schema.go | 10 - tools/schema/generator/templates.go | 1 + .../generator/tstemplates/alltemplates.go | 84 +++++-- tools/schema/generator/tstemplates/consts.go | 38 ++- .../schema/generator/tstemplates/contract.go | 78 +++++-- tools/schema/generator/tstemplates/funcs.go | 28 ++- tools/schema/generator/tstemplates/keys.go | 40 ++-- tools/schema/generator/tstemplates/lib.go | 89 ++++--- tools/schema/generator/tstemplates/main.go | 24 -- tools/schema/generator/tstemplates/params.go | 25 +- tools/schema/generator/tstemplates/proxy.go | 38 +-- tools/schema/generator/tstemplates/results.go | 26 ++- tools/schema/generator/tstemplates/state.go | 27 ++- tools/schema/generator/tstemplates/structs.go | 60 +++-- .../schema/generator/tstemplates/typedefs.go | 96 ++++---- 60 files changed, 1337 insertions(+), 1254 deletions(-) create mode 100644 tools/schema/generator/rstemplates/cargotoml.go delete mode 100644 tools/schema/generator/rstemplates/main.go delete mode 100644 tools/schema/generator/tstemplates/main.go diff --git a/packages/vm/wasmlib/go/wasmlib/coreaccounts/consts.go b/packages/vm/wasmlib/go/wasmlib/coreaccounts/consts.go index 0feb52eb41..47ab2e561c 100644 --- a/packages/vm/wasmlib/go/wasmlib/coreaccounts/consts.go +++ b/packages/vm/wasmlib/go/wasmlib/coreaccounts/consts.go @@ -21,7 +21,11 @@ const ( ParamWithdrawColor = wasmlib.Key("c") ) -const ResultAccountNonce = wasmlib.Key("n") +const ( + ResultAccountNonce = wasmlib.Key("n") + ResultAgents = wasmlib.Key("this") + ResultBalances = wasmlib.Key("this") +) const ( FuncDeposit = "deposit" diff --git a/packages/vm/wasmlib/go/wasmlib/coreblob/consts.go b/packages/vm/wasmlib/go/wasmlib/coreblob/consts.go index 9f2192c17c..2ef5fdd70d 100644 --- a/packages/vm/wasmlib/go/wasmlib/coreblob/consts.go +++ b/packages/vm/wasmlib/go/wasmlib/coreblob/consts.go @@ -16,13 +16,15 @@ const ( ) const ( + ParamBlobs = wasmlib.Key("this") ParamField = wasmlib.Key("field") ParamHash = wasmlib.Key("hash") ) const ( - ResultBytes = wasmlib.Key("bytes") - ResultHash = wasmlib.Key("hash") + ResultBlobSizes = wasmlib.Key("this") + ResultBytes = wasmlib.Key("bytes") + ResultHash = wasmlib.Key("hash") ) const ( diff --git a/packages/vm/wasmlib/src/coreaccounts/consts.rs b/packages/vm/wasmlib/src/coreaccounts/consts.rs index 94eb13b03c..d219a7642a 100644 --- a/packages/vm/wasmlib/src/coreaccounts/consts.rs +++ b/packages/vm/wasmlib/src/coreaccounts/consts.rs @@ -15,26 +15,28 @@ pub const SC_NAME: &str = "accounts"; pub const SC_DESCRIPTION: &str = "Core chain account ledger contract"; pub const HSC_NAME: ScHname = ScHname(0x3c4b5e02); -pub(crate) const PARAM_AGENT_ID: &str = "a"; +pub(crate) const PARAM_AGENT_ID: &str = "a"; pub(crate) const PARAM_WITHDRAW_AMOUNT: &str = "m"; -pub(crate) const PARAM_WITHDRAW_COLOR: &str = "c"; +pub(crate) const PARAM_WITHDRAW_COLOR: &str = "c"; pub(crate) const RESULT_ACCOUNT_NONCE: &str = "n"; - -pub(crate) const FUNC_DEPOSIT: &str = "deposit"; -pub(crate) const FUNC_HARVEST: &str = "harvest"; -pub(crate) const FUNC_WITHDRAW: &str = "withdraw"; -pub(crate) const VIEW_ACCOUNTS: &str = "accounts"; -pub(crate) const VIEW_BALANCE: &str = "balance"; -pub(crate) const VIEW_GET_ACCOUNT_NONCE: &str = "getAccountNonce"; -pub(crate) const VIEW_TOTAL_ASSETS: &str = "totalAssets"; - -pub(crate) const HFUNC_DEPOSIT: ScHname = ScHname(0xbdc9102d); -pub(crate) const HFUNC_HARVEST: ScHname = ScHname(0x7b40efbd); -pub(crate) const HFUNC_WITHDRAW: ScHname = ScHname(0x9dcc0f41); -pub(crate) const HVIEW_ACCOUNTS: ScHname = ScHname(0x3c4b5e02); -pub(crate) const HVIEW_BALANCE: ScHname = ScHname(0x84168cb4); +pub(crate) const RESULT_AGENTS: &str = "this"; +pub(crate) const RESULT_BALANCES: &str = "this"; + +pub(crate) const FUNC_DEPOSIT: &str = "deposit"; +pub(crate) const FUNC_HARVEST: &str = "harvest"; +pub(crate) const FUNC_WITHDRAW: &str = "withdraw"; +pub(crate) const VIEW_ACCOUNTS: &str = "accounts"; +pub(crate) const VIEW_BALANCE: &str = "balance"; +pub(crate) const VIEW_GET_ACCOUNT_NONCE: &str = "getAccountNonce"; +pub(crate) const VIEW_TOTAL_ASSETS: &str = "totalAssets"; + +pub(crate) const HFUNC_DEPOSIT: ScHname = ScHname(0xbdc9102d); +pub(crate) const HFUNC_HARVEST: ScHname = ScHname(0x7b40efbd); +pub(crate) const HFUNC_WITHDRAW: ScHname = ScHname(0x9dcc0f41); +pub(crate) const HVIEW_ACCOUNTS: ScHname = ScHname(0x3c4b5e02); +pub(crate) const HVIEW_BALANCE: ScHname = ScHname(0x84168cb4); pub(crate) const HVIEW_GET_ACCOUNT_NONCE: ScHname = ScHname(0x529d7df9); -pub(crate) const HVIEW_TOTAL_ASSETS: ScHname = ScHname(0xfab0f8d2); +pub(crate) const HVIEW_TOTAL_ASSETS: ScHname = ScHname(0xfab0f8d2); // @formatter:on diff --git a/packages/vm/wasmlib/src/coreaccounts/contract.rs b/packages/vm/wasmlib/src/coreaccounts/contract.rs index b52b701ecb..db364df74c 100644 --- a/packages/vm/wasmlib/src/coreaccounts/contract.rs +++ b/packages/vm/wasmlib/src/coreaccounts/contract.rs @@ -15,39 +15,39 @@ use crate::*; use crate::coreaccounts::*; pub struct DepositCall { - pub func: ScFunc, - pub params: MutableDepositParams, + pub func: ScFunc, + pub params: MutableDepositParams, } pub struct HarvestCall { - pub func: ScFunc, - pub params: MutableHarvestParams, + pub func: ScFunc, + pub params: MutableHarvestParams, } pub struct WithdrawCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct AccountsCall { - pub func: ScView, - pub results: ImmutableAccountsResults, + pub func: ScView, + pub results: ImmutableAccountsResults, } pub struct BalanceCall { - pub func: ScView, - pub params: MutableBalanceParams, - pub results: ImmutableBalanceResults, + pub func: ScView, + pub params: MutableBalanceParams, + pub results: ImmutableBalanceResults, } pub struct GetAccountNonceCall { - pub func: ScView, - pub params: MutableGetAccountNonceParams, - pub results: ImmutableGetAccountNonceResults, + pub func: ScView, + pub params: MutableGetAccountNonceParams, + pub results: ImmutableGetAccountNonceResults, } pub struct TotalAssetsCall { - pub func: ScView, - pub results: ImmutableTotalAssetsResults, + pub func: ScView, + pub results: ImmutableTotalAssetsResults, } pub struct ScFuncs { @@ -56,7 +56,7 @@ pub struct ScFuncs { impl ScFuncs { pub fn deposit(_ctx: & dyn ScFuncCallContext) -> DepositCall { let mut f = DepositCall { - func: ScFunc::new(HSC_NAME, HFUNC_DEPOSIT), + func: ScFunc::new(HSC_NAME, HFUNC_DEPOSIT), params: MutableDepositParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -64,7 +64,7 @@ impl ScFuncs { } pub fn harvest(_ctx: & dyn ScFuncCallContext) -> HarvestCall { let mut f = HarvestCall { - func: ScFunc::new(HSC_NAME, HFUNC_HARVEST), + func: ScFunc::new(HSC_NAME, HFUNC_HARVEST), params: MutableHarvestParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -77,7 +77,7 @@ impl ScFuncs { } pub fn accounts(_ctx: & dyn ScViewCallContext) -> AccountsCall { let mut f = AccountsCall { - func: ScView::new(HSC_NAME, HVIEW_ACCOUNTS), + func: ScView::new(HSC_NAME, HVIEW_ACCOUNTS), results: ImmutableAccountsResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); @@ -85,8 +85,8 @@ impl ScFuncs { } pub fn balance(_ctx: & dyn ScViewCallContext) -> BalanceCall { let mut f = BalanceCall { - func: ScView::new(HSC_NAME, HVIEW_BALANCE), - params: MutableBalanceParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_BALANCE), + params: MutableBalanceParams { id: 0 }, results: ImmutableBalanceResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -94,8 +94,8 @@ impl ScFuncs { } pub fn get_account_nonce(_ctx: & dyn ScViewCallContext) -> GetAccountNonceCall { let mut f = GetAccountNonceCall { - func: ScView::new(HSC_NAME, HVIEW_GET_ACCOUNT_NONCE), - params: MutableGetAccountNonceParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_GET_ACCOUNT_NONCE), + params: MutableGetAccountNonceParams { id: 0 }, results: ImmutableGetAccountNonceResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -103,7 +103,7 @@ impl ScFuncs { } pub fn total_assets(_ctx: & dyn ScViewCallContext) -> TotalAssetsCall { let mut f = TotalAssetsCall { - func: ScView::new(HSC_NAME, HVIEW_TOTAL_ASSETS), + func: ScView::new(HSC_NAME, HVIEW_TOTAL_ASSETS), results: ImmutableTotalAssetsResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); diff --git a/packages/vm/wasmlib/src/coreaccounts/params.rs b/packages/vm/wasmlib/src/coreaccounts/params.rs index dca6f1eca3..b2d494d366 100644 --- a/packages/vm/wasmlib/src/coreaccounts/params.rs +++ b/packages/vm/wasmlib/src/coreaccounts/params.rs @@ -18,9 +18,10 @@ pub struct ImmutableDepositParams { } impl ImmutableDepositParams { + pub fn agent_id(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, PARAM_AGENT_ID.get_key_id()) - } + ScImmutableAgentID::new(self.id, PARAM_AGENT_ID.get_key_id()) + } } #[derive(Clone, Copy)] @@ -29,9 +30,10 @@ pub struct MutableDepositParams { } impl MutableDepositParams { + pub fn agent_id(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, PARAM_AGENT_ID.get_key_id()) - } + ScMutableAgentID::new(self.id, PARAM_AGENT_ID.get_key_id()) + } } #[derive(Clone, Copy)] @@ -40,13 +42,14 @@ pub struct ImmutableHarvestParams { } impl ImmutableHarvestParams { + pub fn withdraw_amount(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, PARAM_WITHDRAW_AMOUNT.get_key_id()) - } + ScImmutableInt64::new(self.id, PARAM_WITHDRAW_AMOUNT.get_key_id()) + } pub fn withdraw_color(&self) -> ScImmutableColor { - ScImmutableColor::new(self.id, PARAM_WITHDRAW_COLOR.get_key_id()) - } + ScImmutableColor::new(self.id, PARAM_WITHDRAW_COLOR.get_key_id()) + } } #[derive(Clone, Copy)] @@ -55,13 +58,14 @@ pub struct MutableHarvestParams { } impl MutableHarvestParams { + pub fn withdraw_amount(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, PARAM_WITHDRAW_AMOUNT.get_key_id()) - } + ScMutableInt64::new(self.id, PARAM_WITHDRAW_AMOUNT.get_key_id()) + } pub fn withdraw_color(&self) -> ScMutableColor { - ScMutableColor::new(self.id, PARAM_WITHDRAW_COLOR.get_key_id()) - } + ScMutableColor::new(self.id, PARAM_WITHDRAW_COLOR.get_key_id()) + } } #[derive(Clone, Copy)] @@ -70,9 +74,10 @@ pub struct ImmutableBalanceParams { } impl ImmutableBalanceParams { + pub fn agent_id(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, PARAM_AGENT_ID.get_key_id()) - } + ScImmutableAgentID::new(self.id, PARAM_AGENT_ID.get_key_id()) + } } #[derive(Clone, Copy)] @@ -81,9 +86,10 @@ pub struct MutableBalanceParams { } impl MutableBalanceParams { + pub fn agent_id(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, PARAM_AGENT_ID.get_key_id()) - } + ScMutableAgentID::new(self.id, PARAM_AGENT_ID.get_key_id()) + } } #[derive(Clone, Copy)] @@ -92,9 +98,10 @@ pub struct ImmutableGetAccountNonceParams { } impl ImmutableGetAccountNonceParams { + pub fn agent_id(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, PARAM_AGENT_ID.get_key_id()) - } + ScImmutableAgentID::new(self.id, PARAM_AGENT_ID.get_key_id()) + } } #[derive(Clone, Copy)] @@ -103,7 +110,8 @@ pub struct MutableGetAccountNonceParams { } impl MutableGetAccountNonceParams { + pub fn agent_id(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, PARAM_AGENT_ID.get_key_id()) - } + ScMutableAgentID::new(self.id, PARAM_AGENT_ID.get_key_id()) + } } diff --git a/packages/vm/wasmlib/src/coreaccounts/results.rs b/packages/vm/wasmlib/src/coreaccounts/results.rs index 21a3fae179..9d9e7df557 100644 --- a/packages/vm/wasmlib/src/coreaccounts/results.rs +++ b/packages/vm/wasmlib/src/coreaccounts/results.rs @@ -13,7 +13,7 @@ use crate::coreaccounts::*; use crate::host::*; pub struct MapAgentIDToImmutableBytes { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapAgentIDToImmutableBytes { @@ -28,18 +28,19 @@ pub struct ImmutableAccountsResults { } impl ImmutableAccountsResults { + pub fn agents(&self) -> MapAgentIDToImmutableBytes { - MapAgentIDToImmutableBytes { obj_id: self.id } - } + MapAgentIDToImmutableBytes { obj_id: self.id } + } } pub struct MapAgentIDToMutableBytes { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapAgentIDToMutableBytes { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_bytes(&self, key: &ScAgentID) -> ScMutableBytes { @@ -53,13 +54,14 @@ pub struct MutableAccountsResults { } impl MutableAccountsResults { + pub fn agents(&self) -> MapAgentIDToMutableBytes { - MapAgentIDToMutableBytes { obj_id: self.id } - } + MapAgentIDToMutableBytes { obj_id: self.id } + } } pub struct MapColorToImmutableInt64 { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapColorToImmutableInt64 { @@ -74,18 +76,19 @@ pub struct ImmutableBalanceResults { } impl ImmutableBalanceResults { + pub fn balances(&self) -> MapColorToImmutableInt64 { - MapColorToImmutableInt64 { obj_id: self.id } - } + MapColorToImmutableInt64 { obj_id: self.id } + } } pub struct MapColorToMutableInt64 { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapColorToMutableInt64 { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_int64(&self, key: &ScColor) -> ScMutableInt64 { @@ -99,9 +102,10 @@ pub struct MutableBalanceResults { } impl MutableBalanceResults { + pub fn balances(&self) -> MapColorToMutableInt64 { - MapColorToMutableInt64 { obj_id: self.id } - } + MapColorToMutableInt64 { obj_id: self.id } + } } #[derive(Clone, Copy)] @@ -110,9 +114,10 @@ pub struct ImmutableGetAccountNonceResults { } impl ImmutableGetAccountNonceResults { + pub fn account_nonce(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, RESULT_ACCOUNT_NONCE.get_key_id()) - } + ScImmutableInt64::new(self.id, RESULT_ACCOUNT_NONCE.get_key_id()) + } } #[derive(Clone, Copy)] @@ -121,9 +126,10 @@ pub struct MutableGetAccountNonceResults { } impl MutableGetAccountNonceResults { + pub fn account_nonce(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, RESULT_ACCOUNT_NONCE.get_key_id()) - } + ScMutableInt64::new(self.id, RESULT_ACCOUNT_NONCE.get_key_id()) + } } #[derive(Clone, Copy)] @@ -132,9 +138,10 @@ pub struct ImmutableTotalAssetsResults { } impl ImmutableTotalAssetsResults { + pub fn balances(&self) -> MapColorToImmutableInt64 { - MapColorToImmutableInt64 { obj_id: self.id } - } + MapColorToImmutableInt64 { obj_id: self.id } + } } #[derive(Clone, Copy)] @@ -143,7 +150,8 @@ pub struct MutableTotalAssetsResults { } impl MutableTotalAssetsResults { + pub fn balances(&self) -> MapColorToMutableInt64 { - MapColorToMutableInt64 { obj_id: self.id } - } + MapColorToMutableInt64 { obj_id: self.id } + } } diff --git a/packages/vm/wasmlib/src/coreblob/consts.rs b/packages/vm/wasmlib/src/coreblob/consts.rs index d586e7153e..2ea81feee9 100644 --- a/packages/vm/wasmlib/src/coreblob/consts.rs +++ b/packages/vm/wasmlib/src/coreblob/consts.rs @@ -15,20 +15,22 @@ pub const SC_NAME: &str = "blob"; pub const SC_DESCRIPTION: &str = "Core blob contract"; pub const HSC_NAME: ScHname = ScHname(0xfd91bc63); +pub(crate) const PARAM_BLOBS: &str = "this"; pub(crate) const PARAM_FIELD: &str = "field"; -pub(crate) const PARAM_HASH: &str = "hash"; +pub(crate) const PARAM_HASH: &str = "hash"; +pub(crate) const RESULT_BLOB_SIZES: &str = "this"; pub(crate) const RESULT_BYTES: &str = "bytes"; -pub(crate) const RESULT_HASH: &str = "hash"; +pub(crate) const RESULT_HASH: &str = "hash"; -pub(crate) const FUNC_STORE_BLOB: &str = "storeBlob"; -pub(crate) const VIEW_GET_BLOB_FIELD: &str = "getBlobField"; +pub(crate) const FUNC_STORE_BLOB: &str = "storeBlob"; +pub(crate) const VIEW_GET_BLOB_FIELD: &str = "getBlobField"; pub(crate) const VIEW_GET_BLOB_INFO: &str = "getBlobInfo"; -pub(crate) const VIEW_LIST_BLOBS: &str = "listBlobs"; +pub(crate) const VIEW_LIST_BLOBS: &str = "listBlobs"; -pub(crate) const HFUNC_STORE_BLOB: ScHname = ScHname(0xddd4c281); +pub(crate) const HFUNC_STORE_BLOB: ScHname = ScHname(0xddd4c281); pub(crate) const HVIEW_GET_BLOB_FIELD: ScHname = ScHname(0x1f448130); -pub(crate) const HVIEW_GET_BLOB_INFO: ScHname = ScHname(0xfde4ab46); -pub(crate) const HVIEW_LIST_BLOBS: ScHname = ScHname(0x62ca7990); +pub(crate) const HVIEW_GET_BLOB_INFO: ScHname = ScHname(0xfde4ab46); +pub(crate) const HVIEW_LIST_BLOBS: ScHname = ScHname(0x62ca7990); // @formatter:on diff --git a/packages/vm/wasmlib/src/coreblob/contract.rs b/packages/vm/wasmlib/src/coreblob/contract.rs index fc3969aa76..ffab194dfc 100644 --- a/packages/vm/wasmlib/src/coreblob/contract.rs +++ b/packages/vm/wasmlib/src/coreblob/contract.rs @@ -15,26 +15,26 @@ use crate::*; use crate::coreblob::*; pub struct StoreBlobCall { - pub func: ScFunc, - pub params: MutableStoreBlobParams, - pub results: ImmutableStoreBlobResults, + pub func: ScFunc, + pub params: MutableStoreBlobParams, + pub results: ImmutableStoreBlobResults, } pub struct GetBlobFieldCall { - pub func: ScView, - pub params: MutableGetBlobFieldParams, - pub results: ImmutableGetBlobFieldResults, + pub func: ScView, + pub params: MutableGetBlobFieldParams, + pub results: ImmutableGetBlobFieldResults, } pub struct GetBlobInfoCall { - pub func: ScView, - pub params: MutableGetBlobInfoParams, - pub results: ImmutableGetBlobInfoResults, + pub func: ScView, + pub params: MutableGetBlobInfoParams, + pub results: ImmutableGetBlobInfoResults, } pub struct ListBlobsCall { - pub func: ScView, - pub results: ImmutableListBlobsResults, + pub func: ScView, + pub results: ImmutableListBlobsResults, } pub struct ScFuncs { @@ -43,8 +43,8 @@ pub struct ScFuncs { impl ScFuncs { pub fn store_blob(_ctx: & dyn ScFuncCallContext) -> StoreBlobCall { let mut f = StoreBlobCall { - func: ScFunc::new(HSC_NAME, HFUNC_STORE_BLOB), - params: MutableStoreBlobParams { id: 0 }, + func: ScFunc::new(HSC_NAME, HFUNC_STORE_BLOB), + params: MutableStoreBlobParams { id: 0 }, results: ImmutableStoreBlobResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -52,8 +52,8 @@ impl ScFuncs { } pub fn get_blob_field(_ctx: & dyn ScViewCallContext) -> GetBlobFieldCall { let mut f = GetBlobFieldCall { - func: ScView::new(HSC_NAME, HVIEW_GET_BLOB_FIELD), - params: MutableGetBlobFieldParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_GET_BLOB_FIELD), + params: MutableGetBlobFieldParams { id: 0 }, results: ImmutableGetBlobFieldResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -61,8 +61,8 @@ impl ScFuncs { } pub fn get_blob_info(_ctx: & dyn ScViewCallContext) -> GetBlobInfoCall { let mut f = GetBlobInfoCall { - func: ScView::new(HSC_NAME, HVIEW_GET_BLOB_INFO), - params: MutableGetBlobInfoParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_GET_BLOB_INFO), + params: MutableGetBlobInfoParams { id: 0 }, results: ImmutableGetBlobInfoResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -70,7 +70,7 @@ impl ScFuncs { } pub fn list_blobs(_ctx: & dyn ScViewCallContext) -> ListBlobsCall { let mut f = ListBlobsCall { - func: ScView::new(HSC_NAME, HVIEW_LIST_BLOBS), + func: ScView::new(HSC_NAME, HVIEW_LIST_BLOBS), results: ImmutableListBlobsResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); diff --git a/packages/vm/wasmlib/src/coreblob/params.rs b/packages/vm/wasmlib/src/coreblob/params.rs index e2ecd927fa..81434f838f 100644 --- a/packages/vm/wasmlib/src/coreblob/params.rs +++ b/packages/vm/wasmlib/src/coreblob/params.rs @@ -13,7 +13,7 @@ use crate::coreblob::*; use crate::host::*; pub struct MapStringToImmutableBytes { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapStringToImmutableBytes { @@ -28,18 +28,19 @@ pub struct ImmutableStoreBlobParams { } impl ImmutableStoreBlobParams { + pub fn blobs(&self) -> MapStringToImmutableBytes { - MapStringToImmutableBytes { obj_id: self.id } - } + MapStringToImmutableBytes { obj_id: self.id } + } } pub struct MapStringToMutableBytes { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapStringToMutableBytes { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_bytes(&self, key: &str) -> ScMutableBytes { @@ -53,9 +54,10 @@ pub struct MutableStoreBlobParams { } impl MutableStoreBlobParams { + pub fn blobs(&self) -> MapStringToMutableBytes { - MapStringToMutableBytes { obj_id: self.id } - } + MapStringToMutableBytes { obj_id: self.id } + } } #[derive(Clone, Copy)] @@ -64,13 +66,14 @@ pub struct ImmutableGetBlobFieldParams { } impl ImmutableGetBlobFieldParams { + pub fn field(&self) -> ScImmutableString { - ScImmutableString::new(self.id, PARAM_FIELD.get_key_id()) - } + ScImmutableString::new(self.id, PARAM_FIELD.get_key_id()) + } pub fn hash(&self) -> ScImmutableHash { - ScImmutableHash::new(self.id, PARAM_HASH.get_key_id()) - } + ScImmutableHash::new(self.id, PARAM_HASH.get_key_id()) + } } #[derive(Clone, Copy)] @@ -79,13 +82,14 @@ pub struct MutableGetBlobFieldParams { } impl MutableGetBlobFieldParams { + pub fn field(&self) -> ScMutableString { - ScMutableString::new(self.id, PARAM_FIELD.get_key_id()) - } + ScMutableString::new(self.id, PARAM_FIELD.get_key_id()) + } pub fn hash(&self) -> ScMutableHash { - ScMutableHash::new(self.id, PARAM_HASH.get_key_id()) - } + ScMutableHash::new(self.id, PARAM_HASH.get_key_id()) + } } #[derive(Clone, Copy)] @@ -94,9 +98,10 @@ pub struct ImmutableGetBlobInfoParams { } impl ImmutableGetBlobInfoParams { + pub fn hash(&self) -> ScImmutableHash { - ScImmutableHash::new(self.id, PARAM_HASH.get_key_id()) - } + ScImmutableHash::new(self.id, PARAM_HASH.get_key_id()) + } } #[derive(Clone, Copy)] @@ -105,7 +110,8 @@ pub struct MutableGetBlobInfoParams { } impl MutableGetBlobInfoParams { + pub fn hash(&self) -> ScMutableHash { - ScMutableHash::new(self.id, PARAM_HASH.get_key_id()) - } + ScMutableHash::new(self.id, PARAM_HASH.get_key_id()) + } } diff --git a/packages/vm/wasmlib/src/coreblob/results.rs b/packages/vm/wasmlib/src/coreblob/results.rs index a4e6be96a6..cfd5172a1e 100644 --- a/packages/vm/wasmlib/src/coreblob/results.rs +++ b/packages/vm/wasmlib/src/coreblob/results.rs @@ -18,9 +18,10 @@ pub struct ImmutableStoreBlobResults { } impl ImmutableStoreBlobResults { + pub fn hash(&self) -> ScImmutableHash { - ScImmutableHash::new(self.id, RESULT_HASH.get_key_id()) - } + ScImmutableHash::new(self.id, RESULT_HASH.get_key_id()) + } } #[derive(Clone, Copy)] @@ -29,9 +30,10 @@ pub struct MutableStoreBlobResults { } impl MutableStoreBlobResults { + pub fn hash(&self) -> ScMutableHash { - ScMutableHash::new(self.id, RESULT_HASH.get_key_id()) - } + ScMutableHash::new(self.id, RESULT_HASH.get_key_id()) + } } #[derive(Clone, Copy)] @@ -40,9 +42,10 @@ pub struct ImmutableGetBlobFieldResults { } impl ImmutableGetBlobFieldResults { + pub fn bytes(&self) -> ScImmutableBytes { - ScImmutableBytes::new(self.id, RESULT_BYTES.get_key_id()) - } + ScImmutableBytes::new(self.id, RESULT_BYTES.get_key_id()) + } } #[derive(Clone, Copy)] @@ -51,13 +54,14 @@ pub struct MutableGetBlobFieldResults { } impl MutableGetBlobFieldResults { + pub fn bytes(&self) -> ScMutableBytes { - ScMutableBytes::new(self.id, RESULT_BYTES.get_key_id()) - } + ScMutableBytes::new(self.id, RESULT_BYTES.get_key_id()) + } } pub struct MapStringToImmutableInt32 { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapStringToImmutableInt32 { @@ -72,18 +76,19 @@ pub struct ImmutableGetBlobInfoResults { } impl ImmutableGetBlobInfoResults { + pub fn blob_sizes(&self) -> MapStringToImmutableInt32 { - MapStringToImmutableInt32 { obj_id: self.id } - } + MapStringToImmutableInt32 { obj_id: self.id } + } } pub struct MapStringToMutableInt32 { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapStringToMutableInt32 { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_int32(&self, key: &str) -> ScMutableInt32 { @@ -97,13 +102,14 @@ pub struct MutableGetBlobInfoResults { } impl MutableGetBlobInfoResults { + pub fn blob_sizes(&self) -> MapStringToMutableInt32 { - MapStringToMutableInt32 { obj_id: self.id } - } + MapStringToMutableInt32 { obj_id: self.id } + } } pub struct MapHashToImmutableInt32 { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapHashToImmutableInt32 { @@ -118,18 +124,19 @@ pub struct ImmutableListBlobsResults { } impl ImmutableListBlobsResults { + pub fn blob_sizes(&self) -> MapHashToImmutableInt32 { - MapHashToImmutableInt32 { obj_id: self.id } - } + MapHashToImmutableInt32 { obj_id: self.id } + } } pub struct MapHashToMutableInt32 { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapHashToMutableInt32 { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_int32(&self, key: &ScHash) -> ScMutableInt32 { @@ -143,7 +150,8 @@ pub struct MutableListBlobsResults { } impl MutableListBlobsResults { + pub fn blob_sizes(&self) -> MapHashToMutableInt32 { - MapHashToMutableInt32 { obj_id: self.id } - } + MapHashToMutableInt32 { obj_id: self.id } + } } diff --git a/packages/vm/wasmlib/src/coreblocklog/consts.rs b/packages/vm/wasmlib/src/coreblocklog/consts.rs index b198f19cc2..ceb811734b 100644 --- a/packages/vm/wasmlib/src/coreblocklog/consts.rs +++ b/packages/vm/wasmlib/src/coreblocklog/consts.rs @@ -15,42 +15,42 @@ pub const SC_NAME: &str = "blocklog"; pub const SC_DESCRIPTION: &str = "Core block log contract"; pub const HSC_NAME: ScHname = ScHname(0xf538ef2b); -pub(crate) const PARAM_BLOCK_INDEX: &str = "n"; +pub(crate) const PARAM_BLOCK_INDEX: &str = "n"; pub(crate) const PARAM_CONTRACT_HNAME: &str = "h"; -pub(crate) const PARAM_FROM_BLOCK: &str = "f"; -pub(crate) const PARAM_REQUEST_ID: &str = "u"; -pub(crate) const PARAM_TO_BLOCK: &str = "t"; - -pub(crate) const RESULT_BLOCK_INDEX: &str = "n"; -pub(crate) const RESULT_BLOCK_INFO: &str = "i"; -pub(crate) const RESULT_EVENT: &str = "e"; -pub(crate) const RESULT_GOVERNING_ADDRESS: &str = "g"; -pub(crate) const RESULT_REQUEST_ID: &str = "u"; -pub(crate) const RESULT_REQUEST_INDEX: &str = "r"; -pub(crate) const RESULT_REQUEST_PROCESSED: &str = "p"; -pub(crate) const RESULT_REQUEST_RECORD: &str = "d"; +pub(crate) const PARAM_FROM_BLOCK: &str = "f"; +pub(crate) const PARAM_REQUEST_ID: &str = "u"; +pub(crate) const PARAM_TO_BLOCK: &str = "t"; + +pub(crate) const RESULT_BLOCK_INDEX: &str = "n"; +pub(crate) const RESULT_BLOCK_INFO: &str = "i"; +pub(crate) const RESULT_EVENT: &str = "e"; +pub(crate) const RESULT_GOVERNING_ADDRESS: &str = "g"; +pub(crate) const RESULT_REQUEST_ID: &str = "u"; +pub(crate) const RESULT_REQUEST_INDEX: &str = "r"; +pub(crate) const RESULT_REQUEST_PROCESSED: &str = "p"; +pub(crate) const RESULT_REQUEST_RECORD: &str = "d"; pub(crate) const RESULT_STATE_CONTROLLER_ADDRESS: &str = "s"; -pub(crate) const VIEW_CONTROL_ADDRESSES: &str = "controlAddresses"; -pub(crate) const VIEW_GET_BLOCK_INFO: &str = "getBlockInfo"; -pub(crate) const VIEW_GET_EVENTS_FOR_BLOCK: &str = "getEventsForBlock"; -pub(crate) const VIEW_GET_EVENTS_FOR_CONTRACT: &str = "getEventsForContract"; -pub(crate) const VIEW_GET_EVENTS_FOR_REQUEST: &str = "getEventsForRequest"; -pub(crate) const VIEW_GET_LATEST_BLOCK_INFO: &str = "getLatestBlockInfo"; -pub(crate) const VIEW_GET_REQUEST_I_DS_FOR_BLOCK: &str = "getRequestIDsForBlock"; -pub(crate) const VIEW_GET_REQUEST_RECEIPT: &str = "getRequestReceipt"; -pub(crate) const VIEW_GET_REQUEST_RECEIPTS_FOR_BLOCK: &str = "getRequestReceiptsForBlock"; -pub(crate) const VIEW_IS_REQUEST_PROCESSED: &str = "isRequestProcessed"; - -pub(crate) const HVIEW_CONTROL_ADDRESSES: ScHname = ScHname(0x796bd223); -pub(crate) const HVIEW_GET_BLOCK_INFO: ScHname = ScHname(0xbe89f9b3); -pub(crate) const HVIEW_GET_EVENTS_FOR_BLOCK: ScHname = ScHname(0x36232798); -pub(crate) const HVIEW_GET_EVENTS_FOR_CONTRACT: ScHname = ScHname(0x682a1922); -pub(crate) const HVIEW_GET_EVENTS_FOR_REQUEST: ScHname = ScHname(0x4f8d68e4); -pub(crate) const HVIEW_GET_LATEST_BLOCK_INFO: ScHname = ScHname(0x084a1760); -pub(crate) const HVIEW_GET_REQUEST_I_DS_FOR_BLOCK: ScHname = ScHname(0x5a20327a); -pub(crate) const HVIEW_GET_REQUEST_RECEIPT: ScHname = ScHname(0xb7f9534f); +pub(crate) const VIEW_CONTROL_ADDRESSES: &str = "controlAddresses"; +pub(crate) const VIEW_GET_BLOCK_INFO: &str = "getBlockInfo"; +pub(crate) const VIEW_GET_EVENTS_FOR_BLOCK: &str = "getEventsForBlock"; +pub(crate) const VIEW_GET_EVENTS_FOR_CONTRACT: &str = "getEventsForContract"; +pub(crate) const VIEW_GET_EVENTS_FOR_REQUEST: &str = "getEventsForRequest"; +pub(crate) const VIEW_GET_LATEST_BLOCK_INFO: &str = "getLatestBlockInfo"; +pub(crate) const VIEW_GET_REQUEST_I_DS_FOR_BLOCK: &str = "getRequestIDsForBlock"; +pub(crate) const VIEW_GET_REQUEST_RECEIPT: &str = "getRequestReceipt"; +pub(crate) const VIEW_GET_REQUEST_RECEIPTS_FOR_BLOCK: &str = "getRequestReceiptsForBlock"; +pub(crate) const VIEW_IS_REQUEST_PROCESSED: &str = "isRequestProcessed"; + +pub(crate) const HVIEW_CONTROL_ADDRESSES: ScHname = ScHname(0x796bd223); +pub(crate) const HVIEW_GET_BLOCK_INFO: ScHname = ScHname(0xbe89f9b3); +pub(crate) const HVIEW_GET_EVENTS_FOR_BLOCK: ScHname = ScHname(0x36232798); +pub(crate) const HVIEW_GET_EVENTS_FOR_CONTRACT: ScHname = ScHname(0x682a1922); +pub(crate) const HVIEW_GET_EVENTS_FOR_REQUEST: ScHname = ScHname(0x4f8d68e4); +pub(crate) const HVIEW_GET_LATEST_BLOCK_INFO: ScHname = ScHname(0x084a1760); +pub(crate) const HVIEW_GET_REQUEST_I_DS_FOR_BLOCK: ScHname = ScHname(0x5a20327a); +pub(crate) const HVIEW_GET_REQUEST_RECEIPT: ScHname = ScHname(0xb7f9534f); pub(crate) const HVIEW_GET_REQUEST_RECEIPTS_FOR_BLOCK: ScHname = ScHname(0x77e3beef); -pub(crate) const HVIEW_IS_REQUEST_PROCESSED: ScHname = ScHname(0xd57d50a9); +pub(crate) const HVIEW_IS_REQUEST_PROCESSED: ScHname = ScHname(0xd57d50a9); // @formatter:on diff --git a/packages/vm/wasmlib/src/coreblocklog/contract.rs b/packages/vm/wasmlib/src/coreblocklog/contract.rs index fa165bdf10..fbd7dd8d49 100644 --- a/packages/vm/wasmlib/src/coreblocklog/contract.rs +++ b/packages/vm/wasmlib/src/coreblocklog/contract.rs @@ -15,61 +15,61 @@ use crate::*; use crate::coreblocklog::*; pub struct ControlAddressesCall { - pub func: ScView, - pub results: ImmutableControlAddressesResults, + pub func: ScView, + pub results: ImmutableControlAddressesResults, } pub struct GetBlockInfoCall { - pub func: ScView, - pub params: MutableGetBlockInfoParams, - pub results: ImmutableGetBlockInfoResults, + pub func: ScView, + pub params: MutableGetBlockInfoParams, + pub results: ImmutableGetBlockInfoResults, } pub struct GetEventsForBlockCall { - pub func: ScView, - pub params: MutableGetEventsForBlockParams, - pub results: ImmutableGetEventsForBlockResults, + pub func: ScView, + pub params: MutableGetEventsForBlockParams, + pub results: ImmutableGetEventsForBlockResults, } pub struct GetEventsForContractCall { - pub func: ScView, - pub params: MutableGetEventsForContractParams, - pub results: ImmutableGetEventsForContractResults, + pub func: ScView, + pub params: MutableGetEventsForContractParams, + pub results: ImmutableGetEventsForContractResults, } pub struct GetEventsForRequestCall { - pub func: ScView, - pub params: MutableGetEventsForRequestParams, - pub results: ImmutableGetEventsForRequestResults, + pub func: ScView, + pub params: MutableGetEventsForRequestParams, + pub results: ImmutableGetEventsForRequestResults, } pub struct GetLatestBlockInfoCall { - pub func: ScView, - pub results: ImmutableGetLatestBlockInfoResults, + pub func: ScView, + pub results: ImmutableGetLatestBlockInfoResults, } pub struct GetRequestIDsForBlockCall { - pub func: ScView, - pub params: MutableGetRequestIDsForBlockParams, - pub results: ImmutableGetRequestIDsForBlockResults, + pub func: ScView, + pub params: MutableGetRequestIDsForBlockParams, + pub results: ImmutableGetRequestIDsForBlockResults, } pub struct GetRequestReceiptCall { - pub func: ScView, - pub params: MutableGetRequestReceiptParams, - pub results: ImmutableGetRequestReceiptResults, + pub func: ScView, + pub params: MutableGetRequestReceiptParams, + pub results: ImmutableGetRequestReceiptResults, } pub struct GetRequestReceiptsForBlockCall { - pub func: ScView, - pub params: MutableGetRequestReceiptsForBlockParams, - pub results: ImmutableGetRequestReceiptsForBlockResults, + pub func: ScView, + pub params: MutableGetRequestReceiptsForBlockParams, + pub results: ImmutableGetRequestReceiptsForBlockResults, } pub struct IsRequestProcessedCall { - pub func: ScView, - pub params: MutableIsRequestProcessedParams, - pub results: ImmutableIsRequestProcessedResults, + pub func: ScView, + pub params: MutableIsRequestProcessedParams, + pub results: ImmutableIsRequestProcessedResults, } pub struct ScFuncs { @@ -78,7 +78,7 @@ pub struct ScFuncs { impl ScFuncs { pub fn control_addresses(_ctx: & dyn ScViewCallContext) -> ControlAddressesCall { let mut f = ControlAddressesCall { - func: ScView::new(HSC_NAME, HVIEW_CONTROL_ADDRESSES), + func: ScView::new(HSC_NAME, HVIEW_CONTROL_ADDRESSES), results: ImmutableControlAddressesResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); @@ -86,8 +86,8 @@ impl ScFuncs { } pub fn get_block_info(_ctx: & dyn ScViewCallContext) -> GetBlockInfoCall { let mut f = GetBlockInfoCall { - func: ScView::new(HSC_NAME, HVIEW_GET_BLOCK_INFO), - params: MutableGetBlockInfoParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_GET_BLOCK_INFO), + params: MutableGetBlockInfoParams { id: 0 }, results: ImmutableGetBlockInfoResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -95,8 +95,8 @@ impl ScFuncs { } pub fn get_events_for_block(_ctx: & dyn ScViewCallContext) -> GetEventsForBlockCall { let mut f = GetEventsForBlockCall { - func: ScView::new(HSC_NAME, HVIEW_GET_EVENTS_FOR_BLOCK), - params: MutableGetEventsForBlockParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_GET_EVENTS_FOR_BLOCK), + params: MutableGetEventsForBlockParams { id: 0 }, results: ImmutableGetEventsForBlockResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -104,8 +104,8 @@ impl ScFuncs { } pub fn get_events_for_contract(_ctx: & dyn ScViewCallContext) -> GetEventsForContractCall { let mut f = GetEventsForContractCall { - func: ScView::new(HSC_NAME, HVIEW_GET_EVENTS_FOR_CONTRACT), - params: MutableGetEventsForContractParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_GET_EVENTS_FOR_CONTRACT), + params: MutableGetEventsForContractParams { id: 0 }, results: ImmutableGetEventsForContractResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -113,8 +113,8 @@ impl ScFuncs { } pub fn get_events_for_request(_ctx: & dyn ScViewCallContext) -> GetEventsForRequestCall { let mut f = GetEventsForRequestCall { - func: ScView::new(HSC_NAME, HVIEW_GET_EVENTS_FOR_REQUEST), - params: MutableGetEventsForRequestParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_GET_EVENTS_FOR_REQUEST), + params: MutableGetEventsForRequestParams { id: 0 }, results: ImmutableGetEventsForRequestResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -122,7 +122,7 @@ impl ScFuncs { } pub fn get_latest_block_info(_ctx: & dyn ScViewCallContext) -> GetLatestBlockInfoCall { let mut f = GetLatestBlockInfoCall { - func: ScView::new(HSC_NAME, HVIEW_GET_LATEST_BLOCK_INFO), + func: ScView::new(HSC_NAME, HVIEW_GET_LATEST_BLOCK_INFO), results: ImmutableGetLatestBlockInfoResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); @@ -130,8 +130,8 @@ impl ScFuncs { } pub fn get_request_i_ds_for_block(_ctx: & dyn ScViewCallContext) -> GetRequestIDsForBlockCall { let mut f = GetRequestIDsForBlockCall { - func: ScView::new(HSC_NAME, HVIEW_GET_REQUEST_I_DS_FOR_BLOCK), - params: MutableGetRequestIDsForBlockParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_GET_REQUEST_I_DS_FOR_BLOCK), + params: MutableGetRequestIDsForBlockParams { id: 0 }, results: ImmutableGetRequestIDsForBlockResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -139,8 +139,8 @@ impl ScFuncs { } pub fn get_request_receipt(_ctx: & dyn ScViewCallContext) -> GetRequestReceiptCall { let mut f = GetRequestReceiptCall { - func: ScView::new(HSC_NAME, HVIEW_GET_REQUEST_RECEIPT), - params: MutableGetRequestReceiptParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_GET_REQUEST_RECEIPT), + params: MutableGetRequestReceiptParams { id: 0 }, results: ImmutableGetRequestReceiptResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -148,8 +148,8 @@ impl ScFuncs { } pub fn get_request_receipts_for_block(_ctx: & dyn ScViewCallContext) -> GetRequestReceiptsForBlockCall { let mut f = GetRequestReceiptsForBlockCall { - func: ScView::new(HSC_NAME, HVIEW_GET_REQUEST_RECEIPTS_FOR_BLOCK), - params: MutableGetRequestReceiptsForBlockParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_GET_REQUEST_RECEIPTS_FOR_BLOCK), + params: MutableGetRequestReceiptsForBlockParams { id: 0 }, results: ImmutableGetRequestReceiptsForBlockResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -157,8 +157,8 @@ impl ScFuncs { } pub fn is_request_processed(_ctx: & dyn ScViewCallContext) -> IsRequestProcessedCall { let mut f = IsRequestProcessedCall { - func: ScView::new(HSC_NAME, HVIEW_IS_REQUEST_PROCESSED), - params: MutableIsRequestProcessedParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_IS_REQUEST_PROCESSED), + params: MutableIsRequestProcessedParams { id: 0 }, results: ImmutableIsRequestProcessedResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); diff --git a/packages/vm/wasmlib/src/coreblocklog/params.rs b/packages/vm/wasmlib/src/coreblocklog/params.rs index 3f7adb0e83..bfae6fd591 100644 --- a/packages/vm/wasmlib/src/coreblocklog/params.rs +++ b/packages/vm/wasmlib/src/coreblocklog/params.rs @@ -18,9 +18,10 @@ pub struct ImmutableGetBlockInfoParams { } impl ImmutableGetBlockInfoParams { + pub fn block_index(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) - } + ScImmutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) + } } #[derive(Clone, Copy)] @@ -29,9 +30,10 @@ pub struct MutableGetBlockInfoParams { } impl MutableGetBlockInfoParams { + pub fn block_index(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) - } + ScMutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) + } } #[derive(Clone, Copy)] @@ -40,9 +42,10 @@ pub struct ImmutableGetEventsForBlockParams { } impl ImmutableGetEventsForBlockParams { + pub fn block_index(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) - } + ScImmutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) + } } #[derive(Clone, Copy)] @@ -51,9 +54,10 @@ pub struct MutableGetEventsForBlockParams { } impl MutableGetEventsForBlockParams { + pub fn block_index(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) - } + ScMutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) + } } #[derive(Clone, Copy)] @@ -62,17 +66,18 @@ pub struct ImmutableGetEventsForContractParams { } impl ImmutableGetEventsForContractParams { + pub fn contract_hname(&self) -> ScImmutableHname { - ScImmutableHname::new(self.id, PARAM_CONTRACT_HNAME.get_key_id()) - } + ScImmutableHname::new(self.id, PARAM_CONTRACT_HNAME.get_key_id()) + } pub fn from_block(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, PARAM_FROM_BLOCK.get_key_id()) - } + ScImmutableInt32::new(self.id, PARAM_FROM_BLOCK.get_key_id()) + } pub fn to_block(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, PARAM_TO_BLOCK.get_key_id()) - } + ScImmutableInt32::new(self.id, PARAM_TO_BLOCK.get_key_id()) + } } #[derive(Clone, Copy)] @@ -81,17 +86,18 @@ pub struct MutableGetEventsForContractParams { } impl MutableGetEventsForContractParams { + pub fn contract_hname(&self) -> ScMutableHname { - ScMutableHname::new(self.id, PARAM_CONTRACT_HNAME.get_key_id()) - } + ScMutableHname::new(self.id, PARAM_CONTRACT_HNAME.get_key_id()) + } pub fn from_block(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, PARAM_FROM_BLOCK.get_key_id()) - } + ScMutableInt32::new(self.id, PARAM_FROM_BLOCK.get_key_id()) + } pub fn to_block(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, PARAM_TO_BLOCK.get_key_id()) - } + ScMutableInt32::new(self.id, PARAM_TO_BLOCK.get_key_id()) + } } #[derive(Clone, Copy)] @@ -100,9 +106,10 @@ pub struct ImmutableGetEventsForRequestParams { } impl ImmutableGetEventsForRequestParams { + pub fn request_id(&self) -> ScImmutableRequestID { - ScImmutableRequestID::new(self.id, PARAM_REQUEST_ID.get_key_id()) - } + ScImmutableRequestID::new(self.id, PARAM_REQUEST_ID.get_key_id()) + } } #[derive(Clone, Copy)] @@ -111,9 +118,10 @@ pub struct MutableGetEventsForRequestParams { } impl MutableGetEventsForRequestParams { + pub fn request_id(&self) -> ScMutableRequestID { - ScMutableRequestID::new(self.id, PARAM_REQUEST_ID.get_key_id()) - } + ScMutableRequestID::new(self.id, PARAM_REQUEST_ID.get_key_id()) + } } #[derive(Clone, Copy)] @@ -122,9 +130,10 @@ pub struct ImmutableGetRequestIDsForBlockParams { } impl ImmutableGetRequestIDsForBlockParams { + pub fn block_index(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) - } + ScImmutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) + } } #[derive(Clone, Copy)] @@ -133,9 +142,10 @@ pub struct MutableGetRequestIDsForBlockParams { } impl MutableGetRequestIDsForBlockParams { + pub fn block_index(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) - } + ScMutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) + } } #[derive(Clone, Copy)] @@ -144,9 +154,10 @@ pub struct ImmutableGetRequestReceiptParams { } impl ImmutableGetRequestReceiptParams { + pub fn request_id(&self) -> ScImmutableRequestID { - ScImmutableRequestID::new(self.id, PARAM_REQUEST_ID.get_key_id()) - } + ScImmutableRequestID::new(self.id, PARAM_REQUEST_ID.get_key_id()) + } } #[derive(Clone, Copy)] @@ -155,9 +166,10 @@ pub struct MutableGetRequestReceiptParams { } impl MutableGetRequestReceiptParams { + pub fn request_id(&self) -> ScMutableRequestID { - ScMutableRequestID::new(self.id, PARAM_REQUEST_ID.get_key_id()) - } + ScMutableRequestID::new(self.id, PARAM_REQUEST_ID.get_key_id()) + } } #[derive(Clone, Copy)] @@ -166,9 +178,10 @@ pub struct ImmutableGetRequestReceiptsForBlockParams { } impl ImmutableGetRequestReceiptsForBlockParams { + pub fn block_index(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) - } + ScImmutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) + } } #[derive(Clone, Copy)] @@ -177,9 +190,10 @@ pub struct MutableGetRequestReceiptsForBlockParams { } impl MutableGetRequestReceiptsForBlockParams { + pub fn block_index(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) - } + ScMutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) + } } #[derive(Clone, Copy)] @@ -188,9 +202,10 @@ pub struct ImmutableIsRequestProcessedParams { } impl ImmutableIsRequestProcessedParams { + pub fn request_id(&self) -> ScImmutableRequestID { - ScImmutableRequestID::new(self.id, PARAM_REQUEST_ID.get_key_id()) - } + ScImmutableRequestID::new(self.id, PARAM_REQUEST_ID.get_key_id()) + } } #[derive(Clone, Copy)] @@ -199,7 +214,8 @@ pub struct MutableIsRequestProcessedParams { } impl MutableIsRequestProcessedParams { + pub fn request_id(&self) -> ScMutableRequestID { - ScMutableRequestID::new(self.id, PARAM_REQUEST_ID.get_key_id()) - } + ScMutableRequestID::new(self.id, PARAM_REQUEST_ID.get_key_id()) + } } diff --git a/packages/vm/wasmlib/src/coreblocklog/results.rs b/packages/vm/wasmlib/src/coreblocklog/results.rs index a3a0e6a750..bee504d09f 100644 --- a/packages/vm/wasmlib/src/coreblocklog/results.rs +++ b/packages/vm/wasmlib/src/coreblocklog/results.rs @@ -18,17 +18,18 @@ pub struct ImmutableControlAddressesResults { } impl ImmutableControlAddressesResults { + pub fn block_index(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, RESULT_BLOCK_INDEX.get_key_id()) - } + ScImmutableInt32::new(self.id, RESULT_BLOCK_INDEX.get_key_id()) + } pub fn governing_address(&self) -> ScImmutableAddress { - ScImmutableAddress::new(self.id, RESULT_GOVERNING_ADDRESS.get_key_id()) - } + ScImmutableAddress::new(self.id, RESULT_GOVERNING_ADDRESS.get_key_id()) + } pub fn state_controller_address(&self) -> ScImmutableAddress { - ScImmutableAddress::new(self.id, RESULT_STATE_CONTROLLER_ADDRESS.get_key_id()) - } + ScImmutableAddress::new(self.id, RESULT_STATE_CONTROLLER_ADDRESS.get_key_id()) + } } #[derive(Clone, Copy)] @@ -37,17 +38,18 @@ pub struct MutableControlAddressesResults { } impl MutableControlAddressesResults { + pub fn block_index(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, RESULT_BLOCK_INDEX.get_key_id()) - } + ScMutableInt32::new(self.id, RESULT_BLOCK_INDEX.get_key_id()) + } pub fn governing_address(&self) -> ScMutableAddress { - ScMutableAddress::new(self.id, RESULT_GOVERNING_ADDRESS.get_key_id()) - } + ScMutableAddress::new(self.id, RESULT_GOVERNING_ADDRESS.get_key_id()) + } pub fn state_controller_address(&self) -> ScMutableAddress { - ScMutableAddress::new(self.id, RESULT_STATE_CONTROLLER_ADDRESS.get_key_id()) - } + ScMutableAddress::new(self.id, RESULT_STATE_CONTROLLER_ADDRESS.get_key_id()) + } } #[derive(Clone, Copy)] @@ -56,9 +58,10 @@ pub struct ImmutableGetBlockInfoResults { } impl ImmutableGetBlockInfoResults { + pub fn block_info(&self) -> ScImmutableBytes { - ScImmutableBytes::new(self.id, RESULT_BLOCK_INFO.get_key_id()) - } + ScImmutableBytes::new(self.id, RESULT_BLOCK_INFO.get_key_id()) + } } #[derive(Clone, Copy)] @@ -67,13 +70,14 @@ pub struct MutableGetBlockInfoResults { } impl MutableGetBlockInfoResults { + pub fn block_info(&self) -> ScMutableBytes { - ScMutableBytes::new(self.id, RESULT_BLOCK_INFO.get_key_id()) - } + ScMutableBytes::new(self.id, RESULT_BLOCK_INFO.get_key_id()) + } } pub struct ArrayOfImmutableBytes { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl ArrayOfImmutableBytes { @@ -92,14 +96,15 @@ pub struct ImmutableGetEventsForBlockResults { } impl ImmutableGetEventsForBlockResults { + pub fn event(&self) -> ArrayOfImmutableBytes { - let arr_id = get_object_id(self.id, RESULT_EVENT.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); - ArrayOfImmutableBytes { obj_id: arr_id } - } + let arr_id = get_object_id(self.id, RESULT_EVENT.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); + ArrayOfImmutableBytes { obj_id: arr_id } + } } pub struct ArrayOfMutableBytes { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl ArrayOfMutableBytes { @@ -122,10 +127,11 @@ pub struct MutableGetEventsForBlockResults { } impl MutableGetEventsForBlockResults { + pub fn event(&self) -> ArrayOfMutableBytes { - let arr_id = get_object_id(self.id, RESULT_EVENT.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); - ArrayOfMutableBytes { obj_id: arr_id } - } + let arr_id = get_object_id(self.id, RESULT_EVENT.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); + ArrayOfMutableBytes { obj_id: arr_id } + } } #[derive(Clone, Copy)] @@ -134,10 +140,11 @@ pub struct ImmutableGetEventsForContractResults { } impl ImmutableGetEventsForContractResults { + pub fn event(&self) -> ArrayOfImmutableBytes { - let arr_id = get_object_id(self.id, RESULT_EVENT.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); - ArrayOfImmutableBytes { obj_id: arr_id } - } + let arr_id = get_object_id(self.id, RESULT_EVENT.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); + ArrayOfImmutableBytes { obj_id: arr_id } + } } #[derive(Clone, Copy)] @@ -146,10 +153,11 @@ pub struct MutableGetEventsForContractResults { } impl MutableGetEventsForContractResults { + pub fn event(&self) -> ArrayOfMutableBytes { - let arr_id = get_object_id(self.id, RESULT_EVENT.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); - ArrayOfMutableBytes { obj_id: arr_id } - } + let arr_id = get_object_id(self.id, RESULT_EVENT.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); + ArrayOfMutableBytes { obj_id: arr_id } + } } #[derive(Clone, Copy)] @@ -158,10 +166,11 @@ pub struct ImmutableGetEventsForRequestResults { } impl ImmutableGetEventsForRequestResults { + pub fn event(&self) -> ArrayOfImmutableBytes { - let arr_id = get_object_id(self.id, RESULT_EVENT.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); - ArrayOfImmutableBytes { obj_id: arr_id } - } + let arr_id = get_object_id(self.id, RESULT_EVENT.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); + ArrayOfImmutableBytes { obj_id: arr_id } + } } #[derive(Clone, Copy)] @@ -170,10 +179,11 @@ pub struct MutableGetEventsForRequestResults { } impl MutableGetEventsForRequestResults { + pub fn event(&self) -> ArrayOfMutableBytes { - let arr_id = get_object_id(self.id, RESULT_EVENT.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); - ArrayOfMutableBytes { obj_id: arr_id } - } + let arr_id = get_object_id(self.id, RESULT_EVENT.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); + ArrayOfMutableBytes { obj_id: arr_id } + } } #[derive(Clone, Copy)] @@ -182,13 +192,14 @@ pub struct ImmutableGetLatestBlockInfoResults { } impl ImmutableGetLatestBlockInfoResults { + pub fn block_index(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, RESULT_BLOCK_INDEX.get_key_id()) - } + ScImmutableInt32::new(self.id, RESULT_BLOCK_INDEX.get_key_id()) + } pub fn block_info(&self) -> ScImmutableBytes { - ScImmutableBytes::new(self.id, RESULT_BLOCK_INFO.get_key_id()) - } + ScImmutableBytes::new(self.id, RESULT_BLOCK_INFO.get_key_id()) + } } #[derive(Clone, Copy)] @@ -197,17 +208,18 @@ pub struct MutableGetLatestBlockInfoResults { } impl MutableGetLatestBlockInfoResults { + pub fn block_index(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, RESULT_BLOCK_INDEX.get_key_id()) - } + ScMutableInt32::new(self.id, RESULT_BLOCK_INDEX.get_key_id()) + } pub fn block_info(&self) -> ScMutableBytes { - ScMutableBytes::new(self.id, RESULT_BLOCK_INFO.get_key_id()) - } + ScMutableBytes::new(self.id, RESULT_BLOCK_INFO.get_key_id()) + } } pub struct ArrayOfImmutableRequestID { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl ArrayOfImmutableRequestID { @@ -226,14 +238,15 @@ pub struct ImmutableGetRequestIDsForBlockResults { } impl ImmutableGetRequestIDsForBlockResults { + pub fn request_id(&self) -> ArrayOfImmutableRequestID { - let arr_id = get_object_id(self.id, RESULT_REQUEST_ID.get_key_id(), TYPE_ARRAY16 | TYPE_REQUEST_ID); - ArrayOfImmutableRequestID { obj_id: arr_id } - } + let arr_id = get_object_id(self.id, RESULT_REQUEST_ID.get_key_id(), TYPE_ARRAY16 | TYPE_REQUEST_ID); + ArrayOfImmutableRequestID { obj_id: arr_id } + } } pub struct ArrayOfMutableRequestID { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl ArrayOfMutableRequestID { @@ -256,10 +269,11 @@ pub struct MutableGetRequestIDsForBlockResults { } impl MutableGetRequestIDsForBlockResults { + pub fn request_id(&self) -> ArrayOfMutableRequestID { - let arr_id = get_object_id(self.id, RESULT_REQUEST_ID.get_key_id(), TYPE_ARRAY16 | TYPE_REQUEST_ID); - ArrayOfMutableRequestID { obj_id: arr_id } - } + let arr_id = get_object_id(self.id, RESULT_REQUEST_ID.get_key_id(), TYPE_ARRAY16 | TYPE_REQUEST_ID); + ArrayOfMutableRequestID { obj_id: arr_id } + } } #[derive(Clone, Copy)] @@ -268,17 +282,18 @@ pub struct ImmutableGetRequestReceiptResults { } impl ImmutableGetRequestReceiptResults { + pub fn block_index(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, RESULT_BLOCK_INDEX.get_key_id()) - } + ScImmutableInt32::new(self.id, RESULT_BLOCK_INDEX.get_key_id()) + } pub fn request_index(&self) -> ScImmutableInt16 { - ScImmutableInt16::new(self.id, RESULT_REQUEST_INDEX.get_key_id()) - } + ScImmutableInt16::new(self.id, RESULT_REQUEST_INDEX.get_key_id()) + } pub fn request_record(&self) -> ScImmutableBytes { - ScImmutableBytes::new(self.id, RESULT_REQUEST_RECORD.get_key_id()) - } + ScImmutableBytes::new(self.id, RESULT_REQUEST_RECORD.get_key_id()) + } } #[derive(Clone, Copy)] @@ -287,17 +302,18 @@ pub struct MutableGetRequestReceiptResults { } impl MutableGetRequestReceiptResults { + pub fn block_index(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, RESULT_BLOCK_INDEX.get_key_id()) - } + ScMutableInt32::new(self.id, RESULT_BLOCK_INDEX.get_key_id()) + } pub fn request_index(&self) -> ScMutableInt16 { - ScMutableInt16::new(self.id, RESULT_REQUEST_INDEX.get_key_id()) - } + ScMutableInt16::new(self.id, RESULT_REQUEST_INDEX.get_key_id()) + } pub fn request_record(&self) -> ScMutableBytes { - ScMutableBytes::new(self.id, RESULT_REQUEST_RECORD.get_key_id()) - } + ScMutableBytes::new(self.id, RESULT_REQUEST_RECORD.get_key_id()) + } } #[derive(Clone, Copy)] @@ -306,10 +322,11 @@ pub struct ImmutableGetRequestReceiptsForBlockResults { } impl ImmutableGetRequestReceiptsForBlockResults { + pub fn request_record(&self) -> ArrayOfImmutableBytes { - let arr_id = get_object_id(self.id, RESULT_REQUEST_RECORD.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); - ArrayOfImmutableBytes { obj_id: arr_id } - } + let arr_id = get_object_id(self.id, RESULT_REQUEST_RECORD.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); + ArrayOfImmutableBytes { obj_id: arr_id } + } } #[derive(Clone, Copy)] @@ -318,10 +335,11 @@ pub struct MutableGetRequestReceiptsForBlockResults { } impl MutableGetRequestReceiptsForBlockResults { + pub fn request_record(&self) -> ArrayOfMutableBytes { - let arr_id = get_object_id(self.id, RESULT_REQUEST_RECORD.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); - ArrayOfMutableBytes { obj_id: arr_id } - } + let arr_id = get_object_id(self.id, RESULT_REQUEST_RECORD.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); + ArrayOfMutableBytes { obj_id: arr_id } + } } #[derive(Clone, Copy)] @@ -330,9 +348,10 @@ pub struct ImmutableIsRequestProcessedResults { } impl ImmutableIsRequestProcessedResults { + pub fn request_processed(&self) -> ScImmutableString { - ScImmutableString::new(self.id, RESULT_REQUEST_PROCESSED.get_key_id()) - } + ScImmutableString::new(self.id, RESULT_REQUEST_PROCESSED.get_key_id()) + } } #[derive(Clone, Copy)] @@ -341,7 +360,8 @@ pub struct MutableIsRequestProcessedResults { } impl MutableIsRequestProcessedResults { + pub fn request_processed(&self) -> ScMutableString { - ScMutableString::new(self.id, RESULT_REQUEST_PROCESSED.get_key_id()) - } + ScMutableString::new(self.id, RESULT_REQUEST_PROCESSED.get_key_id()) + } } diff --git a/packages/vm/wasmlib/src/coregovernance/consts.rs b/packages/vm/wasmlib/src/coregovernance/consts.rs index 01d676af06..9cba42da54 100644 --- a/packages/vm/wasmlib/src/coregovernance/consts.rs +++ b/packages/vm/wasmlib/src/coregovernance/consts.rs @@ -15,53 +15,53 @@ pub const SC_NAME: &str = "governance"; pub const SC_DESCRIPTION: &str = "Core governance contract"; pub const HSC_NAME: ScHname = ScHname(0x17cf909f); -pub(crate) const PARAM_CHAIN_OWNER: &str = "oi"; -pub(crate) const PARAM_FEE_COLOR: &str = "fc"; -pub(crate) const PARAM_HNAME: &str = "hn"; -pub(crate) const PARAM_MAX_BLOB_SIZE: &str = "bs"; -pub(crate) const PARAM_MAX_EVENT_SIZE: &str = "es"; -pub(crate) const PARAM_MAX_EVENTS_PER_REQ: &str = "ne"; -pub(crate) const PARAM_OWNER_FEE: &str = "of"; +pub(crate) const PARAM_CHAIN_OWNER: &str = "oi"; +pub(crate) const PARAM_FEE_COLOR: &str = "fc"; +pub(crate) const PARAM_HNAME: &str = "hn"; +pub(crate) const PARAM_MAX_BLOB_SIZE: &str = "bs"; +pub(crate) const PARAM_MAX_EVENT_SIZE: &str = "es"; +pub(crate) const PARAM_MAX_EVENTS_PER_REQ: &str = "ne"; +pub(crate) const PARAM_OWNER_FEE: &str = "of"; pub(crate) const PARAM_STATE_CONTROLLER_ADDRESS: &str = "S"; -pub(crate) const PARAM_VALIDATOR_FEE: &str = "vf"; +pub(crate) const PARAM_VALIDATOR_FEE: &str = "vf"; pub(crate) const RESULT_ALLOWED_STATE_CONTROLLER_ADDRESSES: &str = "a"; -pub(crate) const RESULT_CHAIN_ID: &str = "c"; -pub(crate) const RESULT_CHAIN_OWNER_ID: &str = "o"; -pub(crate) const RESULT_DEFAULT_OWNER_FEE: &str = "do"; -pub(crate) const RESULT_DEFAULT_VALIDATOR_FEE: &str = "dv"; -pub(crate) const RESULT_DESCRIPTION: &str = "d"; -pub(crate) const RESULT_FEE_COLOR: &str = "f"; -pub(crate) const RESULT_MAX_BLOB_SIZE: &str = "mb"; -pub(crate) const RESULT_MAX_EVENT_SIZE: &str = "me"; -pub(crate) const RESULT_MAX_EVENTS_PER_REQ: &str = "mr"; -pub(crate) const RESULT_OWNER_FEE: &str = "of"; -pub(crate) const RESULT_VALIDATOR_FEE: &str = "vf"; +pub(crate) const RESULT_CHAIN_ID: &str = "c"; +pub(crate) const RESULT_CHAIN_OWNER_ID: &str = "o"; +pub(crate) const RESULT_DEFAULT_OWNER_FEE: &str = "do"; +pub(crate) const RESULT_DEFAULT_VALIDATOR_FEE: &str = "dv"; +pub(crate) const RESULT_DESCRIPTION: &str = "d"; +pub(crate) const RESULT_FEE_COLOR: &str = "f"; +pub(crate) const RESULT_MAX_BLOB_SIZE: &str = "mb"; +pub(crate) const RESULT_MAX_EVENT_SIZE: &str = "me"; +pub(crate) const RESULT_MAX_EVENTS_PER_REQ: &str = "mr"; +pub(crate) const RESULT_OWNER_FEE: &str = "of"; +pub(crate) const RESULT_VALIDATOR_FEE: &str = "vf"; -pub(crate) const FUNC_ADD_ALLOWED_STATE_CONTROLLER_ADDRESS: &str = "addAllowedStateControllerAddress"; -pub(crate) const FUNC_CLAIM_CHAIN_OWNERSHIP: &str = "claimChainOwnership"; -pub(crate) const FUNC_DELEGATE_CHAIN_OWNERSHIP: &str = "delegateChainOwnership"; -pub(crate) const FUNC_REMOVE_ALLOWED_STATE_CONTROLLER_ADDRESS: &str = "removeAllowedStateControllerAddress"; -pub(crate) const FUNC_ROTATE_STATE_CONTROLLER: &str = "rotateStateController"; -pub(crate) const FUNC_SET_CHAIN_INFO: &str = "setChainInfo"; -pub(crate) const FUNC_SET_CONTRACT_FEE: &str = "setContractFee"; -pub(crate) const FUNC_SET_DEFAULT_FEE: &str = "setDefaultFee"; +pub(crate) const FUNC_ADD_ALLOWED_STATE_CONTROLLER_ADDRESS: &str = "addAllowedStateControllerAddress"; +pub(crate) const FUNC_CLAIM_CHAIN_OWNERSHIP: &str = "claimChainOwnership"; +pub(crate) const FUNC_DELEGATE_CHAIN_OWNERSHIP: &str = "delegateChainOwnership"; +pub(crate) const FUNC_REMOVE_ALLOWED_STATE_CONTROLLER_ADDRESS: &str = "removeAllowedStateControllerAddress"; +pub(crate) const FUNC_ROTATE_STATE_CONTROLLER: &str = "rotateStateController"; +pub(crate) const FUNC_SET_CHAIN_INFO: &str = "setChainInfo"; +pub(crate) const FUNC_SET_CONTRACT_FEE: &str = "setContractFee"; +pub(crate) const FUNC_SET_DEFAULT_FEE: &str = "setDefaultFee"; pub(crate) const VIEW_GET_ALLOWED_STATE_CONTROLLER_ADDRESSES: &str = "getAllowedStateControllerAddresses"; -pub(crate) const VIEW_GET_CHAIN_INFO: &str = "getChainInfo"; -pub(crate) const VIEW_GET_FEE_INFO: &str = "getFeeInfo"; -pub(crate) const VIEW_GET_MAX_BLOB_SIZE: &str = "getMaxBlobSize"; +pub(crate) const VIEW_GET_CHAIN_INFO: &str = "getChainInfo"; +pub(crate) const VIEW_GET_FEE_INFO: &str = "getFeeInfo"; +pub(crate) const VIEW_GET_MAX_BLOB_SIZE: &str = "getMaxBlobSize"; -pub(crate) const HFUNC_ADD_ALLOWED_STATE_CONTROLLER_ADDRESS: ScHname = ScHname(0x9469d567); -pub(crate) const HFUNC_CLAIM_CHAIN_OWNERSHIP: ScHname = ScHname(0x03ff0fc0); -pub(crate) const HFUNC_DELEGATE_CHAIN_OWNERSHIP: ScHname = ScHname(0x93ecb6ad); +pub(crate) const HFUNC_ADD_ALLOWED_STATE_CONTROLLER_ADDRESS: ScHname = ScHname(0x9469d567); +pub(crate) const HFUNC_CLAIM_CHAIN_OWNERSHIP: ScHname = ScHname(0x03ff0fc0); +pub(crate) const HFUNC_DELEGATE_CHAIN_OWNERSHIP: ScHname = ScHname(0x93ecb6ad); pub(crate) const HFUNC_REMOVE_ALLOWED_STATE_CONTROLLER_ADDRESS: ScHname = ScHname(0x31f69447); -pub(crate) const HFUNC_ROTATE_STATE_CONTROLLER: ScHname = ScHname(0x244d1038); -pub(crate) const HFUNC_SET_CHAIN_INFO: ScHname = ScHname(0x702f5d2b); -pub(crate) const HFUNC_SET_CONTRACT_FEE: ScHname = ScHname(0x8421a42b); -pub(crate) const HFUNC_SET_DEFAULT_FEE: ScHname = ScHname(0x3310ecd0); -pub(crate) const HVIEW_GET_ALLOWED_STATE_CONTROLLER_ADDRESSES: ScHname = ScHname(0xf3505183); -pub(crate) const HVIEW_GET_CHAIN_INFO: ScHname = ScHname(0x434477e2); -pub(crate) const HVIEW_GET_FEE_INFO: ScHname = ScHname(0x9fe54b48); -pub(crate) const HVIEW_GET_MAX_BLOB_SIZE: ScHname = ScHname(0xe1db3d28); +pub(crate) const HFUNC_ROTATE_STATE_CONTROLLER: ScHname = ScHname(0x244d1038); +pub(crate) const HFUNC_SET_CHAIN_INFO: ScHname = ScHname(0x702f5d2b); +pub(crate) const HFUNC_SET_CONTRACT_FEE: ScHname = ScHname(0x8421a42b); +pub(crate) const HFUNC_SET_DEFAULT_FEE: ScHname = ScHname(0x3310ecd0); +pub(crate) const HVIEW_GET_ALLOWED_STATE_CONTROLLER_ADDRESSES: ScHname = ScHname(0xf3505183); +pub(crate) const HVIEW_GET_CHAIN_INFO: ScHname = ScHname(0x434477e2); +pub(crate) const HVIEW_GET_FEE_INFO: ScHname = ScHname(0x9fe54b48); +pub(crate) const HVIEW_GET_MAX_BLOB_SIZE: ScHname = ScHname(0xe1db3d28); // @formatter:on diff --git a/packages/vm/wasmlib/src/coregovernance/contract.rs b/packages/vm/wasmlib/src/coregovernance/contract.rs index 7fa127cb43..95d05f6cda 100644 --- a/packages/vm/wasmlib/src/coregovernance/contract.rs +++ b/packages/vm/wasmlib/src/coregovernance/contract.rs @@ -15,63 +15,63 @@ use crate::*; use crate::coregovernance::*; pub struct AddAllowedStateControllerAddressCall { - pub func: ScFunc, - pub params: MutableAddAllowedStateControllerAddressParams, + pub func: ScFunc, + pub params: MutableAddAllowedStateControllerAddressParams, } pub struct ClaimChainOwnershipCall { - pub func: ScFunc, + pub func: ScFunc, } pub struct DelegateChainOwnershipCall { - pub func: ScFunc, - pub params: MutableDelegateChainOwnershipParams, + pub func: ScFunc, + pub params: MutableDelegateChainOwnershipParams, } pub struct RemoveAllowedStateControllerAddressCall { - pub func: ScFunc, - pub params: MutableRemoveAllowedStateControllerAddressParams, + pub func: ScFunc, + pub params: MutableRemoveAllowedStateControllerAddressParams, } pub struct RotateStateControllerCall { - pub func: ScFunc, - pub params: MutableRotateStateControllerParams, + pub func: ScFunc, + pub params: MutableRotateStateControllerParams, } pub struct SetChainInfoCall { - pub func: ScFunc, - pub params: MutableSetChainInfoParams, + pub func: ScFunc, + pub params: MutableSetChainInfoParams, } pub struct SetContractFeeCall { - pub func: ScFunc, - pub params: MutableSetContractFeeParams, + pub func: ScFunc, + pub params: MutableSetContractFeeParams, } pub struct SetDefaultFeeCall { - pub func: ScFunc, - pub params: MutableSetDefaultFeeParams, + pub func: ScFunc, + pub params: MutableSetDefaultFeeParams, } pub struct GetAllowedStateControllerAddressesCall { - pub func: ScView, - pub results: ImmutableGetAllowedStateControllerAddressesResults, + pub func: ScView, + pub results: ImmutableGetAllowedStateControllerAddressesResults, } pub struct GetChainInfoCall { - pub func: ScView, - pub results: ImmutableGetChainInfoResults, + pub func: ScView, + pub results: ImmutableGetChainInfoResults, } pub struct GetFeeInfoCall { - pub func: ScView, - pub params: MutableGetFeeInfoParams, - pub results: ImmutableGetFeeInfoResults, + pub func: ScView, + pub params: MutableGetFeeInfoParams, + pub results: ImmutableGetFeeInfoResults, } pub struct GetMaxBlobSizeCall { - pub func: ScView, - pub results: ImmutableGetMaxBlobSizeResults, + pub func: ScView, + pub results: ImmutableGetMaxBlobSizeResults, } pub struct ScFuncs { @@ -80,7 +80,7 @@ pub struct ScFuncs { impl ScFuncs { pub fn add_allowed_state_controller_address(_ctx: & dyn ScFuncCallContext) -> AddAllowedStateControllerAddressCall { let mut f = AddAllowedStateControllerAddressCall { - func: ScFunc::new(HSC_NAME, HFUNC_ADD_ALLOWED_STATE_CONTROLLER_ADDRESS), + func: ScFunc::new(HSC_NAME, HFUNC_ADD_ALLOWED_STATE_CONTROLLER_ADDRESS), params: MutableAddAllowedStateControllerAddressParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -93,7 +93,7 @@ impl ScFuncs { } pub fn delegate_chain_ownership(_ctx: & dyn ScFuncCallContext) -> DelegateChainOwnershipCall { let mut f = DelegateChainOwnershipCall { - func: ScFunc::new(HSC_NAME, HFUNC_DELEGATE_CHAIN_OWNERSHIP), + func: ScFunc::new(HSC_NAME, HFUNC_DELEGATE_CHAIN_OWNERSHIP), params: MutableDelegateChainOwnershipParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -101,7 +101,7 @@ impl ScFuncs { } pub fn remove_allowed_state_controller_address(_ctx: & dyn ScFuncCallContext) -> RemoveAllowedStateControllerAddressCall { let mut f = RemoveAllowedStateControllerAddressCall { - func: ScFunc::new(HSC_NAME, HFUNC_REMOVE_ALLOWED_STATE_CONTROLLER_ADDRESS), + func: ScFunc::new(HSC_NAME, HFUNC_REMOVE_ALLOWED_STATE_CONTROLLER_ADDRESS), params: MutableRemoveAllowedStateControllerAddressParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -109,7 +109,7 @@ impl ScFuncs { } pub fn rotate_state_controller(_ctx: & dyn ScFuncCallContext) -> RotateStateControllerCall { let mut f = RotateStateControllerCall { - func: ScFunc::new(HSC_NAME, HFUNC_ROTATE_STATE_CONTROLLER), + func: ScFunc::new(HSC_NAME, HFUNC_ROTATE_STATE_CONTROLLER), params: MutableRotateStateControllerParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -117,7 +117,7 @@ impl ScFuncs { } pub fn set_chain_info(_ctx: & dyn ScFuncCallContext) -> SetChainInfoCall { let mut f = SetChainInfoCall { - func: ScFunc::new(HSC_NAME, HFUNC_SET_CHAIN_INFO), + func: ScFunc::new(HSC_NAME, HFUNC_SET_CHAIN_INFO), params: MutableSetChainInfoParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -125,7 +125,7 @@ impl ScFuncs { } pub fn set_contract_fee(_ctx: & dyn ScFuncCallContext) -> SetContractFeeCall { let mut f = SetContractFeeCall { - func: ScFunc::new(HSC_NAME, HFUNC_SET_CONTRACT_FEE), + func: ScFunc::new(HSC_NAME, HFUNC_SET_CONTRACT_FEE), params: MutableSetContractFeeParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -133,7 +133,7 @@ impl ScFuncs { } pub fn set_default_fee(_ctx: & dyn ScFuncCallContext) -> SetDefaultFeeCall { let mut f = SetDefaultFeeCall { - func: ScFunc::new(HSC_NAME, HFUNC_SET_DEFAULT_FEE), + func: ScFunc::new(HSC_NAME, HFUNC_SET_DEFAULT_FEE), params: MutableSetDefaultFeeParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -141,7 +141,7 @@ impl ScFuncs { } pub fn get_allowed_state_controller_addresses(_ctx: & dyn ScViewCallContext) -> GetAllowedStateControllerAddressesCall { let mut f = GetAllowedStateControllerAddressesCall { - func: ScView::new(HSC_NAME, HVIEW_GET_ALLOWED_STATE_CONTROLLER_ADDRESSES), + func: ScView::new(HSC_NAME, HVIEW_GET_ALLOWED_STATE_CONTROLLER_ADDRESSES), results: ImmutableGetAllowedStateControllerAddressesResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); @@ -149,7 +149,7 @@ impl ScFuncs { } pub fn get_chain_info(_ctx: & dyn ScViewCallContext) -> GetChainInfoCall { let mut f = GetChainInfoCall { - func: ScView::new(HSC_NAME, HVIEW_GET_CHAIN_INFO), + func: ScView::new(HSC_NAME, HVIEW_GET_CHAIN_INFO), results: ImmutableGetChainInfoResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); @@ -157,8 +157,8 @@ impl ScFuncs { } pub fn get_fee_info(_ctx: & dyn ScViewCallContext) -> GetFeeInfoCall { let mut f = GetFeeInfoCall { - func: ScView::new(HSC_NAME, HVIEW_GET_FEE_INFO), - params: MutableGetFeeInfoParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_GET_FEE_INFO), + params: MutableGetFeeInfoParams { id: 0 }, results: ImmutableGetFeeInfoResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -166,7 +166,7 @@ impl ScFuncs { } pub fn get_max_blob_size(_ctx: & dyn ScViewCallContext) -> GetMaxBlobSizeCall { let mut f = GetMaxBlobSizeCall { - func: ScView::new(HSC_NAME, HVIEW_GET_MAX_BLOB_SIZE), + func: ScView::new(HSC_NAME, HVIEW_GET_MAX_BLOB_SIZE), results: ImmutableGetMaxBlobSizeResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); diff --git a/packages/vm/wasmlib/src/coregovernance/params.rs b/packages/vm/wasmlib/src/coregovernance/params.rs index 0e80984554..5e2b68a05e 100644 --- a/packages/vm/wasmlib/src/coregovernance/params.rs +++ b/packages/vm/wasmlib/src/coregovernance/params.rs @@ -18,17 +18,18 @@ pub struct ImmutableAddAllowedStateControllerAddressParams { } impl ImmutableAddAllowedStateControllerAddressParams { + pub fn chain_owner(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, PARAM_CHAIN_OWNER.get_key_id()) - } + ScImmutableAgentID::new(self.id, PARAM_CHAIN_OWNER.get_key_id()) + } pub fn fee_color(&self) -> ScImmutableColor { - ScImmutableColor::new(self.id, PARAM_FEE_COLOR.get_key_id()) - } + ScImmutableColor::new(self.id, PARAM_FEE_COLOR.get_key_id()) + } pub fn state_controller_address(&self) -> ScImmutableAddress { - ScImmutableAddress::new(self.id, PARAM_STATE_CONTROLLER_ADDRESS.get_key_id()) - } + ScImmutableAddress::new(self.id, PARAM_STATE_CONTROLLER_ADDRESS.get_key_id()) + } } #[derive(Clone, Copy)] @@ -37,17 +38,18 @@ pub struct MutableAddAllowedStateControllerAddressParams { } impl MutableAddAllowedStateControllerAddressParams { + pub fn chain_owner(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, PARAM_CHAIN_OWNER.get_key_id()) - } + ScMutableAgentID::new(self.id, PARAM_CHAIN_OWNER.get_key_id()) + } pub fn fee_color(&self) -> ScMutableColor { - ScMutableColor::new(self.id, PARAM_FEE_COLOR.get_key_id()) - } + ScMutableColor::new(self.id, PARAM_FEE_COLOR.get_key_id()) + } pub fn state_controller_address(&self) -> ScMutableAddress { - ScMutableAddress::new(self.id, PARAM_STATE_CONTROLLER_ADDRESS.get_key_id()) - } + ScMutableAddress::new(self.id, PARAM_STATE_CONTROLLER_ADDRESS.get_key_id()) + } } #[derive(Clone, Copy)] @@ -56,9 +58,10 @@ pub struct ImmutableDelegateChainOwnershipParams { } impl ImmutableDelegateChainOwnershipParams { + pub fn chain_owner(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, PARAM_CHAIN_OWNER.get_key_id()) - } + ScImmutableAgentID::new(self.id, PARAM_CHAIN_OWNER.get_key_id()) + } } #[derive(Clone, Copy)] @@ -67,9 +70,10 @@ pub struct MutableDelegateChainOwnershipParams { } impl MutableDelegateChainOwnershipParams { + pub fn chain_owner(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, PARAM_CHAIN_OWNER.get_key_id()) - } + ScMutableAgentID::new(self.id, PARAM_CHAIN_OWNER.get_key_id()) + } } #[derive(Clone, Copy)] @@ -78,9 +82,10 @@ pub struct ImmutableRemoveAllowedStateControllerAddressParams { } impl ImmutableRemoveAllowedStateControllerAddressParams { + pub fn state_controller_address(&self) -> ScImmutableAddress { - ScImmutableAddress::new(self.id, PARAM_STATE_CONTROLLER_ADDRESS.get_key_id()) - } + ScImmutableAddress::new(self.id, PARAM_STATE_CONTROLLER_ADDRESS.get_key_id()) + } } #[derive(Clone, Copy)] @@ -89,9 +94,10 @@ pub struct MutableRemoveAllowedStateControllerAddressParams { } impl MutableRemoveAllowedStateControllerAddressParams { + pub fn state_controller_address(&self) -> ScMutableAddress { - ScMutableAddress::new(self.id, PARAM_STATE_CONTROLLER_ADDRESS.get_key_id()) - } + ScMutableAddress::new(self.id, PARAM_STATE_CONTROLLER_ADDRESS.get_key_id()) + } } #[derive(Clone, Copy)] @@ -100,9 +106,10 @@ pub struct ImmutableRotateStateControllerParams { } impl ImmutableRotateStateControllerParams { + pub fn state_controller_address(&self) -> ScImmutableAddress { - ScImmutableAddress::new(self.id, PARAM_STATE_CONTROLLER_ADDRESS.get_key_id()) - } + ScImmutableAddress::new(self.id, PARAM_STATE_CONTROLLER_ADDRESS.get_key_id()) + } } #[derive(Clone, Copy)] @@ -111,9 +118,10 @@ pub struct MutableRotateStateControllerParams { } impl MutableRotateStateControllerParams { + pub fn state_controller_address(&self) -> ScMutableAddress { - ScMutableAddress::new(self.id, PARAM_STATE_CONTROLLER_ADDRESS.get_key_id()) - } + ScMutableAddress::new(self.id, PARAM_STATE_CONTROLLER_ADDRESS.get_key_id()) + } } #[derive(Clone, Copy)] @@ -122,25 +130,26 @@ pub struct ImmutableSetChainInfoParams { } impl ImmutableSetChainInfoParams { + pub fn max_blob_size(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, PARAM_MAX_BLOB_SIZE.get_key_id()) - } + ScImmutableInt32::new(self.id, PARAM_MAX_BLOB_SIZE.get_key_id()) + } pub fn max_event_size(&self) -> ScImmutableInt16 { - ScImmutableInt16::new(self.id, PARAM_MAX_EVENT_SIZE.get_key_id()) - } + ScImmutableInt16::new(self.id, PARAM_MAX_EVENT_SIZE.get_key_id()) + } pub fn max_events_per_req(&self) -> ScImmutableInt16 { - ScImmutableInt16::new(self.id, PARAM_MAX_EVENTS_PER_REQ.get_key_id()) - } + ScImmutableInt16::new(self.id, PARAM_MAX_EVENTS_PER_REQ.get_key_id()) + } pub fn owner_fee(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, PARAM_OWNER_FEE.get_key_id()) - } + ScImmutableInt64::new(self.id, PARAM_OWNER_FEE.get_key_id()) + } pub fn validator_fee(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, PARAM_VALIDATOR_FEE.get_key_id()) - } + ScImmutableInt64::new(self.id, PARAM_VALIDATOR_FEE.get_key_id()) + } } #[derive(Clone, Copy)] @@ -149,25 +158,26 @@ pub struct MutableSetChainInfoParams { } impl MutableSetChainInfoParams { + pub fn max_blob_size(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, PARAM_MAX_BLOB_SIZE.get_key_id()) - } + ScMutableInt32::new(self.id, PARAM_MAX_BLOB_SIZE.get_key_id()) + } pub fn max_event_size(&self) -> ScMutableInt16 { - ScMutableInt16::new(self.id, PARAM_MAX_EVENT_SIZE.get_key_id()) - } + ScMutableInt16::new(self.id, PARAM_MAX_EVENT_SIZE.get_key_id()) + } pub fn max_events_per_req(&self) -> ScMutableInt16 { - ScMutableInt16::new(self.id, PARAM_MAX_EVENTS_PER_REQ.get_key_id()) - } + ScMutableInt16::new(self.id, PARAM_MAX_EVENTS_PER_REQ.get_key_id()) + } pub fn owner_fee(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, PARAM_OWNER_FEE.get_key_id()) - } + ScMutableInt64::new(self.id, PARAM_OWNER_FEE.get_key_id()) + } pub fn validator_fee(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, PARAM_VALIDATOR_FEE.get_key_id()) - } + ScMutableInt64::new(self.id, PARAM_VALIDATOR_FEE.get_key_id()) + } } #[derive(Clone, Copy)] @@ -176,17 +186,18 @@ pub struct ImmutableSetContractFeeParams { } impl ImmutableSetContractFeeParams { + pub fn hname(&self) -> ScImmutableHname { - ScImmutableHname::new(self.id, PARAM_HNAME.get_key_id()) - } + ScImmutableHname::new(self.id, PARAM_HNAME.get_key_id()) + } pub fn owner_fee(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, PARAM_OWNER_FEE.get_key_id()) - } + ScImmutableInt64::new(self.id, PARAM_OWNER_FEE.get_key_id()) + } pub fn validator_fee(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, PARAM_VALIDATOR_FEE.get_key_id()) - } + ScImmutableInt64::new(self.id, PARAM_VALIDATOR_FEE.get_key_id()) + } } #[derive(Clone, Copy)] @@ -195,17 +206,18 @@ pub struct MutableSetContractFeeParams { } impl MutableSetContractFeeParams { + pub fn hname(&self) -> ScMutableHname { - ScMutableHname::new(self.id, PARAM_HNAME.get_key_id()) - } + ScMutableHname::new(self.id, PARAM_HNAME.get_key_id()) + } pub fn owner_fee(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, PARAM_OWNER_FEE.get_key_id()) - } + ScMutableInt64::new(self.id, PARAM_OWNER_FEE.get_key_id()) + } pub fn validator_fee(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, PARAM_VALIDATOR_FEE.get_key_id()) - } + ScMutableInt64::new(self.id, PARAM_VALIDATOR_FEE.get_key_id()) + } } #[derive(Clone, Copy)] @@ -214,13 +226,14 @@ pub struct ImmutableSetDefaultFeeParams { } impl ImmutableSetDefaultFeeParams { + pub fn owner_fee(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, PARAM_OWNER_FEE.get_key_id()) - } + ScImmutableInt64::new(self.id, PARAM_OWNER_FEE.get_key_id()) + } pub fn validator_fee(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, PARAM_VALIDATOR_FEE.get_key_id()) - } + ScImmutableInt64::new(self.id, PARAM_VALIDATOR_FEE.get_key_id()) + } } #[derive(Clone, Copy)] @@ -229,13 +242,14 @@ pub struct MutableSetDefaultFeeParams { } impl MutableSetDefaultFeeParams { + pub fn owner_fee(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, PARAM_OWNER_FEE.get_key_id()) - } + ScMutableInt64::new(self.id, PARAM_OWNER_FEE.get_key_id()) + } pub fn validator_fee(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, PARAM_VALIDATOR_FEE.get_key_id()) - } + ScMutableInt64::new(self.id, PARAM_VALIDATOR_FEE.get_key_id()) + } } #[derive(Clone, Copy)] @@ -244,9 +258,10 @@ pub struct ImmutableGetFeeInfoParams { } impl ImmutableGetFeeInfoParams { + pub fn hname(&self) -> ScImmutableHname { - ScImmutableHname::new(self.id, PARAM_HNAME.get_key_id()) - } + ScImmutableHname::new(self.id, PARAM_HNAME.get_key_id()) + } } #[derive(Clone, Copy)] @@ -255,7 +270,8 @@ pub struct MutableGetFeeInfoParams { } impl MutableGetFeeInfoParams { + pub fn hname(&self) -> ScMutableHname { - ScMutableHname::new(self.id, PARAM_HNAME.get_key_id()) - } + ScMutableHname::new(self.id, PARAM_HNAME.get_key_id()) + } } diff --git a/packages/vm/wasmlib/src/coregovernance/results.rs b/packages/vm/wasmlib/src/coregovernance/results.rs index 486dc86988..6ed02d94f3 100644 --- a/packages/vm/wasmlib/src/coregovernance/results.rs +++ b/packages/vm/wasmlib/src/coregovernance/results.rs @@ -13,7 +13,7 @@ use crate::coregovernance::*; use crate::host::*; pub struct ArrayOfImmutableBytes { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl ArrayOfImmutableBytes { @@ -32,14 +32,15 @@ pub struct ImmutableGetAllowedStateControllerAddressesResults { } impl ImmutableGetAllowedStateControllerAddressesResults { + pub fn allowed_state_controller_addresses(&self) -> ArrayOfImmutableBytes { - let arr_id = get_object_id(self.id, RESULT_ALLOWED_STATE_CONTROLLER_ADDRESSES.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); - ArrayOfImmutableBytes { obj_id: arr_id } - } + let arr_id = get_object_id(self.id, RESULT_ALLOWED_STATE_CONTROLLER_ADDRESSES.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); + ArrayOfImmutableBytes { obj_id: arr_id } + } } pub struct ArrayOfMutableBytes { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl ArrayOfMutableBytes { @@ -62,10 +63,11 @@ pub struct MutableGetAllowedStateControllerAddressesResults { } impl MutableGetAllowedStateControllerAddressesResults { + pub fn allowed_state_controller_addresses(&self) -> ArrayOfMutableBytes { - let arr_id = get_object_id(self.id, RESULT_ALLOWED_STATE_CONTROLLER_ADDRESSES.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); - ArrayOfMutableBytes { obj_id: arr_id } - } + let arr_id = get_object_id(self.id, RESULT_ALLOWED_STATE_CONTROLLER_ADDRESSES.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); + ArrayOfMutableBytes { obj_id: arr_id } + } } #[derive(Clone, Copy)] @@ -74,41 +76,42 @@ pub struct ImmutableGetChainInfoResults { } impl ImmutableGetChainInfoResults { + pub fn chain_id(&self) -> ScImmutableChainID { - ScImmutableChainID::new(self.id, RESULT_CHAIN_ID.get_key_id()) - } + ScImmutableChainID::new(self.id, RESULT_CHAIN_ID.get_key_id()) + } pub fn chain_owner_id(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, RESULT_CHAIN_OWNER_ID.get_key_id()) - } + ScImmutableAgentID::new(self.id, RESULT_CHAIN_OWNER_ID.get_key_id()) + } pub fn default_owner_fee(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, RESULT_DEFAULT_OWNER_FEE.get_key_id()) - } + ScImmutableInt64::new(self.id, RESULT_DEFAULT_OWNER_FEE.get_key_id()) + } pub fn default_validator_fee(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, RESULT_DEFAULT_VALIDATOR_FEE.get_key_id()) - } + ScImmutableInt64::new(self.id, RESULT_DEFAULT_VALIDATOR_FEE.get_key_id()) + } pub fn description(&self) -> ScImmutableString { - ScImmutableString::new(self.id, RESULT_DESCRIPTION.get_key_id()) - } + ScImmutableString::new(self.id, RESULT_DESCRIPTION.get_key_id()) + } pub fn fee_color(&self) -> ScImmutableColor { - ScImmutableColor::new(self.id, RESULT_FEE_COLOR.get_key_id()) - } + ScImmutableColor::new(self.id, RESULT_FEE_COLOR.get_key_id()) + } pub fn max_blob_size(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, RESULT_MAX_BLOB_SIZE.get_key_id()) - } + ScImmutableInt32::new(self.id, RESULT_MAX_BLOB_SIZE.get_key_id()) + } pub fn max_event_size(&self) -> ScImmutableInt16 { - ScImmutableInt16::new(self.id, RESULT_MAX_EVENT_SIZE.get_key_id()) - } + ScImmutableInt16::new(self.id, RESULT_MAX_EVENT_SIZE.get_key_id()) + } pub fn max_events_per_req(&self) -> ScImmutableInt16 { - ScImmutableInt16::new(self.id, RESULT_MAX_EVENTS_PER_REQ.get_key_id()) - } + ScImmutableInt16::new(self.id, RESULT_MAX_EVENTS_PER_REQ.get_key_id()) + } } #[derive(Clone, Copy)] @@ -117,41 +120,42 @@ pub struct MutableGetChainInfoResults { } impl MutableGetChainInfoResults { + pub fn chain_id(&self) -> ScMutableChainID { - ScMutableChainID::new(self.id, RESULT_CHAIN_ID.get_key_id()) - } + ScMutableChainID::new(self.id, RESULT_CHAIN_ID.get_key_id()) + } pub fn chain_owner_id(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, RESULT_CHAIN_OWNER_ID.get_key_id()) - } + ScMutableAgentID::new(self.id, RESULT_CHAIN_OWNER_ID.get_key_id()) + } pub fn default_owner_fee(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, RESULT_DEFAULT_OWNER_FEE.get_key_id()) - } + ScMutableInt64::new(self.id, RESULT_DEFAULT_OWNER_FEE.get_key_id()) + } pub fn default_validator_fee(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, RESULT_DEFAULT_VALIDATOR_FEE.get_key_id()) - } + ScMutableInt64::new(self.id, RESULT_DEFAULT_VALIDATOR_FEE.get_key_id()) + } pub fn description(&self) -> ScMutableString { - ScMutableString::new(self.id, RESULT_DESCRIPTION.get_key_id()) - } + ScMutableString::new(self.id, RESULT_DESCRIPTION.get_key_id()) + } pub fn fee_color(&self) -> ScMutableColor { - ScMutableColor::new(self.id, RESULT_FEE_COLOR.get_key_id()) - } + ScMutableColor::new(self.id, RESULT_FEE_COLOR.get_key_id()) + } pub fn max_blob_size(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, RESULT_MAX_BLOB_SIZE.get_key_id()) - } + ScMutableInt32::new(self.id, RESULT_MAX_BLOB_SIZE.get_key_id()) + } pub fn max_event_size(&self) -> ScMutableInt16 { - ScMutableInt16::new(self.id, RESULT_MAX_EVENT_SIZE.get_key_id()) - } + ScMutableInt16::new(self.id, RESULT_MAX_EVENT_SIZE.get_key_id()) + } pub fn max_events_per_req(&self) -> ScMutableInt16 { - ScMutableInt16::new(self.id, RESULT_MAX_EVENTS_PER_REQ.get_key_id()) - } + ScMutableInt16::new(self.id, RESULT_MAX_EVENTS_PER_REQ.get_key_id()) + } } #[derive(Clone, Copy)] @@ -160,17 +164,18 @@ pub struct ImmutableGetFeeInfoResults { } impl ImmutableGetFeeInfoResults { + pub fn fee_color(&self) -> ScImmutableColor { - ScImmutableColor::new(self.id, RESULT_FEE_COLOR.get_key_id()) - } + ScImmutableColor::new(self.id, RESULT_FEE_COLOR.get_key_id()) + } pub fn owner_fee(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, RESULT_OWNER_FEE.get_key_id()) - } + ScImmutableInt64::new(self.id, RESULT_OWNER_FEE.get_key_id()) + } pub fn validator_fee(&self) -> ScImmutableInt64 { - ScImmutableInt64::new(self.id, RESULT_VALIDATOR_FEE.get_key_id()) - } + ScImmutableInt64::new(self.id, RESULT_VALIDATOR_FEE.get_key_id()) + } } #[derive(Clone, Copy)] @@ -179,17 +184,18 @@ pub struct MutableGetFeeInfoResults { } impl MutableGetFeeInfoResults { + pub fn fee_color(&self) -> ScMutableColor { - ScMutableColor::new(self.id, RESULT_FEE_COLOR.get_key_id()) - } + ScMutableColor::new(self.id, RESULT_FEE_COLOR.get_key_id()) + } pub fn owner_fee(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, RESULT_OWNER_FEE.get_key_id()) - } + ScMutableInt64::new(self.id, RESULT_OWNER_FEE.get_key_id()) + } pub fn validator_fee(&self) -> ScMutableInt64 { - ScMutableInt64::new(self.id, RESULT_VALIDATOR_FEE.get_key_id()) - } + ScMutableInt64::new(self.id, RESULT_VALIDATOR_FEE.get_key_id()) + } } #[derive(Clone, Copy)] @@ -198,9 +204,10 @@ pub struct ImmutableGetMaxBlobSizeResults { } impl ImmutableGetMaxBlobSizeResults { + pub fn max_blob_size(&self) -> ScImmutableInt32 { - ScImmutableInt32::new(self.id, RESULT_MAX_BLOB_SIZE.get_key_id()) - } + ScImmutableInt32::new(self.id, RESULT_MAX_BLOB_SIZE.get_key_id()) + } } #[derive(Clone, Copy)] @@ -209,7 +216,8 @@ pub struct MutableGetMaxBlobSizeResults { } impl MutableGetMaxBlobSizeResults { + pub fn max_blob_size(&self) -> ScMutableInt32 { - ScMutableInt32::new(self.id, RESULT_MAX_BLOB_SIZE.get_key_id()) - } + ScMutableInt32::new(self.id, RESULT_MAX_BLOB_SIZE.get_key_id()) + } } diff --git a/packages/vm/wasmlib/src/coreroot/consts.rs b/packages/vm/wasmlib/src/coreroot/consts.rs index 567e71665a..444a1aedaa 100644 --- a/packages/vm/wasmlib/src/coreroot/consts.rs +++ b/packages/vm/wasmlib/src/coreroot/consts.rs @@ -15,26 +15,26 @@ pub const SC_NAME: &str = "root"; pub const SC_DESCRIPTION: &str = "Core root contract"; pub const HSC_NAME: ScHname = ScHname(0xcebf5908); -pub(crate) const PARAM_DEPLOYER: &str = "dp"; -pub(crate) const PARAM_DESCRIPTION: &str = "ds"; -pub(crate) const PARAM_HNAME: &str = "hn"; -pub(crate) const PARAM_NAME: &str = "nm"; +pub(crate) const PARAM_DEPLOYER: &str = "dp"; +pub(crate) const PARAM_DESCRIPTION: &str = "ds"; +pub(crate) const PARAM_HNAME: &str = "hn"; +pub(crate) const PARAM_NAME: &str = "nm"; pub(crate) const PARAM_PROGRAM_HASH: &str = "ph"; -pub(crate) const RESULT_CONTRACT_FOUND: &str = "cf"; +pub(crate) const RESULT_CONTRACT_FOUND: &str = "cf"; pub(crate) const RESULT_CONTRACT_REC_DATA: &str = "dt"; pub(crate) const RESULT_CONTRACT_REGISTRY: &str = "r"; -pub(crate) const FUNC_DEPLOY_CONTRACT: &str = "deployContract"; +pub(crate) const FUNC_DEPLOY_CONTRACT: &str = "deployContract"; pub(crate) const FUNC_GRANT_DEPLOY_PERMISSION: &str = "grantDeployPermission"; -pub(crate) const FUNC_REVOKE_DEPLOY_PERMISSION: &str = "revokeDeployPermission"; -pub(crate) const VIEW_FIND_CONTRACT: &str = "findContract"; -pub(crate) const VIEW_GET_CONTRACT_RECORDS: &str = "getContractRecords"; +pub(crate) const FUNC_REVOKE_DEPLOY_PERMISSION: &str = "revokeDeployPermission"; +pub(crate) const VIEW_FIND_CONTRACT: &str = "findContract"; +pub(crate) const VIEW_GET_CONTRACT_RECORDS: &str = "getContractRecords"; -pub(crate) const HFUNC_DEPLOY_CONTRACT: ScHname = ScHname(0x28232c27); -pub(crate) const HFUNC_GRANT_DEPLOY_PERMISSION: ScHname = ScHname(0xf440263a); +pub(crate) const HFUNC_DEPLOY_CONTRACT: ScHname = ScHname(0x28232c27); +pub(crate) const HFUNC_GRANT_DEPLOY_PERMISSION: ScHname = ScHname(0xf440263a); pub(crate) const HFUNC_REVOKE_DEPLOY_PERMISSION: ScHname = ScHname(0x850744f1); -pub(crate) const HVIEW_FIND_CONTRACT: ScHname = ScHname(0xc145ca00); -pub(crate) const HVIEW_GET_CONTRACT_RECORDS: ScHname = ScHname(0x078b3ef3); +pub(crate) const HVIEW_FIND_CONTRACT: ScHname = ScHname(0xc145ca00); +pub(crate) const HVIEW_GET_CONTRACT_RECORDS: ScHname = ScHname(0x078b3ef3); // @formatter:on diff --git a/packages/vm/wasmlib/src/coreroot/contract.rs b/packages/vm/wasmlib/src/coreroot/contract.rs index fe9ba90cdc..bdd90b5c30 100644 --- a/packages/vm/wasmlib/src/coreroot/contract.rs +++ b/packages/vm/wasmlib/src/coreroot/contract.rs @@ -15,29 +15,29 @@ use crate::*; use crate::coreroot::*; pub struct DeployContractCall { - pub func: ScFunc, - pub params: MutableDeployContractParams, + pub func: ScFunc, + pub params: MutableDeployContractParams, } pub struct GrantDeployPermissionCall { - pub func: ScFunc, - pub params: MutableGrantDeployPermissionParams, + pub func: ScFunc, + pub params: MutableGrantDeployPermissionParams, } pub struct RevokeDeployPermissionCall { - pub func: ScFunc, - pub params: MutableRevokeDeployPermissionParams, + pub func: ScFunc, + pub params: MutableRevokeDeployPermissionParams, } pub struct FindContractCall { - pub func: ScView, - pub params: MutableFindContractParams, - pub results: ImmutableFindContractResults, + pub func: ScView, + pub params: MutableFindContractParams, + pub results: ImmutableFindContractResults, } pub struct GetContractRecordsCall { - pub func: ScView, - pub results: ImmutableGetContractRecordsResults, + pub func: ScView, + pub results: ImmutableGetContractRecordsResults, } pub struct ScFuncs { @@ -46,7 +46,7 @@ pub struct ScFuncs { impl ScFuncs { pub fn deploy_contract(_ctx: & dyn ScFuncCallContext) -> DeployContractCall { let mut f = DeployContractCall { - func: ScFunc::new(HSC_NAME, HFUNC_DEPLOY_CONTRACT), + func: ScFunc::new(HSC_NAME, HFUNC_DEPLOY_CONTRACT), params: MutableDeployContractParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -54,7 +54,7 @@ impl ScFuncs { } pub fn grant_deploy_permission(_ctx: & dyn ScFuncCallContext) -> GrantDeployPermissionCall { let mut f = GrantDeployPermissionCall { - func: ScFunc::new(HSC_NAME, HFUNC_GRANT_DEPLOY_PERMISSION), + func: ScFunc::new(HSC_NAME, HFUNC_GRANT_DEPLOY_PERMISSION), params: MutableGrantDeployPermissionParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -62,7 +62,7 @@ impl ScFuncs { } pub fn revoke_deploy_permission(_ctx: & dyn ScFuncCallContext) -> RevokeDeployPermissionCall { let mut f = RevokeDeployPermissionCall { - func: ScFunc::new(HSC_NAME, HFUNC_REVOKE_DEPLOY_PERMISSION), + func: ScFunc::new(HSC_NAME, HFUNC_REVOKE_DEPLOY_PERMISSION), params: MutableRevokeDeployPermissionParams { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); @@ -70,8 +70,8 @@ impl ScFuncs { } pub fn find_contract(_ctx: & dyn ScViewCallContext) -> FindContractCall { let mut f = FindContractCall { - func: ScView::new(HSC_NAME, HVIEW_FIND_CONTRACT), - params: MutableFindContractParams { id: 0 }, + func: ScView::new(HSC_NAME, HVIEW_FIND_CONTRACT), + params: MutableFindContractParams { id: 0 }, results: ImmutableFindContractResults { id: 0 }, }; f.func.set_ptrs(&mut f.params.id, &mut f.results.id); @@ -79,7 +79,7 @@ impl ScFuncs { } pub fn get_contract_records(_ctx: & dyn ScViewCallContext) -> GetContractRecordsCall { let mut f = GetContractRecordsCall { - func: ScView::new(HSC_NAME, HVIEW_GET_CONTRACT_RECORDS), + func: ScView::new(HSC_NAME, HVIEW_GET_CONTRACT_RECORDS), results: ImmutableGetContractRecordsResults { id: 0 }, }; f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); diff --git a/packages/vm/wasmlib/src/coreroot/params.rs b/packages/vm/wasmlib/src/coreroot/params.rs index dd20e78e87..67ce97e7ed 100644 --- a/packages/vm/wasmlib/src/coreroot/params.rs +++ b/packages/vm/wasmlib/src/coreroot/params.rs @@ -18,17 +18,18 @@ pub struct ImmutableDeployContractParams { } impl ImmutableDeployContractParams { + pub fn description(&self) -> ScImmutableString { - ScImmutableString::new(self.id, PARAM_DESCRIPTION.get_key_id()) - } + ScImmutableString::new(self.id, PARAM_DESCRIPTION.get_key_id()) + } pub fn name(&self) -> ScImmutableString { - ScImmutableString::new(self.id, PARAM_NAME.get_key_id()) - } + ScImmutableString::new(self.id, PARAM_NAME.get_key_id()) + } pub fn program_hash(&self) -> ScImmutableHash { - ScImmutableHash::new(self.id, PARAM_PROGRAM_HASH.get_key_id()) - } + ScImmutableHash::new(self.id, PARAM_PROGRAM_HASH.get_key_id()) + } } #[derive(Clone, Copy)] @@ -37,17 +38,18 @@ pub struct MutableDeployContractParams { } impl MutableDeployContractParams { + pub fn description(&self) -> ScMutableString { - ScMutableString::new(self.id, PARAM_DESCRIPTION.get_key_id()) - } + ScMutableString::new(self.id, PARAM_DESCRIPTION.get_key_id()) + } pub fn name(&self) -> ScMutableString { - ScMutableString::new(self.id, PARAM_NAME.get_key_id()) - } + ScMutableString::new(self.id, PARAM_NAME.get_key_id()) + } pub fn program_hash(&self) -> ScMutableHash { - ScMutableHash::new(self.id, PARAM_PROGRAM_HASH.get_key_id()) - } + ScMutableHash::new(self.id, PARAM_PROGRAM_HASH.get_key_id()) + } } #[derive(Clone, Copy)] @@ -56,9 +58,10 @@ pub struct ImmutableGrantDeployPermissionParams { } impl ImmutableGrantDeployPermissionParams { + pub fn deployer(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, PARAM_DEPLOYER.get_key_id()) - } + ScImmutableAgentID::new(self.id, PARAM_DEPLOYER.get_key_id()) + } } #[derive(Clone, Copy)] @@ -67,9 +70,10 @@ pub struct MutableGrantDeployPermissionParams { } impl MutableGrantDeployPermissionParams { + pub fn deployer(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, PARAM_DEPLOYER.get_key_id()) - } + ScMutableAgentID::new(self.id, PARAM_DEPLOYER.get_key_id()) + } } #[derive(Clone, Copy)] @@ -78,9 +82,10 @@ pub struct ImmutableRevokeDeployPermissionParams { } impl ImmutableRevokeDeployPermissionParams { + pub fn deployer(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, PARAM_DEPLOYER.get_key_id()) - } + ScImmutableAgentID::new(self.id, PARAM_DEPLOYER.get_key_id()) + } } #[derive(Clone, Copy)] @@ -89,9 +94,10 @@ pub struct MutableRevokeDeployPermissionParams { } impl MutableRevokeDeployPermissionParams { + pub fn deployer(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, PARAM_DEPLOYER.get_key_id()) - } + ScMutableAgentID::new(self.id, PARAM_DEPLOYER.get_key_id()) + } } #[derive(Clone, Copy)] @@ -100,9 +106,10 @@ pub struct ImmutableFindContractParams { } impl ImmutableFindContractParams { + pub fn hname(&self) -> ScImmutableHname { - ScImmutableHname::new(self.id, PARAM_HNAME.get_key_id()) - } + ScImmutableHname::new(self.id, PARAM_HNAME.get_key_id()) + } } #[derive(Clone, Copy)] @@ -111,7 +118,8 @@ pub struct MutableFindContractParams { } impl MutableFindContractParams { + pub fn hname(&self) -> ScMutableHname { - ScMutableHname::new(self.id, PARAM_HNAME.get_key_id()) - } + ScMutableHname::new(self.id, PARAM_HNAME.get_key_id()) + } } diff --git a/packages/vm/wasmlib/src/coreroot/results.rs b/packages/vm/wasmlib/src/coreroot/results.rs index 4529c608a5..1bc85dd63d 100644 --- a/packages/vm/wasmlib/src/coreroot/results.rs +++ b/packages/vm/wasmlib/src/coreroot/results.rs @@ -18,13 +18,14 @@ pub struct ImmutableFindContractResults { } impl ImmutableFindContractResults { + pub fn contract_found(&self) -> ScImmutableBytes { - ScImmutableBytes::new(self.id, RESULT_CONTRACT_FOUND.get_key_id()) - } + ScImmutableBytes::new(self.id, RESULT_CONTRACT_FOUND.get_key_id()) + } pub fn contract_rec_data(&self) -> ScImmutableBytes { - ScImmutableBytes::new(self.id, RESULT_CONTRACT_REC_DATA.get_key_id()) - } + ScImmutableBytes::new(self.id, RESULT_CONTRACT_REC_DATA.get_key_id()) + } } #[derive(Clone, Copy)] @@ -33,17 +34,18 @@ pub struct MutableFindContractResults { } impl MutableFindContractResults { + pub fn contract_found(&self) -> ScMutableBytes { - ScMutableBytes::new(self.id, RESULT_CONTRACT_FOUND.get_key_id()) - } + ScMutableBytes::new(self.id, RESULT_CONTRACT_FOUND.get_key_id()) + } pub fn contract_rec_data(&self) -> ScMutableBytes { - ScMutableBytes::new(self.id, RESULT_CONTRACT_REC_DATA.get_key_id()) - } + ScMutableBytes::new(self.id, RESULT_CONTRACT_REC_DATA.get_key_id()) + } } pub struct MapHnameToImmutableBytes { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapHnameToImmutableBytes { @@ -58,19 +60,20 @@ pub struct ImmutableGetContractRecordsResults { } impl ImmutableGetContractRecordsResults { + pub fn contract_registry(&self) -> MapHnameToImmutableBytes { - let map_id = get_object_id(self.id, RESULT_CONTRACT_REGISTRY.get_key_id(), TYPE_MAP); - MapHnameToImmutableBytes { obj_id: map_id } - } + let map_id = get_object_id(self.id, RESULT_CONTRACT_REGISTRY.get_key_id(), TYPE_MAP); + MapHnameToImmutableBytes { obj_id: map_id } + } } pub struct MapHnameToMutableBytes { - pub(crate) obj_id: i32, + pub(crate) obj_id: i32, } impl MapHnameToMutableBytes { pub fn clear(&self) { - clear(self.obj_id) + clear(self.obj_id); } pub fn get_bytes(&self, key: &ScHname) -> ScMutableBytes { @@ -84,8 +87,9 @@ pub struct MutableGetContractRecordsResults { } impl MutableGetContractRecordsResults { + pub fn contract_registry(&self) -> MapHnameToMutableBytes { - let map_id = get_object_id(self.id, RESULT_CONTRACT_REGISTRY.get_key_id(), TYPE_MAP); - MapHnameToMutableBytes { obj_id: map_id } - } + let map_id = get_object_id(self.id, RESULT_CONTRACT_REGISTRY.get_key_id(), TYPE_MAP); + MapHnameToMutableBytes { obj_id: map_id } + } } diff --git a/tools/schema/generator/generator.go b/tools/schema/generator/generator.go index 5dcff196e8..5049fc4afe 100644 --- a/tools/schema/generator/generator.go +++ b/tools/schema/generator/generator.go @@ -107,7 +107,6 @@ func (g *GenBase) init(s *Schema) { g.templates = map[string]string{} g.addTemplates(templates) g.setKeys() - g.emitters["funcSignature"] = emitterFuncSignature } func (g *GenBase) addTemplates(t map[string]string) { @@ -156,59 +155,57 @@ func (g *GenBase) emit(template string) { for i := 1; i < len(lines)-1; i++ { line := lines[i] - // first process special commands - if strings.HasPrefix(line, "$#") { - if strings.HasPrefix(line, "$#each ") { - g.emitEach(strings.TrimSpace(line[7:])) - continue + // replace any placeholder keys + line = emitKeyRegExp.ReplaceAllStringFunc(line, func(key string) string { + text, ok := g.keys[key[1:]] + if ok { + return text } + return "???:" + key + }) + + // remove concatenation markers + line = strings.ReplaceAll(line, "$+", "") + + // now process special commands + if strings.HasPrefix(line, "$#") { if strings.HasPrefix(line, "$#emit ") { g.emit(strings.TrimSpace(line[7:])) continue } + if strings.HasPrefix(line, "$#each ") { + g.emitEach(line) + continue + } if strings.HasPrefix(line, "$#func ") { - g.emitFunc(strings.TrimSpace(line[7:])) + g.emitFunc(line) continue } if strings.HasPrefix(line, "$#if ") { - g.emitIf(strings.TrimSpace(line[5:])) + g.emitIf(line) continue } if strings.HasPrefix(line, "$#set ") { - g.emitSet(strings.TrimSpace(line[6:])) + g.emitSet(line) continue } g.println("???:" + line) continue } - g.println(g.replaceKeys(line)) + g.println(line) } } -func (g *GenBase) replaceKeys(line string) string { - // replace any keys - line = emitKeyRegExp.ReplaceAllStringFunc(line, func(key string) string { - text, ok := g.keys[key[1:]] - if ok { - return text - } - return "???:" + key - }) - - // remove concatenation markers - return strings.ReplaceAll(line, "$+", "") -} - func (g *GenBase) emitEach(key string) { parts := strings.Split(key, " ") - if len(parts) != 2 { + if len(parts) != 3 { g.println("???:" + key) return } - template := parts[1] - switch parts[0] { + template := parts[2] + switch parts[1] { case KeyFunc: for _, g.currentFunc = range g.s.Funcs { g.gen.setFuncKeys() @@ -257,7 +254,13 @@ func (g *GenBase) emitFields(fields []*Field, template string) { } func (g *GenBase) emitFunc(key string) { - emitter, ok := g.emitters[key] + parts := strings.Split(key, " ") + if len(parts) != 2 { + g.println("???:" + key) + return + } + + emitter, ok := g.emitters[parts[1]] if ok { emitter(g) return @@ -267,13 +270,13 @@ func (g *GenBase) emitFunc(key string) { func (g *GenBase) emitIf(key string) { parts := strings.Split(key, " ") - if len(parts) < 2 || len(parts) > 3 { + if len(parts) < 3 || len(parts) > 4 { g.println("???:" + key) return } - conditionKey := parts[0] - template := parts[1] + conditionKey := parts[1] + template := parts[2] condition := false switch conditionKey { @@ -323,8 +326,8 @@ func (g *GenBase) emitIf(key string) { } // else branch? - if len(parts) == 3 { - template = parts[2] + if len(parts) == 4 { + template = parts[3] g.emit(template) } } @@ -340,15 +343,15 @@ func (g *GenBase) fieldIsTypeDef() bool { return false } -func (g *GenBase) emitSet(key string) { - parts := strings.Split(key, " ") - if len(parts) != 2 { - g.println("???:" + key) +func (g *GenBase) emitSet(line string) { + parts := strings.Split(line, " ") + if len(parts) < 3 { + g.println("???:" + line) return } - key = parts[0] - value := g.replaceKeys(parts[1]) + key := parts[1] + value := line[len(parts[0])+len(key)+2:] g.keys[key] = value if key == KeyExist { @@ -635,14 +638,3 @@ func (g *GenBase) setKeyValues(key, value string) { g.keys[snake(key)] = snake(value) g.keys[upper(snake(key))] = upper(snake(value)) } - -func emitterFuncSignature(g *GenBase) { - switch g.currentFunc.FuncName { - case SpecialFuncInit: - case SpecialFuncSetOwner: - case SpecialViewGetOwner: - default: - return - } - g.emit(g.currentFunc.FuncName) -} diff --git a/tools/schema/generator/generator_go.go b/tools/schema/generator/generator_go.go index f1759c8a09..1409750d4a 100644 --- a/tools/schema/generator/generator_go.go +++ b/tools/schema/generator/generator_go.go @@ -179,30 +179,11 @@ func (g *GoGenerator) setFieldKeys() { g.keys["FldLangType"] = goTypes[g.currentField.Type] g.keys["FldMapKeyLangType"] = goTypes[g.currentField.MapKey] g.keys["FldMapKeyKey"] = goKeys[g.currentField.MapKey] - - // native core contracts use Array16 instead of our nested array type - arrayTypeID := "wasmlib.TYPE_ARRAY" - if g.s.CoreContracts { - arrayTypeID = "wasmlib.TYPE_ARRAY16" - } - g.keys["ArrayTypeID"] = arrayTypeID } func (g *GoGenerator) setFuncKeys() { g.GenBase.setFuncKeys() - paramsID := "nil" - if len(g.currentFunc.Params) != 0 { - paramsID = "&f.Params.id" - } - g.keys["paramsID"] = paramsID - - resultsID := "nil" - if len(g.currentFunc.Results) != 0 { - resultsID = "&f.Results.id" - } - g.keys["resultsID"] = resultsID - initFunc := "" initMap := "" if g.currentFunc.Type == InitFunc { diff --git a/tools/schema/generator/generator_rust.go b/tools/schema/generator/generator_rust.go index d025adbe7e..1bf145127c 100644 --- a/tools/schema/generator/generator_rust.go +++ b/tools/schema/generator/generator_rust.go @@ -12,11 +12,6 @@ import ( const ( allowUnusedImports = "#![allow(unused_imports)]" - useCrate = "use crate::*;" - useStructs = "use crate::structs::*;" - useTypeDefs = "use crate::typedefs::*;" - useWasmLib = "use wasmlib::*;" - useWasmLibHost = "use wasmlib::host::*;" ) var rustTypes = StringMap{ @@ -75,10 +70,6 @@ var rustTypeIds = StringMap{ "String": "TYPE_STRING", } -const ( - rustTypeMap = "TYPE_MAP" -) - type RustGenerator struct { GenBase } @@ -101,57 +92,10 @@ func (g *RustGenerator) init(s *Schema) { g.emitters["accessCheck"] = emitterRsAccessCheck } -func (g *RustGenerator) crateOrWasmLib(withContract, withHost bool) string { - if g.s.CoreContracts { - retVal := useCrate - if withContract { - retVal += "\nuse crate::" + g.s.Name + "::*;" - } - if withHost { - retVal += "\nuse crate::host::*;" - } - return retVal - } - retVal := useWasmLib - if withHost { - retVal += "\n" + useWasmLibHost - } - return retVal -} - func (g *RustGenerator) funcName(f *Func) string { return snake(f.FuncName) } -func (g *RustGenerator) generateArrayType(varType string) string { - // native core contracts use Array16 instead of our nested array type - if g.s.CoreContracts { - return "TYPE_ARRAY16 | " + varType - } - return "TYPE_ARRAY | " + varType -} - -func (g *RustGenerator) generateFuncSignature(f *Func) { - switch f.FuncName { - case SpecialFuncInit: - g.printf("\npub fn %s(ctx: &Sc%sContext, f: &%sContext) {\n", g.funcName(f), f.Kind, capitalize(f.Type)) - g.printf(" if f.params.owner().exists() {\n") - g.printf(" f.state.owner().set_value(&f.params.owner().value());\n") - g.printf(" return;\n") - g.printf(" }\n") - g.printf(" f.state.owner().set_value(&ctx.contract_creator());\n") - case SpecialFuncSetOwner: - g.printf("\npub fn %s(_ctx: &Sc%sContext, f: &%sContext) {\n", g.funcName(f), f.Kind, capitalize(f.Type)) - g.printf(" f.state.owner().set_value(&f.params.owner().value());\n") - case SpecialViewGetOwner: - g.printf("\npub fn %s(_ctx: &Sc%sContext, f: &%sContext) {\n", g.funcName(f), f.Kind, capitalize(f.Type)) - g.printf(" f.results.owner().set_value(&f.state.owner().value());\n") - default: - g.printf("\npub fn %s(_ctx: &Sc%sContext, _f: &%sContext) {\n", g.funcName(f), f.Kind, capitalize(f.Type)) - } - g.printf("}\n") -} - func (g *RustGenerator) generateLanguageSpecificFiles() error { if g.s.CoreContracts { return g.createSourceFile("mod", g.writeSpecialMod) @@ -191,116 +135,15 @@ func (g *RustGenerator) generateModLines(format string) { } func (g *RustGenerator) generateProxyArray(field *Field, mutability, arrayType, proxyType string) { - g.printf("\npub struct %s {\n", arrayType) - g.printf(" pub(crate) obj_id: i32,\n") - g.printf("}\n") - - g.printf("\nimpl %s {", arrayType) - defer g.printf("}\n") - - if mutability == PropMutable { - g.printf("\n pub fn clear(&self) {\n") - g.printf(" clear(self.obj_id);\n") - g.printf(" }\n") - } - - g.printf("\n pub fn length(&self) -> i32 {\n") - g.printf(" get_length(self.obj_id)\n") - g.printf(" }\n") - - if field.TypeID == 0 { - g.generateProxyArrayNewType(field, proxyType) - return - } - - // array of predefined type - g.printf("\n pub fn get_%s(&self, index: i32) -> Sc%s {\n", snake(field.Type), proxyType) - g.printf(" Sc%s::new(self.obj_id, Key32(index))\n", proxyType) - g.printf(" }\n") -} - -func (g *RustGenerator) generateProxyArrayNewType(field *Field, proxyType string) { - for _, subtype := range g.s.Typedefs { - if subtype.Name != field.Type { - continue - } - varType := rustTypeMap - if subtype.Array { - varType = rustTypeIds[subtype.Type] - if varType == "" { - varType = "TYPE_BYTES" - } - varType = g.generateArrayType(varType) - } - g.printf("\n pub fn get_%s(&self, index: i32) -> %s {\n", snake(field.Type), proxyType) - g.printf(" let sub_id = get_object_id(self.obj_id, Key32(index), %s)\n", varType) - g.printf(" %s { obj_id: sub_id }\n", proxyType) - g.printf(" }\n") - return - } - - g.printf("\n pub fn get_%s(&self, index: i32) -> %s {\n", snake(field.Type), proxyType) - g.printf(" %s { obj_id: self.obj_id, key_id: Key32(index) }\n", proxyType) - g.printf(" }\n") + panic("generateProxyArray") } func (g *RustGenerator) generateProxyMap(field *Field, mutability, mapType, proxyType string) { - keyType := rustKeyTypes[field.MapKey] - keyValue := rustKeys[field.MapKey] - - g.printf("\npub struct %s {\n", mapType) - g.printf(" pub(crate) obj_id: i32,\n") - g.printf("}\n") - - g.printf("\nimpl %s {", mapType) - defer g.printf("}\n") - - if mutability == PropMutable { - g.printf("\n pub fn clear(&self) {\n") - g.printf(" clear(self.obj_id)\n") - g.printf(" }\n") - } - - if field.TypeID == 0 { - g.generateProxyMapNewType(field, proxyType, keyType, keyValue) - return - } - - // map of predefined type - g.printf("\n pub fn get_%s(&self, key: %s) -> Sc%s {\n", snake(field.Type), keyType, proxyType) - g.printf(" Sc%s::new(self.obj_id, %s.get_key_id())\n", proxyType, keyValue) - g.printf(" }\n") -} - -func (g *RustGenerator) generateProxyMapNewType(field *Field, proxyType, keyType, keyValue string) { - for _, subtype := range g.s.Typedefs { - if subtype.Name != field.Type { - continue - } - varType := rustTypeMap - if subtype.Array { - varType = rustTypeIds[subtype.Type] - if varType == "" { - varType = "TYPE_BYTES" - } - varType = g.generateArrayType(varType) - } - g.printf("\n pub fn get_%s(&self, key: %s) -> %s {\n", snake(field.Type), keyType, proxyType) - g.printf(" let sub_id = get_object_id(self.obj_id, %s.get_key_id(), %s);\n", keyValue, varType) - g.printf(" %s { obj_id: sub_id }\n", proxyType) - g.printf(" }\n") - return - } - - g.printf("\n pub fn get_%s(&self, key: %s) -> %s {\n", snake(field.Type), keyType, proxyType) - g.printf(" %s { obj_id: self.obj_id, key_id: %s.get_key_id() }\n", proxyType, keyValue) - g.printf(" }\n") + panic("generateProxyMap") } func (g *RustGenerator) generateProxyReference(field *Field, mutability, typeName string) { - if field.Name[0] >= 'A' && field.Name[0] <= 'Z' { - g.printf("\npub type %s%s = %s;\n", mutability, field.Name, typeName) - } + panic("generateProxyReference") } func (g *RustGenerator) writeConsts() { @@ -312,19 +155,7 @@ func (g *RustGenerator) writeContract() { } func (g *RustGenerator) writeInitialFuncs() { - g.println(useWasmLib) - g.println() - g.println(useCrate) - if len(g.s.Structs) != 0 { - g.println(useStructs) - } - if len(g.s.Typedefs) != 0 { - g.println(useTypeDefs) - } - - for _, f := range g.s.Funcs { - g.generateFuncSignature(f) - } + g.emit("funcs.rs") } func (g *RustGenerator) writeKeys() { @@ -344,37 +175,20 @@ func (g *RustGenerator) writeResults() { } func (g *RustGenerator) writeSpecialCargoToml() error { - err := g.exists("Cargo.toml") + cargoToml := "Cargo.toml" + err := g.exists(cargoToml) if err == nil { // already exists return nil } - err = g.create("Cargo.toml") + err = g.create(cargoToml) if err != nil { return err } defer g.close() - g.printf("[package]\n") - g.printf("name = \"%s\"\n", g.s.Name) - g.printf("description = \"%s\"\n", g.s.Description) - g.printf("license = \"Apache-2.0\"\n") - g.printf("version = \"0.1.0\"\n") - g.printf("authors = [\"John Doe \"]\n") - g.printf("edition = \"2018\"\n") - g.printf("repository = \"https://%s\"\n", ModuleName) - g.printf("\n[lib]\n") - g.printf("crate-type = [\"cdylib\", \"rlib\"]\n") - g.printf("\n[features]\n") - g.printf("default = [\"console_error_panic_hook\"]\n") - g.printf("\n[dependencies]\n") - g.printf("wasmlib = { git = \"https://github.com/iotaledger/wasp\", branch = \"develop\" }\n") - g.printf("console_error_panic_hook = { version = \"0.1.6\", optional = true }\n") - g.printf("wee_alloc = { version = \"0.4.5\", optional = true }\n") - g.printf("\n[dev-dependencies]\n") - g.printf("wasm-bindgen-test = \"0.3.13\"\n") - + g.emit(cargoToml) return nil } @@ -441,30 +255,11 @@ func (g *RustGenerator) setFieldKeys() { g.keys["FldLangType"] = rustTypes[field.Type] g.keys["FldMapKeyLangType"] = rustKeyTypes[field.MapKey] g.keys["FldMapKeyKey"] = rustKeys[field.MapKey] - - // native core contracts use Array16 instead of our nested array type - arrayTypeID := "TYPE_ARRAY" - if g.s.CoreContracts { - arrayTypeID = "TYPE_ARRAY16" - } - g.keys["ArrayTypeID"] = arrayTypeID } func (g *RustGenerator) setFuncKeys() { g.GenBase.setFuncKeys() - paramsID := "ptr::null_mut()" - if len(g.currentFunc.Params) != 0 { - paramsID = "&mut f.params.id" - } - g.keys["paramsID"] = paramsID - - resultsID := "ptr::null_mut()" - if len(g.currentFunc.Results) != 0 { - resultsID = "&mut f.results.id" - } - g.keys["resultsID"] = resultsID - initFunc := "" if g.currentFunc.Type == InitFunc { initFunc = InitFunc diff --git a/tools/schema/generator/generator_ts.go b/tools/schema/generator/generator_ts.go index 8dc16b3024..3dedabe1f1 100644 --- a/tools/schema/generator/generator_ts.go +++ b/tools/schema/generator/generator_ts.go @@ -756,7 +756,7 @@ func (g *TypeScriptGenerator) setFieldKeys() { if g.s.CoreContracts { arrayTypeID = "TYPE_ARRAY16" } - g.keys["ArrayTypeID"] = arrayTypeID + g.keys["arrayTypeID"] = arrayTypeID } func (g *TypeScriptGenerator) setFuncKeys() { diff --git a/tools/schema/generator/gotemplates/alltemplates.go b/tools/schema/generator/gotemplates/alltemplates.go index fbbd26b144..3f0ecb95a3 100644 --- a/tools/schema/generator/gotemplates/alltemplates.go +++ b/tools/schema/generator/gotemplates/alltemplates.go @@ -1,6 +1,31 @@ package gotemplates +var GoTemplates = []map[string]string{ + goCommon, + constsGo, + contractGo, + funcsGo, + keysGo, + libGo, + mainGo, + paramsGo, + proxyGo, + resultsGo, + stateGo, + structsGo, + typedefsGo, +} + var goCommon = map[string]string{ + // ******************************* + "initGlobals": ` +$#set arrayTypeID wasmlib.TYPE_ARRAY +$#if core setArrayTypeID +`, + // ******************************* + "setArrayTypeID": ` +$#set arrayTypeID wasmlib.TYPE_ARRAY16 +`, // ******************************* "goPackage": ` package $package @@ -16,19 +41,3 @@ $#emit goPackage $#emit importWasmLib `, } - -var GoTemplates = []map[string]string{ - goCommon, - constsGo, - contractGo, - funcsGo, - keysGo, - libGo, - mainGo, - paramsGo, - proxyGo, - resultsGo, - stateGo, - structsGo, - typedefsGo, -} diff --git a/tools/schema/generator/gotemplates/contract.go b/tools/schema/generator/gotemplates/contract.go index 014f60e127..1140663144 100644 --- a/tools/schema/generator/gotemplates/contract.go +++ b/tools/schema/generator/gotemplates/contract.go @@ -33,6 +33,10 @@ $#if result ImmutableFuncNameResults "FuncNameForCall": ` func (sc Funcs) $FuncName(ctx wasmlib.Sc$Kind$+CallContext) *$FuncName$+Call { +$#set paramsID nil +$#set resultsID nil +$#if param setParamsID +$#if result setResultsID $#if ptrs setPtrs noPtrs } `, @@ -53,6 +57,14 @@ $#each func coreExportFunc f := &$FuncName$+Call{Func: wasmlib.NewSc$initFunc$Kind(ctx, HScName, H$Kind$FuncName$initMap)} f.Func.SetPtrs($paramsID, $resultsID) return f +`, + // ******************************* + "setParamsID": ` +$#set paramsID &f.Params.id +`, + // ******************************* + "setResultsID": ` +$#set resultsID &f.Results.id `, // ******************************* "noPtrs": ` diff --git a/tools/schema/generator/gotemplates/funcs.go b/tools/schema/generator/gotemplates/funcs.go index af807504ba..59b795cc0d 100644 --- a/tools/schema/generator/gotemplates/funcs.go +++ b/tools/schema/generator/gotemplates/funcs.go @@ -10,11 +10,11 @@ $#each func funcSignature "funcSignature": ` func $kind$FuncName(ctx wasmlib.Sc$Kind$+Context, f *$FuncName$+Context) { -$#func funcSignature +$#emit init$FuncName } `, // ******************************* - "funcInit": ` + "initFuncInit": ` if f.Params.Owner().Exists() { f.State.Owner().SetValue(f.Params.Owner().Value()) return @@ -22,11 +22,11 @@ $#func funcSignature f.State.Owner().SetValue(ctx.ContractCreator()) `, // ******************************* - "getOwner": ` + "intGetOwner": ` f.Results.Owner().SetValue(f.State.Owner().Value()) `, // ******************************* - "setOwner": ` + "initSetOwner": ` f.State.Owner().SetValue(f.Params.Owner().Value()) `, } diff --git a/tools/schema/generator/gotemplates/params.go b/tools/schema/generator/gotemplates/params.go index 76b6624398..447ee0580f 100644 --- a/tools/schema/generator/gotemplates/params.go +++ b/tools/schema/generator/gotemplates/params.go @@ -29,4 +29,3 @@ type $TypeName struct { $#each param proxyMethods `, } - diff --git a/tools/schema/generator/gotemplates/proxy.go b/tools/schema/generator/gotemplates/proxy.go index 5ff1e53804..b64b702dad 100644 --- a/tools/schema/generator/gotemplates/proxy.go +++ b/tools/schema/generator/gotemplates/proxy.go @@ -28,7 +28,7 @@ $#set varID $Kind$FldName.KeyID() "proxyArray": ` func (s $TypeName) $FldName() ArrayOf$mut$FldType { - arrID := wasmlib.GetObjectID(s.id, $varID, $ArrayTypeID|$FldTypeID) + arrID := wasmlib.GetObjectID(s.id, $varID, $arrayTypeID|$FldTypeID) return ArrayOf$mut$FldType{objID: arrID} } `, diff --git a/tools/schema/generator/gotemplates/results.go b/tools/schema/generator/gotemplates/results.go index 69de3d9b27..1b46ecd872 100644 --- a/tools/schema/generator/gotemplates/results.go +++ b/tools/schema/generator/gotemplates/results.go @@ -29,4 +29,3 @@ type $TypeName struct { $#each result proxyMethods `, } - diff --git a/tools/schema/generator/gotemplates/state.go b/tools/schema/generator/gotemplates/state.go index baddad11f8..00dbd4163e 100644 --- a/tools/schema/generator/gotemplates/state.go +++ b/tools/schema/generator/gotemplates/state.go @@ -22,4 +22,3 @@ type $TypeName struct { $#each state proxyMethods `, } - diff --git a/tools/schema/generator/gotemplates/typedefs.go b/tools/schema/generator/gotemplates/typedefs.go index 4fcdb950d4..84d373342d 100644 --- a/tools/schema/generator/gotemplates/typedefs.go +++ b/tools/schema/generator/gotemplates/typedefs.go @@ -134,6 +134,6 @@ func (m $proxy) Get$FldType(key $FldMapKeyLangType) $mut$FldType { `, // ******************************* "setVarTypeArray": ` -$#set varType $ArrayTypeID|$FldTypeID +$#set varType $arrayTypeID|$FldTypeID `, } diff --git a/tools/schema/generator/rstemplates/alltemplates.go b/tools/schema/generator/rstemplates/alltemplates.go index 0d59b20ae3..488456edec 100644 --- a/tools/schema/generator/rstemplates/alltemplates.go +++ b/tools/schema/generator/rstemplates/alltemplates.go @@ -1,9 +1,36 @@ package rstemplates +var RsTemplates = []map[string]string{ + rsCommon, + cargoToml, + constsRs, + contractRs, + funcsRs, + keysRs, + libRs, + paramsRs, + proxyRs, + resultsRs, + stateRs, + structsRs, + typedefsRs, +} + var rsCommon = map[string]string{ + // ******************************* + "initGlobals": ` +$#set arrayTypeID TYPE_ARRAY +$#set crate +$#if core setArrayTypeID +`, + // ******************************* + "setArrayTypeID": ` +$#set arrayTypeID TYPE_ARRAY16 +$#set crate (crate) +`, // ******************************* "rsHeader": ` -$#if core useCore useWasmLib +$#if core useCrate useWasmLib `, // ******************************* "modParams": ` @@ -22,8 +49,16 @@ mod structs; mod typedefs; `, // ******************************* - "useCore": ` -use core::*; + "useCrate": ` +use crate::*; +`, + // ******************************* + "useCoreContract": ` +use crate::$package::*; +`, + // ******************************* + "useHost": ` +use crate::host::*; `, // ******************************* "useParams": ` @@ -46,19 +81,3 @@ use crate::typedefs::*; use wasmlib::*; `, } - -var RsTemplates = []map[string]string{ - rsCommon, - constsRs, - contractRs, - funcsRs, - keysRs, - libRs, - mainRs, - paramsRs, - proxyRs, - resultsRs, - stateRs, - structsRs, - typedefsRs, -} diff --git a/tools/schema/generator/rstemplates/cargotoml.go b/tools/schema/generator/rstemplates/cargotoml.go new file mode 100644 index 0000000000..c7d245bed1 --- /dev/null +++ b/tools/schema/generator/rstemplates/cargotoml.go @@ -0,0 +1,32 @@ +package rstemplates + +var cargoToml = map[string]string{ + // ******************************* + "Cargo.toml": ` +# Copyright 2020 IOTA Stiftung +# SPDX-License-Identifier: Apache-2.0 + +[package] +name = "$package" +description = "$scDesc" +license = "Apache-2.0" +version = "0.1.0" +authors = ["John Doe "] +edition = "2018" +repository = "https://github.com/iotaledger/wasp" + +[lib] +crate-type = ["cdylib", "rlib"] + +[features] +default = ["console_error_panic_hook"] + +[dependencies] +wasmlib = { git = "https://github.com/iotaledger/wasp", branch = "develop" } +console_error_panic_hook = { version = "0.1.6", optional = true } +wee_alloc = { version = "0.4.5", optional = true } + +[dev-dependencies] +wasm-bindgen-test = "0.3.13" +`, +} diff --git a/tools/schema/generator/rstemplates/consts.go b/tools/schema/generator/rstemplates/consts.go index b66d878ea4..f7b12f5d0e 100644 --- a/tools/schema/generator/rstemplates/consts.go +++ b/tools/schema/generator/rstemplates/consts.go @@ -7,7 +7,7 @@ var constsRs = map[string]string{ #![allow(dead_code)] -$#emit rsHeader +$#if core useCrate useWasmLib pub const SC_NAME: &str = "$scName"; pub const SC_DESCRIPTION: &str = "$scDesc"; @@ -42,14 +42,14 @@ $#each state constField `, // ******************************* "constField": ` -pub const $constPrefix$FLD_NAME: &str = "$fldAlias"; +pub$crate const $constPrefix$FLD_NAME: &str = "$fldAlias"; `, // ******************************* "constFunc": ` -pub const $KIND$+_$FUNC_NAME: &str = "$funcName"; +pub$crate const $KIND$+_$FUNC_NAME: &str = "$funcName"; `, // ******************************* "constHFunc": ` -pub const H$KIND$+_$FUNC_NAME: ScHname = ScHname(0x$funcHName); +pub$crate const H$KIND$+_$FUNC_NAME: ScHname = ScHname(0x$funcHName); `, } diff --git a/tools/schema/generator/rstemplates/contract.go b/tools/schema/generator/rstemplates/contract.go index 0409aee771..7ed34e0508 100644 --- a/tools/schema/generator/rstemplates/contract.go +++ b/tools/schema/generator/rstemplates/contract.go @@ -9,8 +9,8 @@ var contractRs = map[string]string{ use std::ptr; -use wasmlib::*; -$#if core else ContractUses +$#if core useCrate useWasmLib +$#if core useCoreContract contractUses $#each func FuncNameCall pub struct ScFuncs { @@ -23,7 +23,7 @@ $#each func FuncNameForCall // @formatter:on `, // ******************************* - "ContractUses": ` + "contractUses": ` use crate::consts::*; $#if params useParams @@ -49,6 +49,10 @@ $#if result ImmutableFuncNameResults // ******************************* "FuncNameForCall": ` pub fn $func_name(_ctx: & dyn Sc$Kind$+CallContext) -> $FuncName$+Call { +$#set paramsID ptr::null_mut() +$#set resultsID ptr::null_mut() +$#if param setParamsID +$#if result setResultsID $#if ptrs setPtrs noPtrs } `, @@ -69,6 +73,14 @@ $#if result FuncNameResultsInit // ******************************* "FuncNameResultsInit": ` results: Immutable$FuncName$+Results { id: 0 }, +`, + // ******************************* + "setParamsID": ` +$#set paramsID &mut f.params.id +`, + // ******************************* + "setResultsID": ` +$#set resultsID &mut f.results.id `, // ******************************* "noPtrs": ` diff --git a/tools/schema/generator/rstemplates/funcs.go b/tools/schema/generator/rstemplates/funcs.go index ce9d4c13e4..f3ff96cc84 100644 --- a/tools/schema/generator/rstemplates/funcs.go +++ b/tools/schema/generator/rstemplates/funcs.go @@ -6,7 +6,6 @@ var funcsRs = map[string]string{ use wasmlib::*; use crate::*; -use crate::contract::*; $#if structs useStructs $#if typedefs useTypeDefs $#each func funcSignature @@ -15,11 +14,11 @@ $#each func funcSignature "funcSignature": ` pub fn $kind&+_$func_name(ctx: &Sc$Kind$+Context, f: &$FuncName$+Context) { -$#func funcSignature +$#emit init$FuncName } `, // ******************************* - "funcInit": ` + "initFuncInit": ` if f.params.owner().exists() { f.state.owner().set_value(&f.params.owner().value()); return; @@ -27,11 +26,11 @@ $#func funcSignature f.state.owner().set_value(&ctx.contract_creator()); `, // ******************************* - "getOwner": ` + "initGetOwner": ` f.results.owner().set_value(&f.state.owner().value()); `, // ******************************* - "setOwner": ` + "initSetOwner": ` f.state.owner().set_value(&f.params.owner().value()); `, } diff --git a/tools/schema/generator/rstemplates/main.go b/tools/schema/generator/rstemplates/main.go deleted file mode 100644 index 0c88cb23c2..0000000000 --- a/tools/schema/generator/rstemplates/main.go +++ /dev/null @@ -1,24 +0,0 @@ -package rstemplates - -var mainRs = map[string]string{ - // ******************************* - "main.rs": ` -// +build wasm - -package main - -import "github.com/iotaledger/wasp/packages/vm/wasmclient" - -import "$module/rs/$package" - -func main() { -} - -//export on_load -func onLoad() { - h := &wasmclient.WasmVMHost{} - h.ConnectWasmHost() - $package.OnLoad() -} -`, -} diff --git a/tools/schema/generator/rstemplates/params.go b/tools/schema/generator/rstemplates/params.go index 095e722d7a..3f67a2e5fc 100644 --- a/tools/schema/generator/rstemplates/params.go +++ b/tools/schema/generator/rstemplates/params.go @@ -6,13 +6,14 @@ var paramsRs = map[string]string{ #![allow(dead_code)] #![allow(unused_imports)] -use wasmlib::*; -use wasmlib::host::*; -$#if core else paramsUses +$#if core useCrate useWasmLib +$#if core useCoreContract +$#if core useHost paramsUses $#each func paramsFunc `, // ******************************* "paramsUses": ` +use wasmlib::host::*; use crate::*; use crate::keys::*; @@ -44,4 +45,3 @@ $#each param proxyMethods } `, } - diff --git a/tools/schema/generator/rstemplates/proxy.go b/tools/schema/generator/rstemplates/proxy.go index b4aad9020b..42ba6d3777 100644 --- a/tools/schema/generator/rstemplates/proxy.go +++ b/tools/schema/generator/rstemplates/proxy.go @@ -22,13 +22,13 @@ $#if basetype proxyBaseType proxyNewType `, // ******************************* "setCoreVarID": ` -$#set varID $Kind$FLD_NAME.KeyID() +$#set varID $Kind$FLD_NAME.get_key_id() `, // ******************************* "proxyArray": ` pub fn $fld_name(&self) -> ArrayOf$mut$FldType { - let arr_id = get_object_id(self.id, $varID, $ArrayTypeID | $FldTypeID); + let arr_id = get_object_id(self.id, $varID, $arrayTypeID | $FldTypeID); ArrayOf$mut$FldType { obj_id: arr_id } } `, diff --git a/tools/schema/generator/rstemplates/results.go b/tools/schema/generator/rstemplates/results.go index 55a90a531e..278179446c 100644 --- a/tools/schema/generator/rstemplates/results.go +++ b/tools/schema/generator/rstemplates/results.go @@ -6,13 +6,14 @@ var resultsRs = map[string]string{ #![allow(dead_code)] #![allow(unused_imports)] -use wasmlib::*; -use wasmlib::host::*; -$#if core else resultsUses +$#if core useCrate useWasmLib +$#if core useCoreContract +$#if core useHost resultsUses $#each func resultsFunc `, // ******************************* "resultsUses": ` +use wasmlib::host::*; use crate::*; use crate::keys::*; @@ -45,4 +46,3 @@ $#each result proxyMethods } `, } - diff --git a/tools/schema/generator/rstemplates/state.go b/tools/schema/generator/rstemplates/state.go index 33cb2dd7d3..335fbb2e2f 100644 --- a/tools/schema/generator/rstemplates/state.go +++ b/tools/schema/generator/rstemplates/state.go @@ -38,4 +38,3 @@ $#each state proxyMethods } `, } - diff --git a/tools/schema/generator/rstemplates/typedefs.go b/tools/schema/generator/rstemplates/typedefs.go index ca5fe2bd91..824558ecbe 100644 --- a/tools/schema/generator/rstemplates/typedefs.go +++ b/tools/schema/generator/rstemplates/typedefs.go @@ -144,6 +144,6 @@ $#if array setVarTypeArray `, // ******************************* "setVarTypeArray": ` -$#set varType $ArrayTypeID$space|$space$FldTypeID +$#set varType $arrayTypeID | $FldTypeID `, } diff --git a/tools/schema/generator/schema.go b/tools/schema/generator/schema.go index ceca50fdfd..29ec7ccaa1 100644 --- a/tools/schema/generator/schema.go +++ b/tools/schema/generator/schema.go @@ -47,16 +47,6 @@ type Func struct { Type string } -func (f *Func) nameLen(smallest int) int { - if len(f.Results) != 0 { - return 7 - } - if len(f.Params) != 0 { - return 6 - } - return smallest -} - type Struct struct { Name string Fields []*Field diff --git a/tools/schema/generator/templates.go b/tools/schema/generator/templates.go index 337e51d74a..9b6a5afb22 100644 --- a/tools/schema/generator/templates.go +++ b/tools/schema/generator/templates.go @@ -9,6 +9,7 @@ var templates = map[string]string{ `, // ******************************* "copyright": ` +$#emit initGlobals // Copyright 2020 IOTA Stiftung // SPDX-License-Identifier: Apache-2.0 `, diff --git a/tools/schema/generator/tstemplates/alltemplates.go b/tools/schema/generator/tstemplates/alltemplates.go index ea02445e51..c27970fed4 100644 --- a/tools/schema/generator/tstemplates/alltemplates.go +++ b/tools/schema/generator/tstemplates/alltemplates.go @@ -1,22 +1,5 @@ package tstemplates -var tsCommon = map[string]string{ - // ******************************* - "tsPackage": ` -package $package -`, - // ******************************* - "importWasmLib": ` - -import "github.com/iotaledger/wasp/packages/vm/wasmlib/ts/wasmlib" -`, - // ******************************* - "tsHeader": ` -$#emit tsPackage -$#emit importWasmLib -`, -} - var TsTemplates = []map[string]string{ tsCommon, constsTs, @@ -24,7 +7,6 @@ var TsTemplates = []map[string]string{ funcsTs, keysTs, libTs, - mainTs, paramsTs, proxyTs, resultsTs, @@ -32,3 +14,69 @@ var TsTemplates = []map[string]string{ structsTs, typedefsTs, } + +var tsCommon = map[string]string{ + // ******************************* + "initGlobals": ` +$#set arrayTypeID TYPE_ARRAY +$#set crate +$#if core setArrayTypeID +`, + // ******************************* + "setArrayTypeID": ` +$#set arrayTypeID TYPE_ARRAY16 +$#set crate (crate) +`, + // ******************************* + "tsHeader": ` +$#if core useCrate useWasmLib +`, + // ******************************* + "modParams": ` +mod params; +`, + // ******************************* + "modResults": ` +mod results; +`, + // ******************************* + "modStructs": ` +mod structs; +`, + // ******************************* + "modTypeDefs": ` +mod typedefs; +`, + // ******************************* + "useCrate": ` +use crate::*; +`, + // ******************************* + "useCoreContract": ` +use crate::$package::*; +`, + // ******************************* + "useHost": ` +use crate::host::*; +`, + // ******************************* + "useParams": ` +use crate::params::*; +`, + // ******************************* + "useResults": ` +use crate::results::*; +`, + // ******************************* + "useStructs": ` +use crate::structs::*; +`, + // ******************************* + "useTypeDefs": ` +use crate::typedefs::*; +`, + // ******************************* + "useWasmLib": ` +use wasmlib::*; +`, +} diff --git a/tools/schema/generator/tstemplates/consts.go b/tools/schema/generator/tstemplates/consts.go index d8bc710ca3..12864f155a 100644 --- a/tools/schema/generator/tstemplates/consts.go +++ b/tools/schema/generator/tstemplates/consts.go @@ -3,59 +3,53 @@ package tstemplates var constsTs = map[string]string{ // ******************************* "consts.ts": ` -$#emit tsHeader +// @formatter:off -const ( - ScName = "$scName" - ScDescription = "$scDesc" - HScName = wasmlib.ScHname(0x$hscName) -) +#![allow(dead_code)] + +$#if core useCrate useWasmLib + +pub const SC_NAME: &str = "$scName"; +pub const SC_DESCRIPTION: &str = "$scDesc"; +pub const HSC_NAME: ScHname = ScHname(0x$hscName); $#if params constParams $#if results constResults $#if state constState -const ( $#each func constFunc -) -const ( $#each func constHFunc -) + +// @formatter:on `, // ******************************* "constParams": ` -const ( -$#set constPrefix "Param" +$#set constPrefix PARAM_ $#each params constField -) `, // ******************************* "constResults": ` -const ( -$#set constPrefix "Result" +$#set constPrefix RESULT_ $#each results constField -) `, // ******************************* "constState": ` -const ( -$#set constPrefix "State" +$#set constPrefix STATE_ $#each state constField -) `, // ******************************* "constField": ` - $constPrefix$FldName = wasmlib.Key("$fldAlias") +pub$crate const $constPrefix$FLD_NAME: &str = "$fldAlias"; `, // ******************************* "constFunc": ` - $Kind$FuncName = "$funcName" +pub$crate const $KIND$+_$FUNC_NAME: &str = "$funcName"; `, // ******************************* "constHFunc": ` - H$Kind$FuncName = wasmlib.ScHname(0x$funcHName) +pub$crate const H$KIND$+_$FUNC_NAME: ScHname = ScHname(0x$funcHName); `, } diff --git a/tools/schema/generator/tstemplates/contract.go b/tools/schema/generator/tstemplates/contract.go index 8077e440b4..499c1a877c 100644 --- a/tools/schema/generator/tstemplates/contract.go +++ b/tools/schema/generator/tstemplates/contract.go @@ -3,59 +3,89 @@ package tstemplates var contractTs = map[string]string{ // ******************************* "contract.ts": ` -$#emit tsHeader +// @formatter:off + +#![allow(dead_code)] + +use std::ptr; + +$#if core useCrate useWasmLib +$#if core useCoreContract contractUses $#each func FuncNameCall -type Funcs struct{} +pub struct ScFuncs { +} -var ScFuncs Funcs +impl ScFuncs { $#each func FuncNameForCall -$#if core coreOnload +} + +// @formatter:on +`, + // ******************************* + "contractUses": ` + +use crate::consts::*; +$#if params useParams +$#if results useResults `, // ******************************* "FuncNameCall": ` -type $FuncName$+Call struct { - Func *wasmlib.Sc$initFunc$Kind +pub struct $FuncName$+Call { + pub func: Sc$initFunc$Kind, $#if param MutableFuncNameParams $#if result ImmutableFuncNameResults } `, // ******************************* "MutableFuncNameParams": ` - Params Mutable$FuncName$+Params + pub params: Mutable$FuncName$+Params, `, // ******************************* "ImmutableFuncNameResults": ` - Results Immutable$FuncName$+Results + pub results: Immutable$FuncName$+Results, `, // ******************************* "FuncNameForCall": ` - -func (sc Funcs) $FuncName(ctx wasmlib.Sc$Kind$+CallContext) *$FuncName$+Call { + pub fn $func_name(_ctx: & dyn Sc$Kind$+CallContext) -> $FuncName$+Call { +$#set paramsID ptr::null_mut() +$#set resultsID ptr::null_mut() +$#if param setParamsID +$#if result setResultsID $#if ptrs setPtrs noPtrs -} + } `, // ******************************* - "coreOnload": ` - -func OnLoad() { - exports := wasmlib.NewScExports() -$#each func coreExportFunc -} + "setPtrs": ` + let mut f = $FuncName$+Call { + func: Sc$initFunc$Kind::new(HSC_NAME, H$KIND$+_$FUNC_NAME), +$#if param FuncNameParamsInit +$#if result FuncNameResultsInit + }; + f.func.set_ptrs($paramsID, $resultsID); + f `, // ******************************* - "coreExportFunc": ` - exports.Add$Kind($Kind$FuncName, wasmlib.$Kind$+Error) + "FuncNameParamsInit": ` + params: Mutable$FuncName$+Params { id: 0 }, `, // ******************************* - "setPtrs": ` - f := &$FuncName$+Call{Func: wasmlib.NewSc$initFunc$Kind(ctx, HScName, H$Kind$FuncName$initMap)} - f.Func.SetPtrs($paramsID, $resultsID) - return f + "FuncNameResultsInit": ` + results: Immutable$FuncName$+Results { id: 0 }, +`, + // ******************************* + "setParamsID": ` +$#set paramsID &mut f.params.id +`, + // ******************************* + "setResultsID": ` +$#set resultsID &mut f.results.id `, // ******************************* "noPtrs": ` - return &$FuncName$+Call{Func: wasmlib.NewSc$initFunc$Kind(ctx, HScName, H$Kind$FuncName$initMap)} + $FuncName$+Call { + func: Sc$initFunc$Kind::new(HSC_NAME, H$KIND$+_$FUNC_NAME), + } `, } diff --git a/tools/schema/generator/tstemplates/funcs.go b/tools/schema/generator/tstemplates/funcs.go index d2e5b629dd..7a0ad2943d 100644 --- a/tools/schema/generator/tstemplates/funcs.go +++ b/tools/schema/generator/tstemplates/funcs.go @@ -3,30 +3,34 @@ package tstemplates var funcsTs = map[string]string{ // ******************************* "funcs.ts": ` -$#emit tsHeader +use wasmlib::*; + +use crate::*; +$#if structs useStructs +$#if typedefs useTypeDefs $#each func funcSignature `, // ******************************* "funcSignature": ` -func $kind$FuncName(ctx wasmlib.Sc$Kind$+Context, f *$FuncName$+Context) { -$#func funcSignature +pub fn $kind&+_$func_name(ctx: &Sc$Kind$+Context, f: &$FuncName$+Context) { +$#emit init$FuncName } `, // ******************************* - "funcInit": ` - if f.Params.Owner().Exists() { - f.State.Owner().SetValue(f.Params.Owner().Value()) - return + "initFuncInit": ` + if f.params.owner().exists() { + f.state.owner().set_value(&f.params.owner().value()); + return; } - f.State.Owner().SetValue(ctx.ContractCreator()) + f.state.owner().set_value(&ctx.contract_creator()); `, // ******************************* - "getOwner": ` - f.Results.Owner().SetValue(f.State.Owner().Value()) + "initGetOwner": ` + f.results.owner().set_value(&f.state.owner().value()); `, // ******************************* - "setOwner": ` - f.State.Owner().SetValue(f.Params.Owner().Value()) + "initSetOwner": ` + f.state.owner().set_value(&f.params.owner().value()); `, } diff --git a/tools/schema/generator/tstemplates/keys.go b/tools/schema/generator/tstemplates/keys.go index cbf2a090b6..47a074cba4 100644 --- a/tools/schema/generator/tstemplates/keys.go +++ b/tools/schema/generator/tstemplates/keys.go @@ -3,36 +3,48 @@ package tstemplates var keysTs = map[string]string{ // ******************************* "keys.ts": ` -$#emit tsHeader +// @formatter:off -const ( -$#set constPrefix "Param" +#![allow(dead_code)] + +use wasmlib::*; + +use crate::*; + +$#set constPrefix PARAM_ $#each params constFieldIdx -$#set constPrefix "Result" +$#set constPrefix RESULT_ $#each results constFieldIdx -$#set constPrefix "State" +$#set constPrefix STATE_ $#each state constFieldIdx -) -const keyMapLen = $maxIndex +pub const KEY_MAP_LEN: usize = $maxIndex; -var keyMap = [keyMapLen]wasmlib.Key{ -$#set constPrefix "Param" +pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ +$#set constPrefix PARAM_ $#each params constFieldKey -$#set constPrefix "Result" +$#set constPrefix RESULT_ $#each results constFieldKey -$#set constPrefix "State" +$#set constPrefix STATE_ $#each state constFieldKey +]; + +pub static mut IDX_MAP: [Key32; KEY_MAP_LEN] = [Key32(0); KEY_MAP_LEN]; + +pub fn idx_map(idx: usize) -> Key32 { + unsafe { + IDX_MAP[idx] + } } -var idxMap [keyMapLen]wasmlib.Key32 +// @formatter:on `, // ******************************* "constFieldIdx": ` - Idx$constPrefix$FldName = $fldIndex +pub(crate) const IDX_$constPrefix$FLD_NAME: usize = $fldIndex; `, // ******************************* "constFieldKey": ` - $constPrefix$FldName, + $constPrefix$FLD_NAME, `, } diff --git a/tools/schema/generator/tstemplates/lib.go b/tools/schema/generator/tstemplates/lib.go index df911aa435..70547dbba3 100644 --- a/tools/schema/generator/tstemplates/lib.go +++ b/tools/schema/generator/tstemplates/lib.go @@ -3,99 +3,126 @@ package tstemplates var libTs = map[string]string{ // ******************************* "lib.ts": ` -//nolint:dupl -$#emit tsHeader +// @formatter:off -func OnLoad() { - exports := wasmlib.NewScExports() +#![allow(dead_code)] +#![allow(unused_imports)] + +use $package::*; +use wasmlib::*; +use wasmlib::host::*; + +use crate::consts::*; +use crate::keys::*; +$#if params useParams +$#if results useResults +use crate::state::*; + +mod consts; +mod contract; +mod keys; +$#if params modParams +$#if results modResults +mod state; +$#if structs modStructs +$#if typedefs modTypeDefs +mod $package; + +#[no_mangle] +fn on_load() { + let exports = ScExports::new(); $#each func libExportFunc - for i, key := range keyMap { - idxMap[i] = key.KeyID() - } + unsafe { + for i in 0..KEY_MAP_LEN { + IDX_MAP[i] = get_key_id_from_string(KEY_MAP[i]); + } + } } $#each func libThunk + +// @formatter:on `, // ******************************* "libExportFunc": ` - exports.Add$Kind($Kind$FuncName, $kind$FuncName$+Thunk) + exports.add_$kind($KIND$+_$FUNC_NAME, $kind$+_$func_name$+_thunk); `, // ******************************* "libThunk": ` -type $FuncName$+Context struct { +pub struct $FuncName$+Context { $#if param ImmutableFuncNameParams $#if result MutableFuncNameResults $#if func MutablePackageState $#if view ImmutablePackageState } -func $kind$FuncName$+Thunk(ctx wasmlib.Sc$Kind$+Context) { - ctx.Log("$package.$kind$FuncName") +fn $kind$+_$func_name$+_thunk(ctx: &Sc$Kind$+Context) { + ctx.log("$package.$kind$FuncName"); $#func accessCheck - f := &$FuncName$+Context{ + let f = $FuncName$+Context { $#if param ImmutableFuncNameParamsInit $#if result MutableFuncNameResultsInit $#if func MutablePackageStateInit $#if view ImmutablePackageStateInit - } + }; $#each mandatory requireMandatory - $kind$FuncName(ctx, f) - ctx.Log("$package.$kind$FuncName ok") + $kind$+_$func_name(ctx, &f); + ctx.log("$package.$kind$FuncName ok"); } `, // ******************************* "ImmutableFuncNameParams": ` - Params Immutable$FuncName$+Params + params: Immutable$FuncName$+Params, `, // ******************************* "ImmutableFuncNameParamsInit": ` - Params: Immutable$FuncName$+Params{ - id: wasmlib.OBJ_ID_PARAMS, + params: Immutable$FuncName$+Params { + id: OBJ_ID_PARAMS, }, `, // ******************************* "MutableFuncNameResults": ` - Results Mutable$FuncName$+Results + results: Mutable$FuncName$+Results, `, // ******************************* "MutableFuncNameResultsInit": ` - Results: Mutable$FuncName$+Results{ - id: wasmlib.OBJ_ID_RESULTS, + results: Mutable$FuncName$+Results { + id: OBJ_ID_RESULTS, }, `, // ******************************* "MutablePackageState": ` - State Mutable$Package$+State + state: Mutable$Package$+State, `, // ******************************* "MutablePackageStateInit": ` - State: Mutable$Package$+State{ - id: wasmlib.OBJ_ID_STATE, + state: Mutable$Package$+State { + id: OBJ_ID_STATE, }, `, // ******************************* "ImmutablePackageState": ` - State Immutable$Package$+State + state: Immutable$Package$+State, `, // ******************************* "ImmutablePackageStateInit": ` - State: Immutable$Package$+State{ - id: wasmlib.OBJ_ID_STATE, + state: Immutable$Package$+State { + id: OBJ_ID_STATE, }, `, // ******************************* "requireMandatory": ` - ctx.Require(f.Params.$FldName().Exists(), "missing mandatory $fldName") + ctx.require(f.params.$fld_name().exists(), "missing mandatory $fldName"); `, // ******************************* "grantForKey": ` - access := ctx.State().GetAgentID(wasmlib.Key("$grant")) - ctx.Require(access.Exists(), "access not set: $grant") + let access = ctx.state().get_agent_id("$grant"); + ctx.require(access.exists(), "access not set: $grant"); `, // ******************************* "grantRequire": ` - ctx.Require(ctx.Caller() == $grant, "no permission") + ctx.require(ctx.caller() == $grant, "no permission"); `, } diff --git a/tools/schema/generator/tstemplates/main.go b/tools/schema/generator/tstemplates/main.go deleted file mode 100644 index 6e28a60dd3..0000000000 --- a/tools/schema/generator/tstemplates/main.go +++ /dev/null @@ -1,24 +0,0 @@ -package tstemplates - -var mainTs = map[string]string{ - // ******************************* - "main.ts": ` -// +build wasm - -package main - -import "github.com/iotaledger/wasp/packages/vm/wasmclient" - -import "$module/ts/$package" - -func main() { -} - -//export on_load -func onLoad() { - h := &wasmclient.WasmVMHost{} - h.ConnectWasmHost() - $package.OnLoad() -} -`, -} diff --git a/tools/schema/generator/tstemplates/params.go b/tools/schema/generator/tstemplates/params.go index 2058c719c3..7331af6728 100644 --- a/tools/schema/generator/tstemplates/params.go +++ b/tools/schema/generator/tstemplates/params.go @@ -3,8 +3,20 @@ package tstemplates var paramsTs = map[string]string{ // ******************************* "params.ts": ` -$#emit tsHeader +#![allow(dead_code)] +#![allow(unused_imports)] + +$#if core useCrate useWasmLib +$#if core useCoreContract +$#if core useHost paramsUses $#each func paramsFunc +`, + // ******************************* + "paramsUses": ` +use wasmlib::host::*; + +use crate::*; +use crate::keys::*; `, // ******************************* "paramsFunc": ` @@ -12,7 +24,7 @@ $#if params paramsFuncParams `, // ******************************* "paramsFuncParams": ` -$#set Kind Param +$#set Kind PARAM_ $#set mut Immutable $#if param paramsProxyStruct $#set mut Mutable @@ -23,10 +35,13 @@ $#if param paramsProxyStruct $#set TypeName $mut$FuncName$+Params $#each param proxyContainers -type $TypeName struct { - id int32 +#[derive(Clone, Copy)] +pub struct $TypeName { + pub(crate) id: i32, } + +impl $TypeName { $#each param proxyMethods +} `, } - diff --git a/tools/schema/generator/tstemplates/proxy.go b/tools/schema/generator/tstemplates/proxy.go index 1eedce3ee8..3fdefc01a7 100644 --- a/tools/schema/generator/tstemplates/proxy.go +++ b/tools/schema/generator/tstemplates/proxy.go @@ -8,7 +8,7 @@ $#if map typedefProxyMap `, // ******************************* "proxyMethods": ` -$#set varID idxMap[Idx$Kind$FldName] +$#set varID idx_map(IDX_$Kind$FLD_NAME) $#if core setCoreVarID $#if array proxyArray proxyMethods2 `, @@ -22,15 +22,15 @@ $#if basetype proxyBaseType proxyNewType `, // ******************************* "setCoreVarID": ` -$#set varID $Kind$FldName.KeyID() +$#set varID $Kind$FLD_NAME.get_key_id() `, // ******************************* "proxyArray": ` -func (s $TypeName) $FldName() ArrayOf$mut$FldType { - arrID := wasmlib.GetObjectID(s.id, $varID, $ArrayTypeID|$FldTypeID) - return ArrayOf$mut$FldType{objID: arrID} -} + pub fn $fld_name(&self) -> ArrayOf$mut$FldType { + let arr_id = get_object_id(self.id, $varID, $arrayTypeID | $FldTypeID); + ArrayOf$mut$FldType { obj_id: arr_id } + } `, // ******************************* "proxyMap": ` @@ -39,30 +39,30 @@ $#if this proxyMapThis proxyMapOther // ******************************* "proxyMapThis": ` -func (s $TypeName) $FldName() Map$FldMapKey$+To$mut$FldType { - return Map$FldMapKey$+To$mut$FldType{objID: s.id} -} + pub fn $fld_name(&self) -> Map$FldMapKey$+To$mut$FldType { + Map$FldMapKey$+To$mut$FldType { obj_id: self.id } + } `, // ******************************* "proxyMapOther": `55544444.0 -func (s $TypeName) $FldName() Map$FldMapKey$+To$mut$FldType { - mapID := wasmlib.GetObjectID(s.id, $varID, wasmlib.TYPE_MAP) - return Map$FldMapKey$+To$mut$FldType{objID: mapID} -} + pub fn $fld_name(&self) -> Map$FldMapKey$+To$mut$FldType { + let map_id = get_object_id(self.id, $varID, TYPE_MAP); + Map$FldMapKey$+To$mut$FldType { obj_id: map_id } + } `, // ******************************* "proxyBaseType": ` -func (s $TypeName) $FldName() wasmlib.Sc$mut$FldType { - return wasmlib.NewSc$mut$FldType(s.id, $varID) -} + pub fn $fld_name(&self) -> Sc$mut$FldType { + Sc$mut$FldType::new(self.id, $varID) + } `, // ******************************* "proxyNewType": ` -func (s $TypeName) $FldName() $mut$FldType { - return $mut$FldType{objID: s.id, keyID: $varID} -} + pub fn $fld_name(&self) -> $mut$FldType { + $mut$FldType { obj_id: self.id, key_id: $varID } + } `, } diff --git a/tools/schema/generator/tstemplates/results.go b/tools/schema/generator/tstemplates/results.go index e852b40712..a8d3d9e17d 100644 --- a/tools/schema/generator/tstemplates/results.go +++ b/tools/schema/generator/tstemplates/results.go @@ -3,8 +3,21 @@ package tstemplates var resultsTs = map[string]string{ // ******************************* "results.ts": ` -$#emit tsHeader +#![allow(dead_code)] +#![allow(unused_imports)] + +$#if core useCrate useWasmLib +$#if core useCoreContract +$#if core useHost resultsUses $#each func resultsFunc +`, + // ******************************* + "resultsUses": ` +use wasmlib::host::*; + +use crate::*; +use crate::keys::*; +$#if structs useStructs `, // ******************************* "resultsFunc": ` @@ -12,7 +25,7 @@ $#if results resultsFuncResults `, // ******************************* "resultsFuncResults": ` -$#set Kind Result +$#set Kind RESULT_ $#set mut Immutable $#if result resultsProxyStruct $#set mut Mutable @@ -23,10 +36,13 @@ $#if result resultsProxyStruct $#set TypeName $mut$FuncName$+Results $#each result proxyContainers -type $TypeName struct { - id int32 +#[derive(Clone, Copy)] +pub struct $TypeName { + pub(crate) id: i32, } + +impl $TypeName { $#each result proxyMethods +} `, } - diff --git a/tools/schema/generator/tstemplates/state.go b/tools/schema/generator/tstemplates/state.go index 3dc4431ad6..bd2cc24352 100644 --- a/tools/schema/generator/tstemplates/state.go +++ b/tools/schema/generator/tstemplates/state.go @@ -3,9 +3,17 @@ package tstemplates var stateTs = map[string]string{ // ******************************* "state.ts": ` -$#emit tsPackage -$#if state importWasmLib -$#set Kind State +#![allow(dead_code)] +#![allow(unused_imports)] + +use wasmlib::*; +use wasmlib::host::*; + +use crate::*; +use crate::keys::*; +$#if structs useStructs +$#if typedefs useTypeDefs +$#set Kind STATE_ $#set mut Immutable $#emit stateProxyStruct $#set mut Mutable @@ -16,10 +24,17 @@ $#emit stateProxyStruct $#set TypeName $mut$Package$+State $#each state proxyContainers -type $TypeName struct { - id int32 +#[derive(Clone, Copy)] +pub struct $TypeName { + pub(crate) id: i32, } +$#if state stateProxyImpl +`, + // ******************************* + "stateProxyImpl": ` + +impl $TypeName { $#each state proxyMethods +} `, } - diff --git a/tools/schema/generator/tstemplates/structs.go b/tools/schema/generator/tstemplates/structs.go index 3212f39de9..d2491e852c 100644 --- a/tools/schema/generator/tstemplates/structs.go +++ b/tools/schema/generator/tstemplates/structs.go @@ -3,28 +3,36 @@ package tstemplates var structsTs = map[string]string{ // ******************************* "structs.ts": ` -$#emit tsHeader +// @formatter:off + +#![allow(dead_code)] + +use wasmlib::*; +use wasmlib::host::*; $#each structs structType + +// @formatter:on `, // ******************************* "structType": ` -type $StrName struct { +pub struct $StrName { $#each struct structField } -func New$StrName$+FromBytes(bytes []byte) *$StrName { - decode := wasmlib.NewBytesDecoder(bytes) - data := &$StrName$+{} +impl $StrName { + pub fn from_bytes(bytes: &[u8]) -> $StrName { + let mut decode = BytesDecoder::new(bytes); + $StrName { $#each struct structDecode - decode.Close() - return data -} + } + } -func (o *$StrName) Bytes() []byte { - return wasmlib.NewBytesEncoder(). + pub fn to_bytes(&self) -> Vec { + let mut encode = BytesEncoder::new(); $#each struct structEncode - Data() + return encode.data(); + } } $#set mut Immutable $#emit structMethods @@ -33,38 +41,40 @@ $#emit structMethods `, // ******************************* "structField": ` - $FldName $FldLangType $FldComment + pub $fld_name: $FldLangType, $FldComment `, // ******************************* "structDecode": ` - data.$FldName = decode.$FldType() + $fld_name: decode.$fld_type(), `, // ******************************* "structEncode": ` - $FldType(o.$FldName). + encode.$fld_type($ref$+self.$fld_name); `, // ******************************* "structMethods": ` -type $mut$StrName struct { - objID int32 - keyID wasmlib.Key32 +pub struct $mut$StrName { + pub(crate) obj_id: i32, + pub(crate) key_id: Key32, } -func (o $mut$StrName) Exists() bool { - return wasmlib.Exists(o.objID, o.keyID, wasmlib.TYPE_BYTES) -} +impl $mut$StrName { + pub fn exists(&self) -> bool { + exists(self.obj_id, self.key_id, TYPE_BYTES) + } $#if mut structMethodSetValue -func (o $mut$StrName) Value() *$StrName { - return New$StrName$+FromBytes(wasmlib.GetBytes(o.objID, o.keyID, wasmlib.TYPE_BYTES)) + pub fn value(&self) -> $StrName { + $StrName::from_bytes(&get_bytes(self.obj_id, self.key_id, TYPE_BYTES)) + } } `, // ******************************* "structMethodSetValue": ` -func (o $mut$StrName) SetValue(value *$StrName) { - wasmlib.SetBytes(o.objID, o.keyID, wasmlib.TYPE_BYTES, value.Bytes()) -} + pub fn set_value(&self, value: &$StrName) { + set_bytes(self.obj_id, self.key_id, TYPE_BYTES, &value.to_bytes()); + } `, } diff --git a/tools/schema/generator/tstemplates/typedefs.go b/tools/schema/generator/tstemplates/typedefs.go index a64b2eaa99..25ea2fd2b6 100644 --- a/tools/schema/generator/tstemplates/typedefs.go +++ b/tools/schema/generator/tstemplates/typedefs.go @@ -3,8 +3,16 @@ package tstemplates var typedefsTs = map[string]string{ // ******************************* "typedefs.ts": ` -$#emit tsHeader +// @formatter:off + +#![allow(dead_code)] + +use wasmlib::*; +use wasmlib::host::*; +$#if structs useStructs $#each typedef typedefProxy + +// @formatter:on `, // ******************************* "typedefProxy": ` @@ -22,7 +30,7 @@ $#if map typedefProxyAlias // ******************************* "typedefProxyAlias": ` -type $mut$FldName = $proxy +pub type $mut$FldName = $proxy; `, // ******************************* "typedefProxyArray": ` @@ -32,30 +40,32 @@ $#if exist else typedefProxyArrayNew // ******************************* "typedefProxyArrayNew": ` -type $proxy struct { - objID int32 +pub struct $proxy { + pub(crate) obj_id: i32, } + +impl $proxy { $#if mut typedefProxyArrayClear + pub fn length(&self) -> i32 { + get_length(self.obj_id) + } -func (a $proxy) Length() int32 { - return wasmlib.GetLength(a.objID) -} $#if basetype typedefProxyArrayNewBaseType typedefProxyArrayNewOtherType +} $#set exist $proxy `, // ******************************* "typedefProxyArrayClear": ` + pub fn clear(&self) { + clear(self.obj_id); + } -func (a $proxy) Clear() { - wasmlib.Clear(a.objID) -} `, // ******************************* "typedefProxyArrayNewBaseType": ` - -func (a $proxy) Get$FldType(index int32) wasmlib.Sc$mut$FldType { - return wasmlib.NewSc$mut$FldType(a.objID, wasmlib.Key32(index)) -} + pub fn get_$fld_type(&self, index: i32) -> Sc$mut$FldType { + Sc$mut$FldType::new(self.obj_id, Key32(index)) + } `, // ******************************* "typedefProxyArrayNewOtherType": ` @@ -64,20 +74,19 @@ $#if typedef typedefProxyArrayNewOtherTypeTypeDef typedefProxyArrayNewOtherTypeS `, // ******************************* "typedefProxyArrayNewOtherTypeTypeDef": ` -$#set varType wasmlib.TYPE_MAP +$#set varType TYPE_MAP $#if array setVarTypeArray -func (a $proxy) Get$OldType(index int32) $mut$OldType { - subID := wasmlib.GetObjectID(a.objID, wasmlib.Key32(index), $varType) - return $mut$OldType{objID: subID} -} + pub fn Get$OldType(&self, index: i32) -> $mut$OldType { + let sub_id = get_object_id(self.obj_id, Key32(index), $varType); + $mut$OldType { obj_id: sub_id } + } `, // ******************************* "typedefProxyArrayNewOtherTypeStruct": ` - -func (a $proxy) Get$FldType(index int32) $mut$FldType { - return $mut$FldType{objID: a.objID, keyID: wasmlib.Key32(index)} -} + pub fn get_$fld_type(&self, index: i32) -> $mut$FldType { + $mut$FldType { obj_id: self.obj_id, key_id: Key32(index) } + } `, // ******************************* "typedefProxyMap": ` @@ -87,29 +96,32 @@ $#if exist else typedefProxyMapNew // ******************************* "typedefProxyMapNew": ` -type $proxy struct { - objID int32 +pub struct $proxy { + pub(crate) obj_id: i32, } + +impl $proxy { $#if mut typedefProxyMapClear $#if basetype typedefProxyMapNewBaseType typedefProxyMapNewOtherType +} $#set exist $proxy `, // ******************************* "typedefProxyMapClear": ` + pub fn clear(&self) { + clear(self.obj_id); + } -func (m $proxy) Clear() { - wasmlib.Clear(m.objID) -} `, // ******************************* "typedefProxyMapNewBaseType": ` - -func (m $proxy) Get$FldType(key $FldMapKeyLangType) wasmlib.Sc$mut$FldType { - return wasmlib.NewSc$mut$FldType(m.objID, $FldMapKeyKey.KeyID()) -} + pub fn get_$fld_type(&self, key: $FldMapKeyLangType) -> Sc$mut$FldType { + Sc$mut$FldType::new(self.obj_id, key.get_key_id()) + } `, // ******************************* "typedefProxyMapNewOtherType": ` +$#set old_type $fld_type $#set OldType $FldType $#set OldMapKeyLangType $FldMapKeyLangType $#set OldMapKeyKey $FldMapKeyKey @@ -117,23 +129,21 @@ $#if typedef typedefProxyMapNewOtherTypeTypeDef typedefProxyMapNewOtherTypeStruc `, // ******************************* "typedefProxyMapNewOtherTypeTypeDef": ` -$#set varType wasmlib.TYPE_MAP +$#set varType TYPE_MAP $#if array setVarTypeArray - -func (m $proxy) Get$OldType(key $OldMapKeyLangType) $mut$OldType { - subID := wasmlib.GetObjectID(m.objID, $OldMapKeyKey.KeyID(), $varType) - return $mut$OldType{objID: subID} -} + pub fn get_$old_type(&self, key: $OldMapKeyLangType) -> $mut$OldType { + let sub_id = get_object_id(self.obj_id, key.get_key_id(), $varType); + $mut$OldType { obj_id: sub_id } + } `, // ******************************* "typedefProxyMapNewOtherTypeStruct": ` - -func (m $proxy) Get$FldType(key $FldMapKeyLangType) $mut$FldType { - return $mut$FldType{objID: m.objID, keyID: $FldMapKeyKey.KeyID()} -} + pub fn get_$old_type(&self, key: $OldMapKeyLangType) -> $mut$OldType { + $mut$OldType { obj_id: self.obj_id, key_id: key.get_key_id() } + } `, // ******************************* "setVarTypeArray": ` -$#set varType $ArrayTypeID|$FldTypeID +$#set varType $arrayTypeID | $FldTypeID `, } From 2c0783145442e5cb7137500843d83d00fe9b31fe Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Sat, 6 Nov 2021 04:08:34 -0700 Subject: [PATCH 032/198] New TypeScript generator --- contracts/wasm/dividend/ts/dividend/consts.ts | 34 +- .../wasm/dividend/ts/dividend/contract.ts | 53 +- contracts/wasm/dividend/ts/dividend/keys.ts | 36 +- contracts/wasm/dividend/ts/dividend/lib.ts | 70 +- contracts/wasm/dividend/ts/dividend/params.ts | 42 +- .../wasm/dividend/ts/dividend/results.ts | 18 +- contracts/wasm/dividend/ts/dividend/state.ts | 52 +- .../ts/donatewithfeedback/consts.ts | 43 +- .../ts/donatewithfeedback/contract.ts | 38 +- .../ts/donatewithfeedback/keys.ts | 56 +- .../ts/donatewithfeedback/lib.ts | 38 +- .../ts/donatewithfeedback/params.ts | 26 +- .../ts/donatewithfeedback/results.ts | 66 +- .../ts/donatewithfeedback/state.ts | 46 +- .../ts/donatewithfeedback/structs.ts | 26 +- contracts/wasm/erc20/ts/erc20/consts.ts | 40 +- contracts/wasm/erc20/ts/erc20/contract.ts | 66 +- contracts/wasm/erc20/ts/erc20/keys.ts | 44 +- contracts/wasm/erc20/ts/erc20/lib.ts | 82 +-- contracts/wasm/erc20/ts/erc20/params.ts | 98 +-- contracts/wasm/erc20/ts/erc20/results.ts | 26 +- contracts/wasm/erc20/ts/erc20/state.ts | 40 +- contracts/wasm/erc20/ts/erc20/typedefs.ts | 8 +- .../wasm/fairauction/ts/fairauction/consts.ts | 54 +- .../fairauction/ts/fairauction/contract.ts | 46 +- .../wasm/fairauction/ts/fairauction/keys.ts | 84 +-- .../wasm/fairauction/ts/fairauction/lib.ts | 58 +- .../wasm/fairauction/ts/fairauction/params.ts | 66 +- .../fairauction/ts/fairauction/results.ts | 98 +-- .../wasm/fairauction/ts/fairauction/state.ts | 64 +- .../fairauction/ts/fairauction/structs.ts | 66 +- .../fairauction/ts/fairauction/typedefs.ts | 12 +- .../fairroulette/ts/fairroulette/consts.ts | 61 +- .../fairroulette/ts/fairroulette/contract.ts | 71 +- .../wasm/fairroulette/ts/fairroulette/keys.ts | 48 +- .../wasm/fairroulette/ts/fairroulette/lib.ts | 86 +-- .../fairroulette/ts/fairroulette/params.ts | 18 +- .../fairroulette/ts/fairroulette/results.ts | 34 +- .../fairroulette/ts/fairroulette/state.ts | 70 +- .../fairroulette/ts/fairroulette/structs.ts | 18 +- .../wasm/helloworld/ts/helloworld/consts.ts | 6 +- .../wasm/helloworld/ts/helloworld/contract.ts | 17 +- .../wasm/helloworld/ts/helloworld/keys.ts | 4 +- .../wasm/helloworld/ts/helloworld/lib.ts | 18 +- .../wasm/helloworld/ts/helloworld/results.ts | 10 +- .../wasm/helloworld/ts/helloworld/state.ts | 2 +- .../wasm/inccounter/ts/inccounter/consts.ts | 65 +- .../wasm/inccounter/ts/inccounter/contract.ts | 105 ++- .../wasm/inccounter/ts/inccounter/keys.ts | 26 +- .../wasm/inccounter/ts/inccounter/lib.ts | 116 ++-- .../wasm/inccounter/ts/inccounter/params.ts | 34 +- .../wasm/inccounter/ts/inccounter/results.ts | 10 +- .../wasm/inccounter/ts/inccounter/state.ts | 18 +- contracts/wasm/testcore/test/testcore_bg.wasm | Bin 50551 -> 50571 bytes contracts/wasm/testcore/ts/testcore/consts.ts | 182 ++--- .../wasm/testcore/ts/testcore/contract.ts | 266 ++++---- contracts/wasm/testcore/ts/testcore/keys.ts | 136 ++-- contracts/wasm/testcore/ts/testcore/lib.ts | 344 +++++----- contracts/wasm/testcore/ts/testcore/params.ts | 362 +++++----- .../wasm/testcore/ts/testcore/results.ts | 102 +-- contracts/wasm/testcore/ts/testcore/state.ts | 46 +- .../wasm/testwasmlib/test/testwasmlib_bg.wasm | Bin 38365 -> 38377 bytes .../wasm/testwasmlib/ts/testwasmlib/consts.ts | 75 ++- .../testwasmlib/ts/testwasmlib/contract.ts | 90 +-- .../wasm/testwasmlib/ts/testwasmlib/keys.ts | 96 +-- .../wasm/testwasmlib/ts/testwasmlib/lib.ts | 96 +-- .../wasm/testwasmlib/ts/testwasmlib/params.ts | 200 +++--- .../testwasmlib/ts/testwasmlib/results.ts | 42 +- .../wasm/testwasmlib/ts/testwasmlib/state.ts | 20 +- .../testwasmlib/ts/testwasmlib/typedefs.ts | 6 +- .../tokenregistry/ts/tokenregistry/consts.ts | 23 +- .../ts/tokenregistry/contract.ts | 34 +- .../tokenregistry/ts/tokenregistry/keys.ts | 18 +- .../tokenregistry/ts/tokenregistry/lib.ts | 44 +- .../tokenregistry/ts/tokenregistry/params.ts | 42 +- .../tokenregistry/ts/tokenregistry/state.ts | 36 +- .../tokenregistry/ts/tokenregistry/structs.ts | 34 +- .../sbtests/sbtestsc/testcore_bg.wasm | Bin 50551 -> 50571 bytes .../wasmlib/ts/wasmlib/coreaccounts/consts.ts | 32 +- .../ts/wasmlib/coreaccounts/contract.ts | 35 +- .../wasmlib/ts/wasmlib/coreaccounts/params.ts | 42 +- .../ts/wasmlib/coreaccounts/results.ts | 46 +- .../vm/wasmlib/ts/wasmlib/coreblob/consts.ts | 20 +- .../wasmlib/ts/wasmlib/coreblob/contract.ts | 24 +- .../vm/wasmlib/ts/wasmlib/coreblob/params.ts | 40 +- .../vm/wasmlib/ts/wasmlib/coreblob/results.ts | 46 +- .../wasmlib/ts/wasmlib/coreblocklog/consts.ts | 62 +- .../ts/wasmlib/coreblocklog/contract.ts | 58 +- .../wasmlib/ts/wasmlib/coreblocklog/params.ts | 82 +-- .../ts/wasmlib/coreblocklog/results.ts | 150 ++--- .../ts/wasmlib/coregovernance/consts.ts | 84 +-- .../ts/wasmlib/coregovernance/contract.ts | 53 +- .../ts/wasmlib/coregovernance/params.ts | 138 ++-- .../ts/wasmlib/coregovernance/results.ts | 122 ++-- .../vm/wasmlib/ts/wasmlib/coreroot/consts.ts | 28 +- .../wasmlib/ts/wasmlib/coreroot/contract.ts | 24 +- .../vm/wasmlib/ts/wasmlib/coreroot/params.ts | 50 +- .../vm/wasmlib/ts/wasmlib/coreroot/results.ts | 36 +- tools/schema/generator/generator.go | 26 - tools/schema/generator/generator_go.go | 12 - tools/schema/generator/generator_rust.go | 12 - tools/schema/generator/generator_ts.go | 631 ++---------------- tools/schema/generator/schema.go | 17 - .../generator/tstemplates/alltemplates.go | 58 +- tools/schema/generator/tstemplates/consts.go | 26 +- .../schema/generator/tstemplates/contract.go | 92 ++- tools/schema/generator/tstemplates/funcs.go | 17 +- tools/schema/generator/tstemplates/keys.go | 39 +- tools/schema/generator/tstemplates/lib.go | 102 +-- tools/schema/generator/tstemplates/params.go | 24 +- tools/schema/generator/tstemplates/proxy.go | 30 +- tools/schema/generator/tstemplates/results.go | 25 +- tools/schema/generator/tstemplates/state.go | 25 +- tools/schema/generator/tstemplates/structs.go | 59 +- .../schema/generator/tstemplates/typedefs.go | 91 +-- 115 files changed, 3187 insertions(+), 3998 deletions(-) diff --git a/contracts/wasm/dividend/ts/dividend/consts.ts b/contracts/wasm/dividend/ts/dividend/consts.ts index 3972e9b7ca..1f7b66fe47 100644 --- a/contracts/wasm/dividend/ts/dividend/consts.ts +++ b/contracts/wasm/dividend/ts/dividend/consts.ts @@ -5,34 +5,34 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; export const ScName = "dividend"; export const ScDescription = "Simple dividend smart contract"; export const HScName = new wasmlib.ScHname(0xcce2e239); export const ParamAddress = "address"; -export const ParamFactor = "factor"; -export const ParamOwner = "owner"; +export const ParamFactor = "factor"; +export const ParamOwner = "owner"; export const ResultFactor = "factor"; -export const ResultOwner = "owner"; +export const ResultOwner = "owner"; -export const StateMemberList = "memberList"; -export const StateMembers = "members"; -export const StateOwner = "owner"; +export const StateMemberList = "memberList"; +export const StateMembers = "members"; +export const StateOwner = "owner"; export const StateTotalFactor = "totalFactor"; -export const FuncDivide = "divide"; -export const FuncInit = "init"; -export const FuncMember = "member"; -export const FuncSetOwner = "setOwner"; +export const FuncDivide = "divide"; +export const FuncInit = "init"; +export const FuncMember = "member"; +export const FuncSetOwner = "setOwner"; export const ViewGetFactor = "getFactor"; -export const ViewGetOwner = "getOwner"; +export const ViewGetOwner = "getOwner"; -export const HFuncDivide = new wasmlib.ScHname(0xc7878107); -export const HFuncInit = new wasmlib.ScHname(0x1f44d644); -export const HFuncMember = new wasmlib.ScHname(0xc07da2cb); -export const HFuncSetOwner = new wasmlib.ScHname(0x2a15fe7b); +export const HFuncDivide = new wasmlib.ScHname(0xc7878107); +export const HFuncInit = new wasmlib.ScHname(0x1f44d644); +export const HFuncMember = new wasmlib.ScHname(0xc07da2cb); +export const HFuncSetOwner = new wasmlib.ScHname(0x2a15fe7b); export const HViewGetFactor = new wasmlib.ScHname(0x0ee668fe); -export const HViewGetOwner = new wasmlib.ScHname(0x137107a6); +export const HViewGetOwner = new wasmlib.ScHname(0x137107a6); diff --git a/contracts/wasm/dividend/ts/dividend/contract.ts b/contracts/wasm/dividend/ts/dividend/contract.ts index e53fae2a2c..b007d35980 100644 --- a/contracts/wasm/dividend/ts/dividend/contract.ts +++ b/contracts/wasm/dividend/ts/dividend/contract.ts @@ -5,74 +5,73 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class DivideCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncDivide); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncDivide); } export class DivideContext { - state: sc.MutableDividendState = new sc.MutableDividendState(); + state: sc.MutableDividendState = new sc.MutableDividendState(); } export class InitCall { - func: wasmlib.ScInitFunc = new wasmlib.ScInitFunc(sc.HScName, sc.HFuncInit); - params: sc.MutableInitParams = new sc.MutableInitParams(); + func: wasmlib.ScInitFunc = new wasmlib.ScInitFunc(sc.HScName, sc.HFuncInit); + params: sc.MutableInitParams = new sc.MutableInitParams(); } export class InitContext { - params: sc.ImmutableInitParams = new sc.ImmutableInitParams(); - state: sc.MutableDividendState = new sc.MutableDividendState(); + params: sc.ImmutableInitParams = new sc.ImmutableInitParams(); + state: sc.MutableDividendState = new sc.MutableDividendState(); } export class MemberCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncMember); - params: sc.MutableMemberParams = new sc.MutableMemberParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncMember); + params: sc.MutableMemberParams = new sc.MutableMemberParams(); } export class MemberContext { - params: sc.ImmutableMemberParams = new sc.ImmutableMemberParams(); - state: sc.MutableDividendState = new sc.MutableDividendState(); + params: sc.ImmutableMemberParams = new sc.ImmutableMemberParams(); + state: sc.MutableDividendState = new sc.MutableDividendState(); } export class SetOwnerCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncSetOwner); - params: sc.MutableSetOwnerParams = new sc.MutableSetOwnerParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncSetOwner); + params: sc.MutableSetOwnerParams = new sc.MutableSetOwnerParams(); } export class SetOwnerContext { - params: sc.ImmutableSetOwnerParams = new sc.ImmutableSetOwnerParams(); - state: sc.MutableDividendState = new sc.MutableDividendState(); + params: sc.ImmutableSetOwnerParams = new sc.ImmutableSetOwnerParams(); + state: sc.MutableDividendState = new sc.MutableDividendState(); } export class GetFactorCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetFactor); - params: sc.MutableGetFactorParams = new sc.MutableGetFactorParams(); - results: sc.ImmutableGetFactorResults = new sc.ImmutableGetFactorResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetFactor); + params: sc.MutableGetFactorParams = new sc.MutableGetFactorParams(); + results: sc.ImmutableGetFactorResults = new sc.ImmutableGetFactorResults(); } export class GetFactorContext { - params: sc.ImmutableGetFactorParams = new sc.ImmutableGetFactorParams(); - results: sc.MutableGetFactorResults = new sc.MutableGetFactorResults(); - state: sc.ImmutableDividendState = new sc.ImmutableDividendState(); + params: sc.ImmutableGetFactorParams = new sc.ImmutableGetFactorParams(); + results: sc.MutableGetFactorResults = new sc.MutableGetFactorResults(); + state: sc.ImmutableDividendState = new sc.ImmutableDividendState(); } export class GetOwnerCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetOwner); - results: sc.ImmutableGetOwnerResults = new sc.ImmutableGetOwnerResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetOwner); + results: sc.ImmutableGetOwnerResults = new sc.ImmutableGetOwnerResults(); } export class GetOwnerContext { - results: sc.MutableGetOwnerResults = new sc.MutableGetOwnerResults(); - state: sc.ImmutableDividendState = new sc.ImmutableDividendState(); + results: sc.MutableGetOwnerResults = new sc.MutableGetOwnerResults(); + state: sc.ImmutableDividendState = new sc.ImmutableDividendState(); } export class ScFuncs { static divide(ctx: wasmlib.ScFuncCallContext): DivideCall { - let f = new DivideCall(); - return f; + return new DivideCall(); } static init(ctx: wasmlib.ScFuncCallContext): InitCall { diff --git a/contracts/wasm/dividend/ts/dividend/keys.ts b/contracts/wasm/dividend/ts/dividend/keys.ts index d63c0823de..bc7de8907e 100644 --- a/contracts/wasm/dividend/ts/dividend/keys.ts +++ b/contracts/wasm/dividend/ts/dividend/keys.ts @@ -5,29 +5,29 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; -export const IdxParamAddress = 0; -export const IdxParamFactor = 1; -export const IdxParamOwner = 2; -export const IdxResultFactor = 3; -export const IdxResultOwner = 4; -export const IdxStateMemberList = 5; -export const IdxStateMembers = 6; -export const IdxStateOwner = 7; +export const IdxParamAddress = 0; +export const IdxParamFactor = 1; +export const IdxParamOwner = 2; +export const IdxResultFactor = 3; +export const IdxResultOwner = 4; +export const IdxStateMemberList = 5; +export const IdxStateMembers = 6; +export const IdxStateOwner = 7; export const IdxStateTotalFactor = 8; export let keyMap: string[] = [ - sc.ParamAddress, - sc.ParamFactor, - sc.ParamOwner, - sc.ResultFactor, - sc.ResultOwner, - sc.StateMemberList, - sc.StateMembers, - sc.StateOwner, - sc.StateTotalFactor, + sc.ParamAddress, + sc.ParamFactor, + sc.ParamOwner, + sc.ResultFactor, + sc.ResultOwner, + sc.StateMemberList, + sc.StateMembers, + sc.StateOwner, + sc.StateTotalFactor, ]; export let idxMap: wasmlib.Key32[] = new Array(keyMap.length); diff --git a/contracts/wasm/dividend/ts/dividend/lib.ts b/contracts/wasm/dividend/ts/dividend/lib.ts index a34a6d8586..9154b0fe44 100644 --- a/contracts/wasm/dividend/ts/dividend/lib.ts +++ b/contracts/wasm/dividend/ts/dividend/lib.ts @@ -5,7 +5,7 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export function on_call(index: i32): void { @@ -27,69 +27,69 @@ export function on_load(): void { } function funcDivideThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("dividend.funcDivide"); - let f = new sc.DivideContext(); + ctx.log("dividend.funcDivide"); + let f = new sc.DivideContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcDivide(ctx, f); - ctx.log("dividend.funcDivide ok"); + sc.funcDivide(ctx, f); + ctx.log("dividend.funcDivide ok"); } function funcInitThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("dividend.funcInit"); - let f = new sc.InitContext(); + ctx.log("dividend.funcInit"); + let f = new sc.InitContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcInit(ctx, f); - ctx.log("dividend.funcInit ok"); + sc.funcInit(ctx, f); + ctx.log("dividend.funcInit ok"); } function funcMemberThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("dividend.funcMember"); + ctx.log("dividend.funcMember"); // only defined owner of contract can add members - let access = ctx.state().getAgentID(wasmlib.Key32.fromString("owner")); - ctx.require(access.exists(), "access not set: owner"); - ctx.require(ctx.caller().equals(access.value()), "no permission"); + let access = ctx.state().getAgentID(wasmlib.Key32.fromString("owner")); + ctx.require(access.exists(), "access not set: owner"); + ctx.require(ctx.caller().equals(access.value()), "no permission"); - let f = new sc.MemberContext(); + let f = new sc.MemberContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.address().exists(), "missing mandatory address") - ctx.require(f.params.factor().exists(), "missing mandatory factor") - sc.funcMember(ctx, f); - ctx.log("dividend.funcMember ok"); + ctx.require(f.params.address().exists(), "missing mandatory address"); + ctx.require(f.params.factor().exists(), "missing mandatory factor"); + sc.funcMember(ctx, f); + ctx.log("dividend.funcMember ok"); } function funcSetOwnerThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("dividend.funcSetOwner"); + ctx.log("dividend.funcSetOwner"); // only defined owner of contract can change owner - let access = ctx.state().getAgentID(wasmlib.Key32.fromString("owner")); - ctx.require(access.exists(), "access not set: owner"); - ctx.require(ctx.caller().equals(access.value()), "no permission"); + let access = ctx.state().getAgentID(wasmlib.Key32.fromString("owner")); + ctx.require(access.exists(), "access not set: owner"); + ctx.require(ctx.caller().equals(access.value()), "no permission"); - let f = new sc.SetOwnerContext(); + let f = new sc.SetOwnerContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.owner().exists(), "missing mandatory owner") - sc.funcSetOwner(ctx, f); - ctx.log("dividend.funcSetOwner ok"); + ctx.require(f.params.owner().exists(), "missing mandatory owner"); + sc.funcSetOwner(ctx, f); + ctx.log("dividend.funcSetOwner ok"); } function viewGetFactorThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("dividend.viewGetFactor"); - let f = new sc.GetFactorContext(); + ctx.log("dividend.viewGetFactor"); + let f = new sc.GetFactorContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.address().exists(), "missing mandatory address") - sc.viewGetFactor(ctx, f); - ctx.log("dividend.viewGetFactor ok"); + ctx.require(f.params.address().exists(), "missing mandatory address"); + sc.viewGetFactor(ctx, f); + ctx.log("dividend.viewGetFactor ok"); } function viewGetOwnerThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("dividend.viewGetOwner"); - let f = new sc.GetOwnerContext(); + ctx.log("dividend.viewGetOwner"); + let f = new sc.GetOwnerContext(); f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.viewGetOwner(ctx, f); - ctx.log("dividend.viewGetOwner ok"); + sc.viewGetOwner(ctx, f); + ctx.log("dividend.viewGetOwner ok"); } diff --git a/contracts/wasm/dividend/ts/dividend/params.ts b/contracts/wasm/dividend/ts/dividend/params.ts index e02167e7a0..78ccbae6d5 100644 --- a/contracts/wasm/dividend/ts/dividend/params.ts +++ b/contracts/wasm/dividend/ts/dividend/params.ts @@ -5,69 +5,69 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableInitParams extends wasmlib.ScMapID { owner(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); + } } export class MutableInitParams extends wasmlib.ScMapID { owner(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); + } } export class ImmutableMemberParams extends wasmlib.ScMapID { address(): wasmlib.ScImmutableAddress { - return new wasmlib.ScImmutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); - } + return new wasmlib.ScImmutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); + } factor(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamFactor]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamFactor]); + } } export class MutableMemberParams extends wasmlib.ScMapID { address(): wasmlib.ScMutableAddress { - return new wasmlib.ScMutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); - } + return new wasmlib.ScMutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); + } factor(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamFactor]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamFactor]); + } } export class ImmutableSetOwnerParams extends wasmlib.ScMapID { owner(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); + } } export class MutableSetOwnerParams extends wasmlib.ScMapID { owner(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); + } } export class ImmutableGetFactorParams extends wasmlib.ScMapID { address(): wasmlib.ScImmutableAddress { - return new wasmlib.ScImmutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); - } + return new wasmlib.ScImmutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); + } } export class MutableGetFactorParams extends wasmlib.ScMapID { address(): wasmlib.ScMutableAddress { - return new wasmlib.ScMutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); - } + return new wasmlib.ScMutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); + } } diff --git a/contracts/wasm/dividend/ts/dividend/results.ts b/contracts/wasm/dividend/ts/dividend/results.ts index 0a0ac5af3d..6fa46cace8 100644 --- a/contracts/wasm/dividend/ts/dividend/results.ts +++ b/contracts/wasm/dividend/ts/dividend/results.ts @@ -5,33 +5,33 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableGetFactorResults extends wasmlib.ScMapID { factor(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultFactor]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultFactor]); + } } export class MutableGetFactorResults extends wasmlib.ScMapID { factor(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultFactor]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultFactor]); + } } export class ImmutableGetOwnerResults extends wasmlib.ScMapID { owner(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxResultOwner]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxResultOwner]); + } } export class MutableGetOwnerResults extends wasmlib.ScMapID { owner(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxResultOwner]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxResultOwner]); + } } diff --git a/contracts/wasm/dividend/ts/dividend/state.ts b/contracts/wasm/dividend/ts/dividend/state.ts index 60be5bad30..74d23e984e 100644 --- a/contracts/wasm/dividend/ts/dividend/state.ts +++ b/contracts/wasm/dividend/ts/dividend/state.ts @@ -5,11 +5,11 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ArrayOfImmutableAddress { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -25,7 +25,7 @@ export class ArrayOfImmutableAddress { } export class MapAddressToImmutableInt64 { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -39,26 +39,26 @@ export class MapAddressToImmutableInt64 { export class ImmutableDividendState extends wasmlib.ScMapID { memberList(): sc.ArrayOfImmutableAddress { - let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateMemberList], wasmlib.TYPE_ARRAY|wasmlib.TYPE_ADDRESS); - return new sc.ArrayOfImmutableAddress(arrID) - } + let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateMemberList], wasmlib.TYPE_ARRAY|wasmlib.TYPE_ADDRESS); + return new sc.ArrayOfImmutableAddress(arrID); + } members(): sc.MapAddressToImmutableInt64 { - let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateMembers], wasmlib.TYPE_MAP); - return new sc.MapAddressToImmutableInt64(mapID); - } + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateMembers], wasmlib.TYPE_MAP); + return new sc.MapAddressToImmutableInt64(mapID); + } owner(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxStateOwner]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxStateOwner]); + } totalFactor(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateTotalFactor]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateTotalFactor]); + } } export class ArrayOfMutableAddress { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -78,14 +78,14 @@ export class ArrayOfMutableAddress { } export class MapAddressToMutableInt64 { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; } clear(): void { - wasmlib.clear(this.objID) + wasmlib.clear(this.objID); } getInt64(key: wasmlib.ScAddress): wasmlib.ScMutableInt64 { @@ -96,20 +96,20 @@ export class MapAddressToMutableInt64 { export class MutableDividendState extends wasmlib.ScMapID { memberList(): sc.ArrayOfMutableAddress { - let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateMemberList], wasmlib.TYPE_ARRAY|wasmlib.TYPE_ADDRESS); - return new sc.ArrayOfMutableAddress(arrID) - } + let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateMemberList], wasmlib.TYPE_ARRAY|wasmlib.TYPE_ADDRESS); + return new sc.ArrayOfMutableAddress(arrID); + } members(): sc.MapAddressToMutableInt64 { - let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateMembers], wasmlib.TYPE_MAP); - return new sc.MapAddressToMutableInt64(mapID); - } + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateMembers], wasmlib.TYPE_MAP); + return new sc.MapAddressToMutableInt64(mapID); + } owner(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxStateOwner]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxStateOwner]); + } totalFactor(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateTotalFactor]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateTotalFactor]); + } } diff --git a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/consts.ts b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/consts.ts index 0fd579aa81..01512e0646 100644 --- a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/consts.ts +++ b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/consts.ts @@ -5,34 +5,35 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; -export const ScName = "donatewithfeedback"; -export const HScName = new wasmlib.ScHname(0x696d7f66); +export const ScName = "donatewithfeedback"; +export const ScDescription = ""; +export const HScName = new wasmlib.ScHname(0x696d7f66); -export const ParamAmount = "amount"; +export const ParamAmount = "amount"; export const ParamFeedback = "feedback"; -export const ParamNr = "nr"; - -export const ResultAmount = "amount"; -export const ResultCount = "count"; -export const ResultDonator = "donator"; -export const ResultError = "error"; -export const ResultFeedback = "feedback"; -export const ResultMaxDonation = "maxDonation"; -export const ResultTimestamp = "timestamp"; +export const ParamNr = "nr"; + +export const ResultAmount = "amount"; +export const ResultCount = "count"; +export const ResultDonator = "donator"; +export const ResultError = "error"; +export const ResultFeedback = "feedback"; +export const ResultMaxDonation = "maxDonation"; +export const ResultTimestamp = "timestamp"; export const ResultTotalDonation = "totalDonation"; -export const StateLog = "log"; -export const StateMaxDonation = "maxDonation"; +export const StateLog = "log"; +export const StateMaxDonation = "maxDonation"; export const StateTotalDonation = "totalDonation"; -export const FuncDonate = "donate"; -export const FuncWithdraw = "withdraw"; -export const ViewDonation = "donation"; +export const FuncDonate = "donate"; +export const FuncWithdraw = "withdraw"; +export const ViewDonation = "donation"; export const ViewDonationInfo = "donationInfo"; -export const HFuncDonate = new wasmlib.ScHname(0xdc9b133a); -export const HFuncWithdraw = new wasmlib.ScHname(0x9dcc0f41); -export const HViewDonation = new wasmlib.ScHname(0xbdb245ba); +export const HFuncDonate = new wasmlib.ScHname(0xdc9b133a); +export const HFuncWithdraw = new wasmlib.ScHname(0x9dcc0f41); +export const HViewDonation = new wasmlib.ScHname(0xbdb245ba); export const HViewDonationInfo = new wasmlib.ScHname(0xc8f7c726); diff --git a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/contract.ts b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/contract.ts index 10b82740b5..a68343d6f9 100644 --- a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/contract.ts +++ b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/contract.ts @@ -5,49 +5,49 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class DonateCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncDonate); - params: sc.MutableDonateParams = new sc.MutableDonateParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncDonate); + params: sc.MutableDonateParams = new sc.MutableDonateParams(); } export class DonateContext { - params: sc.ImmutableDonateParams = new sc.ImmutableDonateParams(); - state: sc.MutableDonateWithFeedbackState = new sc.MutableDonateWithFeedbackState(); + params: sc.ImmutableDonateParams = new sc.ImmutableDonateParams(); + state: sc.MutableDonateWithFeedbackState = new sc.MutableDonateWithFeedbackState(); } export class WithdrawCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncWithdraw); - params: sc.MutableWithdrawParams = new sc.MutableWithdrawParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncWithdraw); + params: sc.MutableWithdrawParams = new sc.MutableWithdrawParams(); } export class WithdrawContext { - params: sc.ImmutableWithdrawParams = new sc.ImmutableWithdrawParams(); - state: sc.MutableDonateWithFeedbackState = new sc.MutableDonateWithFeedbackState(); + params: sc.ImmutableWithdrawParams = new sc.ImmutableWithdrawParams(); + state: sc.MutableDonateWithFeedbackState = new sc.MutableDonateWithFeedbackState(); } export class DonationCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewDonation); - params: sc.MutableDonationParams = new sc.MutableDonationParams(); - results: sc.ImmutableDonationResults = new sc.ImmutableDonationResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewDonation); + params: sc.MutableDonationParams = new sc.MutableDonationParams(); + results: sc.ImmutableDonationResults = new sc.ImmutableDonationResults(); } export class DonationContext { - params: sc.ImmutableDonationParams = new sc.ImmutableDonationParams(); - results: sc.MutableDonationResults = new sc.MutableDonationResults(); - state: sc.ImmutableDonateWithFeedbackState = new sc.ImmutableDonateWithFeedbackState(); + params: sc.ImmutableDonationParams = new sc.ImmutableDonationParams(); + results: sc.MutableDonationResults = new sc.MutableDonationResults(); + state: sc.ImmutableDonateWithFeedbackState = new sc.ImmutableDonateWithFeedbackState(); } export class DonationInfoCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewDonationInfo); - results: sc.ImmutableDonationInfoResults = new sc.ImmutableDonationInfoResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewDonationInfo); + results: sc.ImmutableDonationInfoResults = new sc.ImmutableDonationInfoResults(); } export class DonationInfoContext { - results: sc.MutableDonationInfoResults = new sc.MutableDonationInfoResults(); - state: sc.ImmutableDonateWithFeedbackState = new sc.ImmutableDonateWithFeedbackState(); + results: sc.MutableDonationInfoResults = new sc.MutableDonationInfoResults(); + state: sc.ImmutableDonateWithFeedbackState = new sc.ImmutableDonateWithFeedbackState(); } export class ScFuncs { diff --git a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/keys.ts b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/keys.ts index 897c2d1de2..52ff7fd98b 100644 --- a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/keys.ts +++ b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/keys.ts @@ -5,39 +5,39 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; -export const IdxParamAmount = 0; -export const IdxParamFeedback = 1; -export const IdxParamNr = 2; -export const IdxResultAmount = 3; -export const IdxResultCount = 4; -export const IdxResultDonator = 5; -export const IdxResultError = 6; -export const IdxResultFeedback = 7; -export const IdxResultMaxDonation = 8; -export const IdxResultTimestamp = 9; +export const IdxParamAmount = 0; +export const IdxParamFeedback = 1; +export const IdxParamNr = 2; +export const IdxResultAmount = 3; +export const IdxResultCount = 4; +export const IdxResultDonator = 5; +export const IdxResultError = 6; +export const IdxResultFeedback = 7; +export const IdxResultMaxDonation = 8; +export const IdxResultTimestamp = 9; export const IdxResultTotalDonation = 10; -export const IdxStateLog = 11; -export const IdxStateMaxDonation = 12; -export const IdxStateTotalDonation = 13; +export const IdxStateLog = 11; +export const IdxStateMaxDonation = 12; +export const IdxStateTotalDonation = 13; export let keyMap: string[] = [ - sc.ParamAmount, - sc.ParamFeedback, - sc.ParamNr, - sc.ResultAmount, - sc.ResultCount, - sc.ResultDonator, - sc.ResultError, - sc.ResultFeedback, - sc.ResultMaxDonation, - sc.ResultTimestamp, - sc.ResultTotalDonation, - sc.StateLog, - sc.StateMaxDonation, - sc.StateTotalDonation, + sc.ParamAmount, + sc.ParamFeedback, + sc.ParamNr, + sc.ResultAmount, + sc.ResultCount, + sc.ResultDonator, + sc.ResultError, + sc.ResultFeedback, + sc.ResultMaxDonation, + sc.ResultTimestamp, + sc.ResultTotalDonation, + sc.StateLog, + sc.StateMaxDonation, + sc.StateTotalDonation, ]; export let idxMap: wasmlib.Key32[] = new Array(keyMap.length); diff --git a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/lib.ts b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/lib.ts index 28dca4c343..089f434c78 100644 --- a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/lib.ts +++ b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/lib.ts @@ -5,7 +5,7 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export function on_call(index: i32): void { @@ -25,42 +25,42 @@ export function on_load(): void { } function funcDonateThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("donatewithfeedback.funcDonate"); - let f = new sc.DonateContext(); + ctx.log("donatewithfeedback.funcDonate"); + let f = new sc.DonateContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcDonate(ctx, f); - ctx.log("donatewithfeedback.funcDonate ok"); + sc.funcDonate(ctx, f); + ctx.log("donatewithfeedback.funcDonate ok"); } function funcWithdrawThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("donatewithfeedback.funcWithdraw"); + ctx.log("donatewithfeedback.funcWithdraw"); // only SC creator can withdraw donated funds - ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); + ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); - let f = new sc.WithdrawContext(); + let f = new sc.WithdrawContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcWithdraw(ctx, f); - ctx.log("donatewithfeedback.funcWithdraw ok"); + sc.funcWithdraw(ctx, f); + ctx.log("donatewithfeedback.funcWithdraw ok"); } function viewDonationThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("donatewithfeedback.viewDonation"); - let f = new sc.DonationContext(); + ctx.log("donatewithfeedback.viewDonation"); + let f = new sc.DonationContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.nr().exists(), "missing mandatory nr") - sc.viewDonation(ctx, f); - ctx.log("donatewithfeedback.viewDonation ok"); + ctx.require(f.params.nr().exists(), "missing mandatory nr"); + sc.viewDonation(ctx, f); + ctx.log("donatewithfeedback.viewDonation ok"); } function viewDonationInfoThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("donatewithfeedback.viewDonationInfo"); - let f = new sc.DonationInfoContext(); + ctx.log("donatewithfeedback.viewDonationInfo"); + let f = new sc.DonationInfoContext(); f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.viewDonationInfo(ctx, f); - ctx.log("donatewithfeedback.viewDonationInfo ok"); + sc.viewDonationInfo(ctx, f); + ctx.log("donatewithfeedback.viewDonationInfo ok"); } diff --git a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/params.ts b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/params.ts index 355aa8dca4..acfecf4821 100644 --- a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/params.ts +++ b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/params.ts @@ -5,47 +5,47 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableDonateParams extends wasmlib.ScMapID { feedback(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamFeedback]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamFeedback]); + } } export class MutableDonateParams extends wasmlib.ScMapID { feedback(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamFeedback]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamFeedback]); + } } export class ImmutableWithdrawParams extends wasmlib.ScMapID { amount(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamAmount]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamAmount]); + } } export class MutableWithdrawParams extends wasmlib.ScMapID { amount(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamAmount]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamAmount]); + } } export class ImmutableDonationParams extends wasmlib.ScMapID { nr(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamNr]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamNr]); + } } export class MutableDonationParams extends wasmlib.ScMapID { nr(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamNr]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamNr]); + } } diff --git a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/results.ts b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/results.ts index e85ff09046..d0b4ea12cd 100644 --- a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/results.ts +++ b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/results.ts @@ -5,81 +5,81 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableDonationResults extends wasmlib.ScMapID { amount(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultAmount]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultAmount]); + } donator(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxResultDonator]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxResultDonator]); + } error(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxResultError]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxResultError]); + } feedback(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxResultFeedback]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxResultFeedback]); + } timestamp(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultTimestamp]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultTimestamp]); + } } export class MutableDonationResults extends wasmlib.ScMapID { amount(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultAmount]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultAmount]); + } donator(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxResultDonator]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxResultDonator]); + } error(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxResultError]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxResultError]); + } feedback(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxResultFeedback]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxResultFeedback]); + } timestamp(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultTimestamp]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultTimestamp]); + } } export class ImmutableDonationInfoResults extends wasmlib.ScMapID { count(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultCount]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultCount]); + } maxDonation(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultMaxDonation]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultMaxDonation]); + } totalDonation(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultTotalDonation]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultTotalDonation]); + } } export class MutableDonationInfoResults extends wasmlib.ScMapID { count(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultCount]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultCount]); + } maxDonation(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultMaxDonation]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultMaxDonation]); + } totalDonation(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultTotalDonation]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultTotalDonation]); + } } diff --git a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/state.ts b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/state.ts index aac74b4133..dca3b721fb 100644 --- a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/state.ts +++ b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/state.ts @@ -5,11 +5,11 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ArrayOfImmutableDonation { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -19,29 +19,29 @@ export class ArrayOfImmutableDonation { return wasmlib.getLength(this.objID); } - getDonation(index: i32): sc.ImmutableDonation { - return new sc.ImmutableDonation(this.objID, new wasmlib.Key32(index)); - } + getDonation(index: i32): sc.ImmutableDonation { + return new sc.ImmutableDonation(this.objID, new wasmlib.Key32(index)); + } } export class ImmutableDonateWithFeedbackState extends wasmlib.ScMapID { log(): sc.ArrayOfImmutableDonation { - let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateLog], wasmlib.TYPE_ARRAY|wasmlib.TYPE_BYTES); - return new sc.ArrayOfImmutableDonation(arrID) - } + let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateLog], wasmlib.TYPE_ARRAY|wasmlib.TYPE_BYTES); + return new sc.ArrayOfImmutableDonation(arrID); + } maxDonation(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateMaxDonation]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateMaxDonation]); + } totalDonation(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateTotalDonation]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateTotalDonation]); + } } export class ArrayOfMutableDonation { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -55,23 +55,23 @@ export class ArrayOfMutableDonation { return wasmlib.getLength(this.objID); } - getDonation(index: i32): sc.MutableDonation { - return new sc.MutableDonation(this.objID, new wasmlib.Key32(index)); - } + getDonation(index: i32): sc.MutableDonation { + return new sc.MutableDonation(this.objID, new wasmlib.Key32(index)); + } } export class MutableDonateWithFeedbackState extends wasmlib.ScMapID { log(): sc.ArrayOfMutableDonation { - let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateLog], wasmlib.TYPE_ARRAY|wasmlib.TYPE_BYTES); - return new sc.ArrayOfMutableDonation(arrID) - } + let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateLog], wasmlib.TYPE_ARRAY|wasmlib.TYPE_BYTES); + return new sc.ArrayOfMutableDonation(arrID); + } maxDonation(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateMaxDonation]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateMaxDonation]); + } totalDonation(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateTotalDonation]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateTotalDonation]); + } } diff --git a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/structs.ts b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/structs.ts index 76419ec3df..e704102f20 100644 --- a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/structs.ts +++ b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/structs.ts @@ -5,14 +5,14 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; export class Donation { - amount : i64 = 0; // amount donated - donator : wasmlib.ScAgentID = new wasmlib.ScAgentID(); // who donated - error : string = ""; // error to be reported to donator if anything goes wrong - feedback : string = ""; // the feedback for the person donated to - timestamp: i64 = 0; // when the donation took place + amount: i64 = 0; // amount donated + donator: wasmlib.ScAgentID = new wasmlib.ScAgentID(); // who donated + error: string = ""; // error to be reported to donator if anything goes wrong + feedback: string = ""; // the feedback for the person donated to + timestamp: i64 = 0; // when the donation took place static fromBytes(bytes: u8[]): Donation { let decode = new wasmlib.BytesDecoder(bytes); @@ -28,11 +28,11 @@ export class Donation { bytes(): u8[] { return new wasmlib.BytesEncoder(). - int64(this.amount). - agentID(this.donator). - string(this.error). - string(this.feedback). - int64(this.timestamp). + int64(this.amount). + agentID(this.donator). + string(this.error). + string(this.feedback). + int64(this.timestamp). data(); } } @@ -51,7 +51,7 @@ export class ImmutableDonation { } value(): Donation { - return Donation.fromBytes(wasmlib.getBytes(this.objID, this.keyID,wasmlib. TYPE_BYTES)); + return Donation.fromBytes(wasmlib.getBytes(this.objID, this.keyID, wasmlib.TYPE_BYTES)); } } @@ -73,6 +73,6 @@ export class MutableDonation { } value(): Donation { - return Donation.fromBytes(wasmlib.getBytes(this.objID, this.keyID,wasmlib. TYPE_BYTES)); + return Donation.fromBytes(wasmlib.getBytes(this.objID, this.keyID, wasmlib.TYPE_BYTES)); } } diff --git a/contracts/wasm/erc20/ts/erc20/consts.ts b/contracts/wasm/erc20/ts/erc20/consts.ts index 46fac336fb..9020011f56 100644 --- a/contracts/wasm/erc20/ts/erc20/consts.ts +++ b/contracts/wasm/erc20/ts/erc20/consts.ts @@ -5,38 +5,38 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; export const ScName = "erc20"; export const ScDescription = "ERC-20 PoC for IOTA Smart Contracts"; export const HScName = new wasmlib.ScHname(0x200e3733); -export const ParamAccount = "ac"; -export const ParamAmount = "am"; -export const ParamCreator = "c"; +export const ParamAccount = "ac"; +export const ParamAmount = "am"; +export const ParamCreator = "c"; export const ParamDelegation = "d"; -export const ParamRecipient = "r"; -export const ParamSupply = "s"; +export const ParamRecipient = "r"; +export const ParamSupply = "s"; export const ResultAmount = "am"; export const ResultSupply = "s"; export const StateAllAllowances = "a"; -export const StateBalances = "b"; -export const StateSupply = "s"; +export const StateBalances = "b"; +export const StateSupply = "s"; -export const FuncApprove = "approve"; -export const FuncInit = "init"; -export const FuncTransfer = "transfer"; +export const FuncApprove = "approve"; +export const FuncInit = "init"; +export const FuncTransfer = "transfer"; export const FuncTransferFrom = "transferFrom"; -export const ViewAllowance = "allowance"; -export const ViewBalanceOf = "balanceOf"; -export const ViewTotalSupply = "totalSupply"; +export const ViewAllowance = "allowance"; +export const ViewBalanceOf = "balanceOf"; +export const ViewTotalSupply = "totalSupply"; -export const HFuncApprove = new wasmlib.ScHname(0xa0661268); -export const HFuncInit = new wasmlib.ScHname(0x1f44d644); -export const HFuncTransfer = new wasmlib.ScHname(0xa15da184); +export const HFuncApprove = new wasmlib.ScHname(0xa0661268); +export const HFuncInit = new wasmlib.ScHname(0x1f44d644); +export const HFuncTransfer = new wasmlib.ScHname(0xa15da184); export const HFuncTransferFrom = new wasmlib.ScHname(0xd5e0a602); -export const HViewAllowance = new wasmlib.ScHname(0x5e16006a); -export const HViewBalanceOf = new wasmlib.ScHname(0x67ef8df4); -export const HViewTotalSupply = new wasmlib.ScHname(0x9505e6ca); +export const HViewAllowance = new wasmlib.ScHname(0x5e16006a); +export const HViewBalanceOf = new wasmlib.ScHname(0x67ef8df4); +export const HViewTotalSupply = new wasmlib.ScHname(0x9505e6ca); diff --git a/contracts/wasm/erc20/ts/erc20/contract.ts b/contracts/wasm/erc20/ts/erc20/contract.ts index edfb4700c2..4bff148b84 100644 --- a/contracts/wasm/erc20/ts/erc20/contract.ts +++ b/contracts/wasm/erc20/ts/erc20/contract.ts @@ -5,81 +5,81 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ApproveCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncApprove); - params: sc.MutableApproveParams = new sc.MutableApproveParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncApprove); + params: sc.MutableApproveParams = new sc.MutableApproveParams(); } export class ApproveContext { - params: sc.ImmutableApproveParams = new sc.ImmutableApproveParams(); - state: sc.MutableErc20State = new sc.MutableErc20State(); + params: sc.ImmutableApproveParams = new sc.ImmutableApproveParams(); + state: sc.MutableErc20State = new sc.MutableErc20State(); } export class InitCall { - func: wasmlib.ScInitFunc = new wasmlib.ScInitFunc(sc.HScName, sc.HFuncInit); - params: sc.MutableInitParams = new sc.MutableInitParams(); + func: wasmlib.ScInitFunc = new wasmlib.ScInitFunc(sc.HScName, sc.HFuncInit); + params: sc.MutableInitParams = new sc.MutableInitParams(); } export class InitContext { - params: sc.ImmutableInitParams = new sc.ImmutableInitParams(); - state: sc.MutableErc20State = new sc.MutableErc20State(); + params: sc.ImmutableInitParams = new sc.ImmutableInitParams(); + state: sc.MutableErc20State = new sc.MutableErc20State(); } export class TransferCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTransfer); - params: sc.MutableTransferParams = new sc.MutableTransferParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTransfer); + params: sc.MutableTransferParams = new sc.MutableTransferParams(); } export class TransferContext { - params: sc.ImmutableTransferParams = new sc.ImmutableTransferParams(); - state: sc.MutableErc20State = new sc.MutableErc20State(); + params: sc.ImmutableTransferParams = new sc.ImmutableTransferParams(); + state: sc.MutableErc20State = new sc.MutableErc20State(); } export class TransferFromCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTransferFrom); - params: sc.MutableTransferFromParams = new sc.MutableTransferFromParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTransferFrom); + params: sc.MutableTransferFromParams = new sc.MutableTransferFromParams(); } export class TransferFromContext { - params: sc.ImmutableTransferFromParams = new sc.ImmutableTransferFromParams(); - state: sc.MutableErc20State = new sc.MutableErc20State(); + params: sc.ImmutableTransferFromParams = new sc.ImmutableTransferFromParams(); + state: sc.MutableErc20State = new sc.MutableErc20State(); } export class AllowanceCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewAllowance); - params: sc.MutableAllowanceParams = new sc.MutableAllowanceParams(); - results: sc.ImmutableAllowanceResults = new sc.ImmutableAllowanceResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewAllowance); + params: sc.MutableAllowanceParams = new sc.MutableAllowanceParams(); + results: sc.ImmutableAllowanceResults = new sc.ImmutableAllowanceResults(); } export class AllowanceContext { - params: sc.ImmutableAllowanceParams = new sc.ImmutableAllowanceParams(); - results: sc.MutableAllowanceResults = new sc.MutableAllowanceResults(); - state: sc.ImmutableErc20State = new sc.ImmutableErc20State(); + params: sc.ImmutableAllowanceParams = new sc.ImmutableAllowanceParams(); + results: sc.MutableAllowanceResults = new sc.MutableAllowanceResults(); + state: sc.ImmutableErc20State = new sc.ImmutableErc20State(); } export class BalanceOfCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewBalanceOf); - params: sc.MutableBalanceOfParams = new sc.MutableBalanceOfParams(); - results: sc.ImmutableBalanceOfResults = new sc.ImmutableBalanceOfResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewBalanceOf); + params: sc.MutableBalanceOfParams = new sc.MutableBalanceOfParams(); + results: sc.ImmutableBalanceOfResults = new sc.ImmutableBalanceOfResults(); } export class BalanceOfContext { - params: sc.ImmutableBalanceOfParams = new sc.ImmutableBalanceOfParams(); - results: sc.MutableBalanceOfResults = new sc.MutableBalanceOfResults(); - state: sc.ImmutableErc20State = new sc.ImmutableErc20State(); + params: sc.ImmutableBalanceOfParams = new sc.ImmutableBalanceOfParams(); + results: sc.MutableBalanceOfResults = new sc.MutableBalanceOfResults(); + state: sc.ImmutableErc20State = new sc.ImmutableErc20State(); } export class TotalSupplyCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewTotalSupply); - results: sc.ImmutableTotalSupplyResults = new sc.ImmutableTotalSupplyResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewTotalSupply); + results: sc.ImmutableTotalSupplyResults = new sc.ImmutableTotalSupplyResults(); } export class TotalSupplyContext { - results: sc.MutableTotalSupplyResults = new sc.MutableTotalSupplyResults(); - state: sc.ImmutableErc20State = new sc.ImmutableErc20State(); + results: sc.MutableTotalSupplyResults = new sc.MutableTotalSupplyResults(); + state: sc.ImmutableErc20State = new sc.ImmutableErc20State(); } export class ScFuncs { diff --git a/contracts/wasm/erc20/ts/erc20/keys.ts b/contracts/wasm/erc20/ts/erc20/keys.ts index 94bbb87373..adaea8b088 100644 --- a/contracts/wasm/erc20/ts/erc20/keys.ts +++ b/contracts/wasm/erc20/ts/erc20/keys.ts @@ -5,33 +5,33 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; -export const IdxParamAccount = 0; -export const IdxParamAmount = 1; -export const IdxParamCreator = 2; -export const IdxParamDelegation = 3; -export const IdxParamRecipient = 4; -export const IdxParamSupply = 5; -export const IdxResultAmount = 6; -export const IdxResultSupply = 7; +export const IdxParamAccount = 0; +export const IdxParamAmount = 1; +export const IdxParamCreator = 2; +export const IdxParamDelegation = 3; +export const IdxParamRecipient = 4; +export const IdxParamSupply = 5; +export const IdxResultAmount = 6; +export const IdxResultSupply = 7; export const IdxStateAllAllowances = 8; -export const IdxStateBalances = 9; -export const IdxStateSupply = 10; +export const IdxStateBalances = 9; +export const IdxStateSupply = 10; export let keyMap: string[] = [ - sc.ParamAccount, - sc.ParamAmount, - sc.ParamCreator, - sc.ParamDelegation, - sc.ParamRecipient, - sc.ParamSupply, - sc.ResultAmount, - sc.ResultSupply, - sc.StateAllAllowances, - sc.StateBalances, - sc.StateSupply, + sc.ParamAccount, + sc.ParamAmount, + sc.ParamCreator, + sc.ParamDelegation, + sc.ParamRecipient, + sc.ParamSupply, + sc.ResultAmount, + sc.ResultSupply, + sc.StateAllAllowances, + sc.StateBalances, + sc.StateSupply, ]; export let idxMap: wasmlib.Key32[] = new Array(keyMap.length); diff --git a/contracts/wasm/erc20/ts/erc20/lib.ts b/contracts/wasm/erc20/ts/erc20/lib.ts index 02027a3e21..48e144845b 100644 --- a/contracts/wasm/erc20/ts/erc20/lib.ts +++ b/contracts/wasm/erc20/ts/erc20/lib.ts @@ -5,7 +5,7 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export function on_call(index: i32): void { @@ -28,78 +28,78 @@ export function on_load(): void { } function funcApproveThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("erc20.funcApprove"); - let f = new sc.ApproveContext(); + ctx.log("erc20.funcApprove"); + let f = new sc.ApproveContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.amount().exists(), "missing mandatory amount") - ctx.require(f.params.delegation().exists(), "missing mandatory delegation") - sc.funcApprove(ctx, f); - ctx.log("erc20.funcApprove ok"); + ctx.require(f.params.amount().exists(), "missing mandatory amount"); + ctx.require(f.params.delegation().exists(), "missing mandatory delegation"); + sc.funcApprove(ctx, f); + ctx.log("erc20.funcApprove ok"); } function funcInitThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("erc20.funcInit"); - let f = new sc.InitContext(); + ctx.log("erc20.funcInit"); + let f = new sc.InitContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.creator().exists(), "missing mandatory creator") - ctx.require(f.params.supply().exists(), "missing mandatory supply") - sc.funcInit(ctx, f); - ctx.log("erc20.funcInit ok"); + ctx.require(f.params.creator().exists(), "missing mandatory creator"); + ctx.require(f.params.supply().exists(), "missing mandatory supply"); + sc.funcInit(ctx, f); + ctx.log("erc20.funcInit ok"); } function funcTransferThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("erc20.funcTransfer"); - let f = new sc.TransferContext(); + ctx.log("erc20.funcTransfer"); + let f = new sc.TransferContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.account().exists(), "missing mandatory account") - ctx.require(f.params.amount().exists(), "missing mandatory amount") - sc.funcTransfer(ctx, f); - ctx.log("erc20.funcTransfer ok"); + ctx.require(f.params.account().exists(), "missing mandatory account"); + ctx.require(f.params.amount().exists(), "missing mandatory amount"); + sc.funcTransfer(ctx, f); + ctx.log("erc20.funcTransfer ok"); } function funcTransferFromThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("erc20.funcTransferFrom"); - let f = new sc.TransferFromContext(); + ctx.log("erc20.funcTransferFrom"); + let f = new sc.TransferFromContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.account().exists(), "missing mandatory account") - ctx.require(f.params.amount().exists(), "missing mandatory amount") - ctx.require(f.params.recipient().exists(), "missing mandatory recipient") - sc.funcTransferFrom(ctx, f); - ctx.log("erc20.funcTransferFrom ok"); + ctx.require(f.params.account().exists(), "missing mandatory account"); + ctx.require(f.params.amount().exists(), "missing mandatory amount"); + ctx.require(f.params.recipient().exists(), "missing mandatory recipient"); + sc.funcTransferFrom(ctx, f); + ctx.log("erc20.funcTransferFrom ok"); } function viewAllowanceThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("erc20.viewAllowance"); - let f = new sc.AllowanceContext(); + ctx.log("erc20.viewAllowance"); + let f = new sc.AllowanceContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.account().exists(), "missing mandatory account") - ctx.require(f.params.delegation().exists(), "missing mandatory delegation") - sc.viewAllowance(ctx, f); - ctx.log("erc20.viewAllowance ok"); + ctx.require(f.params.account().exists(), "missing mandatory account"); + ctx.require(f.params.delegation().exists(), "missing mandatory delegation"); + sc.viewAllowance(ctx, f); + ctx.log("erc20.viewAllowance ok"); } function viewBalanceOfThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("erc20.viewBalanceOf"); - let f = new sc.BalanceOfContext(); + ctx.log("erc20.viewBalanceOf"); + let f = new sc.BalanceOfContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.account().exists(), "missing mandatory account") - sc.viewBalanceOf(ctx, f); - ctx.log("erc20.viewBalanceOf ok"); + ctx.require(f.params.account().exists(), "missing mandatory account"); + sc.viewBalanceOf(ctx, f); + ctx.log("erc20.viewBalanceOf ok"); } function viewTotalSupplyThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("erc20.viewTotalSupply"); - let f = new sc.TotalSupplyContext(); + ctx.log("erc20.viewTotalSupply"); + let f = new sc.TotalSupplyContext(); f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.viewTotalSupply(ctx, f); - ctx.log("erc20.viewTotalSupply ok"); + sc.viewTotalSupply(ctx, f); + ctx.log("erc20.viewTotalSupply ok"); } diff --git a/contracts/wasm/erc20/ts/erc20/params.ts b/contracts/wasm/erc20/ts/erc20/params.ts index 23c35d10da..40d3da1431 100644 --- a/contracts/wasm/erc20/ts/erc20/params.ts +++ b/contracts/wasm/erc20/ts/erc20/params.ts @@ -5,137 +5,137 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableApproveParams extends wasmlib.ScMapID { amount(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamAmount]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamAmount]); + } delegation(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamDelegation]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamDelegation]); + } } export class MutableApproveParams extends wasmlib.ScMapID { amount(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamAmount]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamAmount]); + } delegation(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamDelegation]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamDelegation]); + } } export class ImmutableInitParams extends wasmlib.ScMapID { creator(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamCreator]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamCreator]); + } supply(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamSupply]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamSupply]); + } } export class MutableInitParams extends wasmlib.ScMapID { creator(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamCreator]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamCreator]); + } supply(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamSupply]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamSupply]); + } } export class ImmutableTransferParams extends wasmlib.ScMapID { account(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); + } amount(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamAmount]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamAmount]); + } } export class MutableTransferParams extends wasmlib.ScMapID { account(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); + } amount(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamAmount]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamAmount]); + } } export class ImmutableTransferFromParams extends wasmlib.ScMapID { account(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); + } amount(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamAmount]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamAmount]); + } recipient(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamRecipient]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamRecipient]); + } } export class MutableTransferFromParams extends wasmlib.ScMapID { account(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); + } amount(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamAmount]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamAmount]); + } recipient(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamRecipient]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamRecipient]); + } } export class ImmutableAllowanceParams extends wasmlib.ScMapID { account(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); + } delegation(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamDelegation]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamDelegation]); + } } export class MutableAllowanceParams extends wasmlib.ScMapID { account(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); + } delegation(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamDelegation]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamDelegation]); + } } export class ImmutableBalanceOfParams extends wasmlib.ScMapID { account(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); + } } export class MutableBalanceOfParams extends wasmlib.ScMapID { account(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); + } } diff --git a/contracts/wasm/erc20/ts/erc20/results.ts b/contracts/wasm/erc20/ts/erc20/results.ts index 26435174d4..d20eac6efc 100644 --- a/contracts/wasm/erc20/ts/erc20/results.ts +++ b/contracts/wasm/erc20/ts/erc20/results.ts @@ -5,47 +5,47 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableAllowanceResults extends wasmlib.ScMapID { amount(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultAmount]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultAmount]); + } } export class MutableAllowanceResults extends wasmlib.ScMapID { amount(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultAmount]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultAmount]); + } } export class ImmutableBalanceOfResults extends wasmlib.ScMapID { amount(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultAmount]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultAmount]); + } } export class MutableBalanceOfResults extends wasmlib.ScMapID { amount(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultAmount]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultAmount]); + } } export class ImmutableTotalSupplyResults extends wasmlib.ScMapID { supply(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultSupply]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultSupply]); + } } export class MutableTotalSupplyResults extends wasmlib.ScMapID { supply(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultSupply]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultSupply]); + } } diff --git a/contracts/wasm/erc20/ts/erc20/state.ts b/contracts/wasm/erc20/ts/erc20/state.ts index abca138678..65f197bca1 100644 --- a/contracts/wasm/erc20/ts/erc20/state.ts +++ b/contracts/wasm/erc20/ts/erc20/state.ts @@ -5,11 +5,11 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class MapAgentIDToImmutableAllowancesForAgent { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -24,29 +24,29 @@ export class MapAgentIDToImmutableAllowancesForAgent { export class ImmutableErc20State extends wasmlib.ScMapID { allAllowances(): sc.MapAgentIDToImmutableAllowancesForAgent { - let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateAllAllowances], wasmlib.TYPE_MAP); - return new sc.MapAgentIDToImmutableAllowancesForAgent(mapID); - } + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateAllAllowances], wasmlib.TYPE_MAP); + return new sc.MapAgentIDToImmutableAllowancesForAgent(mapID); + } balances(): sc.MapAgentIDToImmutableInt64 { - let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateBalances], wasmlib.TYPE_MAP); - return new sc.MapAgentIDToImmutableInt64(mapID); - } + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateBalances], wasmlib.TYPE_MAP); + return new sc.MapAgentIDToImmutableInt64(mapID); + } supply(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateSupply]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateSupply]); + } } export class MapAgentIDToMutableAllowancesForAgent { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; } clear(): void { - wasmlib.clear(this.objID) + wasmlib.clear(this.objID); } getAllowancesForAgent(key: wasmlib.ScAgentID): sc.MutableAllowancesForAgent { @@ -58,16 +58,16 @@ export class MapAgentIDToMutableAllowancesForAgent { export class MutableErc20State extends wasmlib.ScMapID { allAllowances(): sc.MapAgentIDToMutableAllowancesForAgent { - let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateAllAllowances], wasmlib.TYPE_MAP); - return new sc.MapAgentIDToMutableAllowancesForAgent(mapID); - } + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateAllAllowances], wasmlib.TYPE_MAP); + return new sc.MapAgentIDToMutableAllowancesForAgent(mapID); + } balances(): sc.MapAgentIDToMutableInt64 { - let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateBalances], wasmlib.TYPE_MAP); - return new sc.MapAgentIDToMutableInt64(mapID); - } + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateBalances], wasmlib.TYPE_MAP); + return new sc.MapAgentIDToMutableInt64(mapID); + } supply(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateSupply]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateSupply]); + } } diff --git a/contracts/wasm/erc20/ts/erc20/typedefs.ts b/contracts/wasm/erc20/ts/erc20/typedefs.ts index 2d2c7ef115..2d09733fac 100644 --- a/contracts/wasm/erc20/ts/erc20/typedefs.ts +++ b/contracts/wasm/erc20/ts/erc20/typedefs.ts @@ -5,11 +5,11 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class MapAgentIDToImmutableInt64 { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -24,14 +24,14 @@ export class ImmutableAllowancesForAgent extends MapAgentIDToImmutableInt64 { }; export class MapAgentIDToMutableInt64 { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; } clear(): void { - wasmlib.clear(this.objID) + wasmlib.clear(this.objID); } getInt64(key: wasmlib.ScAgentID): wasmlib.ScMutableInt64 { diff --git a/contracts/wasm/fairauction/ts/fairauction/consts.ts b/contracts/wasm/fairauction/ts/fairauction/consts.ts index 9fb063c8f5..c1b25c4ffe 100644 --- a/contracts/wasm/fairauction/ts/fairauction/consts.ts +++ b/contracts/wasm/fairauction/ts/fairauction/consts.ts @@ -5,44 +5,44 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; export const ScName = "fairauction"; export const ScDescription = "Decentralized auction to securely sell tokens to the highest bidder"; export const HScName = new wasmlib.ScHname(0x1b5c43b1); -export const ParamColor = "color"; +export const ParamColor = "color"; export const ParamDescription = "description"; -export const ParamDuration = "duration"; -export const ParamMinimumBid = "minimumBid"; +export const ParamDuration = "duration"; +export const ParamMinimumBid = "minimumBid"; export const ParamOwnerMargin = "ownerMargin"; -export const ResultBidders = "bidders"; -export const ResultColor = "color"; -export const ResultCreator = "creator"; -export const ResultDeposit = "deposit"; -export const ResultDescription = "description"; -export const ResultDuration = "duration"; -export const ResultHighestBid = "highestBid"; +export const ResultBidders = "bidders"; +export const ResultColor = "color"; +export const ResultCreator = "creator"; +export const ResultDeposit = "deposit"; +export const ResultDescription = "description"; +export const ResultDuration = "duration"; +export const ResultHighestBid = "highestBid"; export const ResultHighestBidder = "highestBidder"; -export const ResultMinimumBid = "minimumBid"; -export const ResultNumTokens = "numTokens"; -export const ResultOwnerMargin = "ownerMargin"; -export const ResultWhenStarted = "whenStarted"; - -export const StateAuctions = "auctions"; -export const StateBidderList = "bidderList"; -export const StateBids = "bids"; +export const ResultMinimumBid = "minimumBid"; +export const ResultNumTokens = "numTokens"; +export const ResultOwnerMargin = "ownerMargin"; +export const ResultWhenStarted = "whenStarted"; + +export const StateAuctions = "auctions"; +export const StateBidderList = "bidderList"; +export const StateBids = "bids"; export const StateOwnerMargin = "ownerMargin"; export const FuncFinalizeAuction = "finalizeAuction"; -export const FuncPlaceBid = "placeBid"; -export const FuncSetOwnerMargin = "setOwnerMargin"; -export const FuncStartAuction = "startAuction"; -export const ViewGetInfo = "getInfo"; +export const FuncPlaceBid = "placeBid"; +export const FuncSetOwnerMargin = "setOwnerMargin"; +export const FuncStartAuction = "startAuction"; +export const ViewGetInfo = "getInfo"; export const HFuncFinalizeAuction = new wasmlib.ScHname(0x8d534ddc); -export const HFuncPlaceBid = new wasmlib.ScHname(0x9bd72fa9); -export const HFuncSetOwnerMargin = new wasmlib.ScHname(0x1774461a); -export const HFuncStartAuction = new wasmlib.ScHname(0xd5b7bacb); -export const HViewGetInfo = new wasmlib.ScHname(0xcfedba5f); +export const HFuncPlaceBid = new wasmlib.ScHname(0x9bd72fa9); +export const HFuncSetOwnerMargin = new wasmlib.ScHname(0x1774461a); +export const HFuncStartAuction = new wasmlib.ScHname(0xd5b7bacb); +export const HViewGetInfo = new wasmlib.ScHname(0xcfedba5f); diff --git a/contracts/wasm/fairauction/ts/fairauction/contract.ts b/contracts/wasm/fairauction/ts/fairauction/contract.ts index 8c70e07bb8..0d5e9bb799 100644 --- a/contracts/wasm/fairauction/ts/fairauction/contract.ts +++ b/contracts/wasm/fairauction/ts/fairauction/contract.ts @@ -5,59 +5,59 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class FinalizeAuctionCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncFinalizeAuction); - params: sc.MutableFinalizeAuctionParams = new sc.MutableFinalizeAuctionParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncFinalizeAuction); + params: sc.MutableFinalizeAuctionParams = new sc.MutableFinalizeAuctionParams(); } export class FinalizeAuctionContext { - params: sc.ImmutableFinalizeAuctionParams = new sc.ImmutableFinalizeAuctionParams(); - state: sc.MutableFairAuctionState = new sc.MutableFairAuctionState(); + params: sc.ImmutableFinalizeAuctionParams = new sc.ImmutableFinalizeAuctionParams(); + state: sc.MutableFairAuctionState = new sc.MutableFairAuctionState(); } export class PlaceBidCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncPlaceBid); - params: sc.MutablePlaceBidParams = new sc.MutablePlaceBidParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncPlaceBid); + params: sc.MutablePlaceBidParams = new sc.MutablePlaceBidParams(); } export class PlaceBidContext { - params: sc.ImmutablePlaceBidParams = new sc.ImmutablePlaceBidParams(); - state: sc.MutableFairAuctionState = new sc.MutableFairAuctionState(); + params: sc.ImmutablePlaceBidParams = new sc.ImmutablePlaceBidParams(); + state: sc.MutableFairAuctionState = new sc.MutableFairAuctionState(); } export class SetOwnerMarginCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncSetOwnerMargin); - params: sc.MutableSetOwnerMarginParams = new sc.MutableSetOwnerMarginParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncSetOwnerMargin); + params: sc.MutableSetOwnerMarginParams = new sc.MutableSetOwnerMarginParams(); } export class SetOwnerMarginContext { - params: sc.ImmutableSetOwnerMarginParams = new sc.ImmutableSetOwnerMarginParams(); - state: sc.MutableFairAuctionState = new sc.MutableFairAuctionState(); + params: sc.ImmutableSetOwnerMarginParams = new sc.ImmutableSetOwnerMarginParams(); + state: sc.MutableFairAuctionState = new sc.MutableFairAuctionState(); } export class StartAuctionCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncStartAuction); - params: sc.MutableStartAuctionParams = new sc.MutableStartAuctionParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncStartAuction); + params: sc.MutableStartAuctionParams = new sc.MutableStartAuctionParams(); } export class StartAuctionContext { - params: sc.ImmutableStartAuctionParams = new sc.ImmutableStartAuctionParams(); - state: sc.MutableFairAuctionState = new sc.MutableFairAuctionState(); + params: sc.ImmutableStartAuctionParams = new sc.ImmutableStartAuctionParams(); + state: sc.MutableFairAuctionState = new sc.MutableFairAuctionState(); } export class GetInfoCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetInfo); - params: sc.MutableGetInfoParams = new sc.MutableGetInfoParams(); - results: sc.ImmutableGetInfoResults = new sc.ImmutableGetInfoResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetInfo); + params: sc.MutableGetInfoParams = new sc.MutableGetInfoParams(); + results: sc.ImmutableGetInfoResults = new sc.ImmutableGetInfoResults(); } export class GetInfoContext { - params: sc.ImmutableGetInfoParams = new sc.ImmutableGetInfoParams(); - results: sc.MutableGetInfoResults = new sc.MutableGetInfoResults(); - state: sc.ImmutableFairAuctionState = new sc.ImmutableFairAuctionState(); + params: sc.ImmutableGetInfoParams = new sc.ImmutableGetInfoParams(); + results: sc.MutableGetInfoResults = new sc.MutableGetInfoResults(); + state: sc.ImmutableFairAuctionState = new sc.ImmutableFairAuctionState(); } export class ScFuncs { diff --git a/contracts/wasm/fairauction/ts/fairauction/keys.ts b/contracts/wasm/fairauction/ts/fairauction/keys.ts index 9bb253e5d8..2745fd5748 100644 --- a/contracts/wasm/fairauction/ts/fairauction/keys.ts +++ b/contracts/wasm/fairauction/ts/fairauction/keys.ts @@ -5,53 +5,53 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; -export const IdxParamColor = 0; -export const IdxParamDescription = 1; -export const IdxParamDuration = 2; -export const IdxParamMinimumBid = 3; -export const IdxParamOwnerMargin = 4; -export const IdxResultBidders = 5; -export const IdxResultColor = 6; -export const IdxResultCreator = 7; -export const IdxResultDeposit = 8; -export const IdxResultDescription = 9; -export const IdxResultDuration = 10; -export const IdxResultHighestBid = 11; +export const IdxParamColor = 0; +export const IdxParamDescription = 1; +export const IdxParamDuration = 2; +export const IdxParamMinimumBid = 3; +export const IdxParamOwnerMargin = 4; +export const IdxResultBidders = 5; +export const IdxResultColor = 6; +export const IdxResultCreator = 7; +export const IdxResultDeposit = 8; +export const IdxResultDescription = 9; +export const IdxResultDuration = 10; +export const IdxResultHighestBid = 11; export const IdxResultHighestBidder = 12; -export const IdxResultMinimumBid = 13; -export const IdxResultNumTokens = 14; -export const IdxResultOwnerMargin = 15; -export const IdxResultWhenStarted = 16; -export const IdxStateAuctions = 17; -export const IdxStateBidderList = 18; -export const IdxStateBids = 19; -export const IdxStateOwnerMargin = 20; +export const IdxResultMinimumBid = 13; +export const IdxResultNumTokens = 14; +export const IdxResultOwnerMargin = 15; +export const IdxResultWhenStarted = 16; +export const IdxStateAuctions = 17; +export const IdxStateBidderList = 18; +export const IdxStateBids = 19; +export const IdxStateOwnerMargin = 20; export let keyMap: string[] = [ - sc.ParamColor, - sc.ParamDescription, - sc.ParamDuration, - sc.ParamMinimumBid, - sc.ParamOwnerMargin, - sc.ResultBidders, - sc.ResultColor, - sc.ResultCreator, - sc.ResultDeposit, - sc.ResultDescription, - sc.ResultDuration, - sc.ResultHighestBid, - sc.ResultHighestBidder, - sc.ResultMinimumBid, - sc.ResultNumTokens, - sc.ResultOwnerMargin, - sc.ResultWhenStarted, - sc.StateAuctions, - sc.StateBidderList, - sc.StateBids, - sc.StateOwnerMargin, + sc.ParamColor, + sc.ParamDescription, + sc.ParamDuration, + sc.ParamMinimumBid, + sc.ParamOwnerMargin, + sc.ResultBidders, + sc.ResultColor, + sc.ResultCreator, + sc.ResultDeposit, + sc.ResultDescription, + sc.ResultDuration, + sc.ResultHighestBid, + sc.ResultHighestBidder, + sc.ResultMinimumBid, + sc.ResultNumTokens, + sc.ResultOwnerMargin, + sc.ResultWhenStarted, + sc.StateAuctions, + sc.StateBidderList, + sc.StateBids, + sc.StateOwnerMargin, ]; export let idxMap: wasmlib.Key32[] = new Array(keyMap.length); diff --git a/contracts/wasm/fairauction/ts/fairauction/lib.ts b/contracts/wasm/fairauction/ts/fairauction/lib.ts index 9b46528318..677e7a0f1c 100644 --- a/contracts/wasm/fairauction/ts/fairauction/lib.ts +++ b/contracts/wasm/fairauction/ts/fairauction/lib.ts @@ -5,7 +5,7 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export function on_call(index: i32): void { @@ -26,59 +26,59 @@ export function on_load(): void { } function funcFinalizeAuctionThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("fairauction.funcFinalizeAuction"); + ctx.log("fairauction.funcFinalizeAuction"); // only SC itself can invoke this function - ctx.require(ctx.caller().equals(ctx.accountID()), "no permission"); + ctx.require(ctx.caller().equals(ctx.accountID()), "no permission"); - let f = new sc.FinalizeAuctionContext(); + let f = new sc.FinalizeAuctionContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.color().exists(), "missing mandatory color") - sc.funcFinalizeAuction(ctx, f); - ctx.log("fairauction.funcFinalizeAuction ok"); + ctx.require(f.params.color().exists(), "missing mandatory color"); + sc.funcFinalizeAuction(ctx, f); + ctx.log("fairauction.funcFinalizeAuction ok"); } function funcPlaceBidThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("fairauction.funcPlaceBid"); - let f = new sc.PlaceBidContext(); + ctx.log("fairauction.funcPlaceBid"); + let f = new sc.PlaceBidContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.color().exists(), "missing mandatory color") - sc.funcPlaceBid(ctx, f); - ctx.log("fairauction.funcPlaceBid ok"); + ctx.require(f.params.color().exists(), "missing mandatory color"); + sc.funcPlaceBid(ctx, f); + ctx.log("fairauction.funcPlaceBid ok"); } function funcSetOwnerMarginThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("fairauction.funcSetOwnerMargin"); + ctx.log("fairauction.funcSetOwnerMargin"); // only SC creator can set owner margin - ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); + ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); - let f = new sc.SetOwnerMarginContext(); + let f = new sc.SetOwnerMarginContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.ownerMargin().exists(), "missing mandatory ownerMargin") - sc.funcSetOwnerMargin(ctx, f); - ctx.log("fairauction.funcSetOwnerMargin ok"); + ctx.require(f.params.ownerMargin().exists(), "missing mandatory ownerMargin"); + sc.funcSetOwnerMargin(ctx, f); + ctx.log("fairauction.funcSetOwnerMargin ok"); } function funcStartAuctionThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("fairauction.funcStartAuction"); - let f = new sc.StartAuctionContext(); + ctx.log("fairauction.funcStartAuction"); + let f = new sc.StartAuctionContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.color().exists(), "missing mandatory color") - ctx.require(f.params.minimumBid().exists(), "missing mandatory minimumBid") - sc.funcStartAuction(ctx, f); - ctx.log("fairauction.funcStartAuction ok"); + ctx.require(f.params.color().exists(), "missing mandatory color"); + ctx.require(f.params.minimumBid().exists(), "missing mandatory minimumBid"); + sc.funcStartAuction(ctx, f); + ctx.log("fairauction.funcStartAuction ok"); } function viewGetInfoThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("fairauction.viewGetInfo"); - let f = new sc.GetInfoContext(); + ctx.log("fairauction.viewGetInfo"); + let f = new sc.GetInfoContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.color().exists(), "missing mandatory color") - sc.viewGetInfo(ctx, f); - ctx.log("fairauction.viewGetInfo ok"); + ctx.require(f.params.color().exists(), "missing mandatory color"); + sc.viewGetInfo(ctx, f); + ctx.log("fairauction.viewGetInfo ok"); } diff --git a/contracts/wasm/fairauction/ts/fairauction/params.ts b/contracts/wasm/fairauction/ts/fairauction/params.ts index 493722760d..c500ce8e54 100644 --- a/contracts/wasm/fairauction/ts/fairauction/params.ts +++ b/contracts/wasm/fairauction/ts/fairauction/params.ts @@ -5,99 +5,99 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableFinalizeAuctionParams extends wasmlib.ScMapID { color(): wasmlib.ScImmutableColor { - return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); - } + return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); + } } export class MutableFinalizeAuctionParams extends wasmlib.ScMapID { color(): wasmlib.ScMutableColor { - return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); - } + return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); + } } export class ImmutablePlaceBidParams extends wasmlib.ScMapID { color(): wasmlib.ScImmutableColor { - return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); - } + return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); + } } export class MutablePlaceBidParams extends wasmlib.ScMapID { color(): wasmlib.ScMutableColor { - return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); - } + return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); + } } export class ImmutableSetOwnerMarginParams extends wasmlib.ScMapID { ownerMargin(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamOwnerMargin]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamOwnerMargin]); + } } export class MutableSetOwnerMarginParams extends wasmlib.ScMapID { ownerMargin(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamOwnerMargin]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamOwnerMargin]); + } } export class ImmutableStartAuctionParams extends wasmlib.ScMapID { color(): wasmlib.ScImmutableColor { - return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); - } + return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); + } description(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamDescription]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamDescription]); + } duration(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamDuration]); - } + return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamDuration]); + } minimumBid(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamMinimumBid]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamMinimumBid]); + } } export class MutableStartAuctionParams extends wasmlib.ScMapID { color(): wasmlib.ScMutableColor { - return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); - } + return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); + } description(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamDescription]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamDescription]); + } duration(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamDuration]); - } + return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamDuration]); + } minimumBid(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamMinimumBid]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamMinimumBid]); + } } export class ImmutableGetInfoParams extends wasmlib.ScMapID { color(): wasmlib.ScImmutableColor { - return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); - } + return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); + } } export class MutableGetInfoParams extends wasmlib.ScMapID { color(): wasmlib.ScMutableColor { - return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); - } + return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); + } } diff --git a/contracts/wasm/fairauction/ts/fairauction/results.ts b/contracts/wasm/fairauction/ts/fairauction/results.ts index 59dd2a1465..1729fb30db 100644 --- a/contracts/wasm/fairauction/ts/fairauction/results.ts +++ b/contracts/wasm/fairauction/ts/fairauction/results.ts @@ -5,107 +5,107 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableGetInfoResults extends wasmlib.ScMapID { bidders(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxResultBidders]); - } + return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxResultBidders]); + } color(): wasmlib.ScImmutableColor { - return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxResultColor]); - } + return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxResultColor]); + } creator(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxResultCreator]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxResultCreator]); + } deposit(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultDeposit]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultDeposit]); + } description(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxResultDescription]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxResultDescription]); + } duration(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxResultDuration]); - } + return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxResultDuration]); + } highestBid(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultHighestBid]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultHighestBid]); + } highestBidder(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxResultHighestBidder]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxResultHighestBidder]); + } minimumBid(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultMinimumBid]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultMinimumBid]); + } numTokens(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultNumTokens]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultNumTokens]); + } ownerMargin(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultOwnerMargin]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultOwnerMargin]); + } whenStarted(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultWhenStarted]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultWhenStarted]); + } } export class MutableGetInfoResults extends wasmlib.ScMapID { bidders(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxResultBidders]); - } + return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxResultBidders]); + } color(): wasmlib.ScMutableColor { - return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxResultColor]); - } + return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxResultColor]); + } creator(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxResultCreator]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxResultCreator]); + } deposit(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultDeposit]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultDeposit]); + } description(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxResultDescription]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxResultDescription]); + } duration(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxResultDuration]); - } + return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxResultDuration]); + } highestBid(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultHighestBid]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultHighestBid]); + } highestBidder(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxResultHighestBidder]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxResultHighestBidder]); + } minimumBid(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultMinimumBid]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultMinimumBid]); + } numTokens(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultNumTokens]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultNumTokens]); + } ownerMargin(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultOwnerMargin]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultOwnerMargin]); + } whenStarted(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultWhenStarted]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultWhenStarted]); + } } diff --git a/contracts/wasm/fairauction/ts/fairauction/state.ts b/contracts/wasm/fairauction/ts/fairauction/state.ts index 3de34106d4..fc4b9db39a 100644 --- a/contracts/wasm/fairauction/ts/fairauction/state.ts +++ b/contracts/wasm/fairauction/ts/fairauction/state.ts @@ -5,11 +5,11 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class MapColorToImmutableAuction { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -21,7 +21,7 @@ export class MapColorToImmutableAuction { } export class MapColorToImmutableBidderList { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -34,7 +34,7 @@ export class MapColorToImmutableBidderList { } export class MapColorToImmutableBids { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -49,34 +49,34 @@ export class MapColorToImmutableBids { export class ImmutableFairAuctionState extends wasmlib.ScMapID { auctions(): sc.MapColorToImmutableAuction { - let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateAuctions], wasmlib.TYPE_MAP); - return new sc.MapColorToImmutableAuction(mapID); - } + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateAuctions], wasmlib.TYPE_MAP); + return new sc.MapColorToImmutableAuction(mapID); + } bidderList(): sc.MapColorToImmutableBidderList { - let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateBidderList], wasmlib.TYPE_MAP); - return new sc.MapColorToImmutableBidderList(mapID); - } + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateBidderList], wasmlib.TYPE_MAP); + return new sc.MapColorToImmutableBidderList(mapID); + } bids(): sc.MapColorToImmutableBids { - let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateBids], wasmlib.TYPE_MAP); - return new sc.MapColorToImmutableBids(mapID); - } + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateBids], wasmlib.TYPE_MAP); + return new sc.MapColorToImmutableBids(mapID); + } ownerMargin(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateOwnerMargin]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateOwnerMargin]); + } } export class MapColorToMutableAuction { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; } clear(): void { - wasmlib.clear(this.objID) + wasmlib.clear(this.objID); } getAuction(key: wasmlib.ScColor): sc.MutableAuction { @@ -85,14 +85,14 @@ export class MapColorToMutableAuction { } export class MapColorToMutableBidderList { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; } clear(): void { - wasmlib.clear(this.objID) + wasmlib.clear(this.objID); } getBidderList(key: wasmlib.ScColor): sc.MutableBidderList { @@ -102,14 +102,14 @@ export class MapColorToMutableBidderList { } export class MapColorToMutableBids { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; } clear(): void { - wasmlib.clear(this.objID) + wasmlib.clear(this.objID); } getBids(key: wasmlib.ScColor): sc.MutableBids { @@ -121,21 +121,21 @@ export class MapColorToMutableBids { export class MutableFairAuctionState extends wasmlib.ScMapID { auctions(): sc.MapColorToMutableAuction { - let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateAuctions], wasmlib.TYPE_MAP); - return new sc.MapColorToMutableAuction(mapID); - } + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateAuctions], wasmlib.TYPE_MAP); + return new sc.MapColorToMutableAuction(mapID); + } bidderList(): sc.MapColorToMutableBidderList { - let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateBidderList], wasmlib.TYPE_MAP); - return new sc.MapColorToMutableBidderList(mapID); - } + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateBidderList], wasmlib.TYPE_MAP); + return new sc.MapColorToMutableBidderList(mapID); + } bids(): sc.MapColorToMutableBids { - let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateBids], wasmlib.TYPE_MAP); - return new sc.MapColorToMutableBids(mapID); - } + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateBids], wasmlib.TYPE_MAP); + return new sc.MapColorToMutableBids(mapID); + } ownerMargin(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateOwnerMargin]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateOwnerMargin]); + } } diff --git a/contracts/wasm/fairauction/ts/fairauction/structs.ts b/contracts/wasm/fairauction/ts/fairauction/structs.ts index 9a53456c19..dcb47fc152 100644 --- a/contracts/wasm/fairauction/ts/fairauction/structs.ts +++ b/contracts/wasm/fairauction/ts/fairauction/structs.ts @@ -5,20 +5,20 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; export class Auction { - color : wasmlib.ScColor = new wasmlib.ScColor(0); // color of tokens for sale - creator : wasmlib.ScAgentID = new wasmlib.ScAgentID(); // issuer of start_auction transaction - deposit : i64 = 0; // deposit by auction owner to cover the SC fees - description : string = ""; // auction description - duration : i32 = 0; // auction duration in minutes - highestBid : i64 = 0; // the current highest bid amount - highestBidder: wasmlib.ScAgentID = new wasmlib.ScAgentID(); // the current highest bidder - minimumBid : i64 = 0; // minimum bid amount - numTokens : i64 = 0; // number of tokens for sale - ownerMargin : i64 = 0; // auction owner's margin in promilles - whenStarted : i64 = 0; // timestamp when auction started + color: wasmlib.ScColor = new wasmlib.ScColor(0); // color of tokens for sale + creator: wasmlib.ScAgentID = new wasmlib.ScAgentID(); // issuer of start_auction transaction + deposit: i64 = 0; // deposit by auction owner to cover the SC fees + description: string = ""; // auction description + duration: i32 = 0; // auction duration in minutes + highestBid: i64 = 0; // the current highest bid amount + highestBidder: wasmlib.ScAgentID = new wasmlib.ScAgentID(); // the current highest bidder + minimumBid: i64 = 0; // minimum bid amount + numTokens: i64 = 0; // number of tokens for sale + ownerMargin: i64 = 0; // auction owner's margin in promilles + whenStarted: i64 = 0; // timestamp when auction started static fromBytes(bytes: u8[]): Auction { let decode = new wasmlib.BytesDecoder(bytes); @@ -40,17 +40,17 @@ export class Auction { bytes(): u8[] { return new wasmlib.BytesEncoder(). - color(this.color). - agentID(this.creator). - int64(this.deposit). - string(this.description). - int32(this.duration). - int64(this.highestBid). - agentID(this.highestBidder). - int64(this.minimumBid). - int64(this.numTokens). - int64(this.ownerMargin). - int64(this.whenStarted). + color(this.color). + agentID(this.creator). + int64(this.deposit). + string(this.description). + int32(this.duration). + int64(this.highestBid). + agentID(this.highestBidder). + int64(this.minimumBid). + int64(this.numTokens). + int64(this.ownerMargin). + int64(this.whenStarted). data(); } } @@ -69,7 +69,7 @@ export class ImmutableAuction { } value(): Auction { - return Auction.fromBytes(wasmlib.getBytes(this.objID, this.keyID,wasmlib. TYPE_BYTES)); + return Auction.fromBytes(wasmlib.getBytes(this.objID, this.keyID, wasmlib.TYPE_BYTES)); } } @@ -91,14 +91,14 @@ export class MutableAuction { } value(): Auction { - return Auction.fromBytes(wasmlib.getBytes(this.objID, this.keyID,wasmlib. TYPE_BYTES)); + return Auction.fromBytes(wasmlib.getBytes(this.objID, this.keyID, wasmlib.TYPE_BYTES)); } } export class Bid { - amount : i64 = 0; // cumulative amount of bids from same bidder - index : i32 = 0; // index of bidder in bidder list - timestamp: i64 = 0; // timestamp of most recent bid + amount: i64 = 0; // cumulative amount of bids from same bidder + index: i32 = 0; // index of bidder in bidder list + timestamp: i64 = 0; // timestamp of most recent bid static fromBytes(bytes: u8[]): Bid { let decode = new wasmlib.BytesDecoder(bytes); @@ -112,9 +112,9 @@ export class Bid { bytes(): u8[] { return new wasmlib.BytesEncoder(). - int64(this.amount). - int32(this.index). - int64(this.timestamp). + int64(this.amount). + int32(this.index). + int64(this.timestamp). data(); } } @@ -133,7 +133,7 @@ export class ImmutableBid { } value(): Bid { - return Bid.fromBytes(wasmlib.getBytes(this.objID, this.keyID,wasmlib. TYPE_BYTES)); + return Bid.fromBytes(wasmlib.getBytes(this.objID, this.keyID, wasmlib.TYPE_BYTES)); } } @@ -155,6 +155,6 @@ export class MutableBid { } value(): Bid { - return Bid.fromBytes(wasmlib.getBytes(this.objID, this.keyID,wasmlib. TYPE_BYTES)); + return Bid.fromBytes(wasmlib.getBytes(this.objID, this.keyID, wasmlib.TYPE_BYTES)); } } diff --git a/contracts/wasm/fairauction/ts/fairauction/typedefs.ts b/contracts/wasm/fairauction/ts/fairauction/typedefs.ts index 30d6a27bac..246878fa3c 100644 --- a/contracts/wasm/fairauction/ts/fairauction/typedefs.ts +++ b/contracts/wasm/fairauction/ts/fairauction/typedefs.ts @@ -5,11 +5,11 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ArrayOfImmutableAgentID { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -28,7 +28,7 @@ export class ImmutableBidderList extends ArrayOfImmutableAgentID { }; export class ArrayOfMutableAgentID { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -51,7 +51,7 @@ export class MutableBidderList extends ArrayOfMutableAgentID { }; export class MapAgentIDToImmutableBid { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -66,14 +66,14 @@ export class ImmutableBids extends MapAgentIDToImmutableBid { }; export class MapAgentIDToMutableBid { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; } clear(): void { - wasmlib.clear(this.objID) + wasmlib.clear(this.objID); } getBid(key: wasmlib.ScAgentID): sc.MutableBid { diff --git a/contracts/wasm/fairroulette/ts/fairroulette/consts.ts b/contracts/wasm/fairroulette/ts/fairroulette/consts.ts index 45f2a3828f..210f50c191 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/consts.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/consts.ts @@ -5,42 +5,43 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; -export const ScName = "fairroulette"; -export const HScName = new wasmlib.ScHname(0xdf79d138); +export const ScName = "fairroulette"; +export const ScDescription = ""; +export const HScName = new wasmlib.ScHname(0xdf79d138); -export const ParamNumber = "number"; +export const ParamNumber = "number"; export const ParamPlayPeriod = "playPeriod"; export const ResultLastWinningNumber = "lastWinningNumber"; -export const ResultRoundNumber = "roundNumber"; -export const ResultRoundStartedAt = "roundStartedAt"; -export const ResultRoundStatus = "roundStatus"; +export const ResultRoundNumber = "roundNumber"; +export const ResultRoundStartedAt = "roundStartedAt"; +export const ResultRoundStatus = "roundStatus"; -export const StateBets = "bets"; +export const StateBets = "bets"; export const StateLastWinningNumber = "lastWinningNumber"; -export const StatePlayPeriod = "playPeriod"; -export const StateRoundNumber = "roundNumber"; -export const StateRoundStartedAt = "roundStartedAt"; -export const StateRoundStatus = "roundStatus"; - -export const FuncForcePayout = "forcePayout"; -export const FuncForceReset = "forceReset"; -export const FuncPayWinners = "payWinners"; -export const FuncPlaceBet = "placeBet"; -export const FuncPlayPeriod = "playPeriod"; +export const StatePlayPeriod = "playPeriod"; +export const StateRoundNumber = "roundNumber"; +export const StateRoundStartedAt = "roundStartedAt"; +export const StateRoundStatus = "roundStatus"; + +export const FuncForcePayout = "forcePayout"; +export const FuncForceReset = "forceReset"; +export const FuncPayWinners = "payWinners"; +export const FuncPlaceBet = "placeBet"; +export const FuncPlayPeriod = "playPeriod"; export const ViewLastWinningNumber = "lastWinningNumber"; -export const ViewRoundNumber = "roundNumber"; -export const ViewRoundStartedAt = "roundStartedAt"; -export const ViewRoundStatus = "roundStatus"; - -export const HFuncForcePayout = new wasmlib.ScHname(0x555a4c4f); -export const HFuncForceReset = new wasmlib.ScHname(0xa331951e); -export const HFuncPayWinners = new wasmlib.ScHname(0xfb2b0144); -export const HFuncPlaceBet = new wasmlib.ScHname(0xdfba7d1b); -export const HFuncPlayPeriod = new wasmlib.ScHname(0xcb94b293); +export const ViewRoundNumber = "roundNumber"; +export const ViewRoundStartedAt = "roundStartedAt"; +export const ViewRoundStatus = "roundStatus"; + +export const HFuncForcePayout = new wasmlib.ScHname(0x555a4c4f); +export const HFuncForceReset = new wasmlib.ScHname(0xa331951e); +export const HFuncPayWinners = new wasmlib.ScHname(0xfb2b0144); +export const HFuncPlaceBet = new wasmlib.ScHname(0xdfba7d1b); +export const HFuncPlayPeriod = new wasmlib.ScHname(0xcb94b293); export const HViewLastWinningNumber = new wasmlib.ScHname(0x2f5f09fe); -export const HViewRoundNumber = new wasmlib.ScHname(0x0dcfe520); -export const HViewRoundStartedAt = new wasmlib.ScHname(0x725de8b4); -export const HViewRoundStatus = new wasmlib.ScHname(0x145053b5); +export const HViewRoundNumber = new wasmlib.ScHname(0x0dcfe520); +export const HViewRoundStartedAt = new wasmlib.ScHname(0x725de8b4); +export const HViewRoundStatus = new wasmlib.ScHname(0x145053b5); diff --git a/contracts/wasm/fairroulette/ts/fairroulette/contract.ts b/contracts/wasm/fairroulette/ts/fairroulette/contract.ts index 601fcc7be7..234f757701 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/contract.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/contract.ts @@ -5,108 +5,105 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ForcePayoutCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncForcePayout); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncForcePayout); } export class ForcePayoutContext { - state: sc.MutableFairRouletteState = new sc.MutableFairRouletteState(); + state: sc.MutableFairRouletteState = new sc.MutableFairRouletteState(); } export class ForceResetCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncForceReset); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncForceReset); } export class ForceResetContext { - state: sc.MutableFairRouletteState = new sc.MutableFairRouletteState(); + state: sc.MutableFairRouletteState = new sc.MutableFairRouletteState(); } export class PayWinnersCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncPayWinners); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncPayWinners); } export class PayWinnersContext { - state: sc.MutableFairRouletteState = new sc.MutableFairRouletteState(); + state: sc.MutableFairRouletteState = new sc.MutableFairRouletteState(); } export class PlaceBetCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncPlaceBet); - params: sc.MutablePlaceBetParams = new sc.MutablePlaceBetParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncPlaceBet); + params: sc.MutablePlaceBetParams = new sc.MutablePlaceBetParams(); } export class PlaceBetContext { - params: sc.ImmutablePlaceBetParams = new sc.ImmutablePlaceBetParams(); - state: sc.MutableFairRouletteState = new sc.MutableFairRouletteState(); + params: sc.ImmutablePlaceBetParams = new sc.ImmutablePlaceBetParams(); + state: sc.MutableFairRouletteState = new sc.MutableFairRouletteState(); } export class PlayPeriodCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncPlayPeriod); - params: sc.MutablePlayPeriodParams = new sc.MutablePlayPeriodParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncPlayPeriod); + params: sc.MutablePlayPeriodParams = new sc.MutablePlayPeriodParams(); } export class PlayPeriodContext { - params: sc.ImmutablePlayPeriodParams = new sc.ImmutablePlayPeriodParams(); - state: sc.MutableFairRouletteState = new sc.MutableFairRouletteState(); + params: sc.ImmutablePlayPeriodParams = new sc.ImmutablePlayPeriodParams(); + state: sc.MutableFairRouletteState = new sc.MutableFairRouletteState(); } export class LastWinningNumberCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewLastWinningNumber); - results: sc.ImmutableLastWinningNumberResults = new sc.ImmutableLastWinningNumberResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewLastWinningNumber); + results: sc.ImmutableLastWinningNumberResults = new sc.ImmutableLastWinningNumberResults(); } export class LastWinningNumberContext { - results: sc.MutableLastWinningNumberResults = new sc.MutableLastWinningNumberResults(); - state: sc.ImmutableFairRouletteState = new sc.ImmutableFairRouletteState(); + results: sc.MutableLastWinningNumberResults = new sc.MutableLastWinningNumberResults(); + state: sc.ImmutableFairRouletteState = new sc.ImmutableFairRouletteState(); } export class RoundNumberCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewRoundNumber); - results: sc.ImmutableRoundNumberResults = new sc.ImmutableRoundNumberResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewRoundNumber); + results: sc.ImmutableRoundNumberResults = new sc.ImmutableRoundNumberResults(); } export class RoundNumberContext { - results: sc.MutableRoundNumberResults = new sc.MutableRoundNumberResults(); - state: sc.ImmutableFairRouletteState = new sc.ImmutableFairRouletteState(); + results: sc.MutableRoundNumberResults = new sc.MutableRoundNumberResults(); + state: sc.ImmutableFairRouletteState = new sc.ImmutableFairRouletteState(); } export class RoundStartedAtCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewRoundStartedAt); - results: sc.ImmutableRoundStartedAtResults = new sc.ImmutableRoundStartedAtResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewRoundStartedAt); + results: sc.ImmutableRoundStartedAtResults = new sc.ImmutableRoundStartedAtResults(); } export class RoundStartedAtContext { - results: sc.MutableRoundStartedAtResults = new sc.MutableRoundStartedAtResults(); - state: sc.ImmutableFairRouletteState = new sc.ImmutableFairRouletteState(); + results: sc.MutableRoundStartedAtResults = new sc.MutableRoundStartedAtResults(); + state: sc.ImmutableFairRouletteState = new sc.ImmutableFairRouletteState(); } export class RoundStatusCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewRoundStatus); - results: sc.ImmutableRoundStatusResults = new sc.ImmutableRoundStatusResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewRoundStatus); + results: sc.ImmutableRoundStatusResults = new sc.ImmutableRoundStatusResults(); } export class RoundStatusContext { - results: sc.MutableRoundStatusResults = new sc.MutableRoundStatusResults(); - state: sc.ImmutableFairRouletteState = new sc.ImmutableFairRouletteState(); + results: sc.MutableRoundStatusResults = new sc.MutableRoundStatusResults(); + state: sc.ImmutableFairRouletteState = new sc.ImmutableFairRouletteState(); } export class ScFuncs { static forcePayout(ctx: wasmlib.ScFuncCallContext): ForcePayoutCall { - let f = new ForcePayoutCall(); - return f; + return new ForcePayoutCall(); } static forceReset(ctx: wasmlib.ScFuncCallContext): ForceResetCall { - let f = new ForceResetCall(); - return f; + return new ForceResetCall(); } static payWinners(ctx: wasmlib.ScFuncCallContext): PayWinnersCall { - let f = new PayWinnersCall(); - return f; + return new PayWinnersCall(); } static placeBet(ctx: wasmlib.ScFuncCallContext): PlaceBetCall { diff --git a/contracts/wasm/fairroulette/ts/fairroulette/keys.ts b/contracts/wasm/fairroulette/ts/fairroulette/keys.ts index c458464b29..6db1cdf8af 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/keys.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/keys.ts @@ -5,35 +5,35 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; -export const IdxParamNumber = 0; -export const IdxParamPlayPeriod = 1; +export const IdxParamNumber = 0; +export const IdxParamPlayPeriod = 1; export const IdxResultLastWinningNumber = 2; -export const IdxResultRoundNumber = 3; -export const IdxResultRoundStartedAt = 4; -export const IdxResultRoundStatus = 5; -export const IdxStateBets = 6; -export const IdxStateLastWinningNumber = 7; -export const IdxStatePlayPeriod = 8; -export const IdxStateRoundNumber = 9; -export const IdxStateRoundStartedAt = 10; -export const IdxStateRoundStatus = 11; +export const IdxResultRoundNumber = 3; +export const IdxResultRoundStartedAt = 4; +export const IdxResultRoundStatus = 5; +export const IdxStateBets = 6; +export const IdxStateLastWinningNumber = 7; +export const IdxStatePlayPeriod = 8; +export const IdxStateRoundNumber = 9; +export const IdxStateRoundStartedAt = 10; +export const IdxStateRoundStatus = 11; export let keyMap: string[] = [ - sc.ParamNumber, - sc.ParamPlayPeriod, - sc.ResultLastWinningNumber, - sc.ResultRoundNumber, - sc.ResultRoundStartedAt, - sc.ResultRoundStatus, - sc.StateBets, - sc.StateLastWinningNumber, - sc.StatePlayPeriod, - sc.StateRoundNumber, - sc.StateRoundStartedAt, - sc.StateRoundStatus, + sc.ParamNumber, + sc.ParamPlayPeriod, + sc.ResultLastWinningNumber, + sc.ResultRoundNumber, + sc.ResultRoundStartedAt, + sc.ResultRoundStatus, + sc.StateBets, + sc.StateLastWinningNumber, + sc.StatePlayPeriod, + sc.StateRoundNumber, + sc.StateRoundStartedAt, + sc.StateRoundStatus, ]; export let idxMap: wasmlib.Key32[] = new Array(keyMap.length); diff --git a/contracts/wasm/fairroulette/ts/fairroulette/lib.ts b/contracts/wasm/fairroulette/ts/fairroulette/lib.ts index 46d913ab04..493aa6e664 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/lib.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/lib.ts @@ -5,7 +5,7 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export function on_call(index: i32): void { @@ -30,93 +30,93 @@ export function on_load(): void { } function funcForcePayoutThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("fairroulette.funcForcePayout"); + ctx.log("fairroulette.funcForcePayout"); // only SC creator can restart the round forcefully - ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); + ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); - let f = new sc.ForcePayoutContext(); + let f = new sc.ForcePayoutContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcForcePayout(ctx, f); - ctx.log("fairroulette.funcForcePayout ok"); + sc.funcForcePayout(ctx, f); + ctx.log("fairroulette.funcForcePayout ok"); } function funcForceResetThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("fairroulette.funcForceReset"); + ctx.log("fairroulette.funcForceReset"); // only SC creator can restart the round forcefully - ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); + ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); - let f = new sc.ForceResetContext(); + let f = new sc.ForceResetContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcForceReset(ctx, f); - ctx.log("fairroulette.funcForceReset ok"); + sc.funcForceReset(ctx, f); + ctx.log("fairroulette.funcForceReset ok"); } function funcPayWinnersThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("fairroulette.funcPayWinners"); + ctx.log("fairroulette.funcPayWinners"); // only SC itself can invoke this function - ctx.require(ctx.caller().equals(ctx.accountID()), "no permission"); + ctx.require(ctx.caller().equals(ctx.accountID()), "no permission"); - let f = new sc.PayWinnersContext(); + let f = new sc.PayWinnersContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcPayWinners(ctx, f); - ctx.log("fairroulette.funcPayWinners ok"); + sc.funcPayWinners(ctx, f); + ctx.log("fairroulette.funcPayWinners ok"); } function funcPlaceBetThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("fairroulette.funcPlaceBet"); - let f = new sc.PlaceBetContext(); + ctx.log("fairroulette.funcPlaceBet"); + let f = new sc.PlaceBetContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.number().exists(), "missing mandatory number") - sc.funcPlaceBet(ctx, f); - ctx.log("fairroulette.funcPlaceBet ok"); + ctx.require(f.params.number().exists(), "missing mandatory number"); + sc.funcPlaceBet(ctx, f); + ctx.log("fairroulette.funcPlaceBet ok"); } function funcPlayPeriodThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("fairroulette.funcPlayPeriod"); + ctx.log("fairroulette.funcPlayPeriod"); // only SC creator can update the play period - ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); + ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); - let f = new sc.PlayPeriodContext(); + let f = new sc.PlayPeriodContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.playPeriod().exists(), "missing mandatory playPeriod") - sc.funcPlayPeriod(ctx, f); - ctx.log("fairroulette.funcPlayPeriod ok"); + ctx.require(f.params.playPeriod().exists(), "missing mandatory playPeriod"); + sc.funcPlayPeriod(ctx, f); + ctx.log("fairroulette.funcPlayPeriod ok"); } function viewLastWinningNumberThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("fairroulette.viewLastWinningNumber"); - let f = new sc.LastWinningNumberContext(); + ctx.log("fairroulette.viewLastWinningNumber"); + let f = new sc.LastWinningNumberContext(); f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.viewLastWinningNumber(ctx, f); - ctx.log("fairroulette.viewLastWinningNumber ok"); + sc.viewLastWinningNumber(ctx, f); + ctx.log("fairroulette.viewLastWinningNumber ok"); } function viewRoundNumberThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("fairroulette.viewRoundNumber"); - let f = new sc.RoundNumberContext(); + ctx.log("fairroulette.viewRoundNumber"); + let f = new sc.RoundNumberContext(); f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.viewRoundNumber(ctx, f); - ctx.log("fairroulette.viewRoundNumber ok"); + sc.viewRoundNumber(ctx, f); + ctx.log("fairroulette.viewRoundNumber ok"); } function viewRoundStartedAtThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("fairroulette.viewRoundStartedAt"); - let f = new sc.RoundStartedAtContext(); + ctx.log("fairroulette.viewRoundStartedAt"); + let f = new sc.RoundStartedAtContext(); f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.viewRoundStartedAt(ctx, f); - ctx.log("fairroulette.viewRoundStartedAt ok"); + sc.viewRoundStartedAt(ctx, f); + ctx.log("fairroulette.viewRoundStartedAt ok"); } function viewRoundStatusThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("fairroulette.viewRoundStatus"); - let f = new sc.RoundStatusContext(); + ctx.log("fairroulette.viewRoundStatus"); + let f = new sc.RoundStatusContext(); f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.viewRoundStatus(ctx, f); - ctx.log("fairroulette.viewRoundStatus ok"); + sc.viewRoundStatus(ctx, f); + ctx.log("fairroulette.viewRoundStatus ok"); } diff --git a/contracts/wasm/fairroulette/ts/fairroulette/params.ts b/contracts/wasm/fairroulette/ts/fairroulette/params.ts index a79831a801..7b02e49c17 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/params.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/params.ts @@ -5,33 +5,33 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutablePlaceBetParams extends wasmlib.ScMapID { number(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamNumber]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamNumber]); + } } export class MutablePlaceBetParams extends wasmlib.ScMapID { number(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamNumber]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamNumber]); + } } export class ImmutablePlayPeriodParams extends wasmlib.ScMapID { playPeriod(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamPlayPeriod]); - } + return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamPlayPeriod]); + } } export class MutablePlayPeriodParams extends wasmlib.ScMapID { playPeriod(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamPlayPeriod]); - } + return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamPlayPeriod]); + } } diff --git a/contracts/wasm/fairroulette/ts/fairroulette/results.ts b/contracts/wasm/fairroulette/ts/fairroulette/results.ts index 6ac963982b..d0a4a08db4 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/results.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/results.ts @@ -5,61 +5,61 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableLastWinningNumberResults extends wasmlib.ScMapID { lastWinningNumber(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultLastWinningNumber]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultLastWinningNumber]); + } } export class MutableLastWinningNumberResults extends wasmlib.ScMapID { lastWinningNumber(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultLastWinningNumber]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultLastWinningNumber]); + } } export class ImmutableRoundNumberResults extends wasmlib.ScMapID { roundNumber(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultRoundNumber]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultRoundNumber]); + } } export class MutableRoundNumberResults extends wasmlib.ScMapID { roundNumber(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultRoundNumber]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultRoundNumber]); + } } export class ImmutableRoundStartedAtResults extends wasmlib.ScMapID { roundStartedAt(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxResultRoundStartedAt]); - } + return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxResultRoundStartedAt]); + } } export class MutableRoundStartedAtResults extends wasmlib.ScMapID { roundStartedAt(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxResultRoundStartedAt]); - } + return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxResultRoundStartedAt]); + } } export class ImmutableRoundStatusResults extends wasmlib.ScMapID { roundStatus(): wasmlib.ScImmutableInt16 { - return new wasmlib.ScImmutableInt16(this.mapID, sc.idxMap[sc.IdxResultRoundStatus]); - } + return new wasmlib.ScImmutableInt16(this.mapID, sc.idxMap[sc.IdxResultRoundStatus]); + } } export class MutableRoundStatusResults extends wasmlib.ScMapID { roundStatus(): wasmlib.ScMutableInt16 { - return new wasmlib.ScMutableInt16(this.mapID, sc.idxMap[sc.IdxResultRoundStatus]); - } + return new wasmlib.ScMutableInt16(this.mapID, sc.idxMap[sc.IdxResultRoundStatus]); + } } diff --git a/contracts/wasm/fairroulette/ts/fairroulette/state.ts b/contracts/wasm/fairroulette/ts/fairroulette/state.ts index 622f56cf8a..ceb215f1d8 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/state.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/state.ts @@ -5,11 +5,11 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ArrayOfImmutableBet { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -19,41 +19,41 @@ export class ArrayOfImmutableBet { return wasmlib.getLength(this.objID); } - getBet(index: i32): sc.ImmutableBet { - return new sc.ImmutableBet(this.objID, new wasmlib.Key32(index)); - } + getBet(index: i32): sc.ImmutableBet { + return new sc.ImmutableBet(this.objID, new wasmlib.Key32(index)); + } } export class ImmutableFairRouletteState extends wasmlib.ScMapID { bets(): sc.ArrayOfImmutableBet { - let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateBets], wasmlib.TYPE_ARRAY|wasmlib.TYPE_BYTES); - return new sc.ArrayOfImmutableBet(arrID) - } + let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateBets], wasmlib.TYPE_ARRAY|wasmlib.TYPE_BYTES); + return new sc.ArrayOfImmutableBet(arrID); + } lastWinningNumber(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateLastWinningNumber]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateLastWinningNumber]); + } playPeriod(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxStatePlayPeriod]); - } + return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxStatePlayPeriod]); + } roundNumber(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateRoundNumber]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateRoundNumber]); + } roundStartedAt(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxStateRoundStartedAt]); - } + return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxStateRoundStartedAt]); + } roundStatus(): wasmlib.ScImmutableInt16 { - return new wasmlib.ScImmutableInt16(this.mapID, sc.idxMap[sc.IdxStateRoundStatus]); - } + return new wasmlib.ScImmutableInt16(this.mapID, sc.idxMap[sc.IdxStateRoundStatus]); + } } export class ArrayOfMutableBet { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -67,35 +67,35 @@ export class ArrayOfMutableBet { return wasmlib.getLength(this.objID); } - getBet(index: i32): sc.MutableBet { - return new sc.MutableBet(this.objID, new wasmlib.Key32(index)); - } + getBet(index: i32): sc.MutableBet { + return new sc.MutableBet(this.objID, new wasmlib.Key32(index)); + } } export class MutableFairRouletteState extends wasmlib.ScMapID { bets(): sc.ArrayOfMutableBet { - let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateBets], wasmlib.TYPE_ARRAY|wasmlib.TYPE_BYTES); - return new sc.ArrayOfMutableBet(arrID) - } + let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateBets], wasmlib.TYPE_ARRAY|wasmlib.TYPE_BYTES); + return new sc.ArrayOfMutableBet(arrID); + } lastWinningNumber(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateLastWinningNumber]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateLastWinningNumber]); + } playPeriod(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxStatePlayPeriod]); - } + return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxStatePlayPeriod]); + } roundNumber(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateRoundNumber]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateRoundNumber]); + } roundStartedAt(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxStateRoundStartedAt]); - } + return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxStateRoundStartedAt]); + } roundStatus(): wasmlib.ScMutableInt16 { - return new wasmlib.ScMutableInt16(this.mapID, sc.idxMap[sc.IdxStateRoundStatus]); - } + return new wasmlib.ScMutableInt16(this.mapID, sc.idxMap[sc.IdxStateRoundStatus]); + } } diff --git a/contracts/wasm/fairroulette/ts/fairroulette/structs.ts b/contracts/wasm/fairroulette/ts/fairroulette/structs.ts index 4f5e2d41ed..14a72bb759 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/structs.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/structs.ts @@ -5,12 +5,12 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; export class Bet { - amount: i64 = 0; - better: wasmlib.ScAgentID = new wasmlib.ScAgentID(); - number: i64 = 0; + amount: i64 = 0; + better: wasmlib.ScAgentID = new wasmlib.ScAgentID(); + number: i64 = 0; static fromBytes(bytes: u8[]): Bet { let decode = new wasmlib.BytesDecoder(bytes); @@ -24,9 +24,9 @@ export class Bet { bytes(): u8[] { return new wasmlib.BytesEncoder(). - int64(this.amount). - agentID(this.better). - int64(this.number). + int64(this.amount). + agentID(this.better). + int64(this.number). data(); } } @@ -45,7 +45,7 @@ export class ImmutableBet { } value(): Bet { - return Bet.fromBytes(wasmlib.getBytes(this.objID, this.keyID,wasmlib. TYPE_BYTES)); + return Bet.fromBytes(wasmlib.getBytes(this.objID, this.keyID, wasmlib.TYPE_BYTES)); } } @@ -67,6 +67,6 @@ export class MutableBet { } value(): Bet { - return Bet.fromBytes(wasmlib.getBytes(this.objID, this.keyID,wasmlib. TYPE_BYTES)); + return Bet.fromBytes(wasmlib.getBytes(this.objID, this.keyID, wasmlib.TYPE_BYTES)); } } diff --git a/contracts/wasm/helloworld/ts/helloworld/consts.ts b/contracts/wasm/helloworld/ts/helloworld/consts.ts index d93bd75a35..686b23b6ea 100644 --- a/contracts/wasm/helloworld/ts/helloworld/consts.ts +++ b/contracts/wasm/helloworld/ts/helloworld/consts.ts @@ -5,7 +5,7 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; export const ScName = "helloworld"; export const ScDescription = "The ubiquitous hello world demo"; @@ -13,8 +13,8 @@ export const HScName = new wasmlib.ScHname(0x0683223c); export const ResultHelloWorld = "helloWorld"; -export const FuncHelloWorld = "helloWorld"; +export const FuncHelloWorld = "helloWorld"; export const ViewGetHelloWorld = "getHelloWorld"; -export const HFuncHelloWorld = new wasmlib.ScHname(0x9d042e65); +export const HFuncHelloWorld = new wasmlib.ScHname(0x9d042e65); export const HViewGetHelloWorld = new wasmlib.ScHname(0x210439ce); diff --git a/contracts/wasm/helloworld/ts/helloworld/contract.ts b/contracts/wasm/helloworld/ts/helloworld/contract.ts index ac9276f39a..df2b0e44a0 100644 --- a/contracts/wasm/helloworld/ts/helloworld/contract.ts +++ b/contracts/wasm/helloworld/ts/helloworld/contract.ts @@ -5,32 +5,31 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class HelloWorldCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncHelloWorld); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncHelloWorld); } export class HelloWorldContext { - state: sc.MutableHelloWorldState = new sc.MutableHelloWorldState(); + state: sc.MutableHelloWorldState = new sc.MutableHelloWorldState(); } export class GetHelloWorldCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetHelloWorld); - results: sc.ImmutableGetHelloWorldResults = new sc.ImmutableGetHelloWorldResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetHelloWorld); + results: sc.ImmutableGetHelloWorldResults = new sc.ImmutableGetHelloWorldResults(); } export class GetHelloWorldContext { - results: sc.MutableGetHelloWorldResults = new sc.MutableGetHelloWorldResults(); - state: sc.ImmutableHelloWorldState = new sc.ImmutableHelloWorldState(); + results: sc.MutableGetHelloWorldResults = new sc.MutableGetHelloWorldResults(); + state: sc.ImmutableHelloWorldState = new sc.ImmutableHelloWorldState(); } export class ScFuncs { static helloWorld(ctx: wasmlib.ScFuncCallContext): HelloWorldCall { - let f = new HelloWorldCall(); - return f; + return new HelloWorldCall(); } static getHelloWorld(ctx: wasmlib.ScViewCallContext): GetHelloWorldCall { diff --git a/contracts/wasm/helloworld/ts/helloworld/keys.ts b/contracts/wasm/helloworld/ts/helloworld/keys.ts index b8d49c07ea..ea4a8f8442 100644 --- a/contracts/wasm/helloworld/ts/helloworld/keys.ts +++ b/contracts/wasm/helloworld/ts/helloworld/keys.ts @@ -5,13 +5,13 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export const IdxResultHelloWorld = 0; export let keyMap: string[] = [ - sc.ResultHelloWorld, + sc.ResultHelloWorld, ]; export let idxMap: wasmlib.Key32[] = new Array(keyMap.length); diff --git a/contracts/wasm/helloworld/ts/helloworld/lib.ts b/contracts/wasm/helloworld/ts/helloworld/lib.ts index be19e8e7dc..a4af6920e6 100644 --- a/contracts/wasm/helloworld/ts/helloworld/lib.ts +++ b/contracts/wasm/helloworld/ts/helloworld/lib.ts @@ -5,7 +5,7 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export function on_call(index: i32): void { @@ -23,18 +23,18 @@ export function on_load(): void { } function funcHelloWorldThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("helloworld.funcHelloWorld"); - let f = new sc.HelloWorldContext(); + ctx.log("helloworld.funcHelloWorld"); + let f = new sc.HelloWorldContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcHelloWorld(ctx, f); - ctx.log("helloworld.funcHelloWorld ok"); + sc.funcHelloWorld(ctx, f); + ctx.log("helloworld.funcHelloWorld ok"); } function viewGetHelloWorldThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("helloworld.viewGetHelloWorld"); - let f = new sc.GetHelloWorldContext(); + ctx.log("helloworld.viewGetHelloWorld"); + let f = new sc.GetHelloWorldContext(); f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.viewGetHelloWorld(ctx, f); - ctx.log("helloworld.viewGetHelloWorld ok"); + sc.viewGetHelloWorld(ctx, f); + ctx.log("helloworld.viewGetHelloWorld ok"); } diff --git a/contracts/wasm/helloworld/ts/helloworld/results.ts b/contracts/wasm/helloworld/ts/helloworld/results.ts index 2497774190..c668e8061c 100644 --- a/contracts/wasm/helloworld/ts/helloworld/results.ts +++ b/contracts/wasm/helloworld/ts/helloworld/results.ts @@ -5,19 +5,19 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableGetHelloWorldResults extends wasmlib.ScMapID { helloWorld(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxResultHelloWorld]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxResultHelloWorld]); + } } export class MutableGetHelloWorldResults extends wasmlib.ScMapID { helloWorld(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxResultHelloWorld]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxResultHelloWorld]); + } } diff --git a/contracts/wasm/helloworld/ts/helloworld/state.ts b/contracts/wasm/helloworld/ts/helloworld/state.ts index 2fc69e22f8..d8026bdce6 100644 --- a/contracts/wasm/helloworld/ts/helloworld/state.ts +++ b/contracts/wasm/helloworld/ts/helloworld/state.ts @@ -5,7 +5,7 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableHelloWorldState extends wasmlib.ScMapID { diff --git a/contracts/wasm/inccounter/ts/inccounter/consts.ts b/contracts/wasm/inccounter/ts/inccounter/consts.ts index ef54d18fec..fd6d4303c8 100644 --- a/contracts/wasm/inccounter/ts/inccounter/consts.ts +++ b/contracts/wasm/inccounter/ts/inccounter/consts.ts @@ -5,47 +5,48 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; -export const ScName = "inccounter"; -export const HScName = new wasmlib.ScHname(0xaf2438e9); +export const ScName = "inccounter"; +export const ScDescription = ""; +export const HScName = new wasmlib.ScHname(0xaf2438e9); -export const ParamCounter = "counter"; -export const ParamDelay = "delay"; -export const ParamDummy = "dummy"; +export const ParamCounter = "counter"; +export const ParamDelay = "delay"; +export const ParamDummy = "dummy"; export const ParamNumRepeats = "numRepeats"; export const ResultCounter = "counter"; -export const StateCounter = "counter"; +export const StateCounter = "counter"; export const StateNumRepeats = "numRepeats"; -export const FuncCallIncrement = "callIncrement"; +export const FuncCallIncrement = "callIncrement"; export const FuncCallIncrementRecurse5x = "callIncrementRecurse5x"; -export const FuncEndlessLoop = "endlessLoop"; -export const FuncIncrement = "increment"; -export const FuncIncrementWithDelay = "incrementWithDelay"; -export const FuncInit = "init"; +export const FuncEndlessLoop = "endlessLoop"; +export const FuncIncrement = "increment"; +export const FuncIncrementWithDelay = "incrementWithDelay"; +export const FuncInit = "init"; export const FuncLocalStateInternalCall = "localStateInternalCall"; -export const FuncLocalStatePost = "localStatePost"; -export const FuncLocalStateSandboxCall = "localStateSandboxCall"; -export const FuncPostIncrement = "postIncrement"; -export const FuncRepeatMany = "repeatMany"; -export const FuncTestLeb128 = "testLeb128"; -export const FuncWhenMustIncrement = "whenMustIncrement"; -export const ViewGetCounter = "getCounter"; - -export const HFuncCallIncrement = new wasmlib.ScHname(0xeb5dcacd); +export const FuncLocalStatePost = "localStatePost"; +export const FuncLocalStateSandboxCall = "localStateSandboxCall"; +export const FuncPostIncrement = "postIncrement"; +export const FuncRepeatMany = "repeatMany"; +export const FuncTestLeb128 = "testLeb128"; +export const FuncWhenMustIncrement = "whenMustIncrement"; +export const ViewGetCounter = "getCounter"; + +export const HFuncCallIncrement = new wasmlib.ScHname(0xeb5dcacd); export const HFuncCallIncrementRecurse5x = new wasmlib.ScHname(0x8749fbff); -export const HFuncEndlessLoop = new wasmlib.ScHname(0x365f0929); -export const HFuncIncrement = new wasmlib.ScHname(0xd351bd12); -export const HFuncIncrementWithDelay = new wasmlib.ScHname(0xa235bba7); -export const HFuncInit = new wasmlib.ScHname(0x1f44d644); +export const HFuncEndlessLoop = new wasmlib.ScHname(0x365f0929); +export const HFuncIncrement = new wasmlib.ScHname(0xd351bd12); +export const HFuncIncrementWithDelay = new wasmlib.ScHname(0xa235bba7); +export const HFuncInit = new wasmlib.ScHname(0x1f44d644); export const HFuncLocalStateInternalCall = new wasmlib.ScHname(0xecfc5d33); -export const HFuncLocalStatePost = new wasmlib.ScHname(0x3fd54d13); -export const HFuncLocalStateSandboxCall = new wasmlib.ScHname(0x7bd22c53); -export const HFuncPostIncrement = new wasmlib.ScHname(0x81c772f5); -export const HFuncRepeatMany = new wasmlib.ScHname(0x4ff450d3); -export const HFuncTestLeb128 = new wasmlib.ScHname(0xd8364cb9); -export const HFuncWhenMustIncrement = new wasmlib.ScHname(0xb4c3e7a6); -export const HViewGetCounter = new wasmlib.ScHname(0xb423e607); +export const HFuncLocalStatePost = new wasmlib.ScHname(0x3fd54d13); +export const HFuncLocalStateSandboxCall = new wasmlib.ScHname(0x7bd22c53); +export const HFuncPostIncrement = new wasmlib.ScHname(0x81c772f5); +export const HFuncRepeatMany = new wasmlib.ScHname(0x4ff450d3); +export const HFuncTestLeb128 = new wasmlib.ScHname(0xd8364cb9); +export const HFuncWhenMustIncrement = new wasmlib.ScHname(0xb4c3e7a6); +export const HViewGetCounter = new wasmlib.ScHname(0xb423e607); diff --git a/contracts/wasm/inccounter/ts/inccounter/contract.ts b/contracts/wasm/inccounter/ts/inccounter/contract.ts index 99b1df9558..7295028420 100644 --- a/contracts/wasm/inccounter/ts/inccounter/contract.ts +++ b/contracts/wasm/inccounter/ts/inccounter/contract.ts @@ -5,151 +5,147 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class CallIncrementCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncCallIncrement); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncCallIncrement); } export class CallIncrementContext { - state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); + state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); } export class CallIncrementRecurse5xCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncCallIncrementRecurse5x); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncCallIncrementRecurse5x); } export class CallIncrementRecurse5xContext { - state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); + state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); } export class EndlessLoopCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncEndlessLoop); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncEndlessLoop); } export class EndlessLoopContext { - state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); + state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); } export class IncrementCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncIncrement); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncIncrement); } export class IncrementContext { - state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); + state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); } export class IncrementWithDelayCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncIncrementWithDelay); - params: sc.MutableIncrementWithDelayParams = new sc.MutableIncrementWithDelayParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncIncrementWithDelay); + params: sc.MutableIncrementWithDelayParams = new sc.MutableIncrementWithDelayParams(); } export class IncrementWithDelayContext { - params: sc.ImmutableIncrementWithDelayParams = new sc.ImmutableIncrementWithDelayParams(); - state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); + params: sc.ImmutableIncrementWithDelayParams = new sc.ImmutableIncrementWithDelayParams(); + state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); } export class InitCall { - func: wasmlib.ScInitFunc = new wasmlib.ScInitFunc(sc.HScName, sc.HFuncInit); - params: sc.MutableInitParams = new sc.MutableInitParams(); + func: wasmlib.ScInitFunc = new wasmlib.ScInitFunc(sc.HScName, sc.HFuncInit); + params: sc.MutableInitParams = new sc.MutableInitParams(); } export class InitContext { - params: sc.ImmutableInitParams = new sc.ImmutableInitParams(); - state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); + params: sc.ImmutableInitParams = new sc.ImmutableInitParams(); + state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); } export class LocalStateInternalCallCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncLocalStateInternalCall); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncLocalStateInternalCall); } export class LocalStateInternalCallContext { - state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); + state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); } export class LocalStatePostCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncLocalStatePost); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncLocalStatePost); } export class LocalStatePostContext { - state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); + state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); } export class LocalStateSandboxCallCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncLocalStateSandboxCall); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncLocalStateSandboxCall); } export class LocalStateSandboxCallContext { - state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); + state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); } export class PostIncrementCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncPostIncrement); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncPostIncrement); } export class PostIncrementContext { - state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); + state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); } export class RepeatManyCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncRepeatMany); - params: sc.MutableRepeatManyParams = new sc.MutableRepeatManyParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncRepeatMany); + params: sc.MutableRepeatManyParams = new sc.MutableRepeatManyParams(); } export class RepeatManyContext { - params: sc.ImmutableRepeatManyParams = new sc.ImmutableRepeatManyParams(); - state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); + params: sc.ImmutableRepeatManyParams = new sc.ImmutableRepeatManyParams(); + state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); } export class TestLeb128Call { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTestLeb128); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTestLeb128); } export class TestLeb128Context { - state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); + state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); } export class WhenMustIncrementCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncWhenMustIncrement); - params: sc.MutableWhenMustIncrementParams = new sc.MutableWhenMustIncrementParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncWhenMustIncrement); + params: sc.MutableWhenMustIncrementParams = new sc.MutableWhenMustIncrementParams(); } export class WhenMustIncrementContext { - params: sc.ImmutableWhenMustIncrementParams = new sc.ImmutableWhenMustIncrementParams(); - state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); + params: sc.ImmutableWhenMustIncrementParams = new sc.ImmutableWhenMustIncrementParams(); + state: sc.MutableIncCounterState = new sc.MutableIncCounterState(); } export class GetCounterCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetCounter); - results: sc.ImmutableGetCounterResults = new sc.ImmutableGetCounterResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetCounter); + results: sc.ImmutableGetCounterResults = new sc.ImmutableGetCounterResults(); } export class GetCounterContext { - results: sc.MutableGetCounterResults = new sc.MutableGetCounterResults(); - state: sc.ImmutableIncCounterState = new sc.ImmutableIncCounterState(); + results: sc.MutableGetCounterResults = new sc.MutableGetCounterResults(); + state: sc.ImmutableIncCounterState = new sc.ImmutableIncCounterState(); } export class ScFuncs { static callIncrement(ctx: wasmlib.ScFuncCallContext): CallIncrementCall { - let f = new CallIncrementCall(); - return f; + return new CallIncrementCall(); } static callIncrementRecurse5x(ctx: wasmlib.ScFuncCallContext): CallIncrementRecurse5xCall { - let f = new CallIncrementRecurse5xCall(); - return f; + return new CallIncrementRecurse5xCall(); } static endlessLoop(ctx: wasmlib.ScFuncCallContext): EndlessLoopCall { - let f = new EndlessLoopCall(); - return f; + return new EndlessLoopCall(); } static increment(ctx: wasmlib.ScFuncCallContext): IncrementCall { - let f = new IncrementCall(); - return f; + return new IncrementCall(); } static incrementWithDelay(ctx: wasmlib.ScFuncCallContext): IncrementWithDelayCall { @@ -165,23 +161,19 @@ export class ScFuncs { } static localStateInternalCall(ctx: wasmlib.ScFuncCallContext): LocalStateInternalCallCall { - let f = new LocalStateInternalCallCall(); - return f; + return new LocalStateInternalCallCall(); } static localStatePost(ctx: wasmlib.ScFuncCallContext): LocalStatePostCall { - let f = new LocalStatePostCall(); - return f; + return new LocalStatePostCall(); } static localStateSandboxCall(ctx: wasmlib.ScFuncCallContext): LocalStateSandboxCallCall { - let f = new LocalStateSandboxCallCall(); - return f; + return new LocalStateSandboxCallCall(); } static postIncrement(ctx: wasmlib.ScFuncCallContext): PostIncrementCall { - let f = new PostIncrementCall(); - return f; + return new PostIncrementCall(); } static repeatMany(ctx: wasmlib.ScFuncCallContext): RepeatManyCall { @@ -191,8 +183,7 @@ export class ScFuncs { } static testLeb128(ctx: wasmlib.ScFuncCallContext): TestLeb128Call { - let f = new TestLeb128Call(); - return f; + return new TestLeb128Call(); } static whenMustIncrement(ctx: wasmlib.ScFuncCallContext): WhenMustIncrementCall { diff --git a/contracts/wasm/inccounter/ts/inccounter/keys.ts b/contracts/wasm/inccounter/ts/inccounter/keys.ts index 6c9deca9bc..85d9eff219 100644 --- a/contracts/wasm/inccounter/ts/inccounter/keys.ts +++ b/contracts/wasm/inccounter/ts/inccounter/keys.ts @@ -5,25 +5,25 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; -export const IdxParamCounter = 0; -export const IdxParamDelay = 1; -export const IdxParamDummy = 2; +export const IdxParamCounter = 0; +export const IdxParamDelay = 1; +export const IdxParamDummy = 2; export const IdxParamNumRepeats = 3; -export const IdxResultCounter = 4; -export const IdxStateCounter = 5; +export const IdxResultCounter = 4; +export const IdxStateCounter = 5; export const IdxStateNumRepeats = 6; export let keyMap: string[] = [ - sc.ParamCounter, - sc.ParamDelay, - sc.ParamDummy, - sc.ParamNumRepeats, - sc.ResultCounter, - sc.StateCounter, - sc.StateNumRepeats, + sc.ParamCounter, + sc.ParamDelay, + sc.ParamDummy, + sc.ParamNumRepeats, + sc.ResultCounter, + sc.StateCounter, + sc.StateNumRepeats, ]; export let idxMap: wasmlib.Key32[] = new Array(keyMap.length); diff --git a/contracts/wasm/inccounter/ts/inccounter/lib.ts b/contracts/wasm/inccounter/ts/inccounter/lib.ts index 991f71f494..760f34d2c2 100644 --- a/contracts/wasm/inccounter/ts/inccounter/lib.ts +++ b/contracts/wasm/inccounter/ts/inccounter/lib.ts @@ -5,7 +5,7 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export function on_call(index: i32): void { @@ -35,119 +35,119 @@ export function on_load(): void { } function funcCallIncrementThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("inccounter.funcCallIncrement"); - let f = new sc.CallIncrementContext(); + ctx.log("inccounter.funcCallIncrement"); + let f = new sc.CallIncrementContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcCallIncrement(ctx, f); - ctx.log("inccounter.funcCallIncrement ok"); + sc.funcCallIncrement(ctx, f); + ctx.log("inccounter.funcCallIncrement ok"); } function funcCallIncrementRecurse5xThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("inccounter.funcCallIncrementRecurse5x"); - let f = new sc.CallIncrementRecurse5xContext(); + ctx.log("inccounter.funcCallIncrementRecurse5x"); + let f = new sc.CallIncrementRecurse5xContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcCallIncrementRecurse5x(ctx, f); - ctx.log("inccounter.funcCallIncrementRecurse5x ok"); + sc.funcCallIncrementRecurse5x(ctx, f); + ctx.log("inccounter.funcCallIncrementRecurse5x ok"); } function funcEndlessLoopThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("inccounter.funcEndlessLoop"); - let f = new sc.EndlessLoopContext(); + ctx.log("inccounter.funcEndlessLoop"); + let f = new sc.EndlessLoopContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcEndlessLoop(ctx, f); - ctx.log("inccounter.funcEndlessLoop ok"); + sc.funcEndlessLoop(ctx, f); + ctx.log("inccounter.funcEndlessLoop ok"); } function funcIncrementThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("inccounter.funcIncrement"); - let f = new sc.IncrementContext(); + ctx.log("inccounter.funcIncrement"); + let f = new sc.IncrementContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcIncrement(ctx, f); - ctx.log("inccounter.funcIncrement ok"); + sc.funcIncrement(ctx, f); + ctx.log("inccounter.funcIncrement ok"); } function funcIncrementWithDelayThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("inccounter.funcIncrementWithDelay"); - let f = new sc.IncrementWithDelayContext(); + ctx.log("inccounter.funcIncrementWithDelay"); + let f = new sc.IncrementWithDelayContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.delay().exists(), "missing mandatory delay") - sc.funcIncrementWithDelay(ctx, f); - ctx.log("inccounter.funcIncrementWithDelay ok"); + ctx.require(f.params.delay().exists(), "missing mandatory delay"); + sc.funcIncrementWithDelay(ctx, f); + ctx.log("inccounter.funcIncrementWithDelay ok"); } function funcInitThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("inccounter.funcInit"); - let f = new sc.InitContext(); + ctx.log("inccounter.funcInit"); + let f = new sc.InitContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcInit(ctx, f); - ctx.log("inccounter.funcInit ok"); + sc.funcInit(ctx, f); + ctx.log("inccounter.funcInit ok"); } function funcLocalStateInternalCallThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("inccounter.funcLocalStateInternalCall"); - let f = new sc.LocalStateInternalCallContext(); + ctx.log("inccounter.funcLocalStateInternalCall"); + let f = new sc.LocalStateInternalCallContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcLocalStateInternalCall(ctx, f); - ctx.log("inccounter.funcLocalStateInternalCall ok"); + sc.funcLocalStateInternalCall(ctx, f); + ctx.log("inccounter.funcLocalStateInternalCall ok"); } function funcLocalStatePostThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("inccounter.funcLocalStatePost"); - let f = new sc.LocalStatePostContext(); + ctx.log("inccounter.funcLocalStatePost"); + let f = new sc.LocalStatePostContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcLocalStatePost(ctx, f); - ctx.log("inccounter.funcLocalStatePost ok"); + sc.funcLocalStatePost(ctx, f); + ctx.log("inccounter.funcLocalStatePost ok"); } function funcLocalStateSandboxCallThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("inccounter.funcLocalStateSandboxCall"); - let f = new sc.LocalStateSandboxCallContext(); + ctx.log("inccounter.funcLocalStateSandboxCall"); + let f = new sc.LocalStateSandboxCallContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcLocalStateSandboxCall(ctx, f); - ctx.log("inccounter.funcLocalStateSandboxCall ok"); + sc.funcLocalStateSandboxCall(ctx, f); + ctx.log("inccounter.funcLocalStateSandboxCall ok"); } function funcPostIncrementThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("inccounter.funcPostIncrement"); - let f = new sc.PostIncrementContext(); + ctx.log("inccounter.funcPostIncrement"); + let f = new sc.PostIncrementContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcPostIncrement(ctx, f); - ctx.log("inccounter.funcPostIncrement ok"); + sc.funcPostIncrement(ctx, f); + ctx.log("inccounter.funcPostIncrement ok"); } function funcRepeatManyThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("inccounter.funcRepeatMany"); - let f = new sc.RepeatManyContext(); + ctx.log("inccounter.funcRepeatMany"); + let f = new sc.RepeatManyContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcRepeatMany(ctx, f); - ctx.log("inccounter.funcRepeatMany ok"); + sc.funcRepeatMany(ctx, f); + ctx.log("inccounter.funcRepeatMany ok"); } function funcTestLeb128Thunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("inccounter.funcTestLeb128"); - let f = new sc.TestLeb128Context(); + ctx.log("inccounter.funcTestLeb128"); + let f = new sc.TestLeb128Context(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcTestLeb128(ctx, f); - ctx.log("inccounter.funcTestLeb128 ok"); + sc.funcTestLeb128(ctx, f); + ctx.log("inccounter.funcTestLeb128 ok"); } function funcWhenMustIncrementThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("inccounter.funcWhenMustIncrement"); - let f = new sc.WhenMustIncrementContext(); + ctx.log("inccounter.funcWhenMustIncrement"); + let f = new sc.WhenMustIncrementContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcWhenMustIncrement(ctx, f); - ctx.log("inccounter.funcWhenMustIncrement ok"); + sc.funcWhenMustIncrement(ctx, f); + ctx.log("inccounter.funcWhenMustIncrement ok"); } function viewGetCounterThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("inccounter.viewGetCounter"); - let f = new sc.GetCounterContext(); + ctx.log("inccounter.viewGetCounter"); + let f = new sc.GetCounterContext(); f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.viewGetCounter(ctx, f); - ctx.log("inccounter.viewGetCounter ok"); + sc.viewGetCounter(ctx, f); + ctx.log("inccounter.viewGetCounter ok"); } diff --git a/contracts/wasm/inccounter/ts/inccounter/params.ts b/contracts/wasm/inccounter/ts/inccounter/params.ts index 539fd9dc65..0f04ff8e41 100644 --- a/contracts/wasm/inccounter/ts/inccounter/params.ts +++ b/contracts/wasm/inccounter/ts/inccounter/params.ts @@ -5,61 +5,61 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableIncrementWithDelayParams extends wasmlib.ScMapID { delay(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamDelay]); - } + return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamDelay]); + } } export class MutableIncrementWithDelayParams extends wasmlib.ScMapID { delay(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamDelay]); - } + return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamDelay]); + } } export class ImmutableInitParams extends wasmlib.ScMapID { counter(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamCounter]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamCounter]); + } } export class MutableInitParams extends wasmlib.ScMapID { counter(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamCounter]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamCounter]); + } } export class ImmutableRepeatManyParams extends wasmlib.ScMapID { numRepeats(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamNumRepeats]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamNumRepeats]); + } } export class MutableRepeatManyParams extends wasmlib.ScMapID { numRepeats(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamNumRepeats]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamNumRepeats]); + } } export class ImmutableWhenMustIncrementParams extends wasmlib.ScMapID { dummy(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamDummy]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamDummy]); + } } export class MutableWhenMustIncrementParams extends wasmlib.ScMapID { dummy(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamDummy]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamDummy]); + } } diff --git a/contracts/wasm/inccounter/ts/inccounter/results.ts b/contracts/wasm/inccounter/ts/inccounter/results.ts index 7d2c0a489b..98b6f94072 100644 --- a/contracts/wasm/inccounter/ts/inccounter/results.ts +++ b/contracts/wasm/inccounter/ts/inccounter/results.ts @@ -5,19 +5,19 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableGetCounterResults extends wasmlib.ScMapID { counter(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultCounter]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultCounter]); + } } export class MutableGetCounterResults extends wasmlib.ScMapID { counter(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultCounter]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultCounter]); + } } diff --git a/contracts/wasm/inccounter/ts/inccounter/state.ts b/contracts/wasm/inccounter/ts/inccounter/state.ts index be2ff82d28..836ec2088f 100644 --- a/contracts/wasm/inccounter/ts/inccounter/state.ts +++ b/contracts/wasm/inccounter/ts/inccounter/state.ts @@ -5,27 +5,27 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableIncCounterState extends wasmlib.ScMapID { counter(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateCounter]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateCounter]); + } numRepeats(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateNumRepeats]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateNumRepeats]); + } } export class MutableIncCounterState extends wasmlib.ScMapID { counter(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateCounter]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateCounter]); + } numRepeats(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateNumRepeats]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateNumRepeats]); + } } diff --git a/contracts/wasm/testcore/test/testcore_bg.wasm b/contracts/wasm/testcore/test/testcore_bg.wasm index c7701951f23a18b700efdbffc4971d1d0b1cfec8..2966e8bb6c72f77dd90a718a9c01feaa5f9df16f 100644 GIT binary patch delta 7318 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 T`n07Jr%t;7l#bE0V=Mj}OGFzG delta 7228 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 O(kkFRxM9Dy{=Wg?D))H+ diff --git a/contracts/wasm/testcore/ts/testcore/consts.ts b/contracts/wasm/testcore/ts/testcore/consts.ts index bb40094455..ba03a0916c 100644 --- a/contracts/wasm/testcore/ts/testcore/consts.ts +++ b/contracts/wasm/testcore/ts/testcore/consts.ts @@ -5,110 +5,112 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; export const ScName = "testcore"; export const ScDescription = "Core test for ISCP wasmlib Rust/Wasm library"; export const HScName = new wasmlib.ScHname(0x370d33ad); -export const ParamAddress = "address"; -export const ParamAgentID = "agentID"; -export const ParamCaller = "caller"; -export const ParamChainID = "chainID"; -export const ParamChainOwnerID = "chainOwnerID"; +export const ParamAddress = "address"; +export const ParamAgentID = "agentID"; +export const ParamCaller = "caller"; +export const ParamChainID = "chainID"; +export const ParamChainOwnerID = "chainOwnerID"; export const ParamContractCreator = "contractCreator"; -export const ParamContractID = "contractID"; -export const ParamCounter = "counter"; -export const ParamFail = "initFailParam"; -export const ParamHash = "Hash"; -export const ParamHname = "Hname"; -export const ParamHnameContract = "hnameContract"; -export const ParamHnameEP = "hnameEP"; -export const ParamHnameZero = "Hname-0"; -export const ParamInt64 = "int64"; -export const ParamInt64Zero = "int64-0"; -export const ParamIntValue = "intParamValue"; -export const ParamName = "intParamName"; -export const ParamProgHash = "progHash"; -export const ParamString = "string"; -export const ParamStringZero = "string-0"; -export const ParamVarName = "varName"; +export const ParamContractID = "contractID"; +export const ParamCounter = "counter"; +export const ParamFail = "initFailParam"; +export const ParamHash = "Hash"; +export const ParamHname = "Hname"; +export const ParamHnameContract = "hnameContract"; +export const ParamHnameEP = "hnameEP"; +export const ParamHnameZero = "Hname-0"; +export const ParamInt64 = "int64"; +export const ParamInt64Zero = "int64-0"; +export const ParamIntValue = "intParamValue"; +export const ParamName = "intParamName"; +export const ParamProgHash = "progHash"; +export const ParamString = "string"; +export const ParamStringZero = "string-0"; +export const ParamVarName = "varName"; export const ResultChainOwnerID = "chainOwnerID"; -export const ResultCounter = "counter"; -export const ResultIntValue = "intParamValue"; -export const ResultMintedColor = "mintedColor"; +export const ResultCounter = "counter"; +export const ResultIntValue = "intParamValue"; +export const ResultMintedColor = "mintedColor"; export const ResultMintedSupply = "mintedSupply"; -export const ResultSandboxCall = "sandboxCall"; +export const ResultSandboxCall = "sandboxCall"; +export const ResultValues = "this"; +export const ResultVars = "this"; -export const StateCounter = "counter"; -export const StateHnameEP = "hnameEP"; -export const StateInts = "ints"; -export const StateMintedColor = "mintedColor"; +export const StateCounter = "counter"; +export const StateHnameEP = "hnameEP"; +export const StateInts = "ints"; +export const StateMintedColor = "mintedColor"; export const StateMintedSupply = "mintedSupply"; -export const FuncCallOnChain = "callOnChain"; -export const FuncCheckContextFromFullEP = "checkContextFromFullEP"; -export const FuncDoNothing = "doNothing"; -export const FuncGetMintedSupply = "getMintedSupply"; -export const FuncIncCounter = "incCounter"; -export const FuncInit = "init"; -export const FuncPassTypesFull = "passTypesFull"; -export const FuncRunRecursion = "runRecursion"; -export const FuncSendToAddress = "sendToAddress"; -export const FuncSetInt = "setInt"; -export const FuncSpawn = "spawn"; -export const FuncTestBlockContext1 = "testBlockContext1"; -export const FuncTestBlockContext2 = "testBlockContext2"; -export const FuncTestCallPanicFullEP = "testCallPanicFullEP"; +export const FuncCallOnChain = "callOnChain"; +export const FuncCheckContextFromFullEP = "checkContextFromFullEP"; +export const FuncDoNothing = "doNothing"; +export const FuncGetMintedSupply = "getMintedSupply"; +export const FuncIncCounter = "incCounter"; +export const FuncInit = "init"; +export const FuncPassTypesFull = "passTypesFull"; +export const FuncRunRecursion = "runRecursion"; +export const FuncSendToAddress = "sendToAddress"; +export const FuncSetInt = "setInt"; +export const FuncSpawn = "spawn"; +export const FuncTestBlockContext1 = "testBlockContext1"; +export const FuncTestBlockContext2 = "testBlockContext2"; +export const FuncTestCallPanicFullEP = "testCallPanicFullEP"; export const FuncTestCallPanicViewEPFromFull = "testCallPanicViewEPFromFull"; -export const FuncTestChainOwnerIDFull = "testChainOwnerIDFull"; -export const FuncTestEventLogDeploy = "testEventLogDeploy"; -export const FuncTestEventLogEventData = "testEventLogEventData"; -export const FuncTestEventLogGenericData = "testEventLogGenericData"; -export const FuncTestPanicFullEP = "testPanicFullEP"; -export const FuncWithdrawToChain = "withdrawToChain"; -export const ViewCheckContextFromViewEP = "checkContextFromViewEP"; -export const ViewFibonacci = "fibonacci"; -export const ViewGetCounter = "getCounter"; -export const ViewGetInt = "getInt"; -export const ViewGetStringValue = "getStringValue"; -export const ViewJustView = "justView"; -export const ViewPassTypesView = "passTypesView"; +export const FuncTestChainOwnerIDFull = "testChainOwnerIDFull"; +export const FuncTestEventLogDeploy = "testEventLogDeploy"; +export const FuncTestEventLogEventData = "testEventLogEventData"; +export const FuncTestEventLogGenericData = "testEventLogGenericData"; +export const FuncTestPanicFullEP = "testPanicFullEP"; +export const FuncWithdrawToChain = "withdrawToChain"; +export const ViewCheckContextFromViewEP = "checkContextFromViewEP"; +export const ViewFibonacci = "fibonacci"; +export const ViewGetCounter = "getCounter"; +export const ViewGetInt = "getInt"; +export const ViewGetStringValue = "getStringValue"; +export const ViewJustView = "justView"; +export const ViewPassTypesView = "passTypesView"; export const ViewTestCallPanicViewEPFromView = "testCallPanicViewEPFromView"; -export const ViewTestChainOwnerIDView = "testChainOwnerIDView"; -export const ViewTestPanicViewEP = "testPanicViewEP"; -export const ViewTestSandboxCall = "testSandboxCall"; +export const ViewTestChainOwnerIDView = "testChainOwnerIDView"; +export const ViewTestPanicViewEP = "testPanicViewEP"; +export const ViewTestSandboxCall = "testSandboxCall"; -export const HFuncCallOnChain = new wasmlib.ScHname(0x95a3d123); -export const HFuncCheckContextFromFullEP = new wasmlib.ScHname(0xa56c24ba); -export const HFuncDoNothing = new wasmlib.ScHname(0xdda4a6de); -export const HFuncGetMintedSupply = new wasmlib.ScHname(0x0c2d113c); -export const HFuncIncCounter = new wasmlib.ScHname(0x7b287419); -export const HFuncInit = new wasmlib.ScHname(0x1f44d644); -export const HFuncPassTypesFull = new wasmlib.ScHname(0x733ea0ea); -export const HFuncRunRecursion = new wasmlib.ScHname(0x833425fd); -export const HFuncSendToAddress = new wasmlib.ScHname(0x63ce4634); -export const HFuncSetInt = new wasmlib.ScHname(0x62056f74); -export const HFuncSpawn = new wasmlib.ScHname(0xec929d12); -export const HFuncTestBlockContext1 = new wasmlib.ScHname(0x796d4136); -export const HFuncTestBlockContext2 = new wasmlib.ScHname(0x758b0452); -export const HFuncTestCallPanicFullEP = new wasmlib.ScHname(0x4c878834); +export const HFuncCallOnChain = new wasmlib.ScHname(0x95a3d123); +export const HFuncCheckContextFromFullEP = new wasmlib.ScHname(0xa56c24ba); +export const HFuncDoNothing = new wasmlib.ScHname(0xdda4a6de); +export const HFuncGetMintedSupply = new wasmlib.ScHname(0x0c2d113c); +export const HFuncIncCounter = new wasmlib.ScHname(0x7b287419); +export const HFuncInit = new wasmlib.ScHname(0x1f44d644); +export const HFuncPassTypesFull = new wasmlib.ScHname(0x733ea0ea); +export const HFuncRunRecursion = new wasmlib.ScHname(0x833425fd); +export const HFuncSendToAddress = new wasmlib.ScHname(0x63ce4634); +export const HFuncSetInt = new wasmlib.ScHname(0x62056f74); +export const HFuncSpawn = new wasmlib.ScHname(0xec929d12); +export const HFuncTestBlockContext1 = new wasmlib.ScHname(0x796d4136); +export const HFuncTestBlockContext2 = new wasmlib.ScHname(0x758b0452); +export const HFuncTestCallPanicFullEP = new wasmlib.ScHname(0x4c878834); export const HFuncTestCallPanicViewEPFromFull = new wasmlib.ScHname(0xfd7e8c1d); -export const HFuncTestChainOwnerIDFull = new wasmlib.ScHname(0x2aff1167); -export const HFuncTestEventLogDeploy = new wasmlib.ScHname(0x96ff760a); -export const HFuncTestEventLogEventData = new wasmlib.ScHname(0x0efcf939); -export const HFuncTestEventLogGenericData = new wasmlib.ScHname(0x6a16629d); -export const HFuncTestPanicFullEP = new wasmlib.ScHname(0x24fdef07); -export const HFuncWithdrawToChain = new wasmlib.ScHname(0x437bc026); -export const HViewCheckContextFromViewEP = new wasmlib.ScHname(0x88ff0167); -export const HViewFibonacci = new wasmlib.ScHname(0x7940873c); -export const HViewGetCounter = new wasmlib.ScHname(0xb423e607); -export const HViewGetInt = new wasmlib.ScHname(0x1887e5ef); -export const HViewGetStringValue = new wasmlib.ScHname(0xcf0a4d32); -export const HViewJustView = new wasmlib.ScHname(0x33b8972e); -export const HViewPassTypesView = new wasmlib.ScHname(0x1a5b87ea); +export const HFuncTestChainOwnerIDFull = new wasmlib.ScHname(0x2aff1167); +export const HFuncTestEventLogDeploy = new wasmlib.ScHname(0x96ff760a); +export const HFuncTestEventLogEventData = new wasmlib.ScHname(0x0efcf939); +export const HFuncTestEventLogGenericData = new wasmlib.ScHname(0x6a16629d); +export const HFuncTestPanicFullEP = new wasmlib.ScHname(0x24fdef07); +export const HFuncWithdrawToChain = new wasmlib.ScHname(0x437bc026); +export const HViewCheckContextFromViewEP = new wasmlib.ScHname(0x88ff0167); +export const HViewFibonacci = new wasmlib.ScHname(0x7940873c); +export const HViewGetCounter = new wasmlib.ScHname(0xb423e607); +export const HViewGetInt = new wasmlib.ScHname(0x1887e5ef); +export const HViewGetStringValue = new wasmlib.ScHname(0xcf0a4d32); +export const HViewJustView = new wasmlib.ScHname(0x33b8972e); +export const HViewPassTypesView = new wasmlib.ScHname(0x1a5b87ea); export const HViewTestCallPanicViewEPFromView = new wasmlib.ScHname(0x91b10c99); -export const HViewTestChainOwnerIDView = new wasmlib.ScHname(0x26586c33); -export const HViewTestPanicViewEP = new wasmlib.ScHname(0x22bc4d72); -export const HViewTestSandboxCall = new wasmlib.ScHname(0x42d72b63); +export const HViewTestChainOwnerIDView = new wasmlib.ScHname(0x26586c33); +export const HViewTestPanicViewEP = new wasmlib.ScHname(0x22bc4d72); +export const HViewTestSandboxCall = new wasmlib.ScHname(0x42d72b63); diff --git a/contracts/wasm/testcore/ts/testcore/contract.ts b/contracts/wasm/testcore/ts/testcore/contract.ts index a65695a48b..de8e6bf012 100644 --- a/contracts/wasm/testcore/ts/testcore/contract.ts +++ b/contracts/wasm/testcore/ts/testcore/contract.ts @@ -5,313 +5,313 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class CallOnChainCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncCallOnChain); - params: sc.MutableCallOnChainParams = new sc.MutableCallOnChainParams(); - results: sc.ImmutableCallOnChainResults = new sc.ImmutableCallOnChainResults(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncCallOnChain); + params: sc.MutableCallOnChainParams = new sc.MutableCallOnChainParams(); + results: sc.ImmutableCallOnChainResults = new sc.ImmutableCallOnChainResults(); } export class CallOnChainContext { - params: sc.ImmutableCallOnChainParams = new sc.ImmutableCallOnChainParams(); - results: sc.MutableCallOnChainResults = new sc.MutableCallOnChainResults(); - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + params: sc.ImmutableCallOnChainParams = new sc.ImmutableCallOnChainParams(); + results: sc.MutableCallOnChainResults = new sc.MutableCallOnChainResults(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class CheckContextFromFullEPCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncCheckContextFromFullEP); - params: sc.MutableCheckContextFromFullEPParams = new sc.MutableCheckContextFromFullEPParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncCheckContextFromFullEP); + params: sc.MutableCheckContextFromFullEPParams = new sc.MutableCheckContextFromFullEPParams(); } export class CheckContextFromFullEPContext { - params: sc.ImmutableCheckContextFromFullEPParams = new sc.ImmutableCheckContextFromFullEPParams(); - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + params: sc.ImmutableCheckContextFromFullEPParams = new sc.ImmutableCheckContextFromFullEPParams(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class DoNothingCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncDoNothing); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncDoNothing); } export class DoNothingContext { - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class GetMintedSupplyCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncGetMintedSupply); - results: sc.ImmutableGetMintedSupplyResults = new sc.ImmutableGetMintedSupplyResults(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncGetMintedSupply); + results: sc.ImmutableGetMintedSupplyResults = new sc.ImmutableGetMintedSupplyResults(); } export class GetMintedSupplyContext { - results: sc.MutableGetMintedSupplyResults = new sc.MutableGetMintedSupplyResults(); - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + results: sc.MutableGetMintedSupplyResults = new sc.MutableGetMintedSupplyResults(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class IncCounterCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncIncCounter); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncIncCounter); } export class IncCounterContext { - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class InitCall { - func: wasmlib.ScInitFunc = new wasmlib.ScInitFunc(sc.HScName, sc.HFuncInit); - params: sc.MutableInitParams = new sc.MutableInitParams(); + func: wasmlib.ScInitFunc = new wasmlib.ScInitFunc(sc.HScName, sc.HFuncInit); + params: sc.MutableInitParams = new sc.MutableInitParams(); } export class InitContext { - params: sc.ImmutableInitParams = new sc.ImmutableInitParams(); - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + params: sc.ImmutableInitParams = new sc.ImmutableInitParams(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class PassTypesFullCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncPassTypesFull); - params: sc.MutablePassTypesFullParams = new sc.MutablePassTypesFullParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncPassTypesFull); + params: sc.MutablePassTypesFullParams = new sc.MutablePassTypesFullParams(); } export class PassTypesFullContext { - params: sc.ImmutablePassTypesFullParams = new sc.ImmutablePassTypesFullParams(); - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + params: sc.ImmutablePassTypesFullParams = new sc.ImmutablePassTypesFullParams(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class RunRecursionCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncRunRecursion); - params: sc.MutableRunRecursionParams = new sc.MutableRunRecursionParams(); - results: sc.ImmutableRunRecursionResults = new sc.ImmutableRunRecursionResults(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncRunRecursion); + params: sc.MutableRunRecursionParams = new sc.MutableRunRecursionParams(); + results: sc.ImmutableRunRecursionResults = new sc.ImmutableRunRecursionResults(); } export class RunRecursionContext { - params: sc.ImmutableRunRecursionParams = new sc.ImmutableRunRecursionParams(); - results: sc.MutableRunRecursionResults = new sc.MutableRunRecursionResults(); - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + params: sc.ImmutableRunRecursionParams = new sc.ImmutableRunRecursionParams(); + results: sc.MutableRunRecursionResults = new sc.MutableRunRecursionResults(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class SendToAddressCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncSendToAddress); - params: sc.MutableSendToAddressParams = new sc.MutableSendToAddressParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncSendToAddress); + params: sc.MutableSendToAddressParams = new sc.MutableSendToAddressParams(); } export class SendToAddressContext { - params: sc.ImmutableSendToAddressParams = new sc.ImmutableSendToAddressParams(); - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + params: sc.ImmutableSendToAddressParams = new sc.ImmutableSendToAddressParams(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class SetIntCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncSetInt); - params: sc.MutableSetIntParams = new sc.MutableSetIntParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncSetInt); + params: sc.MutableSetIntParams = new sc.MutableSetIntParams(); } export class SetIntContext { - params: sc.ImmutableSetIntParams = new sc.ImmutableSetIntParams(); - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + params: sc.ImmutableSetIntParams = new sc.ImmutableSetIntParams(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class SpawnCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncSpawn); - params: sc.MutableSpawnParams = new sc.MutableSpawnParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncSpawn); + params: sc.MutableSpawnParams = new sc.MutableSpawnParams(); } export class SpawnContext { - params: sc.ImmutableSpawnParams = new sc.ImmutableSpawnParams(); - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + params: sc.ImmutableSpawnParams = new sc.ImmutableSpawnParams(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class TestBlockContext1Call { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTestBlockContext1); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTestBlockContext1); } export class TestBlockContext1Context { - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class TestBlockContext2Call { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTestBlockContext2); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTestBlockContext2); } export class TestBlockContext2Context { - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class TestCallPanicFullEPCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTestCallPanicFullEP); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTestCallPanicFullEP); } export class TestCallPanicFullEPContext { - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class TestCallPanicViewEPFromFullCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTestCallPanicViewEPFromFull); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTestCallPanicViewEPFromFull); } export class TestCallPanicViewEPFromFullContext { - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class TestChainOwnerIDFullCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTestChainOwnerIDFull); - results: sc.ImmutableTestChainOwnerIDFullResults = new sc.ImmutableTestChainOwnerIDFullResults(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTestChainOwnerIDFull); + results: sc.ImmutableTestChainOwnerIDFullResults = new sc.ImmutableTestChainOwnerIDFullResults(); } export class TestChainOwnerIDFullContext { - results: sc.MutableTestChainOwnerIDFullResults = new sc.MutableTestChainOwnerIDFullResults(); - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + results: sc.MutableTestChainOwnerIDFullResults = new sc.MutableTestChainOwnerIDFullResults(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class TestEventLogDeployCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTestEventLogDeploy); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTestEventLogDeploy); } export class TestEventLogDeployContext { - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class TestEventLogEventDataCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTestEventLogEventData); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTestEventLogEventData); } export class TestEventLogEventDataContext { - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class TestEventLogGenericDataCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTestEventLogGenericData); - params: sc.MutableTestEventLogGenericDataParams = new sc.MutableTestEventLogGenericDataParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTestEventLogGenericData); + params: sc.MutableTestEventLogGenericDataParams = new sc.MutableTestEventLogGenericDataParams(); } export class TestEventLogGenericDataContext { - params: sc.ImmutableTestEventLogGenericDataParams = new sc.ImmutableTestEventLogGenericDataParams(); - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + params: sc.ImmutableTestEventLogGenericDataParams = new sc.ImmutableTestEventLogGenericDataParams(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class TestPanicFullEPCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTestPanicFullEP); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTestPanicFullEP); } export class TestPanicFullEPContext { - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class WithdrawToChainCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncWithdrawToChain); - params: sc.MutableWithdrawToChainParams = new sc.MutableWithdrawToChainParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncWithdrawToChain); + params: sc.MutableWithdrawToChainParams = new sc.MutableWithdrawToChainParams(); } export class WithdrawToChainContext { - params: sc.ImmutableWithdrawToChainParams = new sc.ImmutableWithdrawToChainParams(); - state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); + params: sc.ImmutableWithdrawToChainParams = new sc.ImmutableWithdrawToChainParams(); + state: sc.MutableTestCoreState = new sc.MutableTestCoreState(); } export class CheckContextFromViewEPCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewCheckContextFromViewEP); - params: sc.MutableCheckContextFromViewEPParams = new sc.MutableCheckContextFromViewEPParams(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewCheckContextFromViewEP); + params: sc.MutableCheckContextFromViewEPParams = new sc.MutableCheckContextFromViewEPParams(); } export class CheckContextFromViewEPContext { - params: sc.ImmutableCheckContextFromViewEPParams = new sc.ImmutableCheckContextFromViewEPParams(); - state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); + params: sc.ImmutableCheckContextFromViewEPParams = new sc.ImmutableCheckContextFromViewEPParams(); + state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); } export class FibonacciCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewFibonacci); - params: sc.MutableFibonacciParams = new sc.MutableFibonacciParams(); - results: sc.ImmutableFibonacciResults = new sc.ImmutableFibonacciResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewFibonacci); + params: sc.MutableFibonacciParams = new sc.MutableFibonacciParams(); + results: sc.ImmutableFibonacciResults = new sc.ImmutableFibonacciResults(); } export class FibonacciContext { - params: sc.ImmutableFibonacciParams = new sc.ImmutableFibonacciParams(); - results: sc.MutableFibonacciResults = new sc.MutableFibonacciResults(); - state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); + params: sc.ImmutableFibonacciParams = new sc.ImmutableFibonacciParams(); + results: sc.MutableFibonacciResults = new sc.MutableFibonacciResults(); + state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); } export class GetCounterCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetCounter); - results: sc.ImmutableGetCounterResults = new sc.ImmutableGetCounterResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetCounter); + results: sc.ImmutableGetCounterResults = new sc.ImmutableGetCounterResults(); } export class GetCounterContext { - results: sc.MutableGetCounterResults = new sc.MutableGetCounterResults(); - state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); + results: sc.MutableGetCounterResults = new sc.MutableGetCounterResults(); + state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); } export class GetIntCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetInt); - params: sc.MutableGetIntParams = new sc.MutableGetIntParams(); - results: sc.ImmutableGetIntResults = new sc.ImmutableGetIntResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetInt); + params: sc.MutableGetIntParams = new sc.MutableGetIntParams(); + results: sc.ImmutableGetIntResults = new sc.ImmutableGetIntResults(); } export class GetIntContext { - params: sc.ImmutableGetIntParams = new sc.ImmutableGetIntParams(); - results: sc.MutableGetIntResults = new sc.MutableGetIntResults(); - state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); + params: sc.ImmutableGetIntParams = new sc.ImmutableGetIntParams(); + results: sc.MutableGetIntResults = new sc.MutableGetIntResults(); + state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); } export class GetStringValueCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetStringValue); - params: sc.MutableGetStringValueParams = new sc.MutableGetStringValueParams(); - results: sc.ImmutableGetStringValueResults = new sc.ImmutableGetStringValueResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetStringValue); + params: sc.MutableGetStringValueParams = new sc.MutableGetStringValueParams(); + results: sc.ImmutableGetStringValueResults = new sc.ImmutableGetStringValueResults(); } export class GetStringValueContext { - params: sc.ImmutableGetStringValueParams = new sc.ImmutableGetStringValueParams(); - results: sc.MutableGetStringValueResults = new sc.MutableGetStringValueResults(); - state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); + params: sc.ImmutableGetStringValueParams = new sc.ImmutableGetStringValueParams(); + results: sc.MutableGetStringValueResults = new sc.MutableGetStringValueResults(); + state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); } export class JustViewCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewJustView); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewJustView); } export class JustViewContext { - state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); + state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); } export class PassTypesViewCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewPassTypesView); - params: sc.MutablePassTypesViewParams = new sc.MutablePassTypesViewParams(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewPassTypesView); + params: sc.MutablePassTypesViewParams = new sc.MutablePassTypesViewParams(); } export class PassTypesViewContext { - params: sc.ImmutablePassTypesViewParams = new sc.ImmutablePassTypesViewParams(); - state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); + params: sc.ImmutablePassTypesViewParams = new sc.ImmutablePassTypesViewParams(); + state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); } export class TestCallPanicViewEPFromViewCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewTestCallPanicViewEPFromView); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewTestCallPanicViewEPFromView); } export class TestCallPanicViewEPFromViewContext { - state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); + state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); } export class TestChainOwnerIDViewCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewTestChainOwnerIDView); - results: sc.ImmutableTestChainOwnerIDViewResults = new sc.ImmutableTestChainOwnerIDViewResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewTestChainOwnerIDView); + results: sc.ImmutableTestChainOwnerIDViewResults = new sc.ImmutableTestChainOwnerIDViewResults(); } export class TestChainOwnerIDViewContext { - results: sc.MutableTestChainOwnerIDViewResults = new sc.MutableTestChainOwnerIDViewResults(); - state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); + results: sc.MutableTestChainOwnerIDViewResults = new sc.MutableTestChainOwnerIDViewResults(); + state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); } export class TestPanicViewEPCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewTestPanicViewEP); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewTestPanicViewEP); } export class TestPanicViewEPContext { - state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); + state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); } export class TestSandboxCallCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewTestSandboxCall); - results: sc.ImmutableTestSandboxCallResults = new sc.ImmutableTestSandboxCallResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewTestSandboxCall); + results: sc.ImmutableTestSandboxCallResults = new sc.ImmutableTestSandboxCallResults(); } export class TestSandboxCallContext { - results: sc.MutableTestSandboxCallResults = new sc.MutableTestSandboxCallResults(); - state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); + results: sc.MutableTestSandboxCallResults = new sc.MutableTestSandboxCallResults(); + state: sc.ImmutableTestCoreState = new sc.ImmutableTestCoreState(); } export class ScFuncs { @@ -329,8 +329,7 @@ export class ScFuncs { } static doNothing(ctx: wasmlib.ScFuncCallContext): DoNothingCall { - let f = new DoNothingCall(); - return f; + return new DoNothingCall(); } static getMintedSupply(ctx: wasmlib.ScFuncCallContext): GetMintedSupplyCall { @@ -340,8 +339,7 @@ export class ScFuncs { } static incCounter(ctx: wasmlib.ScFuncCallContext): IncCounterCall { - let f = new IncCounterCall(); - return f; + return new IncCounterCall(); } static init(ctx: wasmlib.ScFuncCallContext): InitCall { @@ -381,23 +379,19 @@ export class ScFuncs { } static testBlockContext1(ctx: wasmlib.ScFuncCallContext): TestBlockContext1Call { - let f = new TestBlockContext1Call(); - return f; + return new TestBlockContext1Call(); } static testBlockContext2(ctx: wasmlib.ScFuncCallContext): TestBlockContext2Call { - let f = new TestBlockContext2Call(); - return f; + return new TestBlockContext2Call(); } static testCallPanicFullEP(ctx: wasmlib.ScFuncCallContext): TestCallPanicFullEPCall { - let f = new TestCallPanicFullEPCall(); - return f; + return new TestCallPanicFullEPCall(); } static testCallPanicViewEPFromFull(ctx: wasmlib.ScFuncCallContext): TestCallPanicViewEPFromFullCall { - let f = new TestCallPanicViewEPFromFullCall(); - return f; + return new TestCallPanicViewEPFromFullCall(); } static testChainOwnerIDFull(ctx: wasmlib.ScFuncCallContext): TestChainOwnerIDFullCall { @@ -407,13 +401,11 @@ export class ScFuncs { } static testEventLogDeploy(ctx: wasmlib.ScFuncCallContext): TestEventLogDeployCall { - let f = new TestEventLogDeployCall(); - return f; + return new TestEventLogDeployCall(); } static testEventLogEventData(ctx: wasmlib.ScFuncCallContext): TestEventLogEventDataCall { - let f = new TestEventLogEventDataCall(); - return f; + return new TestEventLogEventDataCall(); } static testEventLogGenericData(ctx: wasmlib.ScFuncCallContext): TestEventLogGenericDataCall { @@ -423,8 +415,7 @@ export class ScFuncs { } static testPanicFullEP(ctx: wasmlib.ScFuncCallContext): TestPanicFullEPCall { - let f = new TestPanicFullEPCall(); - return f; + return new TestPanicFullEPCall(); } static withdrawToChain(ctx: wasmlib.ScFuncCallContext): WithdrawToChainCall { @@ -464,8 +455,7 @@ export class ScFuncs { } static justView(ctx: wasmlib.ScViewCallContext): JustViewCall { - let f = new JustViewCall(); - return f; + return new JustViewCall(); } static passTypesView(ctx: wasmlib.ScViewCallContext): PassTypesViewCall { @@ -475,8 +465,7 @@ export class ScFuncs { } static testCallPanicViewEPFromView(ctx: wasmlib.ScViewCallContext): TestCallPanicViewEPFromViewCall { - let f = new TestCallPanicViewEPFromViewCall(); - return f; + return new TestCallPanicViewEPFromViewCall(); } static testChainOwnerIDView(ctx: wasmlib.ScViewCallContext): TestChainOwnerIDViewCall { @@ -486,8 +475,7 @@ export class ScFuncs { } static testPanicViewEP(ctx: wasmlib.ScViewCallContext): TestPanicViewEPCall { - let f = new TestPanicViewEPCall(); - return f; + return new TestPanicViewEPCall(); } static testSandboxCall(ctx: wasmlib.ScViewCallContext): TestSandboxCallCall { diff --git a/contracts/wasm/testcore/ts/testcore/keys.ts b/contracts/wasm/testcore/ts/testcore/keys.ts index cee489bf53..421e1546cd 100644 --- a/contracts/wasm/testcore/ts/testcore/keys.ts +++ b/contracts/wasm/testcore/ts/testcore/keys.ts @@ -5,77 +5,81 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; -export const IdxParamAddress = 0; -export const IdxParamAgentID = 1; -export const IdxParamCaller = 2; -export const IdxParamChainID = 3; -export const IdxParamChainOwnerID = 4; +export const IdxParamAddress = 0; +export const IdxParamAgentID = 1; +export const IdxParamCaller = 2; +export const IdxParamChainID = 3; +export const IdxParamChainOwnerID = 4; export const IdxParamContractCreator = 5; -export const IdxParamContractID = 6; -export const IdxParamCounter = 7; -export const IdxParamFail = 8; -export const IdxParamHash = 9; -export const IdxParamHname = 10; -export const IdxParamHnameContract = 11; -export const IdxParamHnameEP = 12; -export const IdxParamHnameZero = 13; -export const IdxParamInt64 = 14; -export const IdxParamInt64Zero = 15; -export const IdxParamIntValue = 16; -export const IdxParamName = 17; -export const IdxParamProgHash = 18; -export const IdxParamString = 19; -export const IdxParamStringZero = 20; -export const IdxParamVarName = 21; -export const IdxResultChainOwnerID = 22; -export const IdxResultCounter = 23; -export const IdxResultIntValue = 24; -export const IdxResultMintedColor = 25; -export const IdxResultMintedSupply = 26; -export const IdxResultSandboxCall = 27; -export const IdxStateCounter = 28; -export const IdxStateHnameEP = 29; -export const IdxStateInts = 30; -export const IdxStateMintedColor = 31; -export const IdxStateMintedSupply = 32; +export const IdxParamContractID = 6; +export const IdxParamCounter = 7; +export const IdxParamFail = 8; +export const IdxParamHash = 9; +export const IdxParamHname = 10; +export const IdxParamHnameContract = 11; +export const IdxParamHnameEP = 12; +export const IdxParamHnameZero = 13; +export const IdxParamInt64 = 14; +export const IdxParamInt64Zero = 15; +export const IdxParamIntValue = 16; +export const IdxParamName = 17; +export const IdxParamProgHash = 18; +export const IdxParamString = 19; +export const IdxParamStringZero = 20; +export const IdxParamVarName = 21; +export const IdxResultChainOwnerID = 22; +export const IdxResultCounter = 23; +export const IdxResultIntValue = 24; +export const IdxResultMintedColor = 25; +export const IdxResultMintedSupply = 26; +export const IdxResultSandboxCall = 27; +export const IdxResultValues = 28; +export const IdxResultVars = 29; +export const IdxStateCounter = 30; +export const IdxStateHnameEP = 31; +export const IdxStateInts = 32; +export const IdxStateMintedColor = 33; +export const IdxStateMintedSupply = 34; export let keyMap: string[] = [ - sc.ParamAddress, - sc.ParamAgentID, - sc.ParamCaller, - sc.ParamChainID, - sc.ParamChainOwnerID, - sc.ParamContractCreator, - sc.ParamContractID, - sc.ParamCounter, - sc.ParamFail, - sc.ParamHash, - sc.ParamHname, - sc.ParamHnameContract, - sc.ParamHnameEP, - sc.ParamHnameZero, - sc.ParamInt64, - sc.ParamInt64Zero, - sc.ParamIntValue, - sc.ParamName, - sc.ParamProgHash, - sc.ParamString, - sc.ParamStringZero, - sc.ParamVarName, - sc.ResultChainOwnerID, - sc.ResultCounter, - sc.ResultIntValue, - sc.ResultMintedColor, - sc.ResultMintedSupply, - sc.ResultSandboxCall, - sc.StateCounter, - sc.StateHnameEP, - sc.StateInts, - sc.StateMintedColor, - sc.StateMintedSupply, + sc.ParamAddress, + sc.ParamAgentID, + sc.ParamCaller, + sc.ParamChainID, + sc.ParamChainOwnerID, + sc.ParamContractCreator, + sc.ParamContractID, + sc.ParamCounter, + sc.ParamFail, + sc.ParamHash, + sc.ParamHname, + sc.ParamHnameContract, + sc.ParamHnameEP, + sc.ParamHnameZero, + sc.ParamInt64, + sc.ParamInt64Zero, + sc.ParamIntValue, + sc.ParamName, + sc.ParamProgHash, + sc.ParamString, + sc.ParamStringZero, + sc.ParamVarName, + sc.ResultChainOwnerID, + sc.ResultCounter, + sc.ResultIntValue, + sc.ResultMintedColor, + sc.ResultMintedSupply, + sc.ResultSandboxCall, + sc.ResultValues, + sc.ResultVars, + sc.StateCounter, + sc.StateHnameEP, + sc.StateInts, + sc.StateMintedColor, + sc.StateMintedSupply, ]; export let idxMap: wasmlib.Key32[] = new Array(keyMap.length); diff --git a/contracts/wasm/testcore/ts/testcore/lib.ts b/contracts/wasm/testcore/ts/testcore/lib.ts index 468c8b992f..9e8b213587 100644 --- a/contracts/wasm/testcore/ts/testcore/lib.ts +++ b/contracts/wasm/testcore/ts/testcore/lib.ts @@ -5,7 +5,7 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export function on_call(index: i32): void { @@ -53,326 +53,326 @@ export function on_load(): void { } function funcCallOnChainThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcCallOnChain"); - let f = new sc.CallOnChainContext(); + ctx.log("testcore.funcCallOnChain"); + let f = new sc.CallOnChainContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.intValue().exists(), "missing mandatory intValue") - sc.funcCallOnChain(ctx, f); - ctx.log("testcore.funcCallOnChain ok"); + ctx.require(f.params.intValue().exists(), "missing mandatory intValue"); + sc.funcCallOnChain(ctx, f); + ctx.log("testcore.funcCallOnChain ok"); } function funcCheckContextFromFullEPThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcCheckContextFromFullEP"); - let f = new sc.CheckContextFromFullEPContext(); + ctx.log("testcore.funcCheckContextFromFullEP"); + let f = new sc.CheckContextFromFullEPContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.agentID().exists(), "missing mandatory agentID") - ctx.require(f.params.caller().exists(), "missing mandatory caller") - ctx.require(f.params.chainID().exists(), "missing mandatory chainID") - ctx.require(f.params.chainOwnerID().exists(), "missing mandatory chainOwnerID") - ctx.require(f.params.contractCreator().exists(), "missing mandatory contractCreator") - sc.funcCheckContextFromFullEP(ctx, f); - ctx.log("testcore.funcCheckContextFromFullEP ok"); + ctx.require(f.params.agentID().exists(), "missing mandatory agentID"); + ctx.require(f.params.caller().exists(), "missing mandatory caller"); + ctx.require(f.params.chainID().exists(), "missing mandatory chainID"); + ctx.require(f.params.chainOwnerID().exists(), "missing mandatory chainOwnerID"); + ctx.require(f.params.contractCreator().exists(), "missing mandatory contractCreator"); + sc.funcCheckContextFromFullEP(ctx, f); + ctx.log("testcore.funcCheckContextFromFullEP ok"); } function funcDoNothingThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcDoNothing"); - let f = new sc.DoNothingContext(); + ctx.log("testcore.funcDoNothing"); + let f = new sc.DoNothingContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcDoNothing(ctx, f); - ctx.log("testcore.funcDoNothing ok"); + sc.funcDoNothing(ctx, f); + ctx.log("testcore.funcDoNothing ok"); } function funcGetMintedSupplyThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcGetMintedSupply"); - let f = new sc.GetMintedSupplyContext(); + ctx.log("testcore.funcGetMintedSupply"); + let f = new sc.GetMintedSupplyContext(); f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcGetMintedSupply(ctx, f); - ctx.log("testcore.funcGetMintedSupply ok"); + sc.funcGetMintedSupply(ctx, f); + ctx.log("testcore.funcGetMintedSupply ok"); } function funcIncCounterThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcIncCounter"); - let f = new sc.IncCounterContext(); + ctx.log("testcore.funcIncCounter"); + let f = new sc.IncCounterContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcIncCounter(ctx, f); - ctx.log("testcore.funcIncCounter ok"); + sc.funcIncCounter(ctx, f); + ctx.log("testcore.funcIncCounter ok"); } function funcInitThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcInit"); - let f = new sc.InitContext(); + ctx.log("testcore.funcInit"); + let f = new sc.InitContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcInit(ctx, f); - ctx.log("testcore.funcInit ok"); + sc.funcInit(ctx, f); + ctx.log("testcore.funcInit ok"); } function funcPassTypesFullThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcPassTypesFull"); - let f = new sc.PassTypesFullContext(); + ctx.log("testcore.funcPassTypesFull"); + let f = new sc.PassTypesFullContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.address().exists(), "missing mandatory address") - ctx.require(f.params.agentID().exists(), "missing mandatory agentID") - ctx.require(f.params.chainID().exists(), "missing mandatory chainID") - ctx.require(f.params.contractID().exists(), "missing mandatory contractID") - ctx.require(f.params.hash().exists(), "missing mandatory hash") - ctx.require(f.params.hname().exists(), "missing mandatory hname") - ctx.require(f.params.hnameZero().exists(), "missing mandatory hnameZero") - ctx.require(f.params.int64().exists(), "missing mandatory int64") - ctx.require(f.params.int64Zero().exists(), "missing mandatory int64Zero") - ctx.require(f.params.string().exists(), "missing mandatory string") - ctx.require(f.params.stringZero().exists(), "missing mandatory stringZero") - sc.funcPassTypesFull(ctx, f); - ctx.log("testcore.funcPassTypesFull ok"); + ctx.require(f.params.address().exists(), "missing mandatory address"); + ctx.require(f.params.agentID().exists(), "missing mandatory agentID"); + ctx.require(f.params.chainID().exists(), "missing mandatory chainID"); + ctx.require(f.params.contractID().exists(), "missing mandatory contractID"); + ctx.require(f.params.hash().exists(), "missing mandatory hash"); + ctx.require(f.params.hname().exists(), "missing mandatory hname"); + ctx.require(f.params.hnameZero().exists(), "missing mandatory hnameZero"); + ctx.require(f.params.int64().exists(), "missing mandatory int64"); + ctx.require(f.params.int64Zero().exists(), "missing mandatory int64Zero"); + ctx.require(f.params.string().exists(), "missing mandatory string"); + ctx.require(f.params.stringZero().exists(), "missing mandatory stringZero"); + sc.funcPassTypesFull(ctx, f); + ctx.log("testcore.funcPassTypesFull ok"); } function funcRunRecursionThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcRunRecursion"); - let f = new sc.RunRecursionContext(); + ctx.log("testcore.funcRunRecursion"); + let f = new sc.RunRecursionContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.intValue().exists(), "missing mandatory intValue") - sc.funcRunRecursion(ctx, f); - ctx.log("testcore.funcRunRecursion ok"); + ctx.require(f.params.intValue().exists(), "missing mandatory intValue"); + sc.funcRunRecursion(ctx, f); + ctx.log("testcore.funcRunRecursion ok"); } function funcSendToAddressThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcSendToAddress"); - ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); + ctx.log("testcore.funcSendToAddress"); + ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); - let f = new sc.SendToAddressContext(); + let f = new sc.SendToAddressContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.address().exists(), "missing mandatory address") - sc.funcSendToAddress(ctx, f); - ctx.log("testcore.funcSendToAddress ok"); + ctx.require(f.params.address().exists(), "missing mandatory address"); + sc.funcSendToAddress(ctx, f); + ctx.log("testcore.funcSendToAddress ok"); } function funcSetIntThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcSetInt"); - let f = new sc.SetIntContext(); + ctx.log("testcore.funcSetInt"); + let f = new sc.SetIntContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.intValue().exists(), "missing mandatory intValue") - ctx.require(f.params.name().exists(), "missing mandatory name") - sc.funcSetInt(ctx, f); - ctx.log("testcore.funcSetInt ok"); + ctx.require(f.params.intValue().exists(), "missing mandatory intValue"); + ctx.require(f.params.name().exists(), "missing mandatory name"); + sc.funcSetInt(ctx, f); + ctx.log("testcore.funcSetInt ok"); } function funcSpawnThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcSpawn"); - let f = new sc.SpawnContext(); + ctx.log("testcore.funcSpawn"); + let f = new sc.SpawnContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.progHash().exists(), "missing mandatory progHash") - sc.funcSpawn(ctx, f); - ctx.log("testcore.funcSpawn ok"); + ctx.require(f.params.progHash().exists(), "missing mandatory progHash"); + sc.funcSpawn(ctx, f); + ctx.log("testcore.funcSpawn ok"); } function funcTestBlockContext1Thunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcTestBlockContext1"); - let f = new sc.TestBlockContext1Context(); + ctx.log("testcore.funcTestBlockContext1"); + let f = new sc.TestBlockContext1Context(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcTestBlockContext1(ctx, f); - ctx.log("testcore.funcTestBlockContext1 ok"); + sc.funcTestBlockContext1(ctx, f); + ctx.log("testcore.funcTestBlockContext1 ok"); } function funcTestBlockContext2Thunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcTestBlockContext2"); - let f = new sc.TestBlockContext2Context(); + ctx.log("testcore.funcTestBlockContext2"); + let f = new sc.TestBlockContext2Context(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcTestBlockContext2(ctx, f); - ctx.log("testcore.funcTestBlockContext2 ok"); + sc.funcTestBlockContext2(ctx, f); + ctx.log("testcore.funcTestBlockContext2 ok"); } function funcTestCallPanicFullEPThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcTestCallPanicFullEP"); - let f = new sc.TestCallPanicFullEPContext(); + ctx.log("testcore.funcTestCallPanicFullEP"); + let f = new sc.TestCallPanicFullEPContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcTestCallPanicFullEP(ctx, f); - ctx.log("testcore.funcTestCallPanicFullEP ok"); + sc.funcTestCallPanicFullEP(ctx, f); + ctx.log("testcore.funcTestCallPanicFullEP ok"); } function funcTestCallPanicViewEPFromFullThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcTestCallPanicViewEPFromFull"); - let f = new sc.TestCallPanicViewEPFromFullContext(); + ctx.log("testcore.funcTestCallPanicViewEPFromFull"); + let f = new sc.TestCallPanicViewEPFromFullContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcTestCallPanicViewEPFromFull(ctx, f); - ctx.log("testcore.funcTestCallPanicViewEPFromFull ok"); + sc.funcTestCallPanicViewEPFromFull(ctx, f); + ctx.log("testcore.funcTestCallPanicViewEPFromFull ok"); } function funcTestChainOwnerIDFullThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcTestChainOwnerIDFull"); - let f = new sc.TestChainOwnerIDFullContext(); + ctx.log("testcore.funcTestChainOwnerIDFull"); + let f = new sc.TestChainOwnerIDFullContext(); f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcTestChainOwnerIDFull(ctx, f); - ctx.log("testcore.funcTestChainOwnerIDFull ok"); + sc.funcTestChainOwnerIDFull(ctx, f); + ctx.log("testcore.funcTestChainOwnerIDFull ok"); } function funcTestEventLogDeployThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcTestEventLogDeploy"); - let f = new sc.TestEventLogDeployContext(); + ctx.log("testcore.funcTestEventLogDeploy"); + let f = new sc.TestEventLogDeployContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcTestEventLogDeploy(ctx, f); - ctx.log("testcore.funcTestEventLogDeploy ok"); + sc.funcTestEventLogDeploy(ctx, f); + ctx.log("testcore.funcTestEventLogDeploy ok"); } function funcTestEventLogEventDataThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcTestEventLogEventData"); - let f = new sc.TestEventLogEventDataContext(); + ctx.log("testcore.funcTestEventLogEventData"); + let f = new sc.TestEventLogEventDataContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcTestEventLogEventData(ctx, f); - ctx.log("testcore.funcTestEventLogEventData ok"); + sc.funcTestEventLogEventData(ctx, f); + ctx.log("testcore.funcTestEventLogEventData ok"); } function funcTestEventLogGenericDataThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcTestEventLogGenericData"); - let f = new sc.TestEventLogGenericDataContext(); + ctx.log("testcore.funcTestEventLogGenericData"); + let f = new sc.TestEventLogGenericDataContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.counter().exists(), "missing mandatory counter") - sc.funcTestEventLogGenericData(ctx, f); - ctx.log("testcore.funcTestEventLogGenericData ok"); + ctx.require(f.params.counter().exists(), "missing mandatory counter"); + sc.funcTestEventLogGenericData(ctx, f); + ctx.log("testcore.funcTestEventLogGenericData ok"); } function funcTestPanicFullEPThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcTestPanicFullEP"); - let f = new sc.TestPanicFullEPContext(); + ctx.log("testcore.funcTestPanicFullEP"); + let f = new sc.TestPanicFullEPContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcTestPanicFullEP(ctx, f); - ctx.log("testcore.funcTestPanicFullEP ok"); + sc.funcTestPanicFullEP(ctx, f); + ctx.log("testcore.funcTestPanicFullEP ok"); } function funcWithdrawToChainThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testcore.funcWithdrawToChain"); - let f = new sc.WithdrawToChainContext(); + ctx.log("testcore.funcWithdrawToChain"); + let f = new sc.WithdrawToChainContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.chainID().exists(), "missing mandatory chainID") - sc.funcWithdrawToChain(ctx, f); - ctx.log("testcore.funcWithdrawToChain ok"); + ctx.require(f.params.chainID().exists(), "missing mandatory chainID"); + sc.funcWithdrawToChain(ctx, f); + ctx.log("testcore.funcWithdrawToChain ok"); } function viewCheckContextFromViewEPThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("testcore.viewCheckContextFromViewEP"); - let f = new sc.CheckContextFromViewEPContext(); + ctx.log("testcore.viewCheckContextFromViewEP"); + let f = new sc.CheckContextFromViewEPContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.agentID().exists(), "missing mandatory agentID") - ctx.require(f.params.chainID().exists(), "missing mandatory chainID") - ctx.require(f.params.chainOwnerID().exists(), "missing mandatory chainOwnerID") - ctx.require(f.params.contractCreator().exists(), "missing mandatory contractCreator") - sc.viewCheckContextFromViewEP(ctx, f); - ctx.log("testcore.viewCheckContextFromViewEP ok"); + ctx.require(f.params.agentID().exists(), "missing mandatory agentID"); + ctx.require(f.params.chainID().exists(), "missing mandatory chainID"); + ctx.require(f.params.chainOwnerID().exists(), "missing mandatory chainOwnerID"); + ctx.require(f.params.contractCreator().exists(), "missing mandatory contractCreator"); + sc.viewCheckContextFromViewEP(ctx, f); + ctx.log("testcore.viewCheckContextFromViewEP ok"); } function viewFibonacciThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("testcore.viewFibonacci"); - let f = new sc.FibonacciContext(); + ctx.log("testcore.viewFibonacci"); + let f = new sc.FibonacciContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.intValue().exists(), "missing mandatory intValue") - sc.viewFibonacci(ctx, f); - ctx.log("testcore.viewFibonacci ok"); + ctx.require(f.params.intValue().exists(), "missing mandatory intValue"); + sc.viewFibonacci(ctx, f); + ctx.log("testcore.viewFibonacci ok"); } function viewGetCounterThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("testcore.viewGetCounter"); - let f = new sc.GetCounterContext(); + ctx.log("testcore.viewGetCounter"); + let f = new sc.GetCounterContext(); f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.viewGetCounter(ctx, f); - ctx.log("testcore.viewGetCounter ok"); + sc.viewGetCounter(ctx, f); + ctx.log("testcore.viewGetCounter ok"); } function viewGetIntThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("testcore.viewGetInt"); - let f = new sc.GetIntContext(); + ctx.log("testcore.viewGetInt"); + let f = new sc.GetIntContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.name().exists(), "missing mandatory name") - sc.viewGetInt(ctx, f); - ctx.log("testcore.viewGetInt ok"); + ctx.require(f.params.name().exists(), "missing mandatory name"); + sc.viewGetInt(ctx, f); + ctx.log("testcore.viewGetInt ok"); } function viewGetStringValueThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("testcore.viewGetStringValue"); - let f = new sc.GetStringValueContext(); + ctx.log("testcore.viewGetStringValue"); + let f = new sc.GetStringValueContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.varName().exists(), "missing mandatory varName") - sc.viewGetStringValue(ctx, f); - ctx.log("testcore.viewGetStringValue ok"); + ctx.require(f.params.varName().exists(), "missing mandatory varName"); + sc.viewGetStringValue(ctx, f); + ctx.log("testcore.viewGetStringValue ok"); } function viewJustViewThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("testcore.viewJustView"); - let f = new sc.JustViewContext(); + ctx.log("testcore.viewJustView"); + let f = new sc.JustViewContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.viewJustView(ctx, f); - ctx.log("testcore.viewJustView ok"); + sc.viewJustView(ctx, f); + ctx.log("testcore.viewJustView ok"); } function viewPassTypesViewThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("testcore.viewPassTypesView"); - let f = new sc.PassTypesViewContext(); + ctx.log("testcore.viewPassTypesView"); + let f = new sc.PassTypesViewContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.address().exists(), "missing mandatory address") - ctx.require(f.params.agentID().exists(), "missing mandatory agentID") - ctx.require(f.params.chainID().exists(), "missing mandatory chainID") - ctx.require(f.params.contractID().exists(), "missing mandatory contractID") - ctx.require(f.params.hash().exists(), "missing mandatory hash") - ctx.require(f.params.hname().exists(), "missing mandatory hname") - ctx.require(f.params.hnameZero().exists(), "missing mandatory hnameZero") - ctx.require(f.params.int64().exists(), "missing mandatory int64") - ctx.require(f.params.int64Zero().exists(), "missing mandatory int64Zero") - ctx.require(f.params.string().exists(), "missing mandatory string") - ctx.require(f.params.stringZero().exists(), "missing mandatory stringZero") - sc.viewPassTypesView(ctx, f); - ctx.log("testcore.viewPassTypesView ok"); + ctx.require(f.params.address().exists(), "missing mandatory address"); + ctx.require(f.params.agentID().exists(), "missing mandatory agentID"); + ctx.require(f.params.chainID().exists(), "missing mandatory chainID"); + ctx.require(f.params.contractID().exists(), "missing mandatory contractID"); + ctx.require(f.params.hash().exists(), "missing mandatory hash"); + ctx.require(f.params.hname().exists(), "missing mandatory hname"); + ctx.require(f.params.hnameZero().exists(), "missing mandatory hnameZero"); + ctx.require(f.params.int64().exists(), "missing mandatory int64"); + ctx.require(f.params.int64Zero().exists(), "missing mandatory int64Zero"); + ctx.require(f.params.string().exists(), "missing mandatory string"); + ctx.require(f.params.stringZero().exists(), "missing mandatory stringZero"); + sc.viewPassTypesView(ctx, f); + ctx.log("testcore.viewPassTypesView ok"); } function viewTestCallPanicViewEPFromViewThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("testcore.viewTestCallPanicViewEPFromView"); - let f = new sc.TestCallPanicViewEPFromViewContext(); + ctx.log("testcore.viewTestCallPanicViewEPFromView"); + let f = new sc.TestCallPanicViewEPFromViewContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.viewTestCallPanicViewEPFromView(ctx, f); - ctx.log("testcore.viewTestCallPanicViewEPFromView ok"); + sc.viewTestCallPanicViewEPFromView(ctx, f); + ctx.log("testcore.viewTestCallPanicViewEPFromView ok"); } function viewTestChainOwnerIDViewThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("testcore.viewTestChainOwnerIDView"); - let f = new sc.TestChainOwnerIDViewContext(); + ctx.log("testcore.viewTestChainOwnerIDView"); + let f = new sc.TestChainOwnerIDViewContext(); f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.viewTestChainOwnerIDView(ctx, f); - ctx.log("testcore.viewTestChainOwnerIDView ok"); + sc.viewTestChainOwnerIDView(ctx, f); + ctx.log("testcore.viewTestChainOwnerIDView ok"); } function viewTestPanicViewEPThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("testcore.viewTestPanicViewEP"); - let f = new sc.TestPanicViewEPContext(); + ctx.log("testcore.viewTestPanicViewEP"); + let f = new sc.TestPanicViewEPContext(); f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.viewTestPanicViewEP(ctx, f); - ctx.log("testcore.viewTestPanicViewEP ok"); + sc.viewTestPanicViewEP(ctx, f); + ctx.log("testcore.viewTestPanicViewEP ok"); } function viewTestSandboxCallThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("testcore.viewTestSandboxCall"); - let f = new sc.TestSandboxCallContext(); + ctx.log("testcore.viewTestSandboxCall"); + let f = new sc.TestSandboxCallContext(); f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.viewTestSandboxCall(ctx, f); - ctx.log("testcore.viewTestSandboxCall ok"); + sc.viewTestSandboxCall(ctx, f); + ctx.log("testcore.viewTestSandboxCall ok"); } diff --git a/contracts/wasm/testcore/ts/testcore/params.ts b/contracts/wasm/testcore/ts/testcore/params.ts index 6d961d9498..f39660b2d6 100644 --- a/contracts/wasm/testcore/ts/testcore/params.ts +++ b/contracts/wasm/testcore/ts/testcore/params.ts @@ -5,455 +5,455 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableCallOnChainParams extends wasmlib.ScMapID { hnameContract(): wasmlib.ScImmutableHname { - return new wasmlib.ScImmutableHname(this.mapID, sc.idxMap[sc.IdxParamHnameContract]); - } + return new wasmlib.ScImmutableHname(this.mapID, sc.idxMap[sc.IdxParamHnameContract]); + } hnameEP(): wasmlib.ScImmutableHname { - return new wasmlib.ScImmutableHname(this.mapID, sc.idxMap[sc.IdxParamHnameEP]); - } + return new wasmlib.ScImmutableHname(this.mapID, sc.idxMap[sc.IdxParamHnameEP]); + } intValue(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); + } } export class MutableCallOnChainParams extends wasmlib.ScMapID { hnameContract(): wasmlib.ScMutableHname { - return new wasmlib.ScMutableHname(this.mapID, sc.idxMap[sc.IdxParamHnameContract]); - } + return new wasmlib.ScMutableHname(this.mapID, sc.idxMap[sc.IdxParamHnameContract]); + } hnameEP(): wasmlib.ScMutableHname { - return new wasmlib.ScMutableHname(this.mapID, sc.idxMap[sc.IdxParamHnameEP]); - } + return new wasmlib.ScMutableHname(this.mapID, sc.idxMap[sc.IdxParamHnameEP]); + } intValue(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); + } } export class ImmutableCheckContextFromFullEPParams extends wasmlib.ScMapID { agentID(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); + } caller(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamCaller]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamCaller]); + } chainID(): wasmlib.ScImmutableChainID { - return new wasmlib.ScImmutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); - } + return new wasmlib.ScImmutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); + } chainOwnerID(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamChainOwnerID]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamChainOwnerID]); + } contractCreator(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamContractCreator]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamContractCreator]); + } } export class MutableCheckContextFromFullEPParams extends wasmlib.ScMapID { agentID(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); + } caller(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamCaller]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamCaller]); + } chainID(): wasmlib.ScMutableChainID { - return new wasmlib.ScMutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); - } + return new wasmlib.ScMutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); + } chainOwnerID(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamChainOwnerID]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamChainOwnerID]); + } contractCreator(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamContractCreator]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamContractCreator]); + } } export class ImmutableInitParams extends wasmlib.ScMapID { fail(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamFail]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamFail]); + } } export class MutableInitParams extends wasmlib.ScMapID { fail(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamFail]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamFail]); + } } export class ImmutablePassTypesFullParams extends wasmlib.ScMapID { address(): wasmlib.ScImmutableAddress { - return new wasmlib.ScImmutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); - } + return new wasmlib.ScImmutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); + } agentID(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); + } chainID(): wasmlib.ScImmutableChainID { - return new wasmlib.ScImmutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); - } + return new wasmlib.ScImmutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); + } contractID(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamContractID]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamContractID]); + } hash(): wasmlib.ScImmutableHash { - return new wasmlib.ScImmutableHash(this.mapID, sc.idxMap[sc.IdxParamHash]); - } + return new wasmlib.ScImmutableHash(this.mapID, sc.idxMap[sc.IdxParamHash]); + } hname(): wasmlib.ScImmutableHname { - return new wasmlib.ScImmutableHname(this.mapID, sc.idxMap[sc.IdxParamHname]); - } + return new wasmlib.ScImmutableHname(this.mapID, sc.idxMap[sc.IdxParamHname]); + } hnameZero(): wasmlib.ScImmutableHname { - return new wasmlib.ScImmutableHname(this.mapID, sc.idxMap[sc.IdxParamHnameZero]); - } + return new wasmlib.ScImmutableHname(this.mapID, sc.idxMap[sc.IdxParamHnameZero]); + } int64(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64]); + } int64Zero(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64Zero]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64Zero]); + } string(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamString]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamString]); + } stringZero(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamStringZero]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamStringZero]); + } } export class MutablePassTypesFullParams extends wasmlib.ScMapID { address(): wasmlib.ScMutableAddress { - return new wasmlib.ScMutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); - } + return new wasmlib.ScMutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); + } agentID(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); + } chainID(): wasmlib.ScMutableChainID { - return new wasmlib.ScMutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); - } + return new wasmlib.ScMutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); + } contractID(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamContractID]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamContractID]); + } hash(): wasmlib.ScMutableHash { - return new wasmlib.ScMutableHash(this.mapID, sc.idxMap[sc.IdxParamHash]); - } + return new wasmlib.ScMutableHash(this.mapID, sc.idxMap[sc.IdxParamHash]); + } hname(): wasmlib.ScMutableHname { - return new wasmlib.ScMutableHname(this.mapID, sc.idxMap[sc.IdxParamHname]); - } + return new wasmlib.ScMutableHname(this.mapID, sc.idxMap[sc.IdxParamHname]); + } hnameZero(): wasmlib.ScMutableHname { - return new wasmlib.ScMutableHname(this.mapID, sc.idxMap[sc.IdxParamHnameZero]); - } + return new wasmlib.ScMutableHname(this.mapID, sc.idxMap[sc.IdxParamHnameZero]); + } int64(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64]); + } int64Zero(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64Zero]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64Zero]); + } string(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamString]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamString]); + } stringZero(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamStringZero]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamStringZero]); + } } export class ImmutableRunRecursionParams extends wasmlib.ScMapID { intValue(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); + } } export class MutableRunRecursionParams extends wasmlib.ScMapID { intValue(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); + } } export class ImmutableSendToAddressParams extends wasmlib.ScMapID { address(): wasmlib.ScImmutableAddress { - return new wasmlib.ScImmutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); - } + return new wasmlib.ScImmutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); + } } export class MutableSendToAddressParams extends wasmlib.ScMapID { address(): wasmlib.ScMutableAddress { - return new wasmlib.ScMutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); - } + return new wasmlib.ScMutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); + } } export class ImmutableSetIntParams extends wasmlib.ScMapID { intValue(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); + } name(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamName]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamName]); + } } export class MutableSetIntParams extends wasmlib.ScMapID { intValue(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); + } name(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamName]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamName]); + } } export class ImmutableSpawnParams extends wasmlib.ScMapID { progHash(): wasmlib.ScImmutableHash { - return new wasmlib.ScImmutableHash(this.mapID, sc.idxMap[sc.IdxParamProgHash]); - } + return new wasmlib.ScImmutableHash(this.mapID, sc.idxMap[sc.IdxParamProgHash]); + } } export class MutableSpawnParams extends wasmlib.ScMapID { progHash(): wasmlib.ScMutableHash { - return new wasmlib.ScMutableHash(this.mapID, sc.idxMap[sc.IdxParamProgHash]); - } + return new wasmlib.ScMutableHash(this.mapID, sc.idxMap[sc.IdxParamProgHash]); + } } export class ImmutableTestEventLogGenericDataParams extends wasmlib.ScMapID { counter(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamCounter]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamCounter]); + } } export class MutableTestEventLogGenericDataParams extends wasmlib.ScMapID { counter(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamCounter]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamCounter]); + } } export class ImmutableWithdrawToChainParams extends wasmlib.ScMapID { chainID(): wasmlib.ScImmutableChainID { - return new wasmlib.ScImmutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); - } + return new wasmlib.ScImmutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); + } } export class MutableWithdrawToChainParams extends wasmlib.ScMapID { chainID(): wasmlib.ScMutableChainID { - return new wasmlib.ScMutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); - } + return new wasmlib.ScMutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); + } } export class ImmutableCheckContextFromViewEPParams extends wasmlib.ScMapID { agentID(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); + } chainID(): wasmlib.ScImmutableChainID { - return new wasmlib.ScImmutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); - } + return new wasmlib.ScImmutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); + } chainOwnerID(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamChainOwnerID]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamChainOwnerID]); + } contractCreator(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamContractCreator]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamContractCreator]); + } } export class MutableCheckContextFromViewEPParams extends wasmlib.ScMapID { agentID(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); + } chainID(): wasmlib.ScMutableChainID { - return new wasmlib.ScMutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); - } + return new wasmlib.ScMutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); + } chainOwnerID(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamChainOwnerID]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamChainOwnerID]); + } contractCreator(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamContractCreator]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamContractCreator]); + } } export class ImmutableFibonacciParams extends wasmlib.ScMapID { intValue(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); + } } export class MutableFibonacciParams extends wasmlib.ScMapID { intValue(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); + } } export class ImmutableGetIntParams extends wasmlib.ScMapID { name(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamName]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamName]); + } } export class MutableGetIntParams extends wasmlib.ScMapID { name(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamName]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamName]); + } } export class ImmutableGetStringValueParams extends wasmlib.ScMapID { varName(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamVarName]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamVarName]); + } } export class MutableGetStringValueParams extends wasmlib.ScMapID { varName(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamVarName]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamVarName]); + } } export class ImmutablePassTypesViewParams extends wasmlib.ScMapID { address(): wasmlib.ScImmutableAddress { - return new wasmlib.ScImmutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); - } + return new wasmlib.ScImmutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); + } agentID(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); + } chainID(): wasmlib.ScImmutableChainID { - return new wasmlib.ScImmutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); - } + return new wasmlib.ScImmutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); + } contractID(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamContractID]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamContractID]); + } hash(): wasmlib.ScImmutableHash { - return new wasmlib.ScImmutableHash(this.mapID, sc.idxMap[sc.IdxParamHash]); - } + return new wasmlib.ScImmutableHash(this.mapID, sc.idxMap[sc.IdxParamHash]); + } hname(): wasmlib.ScImmutableHname { - return new wasmlib.ScImmutableHname(this.mapID, sc.idxMap[sc.IdxParamHname]); - } + return new wasmlib.ScImmutableHname(this.mapID, sc.idxMap[sc.IdxParamHname]); + } hnameZero(): wasmlib.ScImmutableHname { - return new wasmlib.ScImmutableHname(this.mapID, sc.idxMap[sc.IdxParamHnameZero]); - } + return new wasmlib.ScImmutableHname(this.mapID, sc.idxMap[sc.IdxParamHnameZero]); + } int64(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64]); + } int64Zero(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64Zero]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64Zero]); + } string(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamString]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamString]); + } stringZero(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamStringZero]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamStringZero]); + } } export class MutablePassTypesViewParams extends wasmlib.ScMapID { address(): wasmlib.ScMutableAddress { - return new wasmlib.ScMutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); - } + return new wasmlib.ScMutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); + } agentID(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); + } chainID(): wasmlib.ScMutableChainID { - return new wasmlib.ScMutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); - } + return new wasmlib.ScMutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); + } contractID(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamContractID]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamContractID]); + } hash(): wasmlib.ScMutableHash { - return new wasmlib.ScMutableHash(this.mapID, sc.idxMap[sc.IdxParamHash]); - } + return new wasmlib.ScMutableHash(this.mapID, sc.idxMap[sc.IdxParamHash]); + } hname(): wasmlib.ScMutableHname { - return new wasmlib.ScMutableHname(this.mapID, sc.idxMap[sc.IdxParamHname]); - } + return new wasmlib.ScMutableHname(this.mapID, sc.idxMap[sc.IdxParamHname]); + } hnameZero(): wasmlib.ScMutableHname { - return new wasmlib.ScMutableHname(this.mapID, sc.idxMap[sc.IdxParamHnameZero]); - } + return new wasmlib.ScMutableHname(this.mapID, sc.idxMap[sc.IdxParamHnameZero]); + } int64(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64]); + } int64Zero(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64Zero]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64Zero]); + } string(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamString]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamString]); + } stringZero(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamStringZero]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamStringZero]); + } } diff --git a/contracts/wasm/testcore/ts/testcore/results.ts b/contracts/wasm/testcore/ts/testcore/results.ts index 1c64fa616f..0728435078 100644 --- a/contracts/wasm/testcore/ts/testcore/results.ts +++ b/contracts/wasm/testcore/ts/testcore/results.ts @@ -5,103 +5,103 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableCallOnChainResults extends wasmlib.ScMapID { intValue(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultIntValue]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultIntValue]); + } } export class MutableCallOnChainResults extends wasmlib.ScMapID { intValue(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultIntValue]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultIntValue]); + } } export class ImmutableGetMintedSupplyResults extends wasmlib.ScMapID { mintedColor(): wasmlib.ScImmutableColor { - return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxResultMintedColor]); - } + return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxResultMintedColor]); + } mintedSupply(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultMintedSupply]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultMintedSupply]); + } } export class MutableGetMintedSupplyResults extends wasmlib.ScMapID { mintedColor(): wasmlib.ScMutableColor { - return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxResultMintedColor]); - } + return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxResultMintedColor]); + } mintedSupply(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultMintedSupply]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultMintedSupply]); + } } export class ImmutableRunRecursionResults extends wasmlib.ScMapID { intValue(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultIntValue]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultIntValue]); + } } export class MutableRunRecursionResults extends wasmlib.ScMapID { intValue(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultIntValue]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultIntValue]); + } } export class ImmutableTestChainOwnerIDFullResults extends wasmlib.ScMapID { chainOwnerID(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxResultChainOwnerID]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxResultChainOwnerID]); + } } export class MutableTestChainOwnerIDFullResults extends wasmlib.ScMapID { chainOwnerID(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxResultChainOwnerID]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxResultChainOwnerID]); + } } export class ImmutableFibonacciResults extends wasmlib.ScMapID { intValue(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultIntValue]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultIntValue]); + } } export class MutableFibonacciResults extends wasmlib.ScMapID { intValue(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultIntValue]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultIntValue]); + } } export class ImmutableGetCounterResults extends wasmlib.ScMapID { counter(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultCounter]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultCounter]); + } } export class MutableGetCounterResults extends wasmlib.ScMapID { counter(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultCounter]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultCounter]); + } } export class MapStringToImmutableInt64 { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -115,19 +115,19 @@ export class MapStringToImmutableInt64 { export class ImmutableGetIntResults extends wasmlib.ScMapID { values(): sc.MapStringToImmutableInt64 { - return new sc.MapStringToImmutableInt64(this.mapID); - } + return new sc.MapStringToImmutableInt64(this.mapID); + } } export class MapStringToMutableInt64 { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; } clear(): void { - wasmlib.clear(this.objID) + wasmlib.clear(this.objID); } getInt64(key: string): wasmlib.ScMutableInt64 { @@ -138,12 +138,12 @@ export class MapStringToMutableInt64 { export class MutableGetIntResults extends wasmlib.ScMapID { values(): sc.MapStringToMutableInt64 { - return new sc.MapStringToMutableInt64(this.mapID); - } + return new sc.MapStringToMutableInt64(this.mapID); + } } export class MapStringToImmutableString { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -157,19 +157,19 @@ export class MapStringToImmutableString { export class ImmutableGetStringValueResults extends wasmlib.ScMapID { vars(): sc.MapStringToImmutableString { - return new sc.MapStringToImmutableString(this.mapID); - } + return new sc.MapStringToImmutableString(this.mapID); + } } export class MapStringToMutableString { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; } clear(): void { - wasmlib.clear(this.objID) + wasmlib.clear(this.objID); } getString(key: string): wasmlib.ScMutableString { @@ -180,34 +180,34 @@ export class MapStringToMutableString { export class MutableGetStringValueResults extends wasmlib.ScMapID { vars(): sc.MapStringToMutableString { - return new sc.MapStringToMutableString(this.mapID); - } + return new sc.MapStringToMutableString(this.mapID); + } } export class ImmutableTestChainOwnerIDViewResults extends wasmlib.ScMapID { chainOwnerID(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxResultChainOwnerID]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxResultChainOwnerID]); + } } export class MutableTestChainOwnerIDViewResults extends wasmlib.ScMapID { chainOwnerID(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxResultChainOwnerID]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxResultChainOwnerID]); + } } export class ImmutableTestSandboxCallResults extends wasmlib.ScMapID { sandboxCall(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxResultSandboxCall]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxResultSandboxCall]); + } } export class MutableTestSandboxCallResults extends wasmlib.ScMapID { sandboxCall(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxResultSandboxCall]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxResultSandboxCall]); + } } diff --git a/contracts/wasm/testcore/ts/testcore/state.ts b/contracts/wasm/testcore/ts/testcore/state.ts index f2fe2ddfa6..2cd57331e4 100644 --- a/contracts/wasm/testcore/ts/testcore/state.ts +++ b/contracts/wasm/testcore/ts/testcore/state.ts @@ -5,53 +5,53 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableTestCoreState extends wasmlib.ScMapID { counter(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateCounter]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateCounter]); + } hnameEP(): wasmlib.ScImmutableHname { - return new wasmlib.ScImmutableHname(this.mapID, sc.idxMap[sc.IdxStateHnameEP]); - } + return new wasmlib.ScImmutableHname(this.mapID, sc.idxMap[sc.IdxStateHnameEP]); + } ints(): sc.MapStringToImmutableInt64 { - let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateInts], wasmlib.TYPE_MAP); - return new sc.MapStringToImmutableInt64(mapID); - } + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateInts], wasmlib.TYPE_MAP); + return new sc.MapStringToImmutableInt64(mapID); + } mintedColor(): wasmlib.ScImmutableColor { - return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxStateMintedColor]); - } + return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxStateMintedColor]); + } mintedSupply(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateMintedSupply]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateMintedSupply]); + } } export class MutableTestCoreState extends wasmlib.ScMapID { counter(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateCounter]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateCounter]); + } hnameEP(): wasmlib.ScMutableHname { - return new wasmlib.ScMutableHname(this.mapID, sc.idxMap[sc.IdxStateHnameEP]); - } + return new wasmlib.ScMutableHname(this.mapID, sc.idxMap[sc.IdxStateHnameEP]); + } ints(): sc.MapStringToMutableInt64 { - let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateInts], wasmlib.TYPE_MAP); - return new sc.MapStringToMutableInt64(mapID); - } + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateInts], wasmlib.TYPE_MAP); + return new sc.MapStringToMutableInt64(mapID); + } mintedColor(): wasmlib.ScMutableColor { - return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxStateMintedColor]); - } + return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxStateMintedColor]); + } mintedSupply(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateMintedSupply]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateMintedSupply]); + } } diff --git a/contracts/wasm/testwasmlib/test/testwasmlib_bg.wasm b/contracts/wasm/testwasmlib/test/testwasmlib_bg.wasm index a7eb32fe2bfd4da746b8ac0815d2621c46aba0cb..279d30263ba4b0cc76ac6bd93a2e9363fdb69ffd 100644 GIT binary patch delta 5900 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 OF_&;~kZwPDBOxjP diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/consts.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/consts.ts index 0919d7d32f..f89139c319 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/consts.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/consts.ts @@ -5,54 +5,55 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; export const ScName = "testwasmlib"; export const ScDescription = "Exercise all aspects of WasmLib"; export const HScName = new wasmlib.ScHname(0x89703a45); -export const ParamAddress = "address"; -export const ParamAgentID = "agentID"; -export const ParamBlockIndex = "blockIndex"; -export const ParamBytes = "bytes"; -export const ParamChainID = "chainID"; -export const ParamColor = "color"; -export const ParamHash = "hash"; -export const ParamHname = "hname"; -export const ParamIndex = "index"; -export const ParamInt16 = "int16"; -export const ParamInt32 = "int32"; -export const ParamInt64 = "int64"; -export const ParamName = "name"; +export const ParamAddress = "address"; +export const ParamAgentID = "agentID"; +export const ParamBlockIndex = "blockIndex"; +export const ParamBytes = "bytes"; +export const ParamChainID = "chainID"; +export const ParamColor = "color"; +export const ParamHash = "hash"; +export const ParamHname = "hname"; +export const ParamIndex = "index"; +export const ParamInt16 = "int16"; +export const ParamInt32 = "int32"; +export const ParamInt64 = "int64"; +export const ParamName = "name"; +export const ParamParam = "this"; export const ParamRecordIndex = "recordIndex"; -export const ParamRequestID = "requestID"; -export const ParamString = "string"; -export const ParamValue = "value"; +export const ParamRequestID = "requestID"; +export const ParamString = "string"; +export const ParamValue = "value"; -export const ResultCount = "count"; -export const ResultIotas = "iotas"; +export const ResultCount = "count"; +export const ResultIotas = "iotas"; export const ResultLength = "length"; export const ResultRecord = "record"; -export const ResultValue = "value"; +export const ResultValue = "value"; export const StateArrays = "arrays"; -export const FuncArrayClear = "arrayClear"; -export const FuncArrayCreate = "arrayCreate"; -export const FuncArraySet = "arraySet"; -export const FuncParamTypes = "paramTypes"; -export const ViewArrayLength = "arrayLength"; -export const ViewArrayValue = "arrayValue"; -export const ViewBlockRecord = "blockRecord"; +export const FuncArrayClear = "arrayClear"; +export const FuncArrayCreate = "arrayCreate"; +export const FuncArraySet = "arraySet"; +export const FuncParamTypes = "paramTypes"; +export const ViewArrayLength = "arrayLength"; +export const ViewArrayValue = "arrayValue"; +export const ViewBlockRecord = "blockRecord"; export const ViewBlockRecords = "blockRecords"; -export const ViewIotaBalance = "iotaBalance"; - -export const HFuncArrayClear = new wasmlib.ScHname(0x88021821); -export const HFuncArrayCreate = new wasmlib.ScHname(0x1ed5b23b); -export const HFuncArraySet = new wasmlib.ScHname(0x2c4150b3); -export const HFuncParamTypes = new wasmlib.ScHname(0x6921c4cd); -export const HViewArrayLength = new wasmlib.ScHname(0x3a831021); -export const HViewArrayValue = new wasmlib.ScHname(0x662dbd81); -export const HViewBlockRecord = new wasmlib.ScHname(0xad13b2f8); +export const ViewIotaBalance = "iotaBalance"; + +export const HFuncArrayClear = new wasmlib.ScHname(0x88021821); +export const HFuncArrayCreate = new wasmlib.ScHname(0x1ed5b23b); +export const HFuncArraySet = new wasmlib.ScHname(0x2c4150b3); +export const HFuncParamTypes = new wasmlib.ScHname(0x6921c4cd); +export const HViewArrayLength = new wasmlib.ScHname(0x3a831021); +export const HViewArrayValue = new wasmlib.ScHname(0x662dbd81); +export const HViewBlockRecord = new wasmlib.ScHname(0xad13b2f8); export const HViewBlockRecords = new wasmlib.ScHname(0x16e249ea); -export const HViewIotaBalance = new wasmlib.ScHname(0x9d3920bd); +export const HViewIotaBalance = new wasmlib.ScHname(0x9d3920bd); diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/contract.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/contract.ts index 1cf201fa0a..fcc1b7eed1 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/contract.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/contract.ts @@ -5,105 +5,105 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ArrayClearCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncArrayClear); - params: sc.MutableArrayClearParams = new sc.MutableArrayClearParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncArrayClear); + params: sc.MutableArrayClearParams = new sc.MutableArrayClearParams(); } export class ArrayClearContext { - params: sc.ImmutableArrayClearParams = new sc.ImmutableArrayClearParams(); - state: sc.MutableTestWasmLibState = new sc.MutableTestWasmLibState(); + params: sc.ImmutableArrayClearParams = new sc.ImmutableArrayClearParams(); + state: sc.MutableTestWasmLibState = new sc.MutableTestWasmLibState(); } export class ArrayCreateCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncArrayCreate); - params: sc.MutableArrayCreateParams = new sc.MutableArrayCreateParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncArrayCreate); + params: sc.MutableArrayCreateParams = new sc.MutableArrayCreateParams(); } export class ArrayCreateContext { - params: sc.ImmutableArrayCreateParams = new sc.ImmutableArrayCreateParams(); - state: sc.MutableTestWasmLibState = new sc.MutableTestWasmLibState(); + params: sc.ImmutableArrayCreateParams = new sc.ImmutableArrayCreateParams(); + state: sc.MutableTestWasmLibState = new sc.MutableTestWasmLibState(); } export class ArraySetCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncArraySet); - params: sc.MutableArraySetParams = new sc.MutableArraySetParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncArraySet); + params: sc.MutableArraySetParams = new sc.MutableArraySetParams(); } export class ArraySetContext { - params: sc.ImmutableArraySetParams = new sc.ImmutableArraySetParams(); - state: sc.MutableTestWasmLibState = new sc.MutableTestWasmLibState(); + params: sc.ImmutableArraySetParams = new sc.ImmutableArraySetParams(); + state: sc.MutableTestWasmLibState = new sc.MutableTestWasmLibState(); } export class ParamTypesCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncParamTypes); - params: sc.MutableParamTypesParams = new sc.MutableParamTypesParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncParamTypes); + params: sc.MutableParamTypesParams = new sc.MutableParamTypesParams(); } export class ParamTypesContext { - params: sc.ImmutableParamTypesParams = new sc.ImmutableParamTypesParams(); - state: sc.MutableTestWasmLibState = new sc.MutableTestWasmLibState(); + params: sc.ImmutableParamTypesParams = new sc.ImmutableParamTypesParams(); + state: sc.MutableTestWasmLibState = new sc.MutableTestWasmLibState(); } export class ArrayLengthCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewArrayLength); - params: sc.MutableArrayLengthParams = new sc.MutableArrayLengthParams(); - results: sc.ImmutableArrayLengthResults = new sc.ImmutableArrayLengthResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewArrayLength); + params: sc.MutableArrayLengthParams = new sc.MutableArrayLengthParams(); + results: sc.ImmutableArrayLengthResults = new sc.ImmutableArrayLengthResults(); } export class ArrayLengthContext { - params: sc.ImmutableArrayLengthParams = new sc.ImmutableArrayLengthParams(); - results: sc.MutableArrayLengthResults = new sc.MutableArrayLengthResults(); - state: sc.ImmutableTestWasmLibState = new sc.ImmutableTestWasmLibState(); + params: sc.ImmutableArrayLengthParams = new sc.ImmutableArrayLengthParams(); + results: sc.MutableArrayLengthResults = new sc.MutableArrayLengthResults(); + state: sc.ImmutableTestWasmLibState = new sc.ImmutableTestWasmLibState(); } export class ArrayValueCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewArrayValue); - params: sc.MutableArrayValueParams = new sc.MutableArrayValueParams(); - results: sc.ImmutableArrayValueResults = new sc.ImmutableArrayValueResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewArrayValue); + params: sc.MutableArrayValueParams = new sc.MutableArrayValueParams(); + results: sc.ImmutableArrayValueResults = new sc.ImmutableArrayValueResults(); } export class ArrayValueContext { - params: sc.ImmutableArrayValueParams = new sc.ImmutableArrayValueParams(); - results: sc.MutableArrayValueResults = new sc.MutableArrayValueResults(); - state: sc.ImmutableTestWasmLibState = new sc.ImmutableTestWasmLibState(); + params: sc.ImmutableArrayValueParams = new sc.ImmutableArrayValueParams(); + results: sc.MutableArrayValueResults = new sc.MutableArrayValueResults(); + state: sc.ImmutableTestWasmLibState = new sc.ImmutableTestWasmLibState(); } export class BlockRecordCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewBlockRecord); - params: sc.MutableBlockRecordParams = new sc.MutableBlockRecordParams(); - results: sc.ImmutableBlockRecordResults = new sc.ImmutableBlockRecordResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewBlockRecord); + params: sc.MutableBlockRecordParams = new sc.MutableBlockRecordParams(); + results: sc.ImmutableBlockRecordResults = new sc.ImmutableBlockRecordResults(); } export class BlockRecordContext { - params: sc.ImmutableBlockRecordParams = new sc.ImmutableBlockRecordParams(); - results: sc.MutableBlockRecordResults = new sc.MutableBlockRecordResults(); - state: sc.ImmutableTestWasmLibState = new sc.ImmutableTestWasmLibState(); + params: sc.ImmutableBlockRecordParams = new sc.ImmutableBlockRecordParams(); + results: sc.MutableBlockRecordResults = new sc.MutableBlockRecordResults(); + state: sc.ImmutableTestWasmLibState = new sc.ImmutableTestWasmLibState(); } export class BlockRecordsCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewBlockRecords); - params: sc.MutableBlockRecordsParams = new sc.MutableBlockRecordsParams(); - results: sc.ImmutableBlockRecordsResults = new sc.ImmutableBlockRecordsResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewBlockRecords); + params: sc.MutableBlockRecordsParams = new sc.MutableBlockRecordsParams(); + results: sc.ImmutableBlockRecordsResults = new sc.ImmutableBlockRecordsResults(); } export class BlockRecordsContext { - params: sc.ImmutableBlockRecordsParams = new sc.ImmutableBlockRecordsParams(); - results: sc.MutableBlockRecordsResults = new sc.MutableBlockRecordsResults(); - state: sc.ImmutableTestWasmLibState = new sc.ImmutableTestWasmLibState(); + params: sc.ImmutableBlockRecordsParams = new sc.ImmutableBlockRecordsParams(); + results: sc.MutableBlockRecordsResults = new sc.MutableBlockRecordsResults(); + state: sc.ImmutableTestWasmLibState = new sc.ImmutableTestWasmLibState(); } export class IotaBalanceCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewIotaBalance); - results: sc.ImmutableIotaBalanceResults = new sc.ImmutableIotaBalanceResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewIotaBalance); + results: sc.ImmutableIotaBalanceResults = new sc.ImmutableIotaBalanceResults(); } export class IotaBalanceContext { - results: sc.MutableIotaBalanceResults = new sc.MutableIotaBalanceResults(); - state: sc.ImmutableTestWasmLibState = new sc.ImmutableTestWasmLibState(); + results: sc.MutableIotaBalanceResults = new sc.MutableIotaBalanceResults(); + state: sc.ImmutableTestWasmLibState = new sc.ImmutableTestWasmLibState(); } export class ScFuncs { diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/keys.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/keys.ts index d530270667..b6c2ec7a7e 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/keys.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/keys.ts @@ -5,57 +5,59 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; -export const IdxParamAddress = 0; -export const IdxParamAgentID = 1; -export const IdxParamBlockIndex = 2; -export const IdxParamBytes = 3; -export const IdxParamChainID = 4; -export const IdxParamColor = 5; -export const IdxParamHash = 6; -export const IdxParamHname = 7; -export const IdxParamIndex = 8; -export const IdxParamInt16 = 9; -export const IdxParamInt32 = 10; -export const IdxParamInt64 = 11; -export const IdxParamName = 12; -export const IdxParamRecordIndex = 13; -export const IdxParamRequestID = 14; -export const IdxParamString = 15; -export const IdxParamValue = 16; -export const IdxResultCount = 17; -export const IdxResultIotas = 18; -export const IdxResultLength = 19; -export const IdxResultRecord = 20; -export const IdxResultValue = 21; -export const IdxStateArrays = 22; +export const IdxParamAddress = 0; +export const IdxParamAgentID = 1; +export const IdxParamBlockIndex = 2; +export const IdxParamBytes = 3; +export const IdxParamChainID = 4; +export const IdxParamColor = 5; +export const IdxParamHash = 6; +export const IdxParamHname = 7; +export const IdxParamIndex = 8; +export const IdxParamInt16 = 9; +export const IdxParamInt32 = 10; +export const IdxParamInt64 = 11; +export const IdxParamName = 12; +export const IdxParamParam = 13; +export const IdxParamRecordIndex = 14; +export const IdxParamRequestID = 15; +export const IdxParamString = 16; +export const IdxParamValue = 17; +export const IdxResultCount = 18; +export const IdxResultIotas = 19; +export const IdxResultLength = 20; +export const IdxResultRecord = 21; +export const IdxResultValue = 22; +export const IdxStateArrays = 23; export let keyMap: string[] = [ - sc.ParamAddress, - sc.ParamAgentID, - sc.ParamBlockIndex, - sc.ParamBytes, - sc.ParamChainID, - sc.ParamColor, - sc.ParamHash, - sc.ParamHname, - sc.ParamIndex, - sc.ParamInt16, - sc.ParamInt32, - sc.ParamInt64, - sc.ParamName, - sc.ParamRecordIndex, - sc.ParamRequestID, - sc.ParamString, - sc.ParamValue, - sc.ResultCount, - sc.ResultIotas, - sc.ResultLength, - sc.ResultRecord, - sc.ResultValue, - sc.StateArrays, + sc.ParamAddress, + sc.ParamAgentID, + sc.ParamBlockIndex, + sc.ParamBytes, + sc.ParamChainID, + sc.ParamColor, + sc.ParamHash, + sc.ParamHname, + sc.ParamIndex, + sc.ParamInt16, + sc.ParamInt32, + sc.ParamInt64, + sc.ParamName, + sc.ParamParam, + sc.ParamRecordIndex, + sc.ParamRequestID, + sc.ParamString, + sc.ParamValue, + sc.ResultCount, + sc.ResultIotas, + sc.ResultLength, + sc.ResultRecord, + sc.ResultValue, + sc.StateArrays, ]; export let idxMap: wasmlib.Key32[] = new Array(keyMap.length); diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/lib.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/lib.ts index 64720fe3b6..781370df76 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/lib.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/lib.ts @@ -5,7 +5,7 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export function on_call(index: i32): void { @@ -30,97 +30,97 @@ export function on_load(): void { } function funcArrayClearThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testwasmlib.funcArrayClear"); - let f = new sc.ArrayClearContext(); + ctx.log("testwasmlib.funcArrayClear"); + let f = new sc.ArrayClearContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.name().exists(), "missing mandatory name") - sc.funcArrayClear(ctx, f); - ctx.log("testwasmlib.funcArrayClear ok"); + ctx.require(f.params.name().exists(), "missing mandatory name"); + sc.funcArrayClear(ctx, f); + ctx.log("testwasmlib.funcArrayClear ok"); } function funcArrayCreateThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testwasmlib.funcArrayCreate"); - let f = new sc.ArrayCreateContext(); + ctx.log("testwasmlib.funcArrayCreate"); + let f = new sc.ArrayCreateContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.name().exists(), "missing mandatory name") - sc.funcArrayCreate(ctx, f); - ctx.log("testwasmlib.funcArrayCreate ok"); + ctx.require(f.params.name().exists(), "missing mandatory name"); + sc.funcArrayCreate(ctx, f); + ctx.log("testwasmlib.funcArrayCreate ok"); } function funcArraySetThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testwasmlib.funcArraySet"); - let f = new sc.ArraySetContext(); + ctx.log("testwasmlib.funcArraySet"); + let f = new sc.ArraySetContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.index().exists(), "missing mandatory index") - ctx.require(f.params.name().exists(), "missing mandatory name") - ctx.require(f.params.value().exists(), "missing mandatory value") - sc.funcArraySet(ctx, f); - ctx.log("testwasmlib.funcArraySet ok"); + ctx.require(f.params.index().exists(), "missing mandatory index"); + ctx.require(f.params.name().exists(), "missing mandatory name"); + ctx.require(f.params.value().exists(), "missing mandatory value"); + sc.funcArraySet(ctx, f); + ctx.log("testwasmlib.funcArraySet ok"); } function funcParamTypesThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("testwasmlib.funcParamTypes"); - let f = new sc.ParamTypesContext(); + ctx.log("testwasmlib.funcParamTypes"); + let f = new sc.ParamTypesContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcParamTypes(ctx, f); - ctx.log("testwasmlib.funcParamTypes ok"); + sc.funcParamTypes(ctx, f); + ctx.log("testwasmlib.funcParamTypes ok"); } function viewArrayLengthThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("testwasmlib.viewArrayLength"); - let f = new sc.ArrayLengthContext(); + ctx.log("testwasmlib.viewArrayLength"); + let f = new sc.ArrayLengthContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.name().exists(), "missing mandatory name") - sc.viewArrayLength(ctx, f); - ctx.log("testwasmlib.viewArrayLength ok"); + ctx.require(f.params.name().exists(), "missing mandatory name"); + sc.viewArrayLength(ctx, f); + ctx.log("testwasmlib.viewArrayLength ok"); } function viewArrayValueThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("testwasmlib.viewArrayValue"); - let f = new sc.ArrayValueContext(); + ctx.log("testwasmlib.viewArrayValue"); + let f = new sc.ArrayValueContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.index().exists(), "missing mandatory index") - ctx.require(f.params.name().exists(), "missing mandatory name") - sc.viewArrayValue(ctx, f); - ctx.log("testwasmlib.viewArrayValue ok"); + ctx.require(f.params.index().exists(), "missing mandatory index"); + ctx.require(f.params.name().exists(), "missing mandatory name"); + sc.viewArrayValue(ctx, f); + ctx.log("testwasmlib.viewArrayValue ok"); } function viewBlockRecordThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("testwasmlib.viewBlockRecord"); - let f = new sc.BlockRecordContext(); + ctx.log("testwasmlib.viewBlockRecord"); + let f = new sc.BlockRecordContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.blockIndex().exists(), "missing mandatory blockIndex") - ctx.require(f.params.recordIndex().exists(), "missing mandatory recordIndex") - sc.viewBlockRecord(ctx, f); - ctx.log("testwasmlib.viewBlockRecord ok"); + ctx.require(f.params.blockIndex().exists(), "missing mandatory blockIndex"); + ctx.require(f.params.recordIndex().exists(), "missing mandatory recordIndex"); + sc.viewBlockRecord(ctx, f); + ctx.log("testwasmlib.viewBlockRecord ok"); } function viewBlockRecordsThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("testwasmlib.viewBlockRecords"); - let f = new sc.BlockRecordsContext(); + ctx.log("testwasmlib.viewBlockRecords"); + let f = new sc.BlockRecordsContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.blockIndex().exists(), "missing mandatory blockIndex") - sc.viewBlockRecords(ctx, f); - ctx.log("testwasmlib.viewBlockRecords ok"); + ctx.require(f.params.blockIndex().exists(), "missing mandatory blockIndex"); + sc.viewBlockRecords(ctx, f); + ctx.log("testwasmlib.viewBlockRecords ok"); } function viewIotaBalanceThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("testwasmlib.viewIotaBalance"); - let f = new sc.IotaBalanceContext(); + ctx.log("testwasmlib.viewIotaBalance"); + let f = new sc.IotaBalanceContext(); f.results.mapID = wasmlib.OBJ_ID_RESULTS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.viewIotaBalance(ctx, f); - ctx.log("testwasmlib.viewIotaBalance ok"); + sc.viewIotaBalance(ctx, f); + ctx.log("testwasmlib.viewIotaBalance ok"); } diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/params.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/params.ts index f70524c36c..90d2e67579 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/params.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/params.ts @@ -5,69 +5,69 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableArrayClearParams extends wasmlib.ScMapID { name(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamName]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamName]); + } } export class MutableArrayClearParams extends wasmlib.ScMapID { name(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamName]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamName]); + } } export class ImmutableArrayCreateParams extends wasmlib.ScMapID { name(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamName]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamName]); + } } export class MutableArrayCreateParams extends wasmlib.ScMapID { name(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamName]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamName]); + } } export class ImmutableArraySetParams extends wasmlib.ScMapID { index(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamIndex]); - } + return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamIndex]); + } name(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamName]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamName]); + } value(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamValue]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamValue]); + } } export class MutableArraySetParams extends wasmlib.ScMapID { index(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamIndex]); - } + return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamIndex]); + } name(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamName]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamName]); + } value(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamValue]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamValue]); + } } export class MapStringToImmutableBytes { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -81,67 +81,67 @@ export class MapStringToImmutableBytes { export class ImmutableParamTypesParams extends wasmlib.ScMapID { address(): wasmlib.ScImmutableAddress { - return new wasmlib.ScImmutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); - } + return new wasmlib.ScImmutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); + } agentID(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); - } + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); + } bytes(): wasmlib.ScImmutableBytes { - return new wasmlib.ScImmutableBytes(this.mapID, sc.idxMap[sc.IdxParamBytes]); - } + return new wasmlib.ScImmutableBytes(this.mapID, sc.idxMap[sc.IdxParamBytes]); + } chainID(): wasmlib.ScImmutableChainID { - return new wasmlib.ScImmutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); - } + return new wasmlib.ScImmutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); + } color(): wasmlib.ScImmutableColor { - return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); - } + return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); + } hash(): wasmlib.ScImmutableHash { - return new wasmlib.ScImmutableHash(this.mapID, sc.idxMap[sc.IdxParamHash]); - } + return new wasmlib.ScImmutableHash(this.mapID, sc.idxMap[sc.IdxParamHash]); + } hname(): wasmlib.ScImmutableHname { - return new wasmlib.ScImmutableHname(this.mapID, sc.idxMap[sc.IdxParamHname]); - } + return new wasmlib.ScImmutableHname(this.mapID, sc.idxMap[sc.IdxParamHname]); + } int16(): wasmlib.ScImmutableInt16 { - return new wasmlib.ScImmutableInt16(this.mapID, sc.idxMap[sc.IdxParamInt16]); - } + return new wasmlib.ScImmutableInt16(this.mapID, sc.idxMap[sc.IdxParamInt16]); + } int32(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamInt32]); - } + return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamInt32]); + } int64(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64]); + } param(): sc.MapStringToImmutableBytes { - return new sc.MapStringToImmutableBytes(this.mapID); - } + return new sc.MapStringToImmutableBytes(this.mapID); + } requestID(): wasmlib.ScImmutableRequestID { - return new wasmlib.ScImmutableRequestID(this.mapID, sc.idxMap[sc.IdxParamRequestID]); - } + return new wasmlib.ScImmutableRequestID(this.mapID, sc.idxMap[sc.IdxParamRequestID]); + } string(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamString]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamString]); + } } export class MapStringToMutableBytes { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; } clear(): void { - wasmlib.clear(this.objID) + wasmlib.clear(this.objID); } getBytes(key: string): wasmlib.ScMutableBytes { @@ -152,126 +152,126 @@ export class MapStringToMutableBytes { export class MutableParamTypesParams extends wasmlib.ScMapID { address(): wasmlib.ScMutableAddress { - return new wasmlib.ScMutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); - } + return new wasmlib.ScMutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); + } agentID(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); - } + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); + } bytes(): wasmlib.ScMutableBytes { - return new wasmlib.ScMutableBytes(this.mapID, sc.idxMap[sc.IdxParamBytes]); - } + return new wasmlib.ScMutableBytes(this.mapID, sc.idxMap[sc.IdxParamBytes]); + } chainID(): wasmlib.ScMutableChainID { - return new wasmlib.ScMutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); - } + return new wasmlib.ScMutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); + } color(): wasmlib.ScMutableColor { - return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); - } + return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); + } hash(): wasmlib.ScMutableHash { - return new wasmlib.ScMutableHash(this.mapID, sc.idxMap[sc.IdxParamHash]); - } + return new wasmlib.ScMutableHash(this.mapID, sc.idxMap[sc.IdxParamHash]); + } hname(): wasmlib.ScMutableHname { - return new wasmlib.ScMutableHname(this.mapID, sc.idxMap[sc.IdxParamHname]); - } + return new wasmlib.ScMutableHname(this.mapID, sc.idxMap[sc.IdxParamHname]); + } int16(): wasmlib.ScMutableInt16 { - return new wasmlib.ScMutableInt16(this.mapID, sc.idxMap[sc.IdxParamInt16]); - } + return new wasmlib.ScMutableInt16(this.mapID, sc.idxMap[sc.IdxParamInt16]); + } int32(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamInt32]); - } + return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamInt32]); + } int64(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64]); + } param(): sc.MapStringToMutableBytes { - return new sc.MapStringToMutableBytes(this.mapID); - } + return new sc.MapStringToMutableBytes(this.mapID); + } requestID(): wasmlib.ScMutableRequestID { - return new wasmlib.ScMutableRequestID(this.mapID, sc.idxMap[sc.IdxParamRequestID]); - } + return new wasmlib.ScMutableRequestID(this.mapID, sc.idxMap[sc.IdxParamRequestID]); + } string(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamString]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamString]); + } } export class ImmutableArrayLengthParams extends wasmlib.ScMapID { name(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamName]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamName]); + } } export class MutableArrayLengthParams extends wasmlib.ScMapID { name(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamName]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamName]); + } } export class ImmutableArrayValueParams extends wasmlib.ScMapID { index(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamIndex]); - } + return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamIndex]); + } name(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamName]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamName]); + } } export class MutableArrayValueParams extends wasmlib.ScMapID { index(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamIndex]); - } + return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamIndex]); + } name(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamName]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamName]); + } } export class ImmutableBlockRecordParams extends wasmlib.ScMapID { blockIndex(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamBlockIndex]); - } + return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamBlockIndex]); + } recordIndex(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamRecordIndex]); - } + return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamRecordIndex]); + } } export class MutableBlockRecordParams extends wasmlib.ScMapID { blockIndex(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamBlockIndex]); - } + return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamBlockIndex]); + } recordIndex(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamRecordIndex]); - } + return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamRecordIndex]); + } } export class ImmutableBlockRecordsParams extends wasmlib.ScMapID { blockIndex(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamBlockIndex]); - } + return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamBlockIndex]); + } } export class MutableBlockRecordsParams extends wasmlib.ScMapID { blockIndex(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamBlockIndex]); - } + return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamBlockIndex]); + } } diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/results.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/results.ts index a4427f0b3b..7d055b16b1 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/results.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/results.ts @@ -5,75 +5,75 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableArrayLengthResults extends wasmlib.ScMapID { length(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxResultLength]); - } + return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxResultLength]); + } } export class MutableArrayLengthResults extends wasmlib.ScMapID { length(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxResultLength]); - } + return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxResultLength]); + } } export class ImmutableArrayValueResults extends wasmlib.ScMapID { value(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxResultValue]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxResultValue]); + } } export class MutableArrayValueResults extends wasmlib.ScMapID { value(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxResultValue]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxResultValue]); + } } export class ImmutableBlockRecordResults extends wasmlib.ScMapID { record(): wasmlib.ScImmutableBytes { - return new wasmlib.ScImmutableBytes(this.mapID, sc.idxMap[sc.IdxResultRecord]); - } + return new wasmlib.ScImmutableBytes(this.mapID, sc.idxMap[sc.IdxResultRecord]); + } } export class MutableBlockRecordResults extends wasmlib.ScMapID { record(): wasmlib.ScMutableBytes { - return new wasmlib.ScMutableBytes(this.mapID, sc.idxMap[sc.IdxResultRecord]); - } + return new wasmlib.ScMutableBytes(this.mapID, sc.idxMap[sc.IdxResultRecord]); + } } export class ImmutableBlockRecordsResults extends wasmlib.ScMapID { count(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxResultCount]); - } + return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxResultCount]); + } } export class MutableBlockRecordsResults extends wasmlib.ScMapID { count(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxResultCount]); - } + return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxResultCount]); + } } export class ImmutableIotaBalanceResults extends wasmlib.ScMapID { iotas(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultIotas]); - } + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultIotas]); + } } export class MutableIotaBalanceResults extends wasmlib.ScMapID { iotas(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultIotas]); - } + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultIotas]); + } } diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/state.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/state.ts index 5f63655ae7..e2514c7a67 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/state.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/state.ts @@ -5,11 +5,11 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class MapStringToImmutableStringArray { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -24,20 +24,20 @@ export class MapStringToImmutableStringArray { export class ImmutableTestWasmLibState extends wasmlib.ScMapID { arrays(): sc.MapStringToImmutableStringArray { - let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateArrays], wasmlib.TYPE_MAP); - return new sc.MapStringToImmutableStringArray(mapID); - } + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateArrays], wasmlib.TYPE_MAP); + return new sc.MapStringToImmutableStringArray(mapID); + } } export class MapStringToMutableStringArray { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; } clear(): void { - wasmlib.clear(this.objID) + wasmlib.clear(this.objID); } getStringArray(key: string): sc.MutableStringArray { @@ -49,7 +49,7 @@ export class MapStringToMutableStringArray { export class MutableTestWasmLibState extends wasmlib.ScMapID { arrays(): sc.MapStringToMutableStringArray { - let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateArrays], wasmlib.TYPE_MAP); - return new sc.MapStringToMutableStringArray(mapID); - } + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateArrays], wasmlib.TYPE_MAP); + return new sc.MapStringToMutableStringArray(mapID); + } } diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/typedefs.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/typedefs.ts index 872ea82c21..aab311ce94 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/typedefs.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/typedefs.ts @@ -5,11 +5,11 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ArrayOfImmutableString { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -28,7 +28,7 @@ export class ImmutableStringArray extends ArrayOfImmutableString { }; export class ArrayOfMutableString { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; diff --git a/contracts/wasm/tokenregistry/ts/tokenregistry/consts.ts b/contracts/wasm/tokenregistry/ts/tokenregistry/consts.ts index 27aab17d0d..21e028e2c3 100644 --- a/contracts/wasm/tokenregistry/ts/tokenregistry/consts.ts +++ b/contracts/wasm/tokenregistry/ts/tokenregistry/consts.ts @@ -5,24 +5,25 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; -export const ScName = "tokenregistry"; -export const HScName = new wasmlib.ScHname(0xe1ba0c78); +export const ScName = "tokenregistry"; +export const ScDescription = ""; +export const HScName = new wasmlib.ScHname(0xe1ba0c78); -export const ParamColor = "color"; +export const ParamColor = "color"; export const ParamDescription = "description"; export const ParamUserDefined = "userDefined"; export const StateColorList = "colorList"; -export const StateRegistry = "registry"; +export const StateRegistry = "registry"; -export const FuncMintSupply = "mintSupply"; +export const FuncMintSupply = "mintSupply"; export const FuncTransferOwnership = "transferOwnership"; -export const FuncUpdateMetadata = "updateMetadata"; -export const ViewGetInfo = "getInfo"; +export const FuncUpdateMetadata = "updateMetadata"; +export const ViewGetInfo = "getInfo"; -export const HFuncMintSupply = new wasmlib.ScHname(0x564349a7); +export const HFuncMintSupply = new wasmlib.ScHname(0x564349a7); export const HFuncTransferOwnership = new wasmlib.ScHname(0xbb9eb5af); -export const HFuncUpdateMetadata = new wasmlib.ScHname(0xa26b23b6); -export const HViewGetInfo = new wasmlib.ScHname(0xcfedba5f); +export const HFuncUpdateMetadata = new wasmlib.ScHname(0xa26b23b6); +export const HViewGetInfo = new wasmlib.ScHname(0xcfedba5f); diff --git a/contracts/wasm/tokenregistry/ts/tokenregistry/contract.ts b/contracts/wasm/tokenregistry/ts/tokenregistry/contract.ts index 8570ad323a..9c4a118484 100644 --- a/contracts/wasm/tokenregistry/ts/tokenregistry/contract.ts +++ b/contracts/wasm/tokenregistry/ts/tokenregistry/contract.ts @@ -5,47 +5,47 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class MintSupplyCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncMintSupply); - params: sc.MutableMintSupplyParams = new sc.MutableMintSupplyParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncMintSupply); + params: sc.MutableMintSupplyParams = new sc.MutableMintSupplyParams(); } export class MintSupplyContext { - params: sc.ImmutableMintSupplyParams = new sc.ImmutableMintSupplyParams(); - state: sc.MutableTokenRegistryState = new sc.MutableTokenRegistryState(); + params: sc.ImmutableMintSupplyParams = new sc.ImmutableMintSupplyParams(); + state: sc.MutableTokenRegistryState = new sc.MutableTokenRegistryState(); } export class TransferOwnershipCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTransferOwnership); - params: sc.MutableTransferOwnershipParams = new sc.MutableTransferOwnershipParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTransferOwnership); + params: sc.MutableTransferOwnershipParams = new sc.MutableTransferOwnershipParams(); } export class TransferOwnershipContext { - params: sc.ImmutableTransferOwnershipParams = new sc.ImmutableTransferOwnershipParams(); - state: sc.MutableTokenRegistryState = new sc.MutableTokenRegistryState(); + params: sc.ImmutableTransferOwnershipParams = new sc.ImmutableTransferOwnershipParams(); + state: sc.MutableTokenRegistryState = new sc.MutableTokenRegistryState(); } export class UpdateMetadataCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncUpdateMetadata); - params: sc.MutableUpdateMetadataParams = new sc.MutableUpdateMetadataParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncUpdateMetadata); + params: sc.MutableUpdateMetadataParams = new sc.MutableUpdateMetadataParams(); } export class UpdateMetadataContext { - params: sc.ImmutableUpdateMetadataParams = new sc.ImmutableUpdateMetadataParams(); - state: sc.MutableTokenRegistryState = new sc.MutableTokenRegistryState(); + params: sc.ImmutableUpdateMetadataParams = new sc.ImmutableUpdateMetadataParams(); + state: sc.MutableTokenRegistryState = new sc.MutableTokenRegistryState(); } export class GetInfoCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetInfo); - params: sc.MutableGetInfoParams = new sc.MutableGetInfoParams(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetInfo); + params: sc.MutableGetInfoParams = new sc.MutableGetInfoParams(); } export class GetInfoContext { - params: sc.ImmutableGetInfoParams = new sc.ImmutableGetInfoParams(); - state: sc.ImmutableTokenRegistryState = new sc.ImmutableTokenRegistryState(); + params: sc.ImmutableGetInfoParams = new sc.ImmutableGetInfoParams(); + state: sc.ImmutableTokenRegistryState = new sc.ImmutableTokenRegistryState(); } export class ScFuncs { diff --git a/contracts/wasm/tokenregistry/ts/tokenregistry/keys.ts b/contracts/wasm/tokenregistry/ts/tokenregistry/keys.ts index d4325599ea..743fc204b8 100644 --- a/contracts/wasm/tokenregistry/ts/tokenregistry/keys.ts +++ b/contracts/wasm/tokenregistry/ts/tokenregistry/keys.ts @@ -5,21 +5,21 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; -export const IdxParamColor = 0; +export const IdxParamColor = 0; export const IdxParamDescription = 1; export const IdxParamUserDefined = 2; -export const IdxStateColorList = 3; -export const IdxStateRegistry = 4; +export const IdxStateColorList = 3; +export const IdxStateRegistry = 4; export let keyMap: string[] = [ - sc.ParamColor, - sc.ParamDescription, - sc.ParamUserDefined, - sc.StateColorList, - sc.StateRegistry, + sc.ParamColor, + sc.ParamDescription, + sc.ParamUserDefined, + sc.StateColorList, + sc.StateRegistry, ]; export let idxMap: wasmlib.Key32[] = new Array(keyMap.length); diff --git a/contracts/wasm/tokenregistry/ts/tokenregistry/lib.ts b/contracts/wasm/tokenregistry/ts/tokenregistry/lib.ts index 7678df9ec0..ec61666618 100644 --- a/contracts/wasm/tokenregistry/ts/tokenregistry/lib.ts +++ b/contracts/wasm/tokenregistry/ts/tokenregistry/lib.ts @@ -5,7 +5,7 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export function on_call(index: i32): void { @@ -25,46 +25,46 @@ export function on_load(): void { } function funcMintSupplyThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("tokenregistry.funcMintSupply"); - let f = new sc.MintSupplyContext(); + ctx.log("tokenregistry.funcMintSupply"); + let f = new sc.MintSupplyContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - sc.funcMintSupply(ctx, f); - ctx.log("tokenregistry.funcMintSupply ok"); + sc.funcMintSupply(ctx, f); + ctx.log("tokenregistry.funcMintSupply ok"); } function funcTransferOwnershipThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("tokenregistry.funcTransferOwnership"); + ctx.log("tokenregistry.funcTransferOwnership"); // TODO the one who can transfer token ownership - ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); + ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); - let f = new sc.TransferOwnershipContext(); + let f = new sc.TransferOwnershipContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.color().exists(), "missing mandatory color") - sc.funcTransferOwnership(ctx, f); - ctx.log("tokenregistry.funcTransferOwnership ok"); + ctx.require(f.params.color().exists(), "missing mandatory color"); + sc.funcTransferOwnership(ctx, f); + ctx.log("tokenregistry.funcTransferOwnership ok"); } function funcUpdateMetadataThunk(ctx: wasmlib.ScFuncContext): void { - ctx.log("tokenregistry.funcUpdateMetadata"); + ctx.log("tokenregistry.funcUpdateMetadata"); // TODO the one who can change the token info - ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); + ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); - let f = new sc.UpdateMetadataContext(); + let f = new sc.UpdateMetadataContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.color().exists(), "missing mandatory color") - sc.funcUpdateMetadata(ctx, f); - ctx.log("tokenregistry.funcUpdateMetadata ok"); + ctx.require(f.params.color().exists(), "missing mandatory color"); + sc.funcUpdateMetadata(ctx, f); + ctx.log("tokenregistry.funcUpdateMetadata ok"); } function viewGetInfoThunk(ctx: wasmlib.ScViewContext): void { - ctx.log("tokenregistry.viewGetInfo"); - let f = new sc.GetInfoContext(); + ctx.log("tokenregistry.viewGetInfo"); + let f = new sc.GetInfoContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.color().exists(), "missing mandatory color") - sc.viewGetInfo(ctx, f); - ctx.log("tokenregistry.viewGetInfo ok"); + ctx.require(f.params.color().exists(), "missing mandatory color"); + sc.viewGetInfo(ctx, f); + ctx.log("tokenregistry.viewGetInfo ok"); } diff --git a/contracts/wasm/tokenregistry/ts/tokenregistry/params.ts b/contracts/wasm/tokenregistry/ts/tokenregistry/params.ts index 6c55fd2bfc..3ce2ae7764 100644 --- a/contracts/wasm/tokenregistry/ts/tokenregistry/params.ts +++ b/contracts/wasm/tokenregistry/ts/tokenregistry/params.ts @@ -5,69 +5,69 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableMintSupplyParams extends wasmlib.ScMapID { description(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamDescription]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamDescription]); + } userDefined(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamUserDefined]); - } + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamUserDefined]); + } } export class MutableMintSupplyParams extends wasmlib.ScMapID { description(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamDescription]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamDescription]); + } userDefined(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamUserDefined]); - } + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamUserDefined]); + } } export class ImmutableTransferOwnershipParams extends wasmlib.ScMapID { color(): wasmlib.ScImmutableColor { - return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); - } + return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); + } } export class MutableTransferOwnershipParams extends wasmlib.ScMapID { color(): wasmlib.ScMutableColor { - return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); - } + return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); + } } export class ImmutableUpdateMetadataParams extends wasmlib.ScMapID { color(): wasmlib.ScImmutableColor { - return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); - } + return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); + } } export class MutableUpdateMetadataParams extends wasmlib.ScMapID { color(): wasmlib.ScMutableColor { - return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); - } + return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); + } } export class ImmutableGetInfoParams extends wasmlib.ScMapID { color(): wasmlib.ScImmutableColor { - return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); - } + return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); + } } export class MutableGetInfoParams extends wasmlib.ScMapID { color(): wasmlib.ScMutableColor { - return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); - } + return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); + } } diff --git a/contracts/wasm/tokenregistry/ts/tokenregistry/state.ts b/contracts/wasm/tokenregistry/ts/tokenregistry/state.ts index e82e0fe03d..7467cf2e9e 100644 --- a/contracts/wasm/tokenregistry/ts/tokenregistry/state.ts +++ b/contracts/wasm/tokenregistry/ts/tokenregistry/state.ts @@ -5,11 +5,11 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ArrayOfImmutableColor { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -25,7 +25,7 @@ export class ArrayOfImmutableColor { } export class MapColorToImmutableToken { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -39,18 +39,18 @@ export class MapColorToImmutableToken { export class ImmutableTokenRegistryState extends wasmlib.ScMapID { colorList(): sc.ArrayOfImmutableColor { - let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateColorList], wasmlib.TYPE_ARRAY|wasmlib.TYPE_COLOR); - return new sc.ArrayOfImmutableColor(arrID) - } + let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateColorList], wasmlib.TYPE_ARRAY|wasmlib.TYPE_COLOR); + return new sc.ArrayOfImmutableColor(arrID); + } registry(): sc.MapColorToImmutableToken { - let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateRegistry], wasmlib.TYPE_MAP); - return new sc.MapColorToImmutableToken(mapID); - } + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateRegistry], wasmlib.TYPE_MAP); + return new sc.MapColorToImmutableToken(mapID); + } } export class ArrayOfMutableColor { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -70,14 +70,14 @@ export class ArrayOfMutableColor { } export class MapColorToMutableToken { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; } clear(): void { - wasmlib.clear(this.objID) + wasmlib.clear(this.objID); } getToken(key: wasmlib.ScColor): sc.MutableToken { @@ -88,12 +88,12 @@ export class MapColorToMutableToken { export class MutableTokenRegistryState extends wasmlib.ScMapID { colorList(): sc.ArrayOfMutableColor { - let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateColorList], wasmlib.TYPE_ARRAY|wasmlib.TYPE_COLOR); - return new sc.ArrayOfMutableColor(arrID) - } + let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateColorList], wasmlib.TYPE_ARRAY|wasmlib.TYPE_COLOR); + return new sc.ArrayOfMutableColor(arrID); + } registry(): sc.MapColorToMutableToken { - let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateRegistry], wasmlib.TYPE_MAP); - return new sc.MapColorToMutableToken(mapID); - } + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateRegistry], wasmlib.TYPE_MAP); + return new sc.MapColorToMutableToken(mapID); + } } diff --git a/contracts/wasm/tokenregistry/ts/tokenregistry/structs.ts b/contracts/wasm/tokenregistry/ts/tokenregistry/structs.ts index 8bdb6867c1..2e133d07e9 100644 --- a/contracts/wasm/tokenregistry/ts/tokenregistry/structs.ts +++ b/contracts/wasm/tokenregistry/ts/tokenregistry/structs.ts @@ -5,16 +5,16 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; export class Token { - created : i64 = 0; // creation timestamp - description: string = ""; // description what minted token represents - mintedBy : wasmlib.ScAgentID = new wasmlib.ScAgentID(); // original minter - owner : wasmlib.ScAgentID = new wasmlib.ScAgentID(); // current owner - supply : i64 = 0; // amount of tokens originally minted - updated : i64 = 0; // last update timestamp - userDefined: string = ""; // any user defined text + created: i64 = 0; // creation timestamp + description: string = ""; // description what minted token represents + mintedBy: wasmlib.ScAgentID = new wasmlib.ScAgentID(); // original minter + owner: wasmlib.ScAgentID = new wasmlib.ScAgentID(); // current owner + supply: i64 = 0; // amount of tokens originally minted + updated: i64 = 0; // last update timestamp + userDefined: string = ""; // any user defined text static fromBytes(bytes: u8[]): Token { let decode = new wasmlib.BytesDecoder(bytes); @@ -32,13 +32,13 @@ export class Token { bytes(): u8[] { return new wasmlib.BytesEncoder(). - int64(this.created). - string(this.description). - agentID(this.mintedBy). - agentID(this.owner). - int64(this.supply). - int64(this.updated). - string(this.userDefined). + int64(this.created). + string(this.description). + agentID(this.mintedBy). + agentID(this.owner). + int64(this.supply). + int64(this.updated). + string(this.userDefined). data(); } } @@ -57,7 +57,7 @@ export class ImmutableToken { } value(): Token { - return Token.fromBytes(wasmlib.getBytes(this.objID, this.keyID,wasmlib. TYPE_BYTES)); + return Token.fromBytes(wasmlib.getBytes(this.objID, this.keyID, wasmlib.TYPE_BYTES)); } } @@ -79,6 +79,6 @@ export class MutableToken { } value(): Token { - return Token.fromBytes(wasmlib.getBytes(this.objID, this.keyID,wasmlib. TYPE_BYTES)); + return Token.fromBytes(wasmlib.getBytes(this.objID, this.keyID, wasmlib.TYPE_BYTES)); } } diff --git a/packages/vm/core/testcore/sbtests/sbtestsc/testcore_bg.wasm b/packages/vm/core/testcore/sbtests/sbtestsc/testcore_bg.wasm index c7701951f23a18b700efdbffc4971d1d0b1cfec8..2966e8bb6c72f77dd90a718a9c01feaa5f9df16f 100644 GIT binary patch delta 7318 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 T`n07Jr%t;7l#bE0V=Mj}OGFzG delta 7228 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 O(kkFRxM9Dy{=Wg?D))H+ diff --git a/packages/vm/wasmlib/ts/wasmlib/coreaccounts/consts.ts b/packages/vm/wasmlib/ts/wasmlib/coreaccounts/consts.ts index 82006e4680..6b62c38dbd 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreaccounts/consts.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreaccounts/consts.ts @@ -5,30 +5,32 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; export const ScName = "accounts"; export const ScDescription = "Core chain account ledger contract"; export const HScName = new wasmlib.ScHname(0x3c4b5e02); -export const ParamAgentID = "a"; +export const ParamAgentID = "a"; export const ParamWithdrawAmount = "m"; -export const ParamWithdrawColor = "c"; +export const ParamWithdrawColor = "c"; export const ResultAccountNonce = "n"; +export const ResultAgents = "this"; +export const ResultBalances = "this"; -export const FuncDeposit = "deposit"; -export const FuncHarvest = "harvest"; -export const FuncWithdraw = "withdraw"; -export const ViewAccounts = "accounts"; -export const ViewBalance = "balance"; +export const FuncDeposit = "deposit"; +export const FuncHarvest = "harvest"; +export const FuncWithdraw = "withdraw"; +export const ViewAccounts = "accounts"; +export const ViewBalance = "balance"; export const ViewGetAccountNonce = "getAccountNonce"; -export const ViewTotalAssets = "totalAssets"; +export const ViewTotalAssets = "totalAssets"; -export const HFuncDeposit = new wasmlib.ScHname(0xbdc9102d); -export const HFuncHarvest = new wasmlib.ScHname(0x7b40efbd); -export const HFuncWithdraw = new wasmlib.ScHname(0x9dcc0f41); -export const HViewAccounts = new wasmlib.ScHname(0x3c4b5e02); -export const HViewBalance = new wasmlib.ScHname(0x84168cb4); +export const HFuncDeposit = new wasmlib.ScHname(0xbdc9102d); +export const HFuncHarvest = new wasmlib.ScHname(0x7b40efbd); +export const HFuncWithdraw = new wasmlib.ScHname(0x9dcc0f41); +export const HViewAccounts = new wasmlib.ScHname(0x3c4b5e02); +export const HViewBalance = new wasmlib.ScHname(0x84168cb4); export const HViewGetAccountNonce = new wasmlib.ScHname(0x529d7df9); -export const HViewTotalAssets = new wasmlib.ScHname(0xfab0f8d2); +export const HViewTotalAssets = new wasmlib.ScHname(0xfab0f8d2); diff --git a/packages/vm/wasmlib/ts/wasmlib/coreaccounts/contract.ts b/packages/vm/wasmlib/ts/wasmlib/coreaccounts/contract.ts index f969323f7d..86852b5a9d 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreaccounts/contract.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreaccounts/contract.ts @@ -5,43 +5,43 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class DepositCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncDeposit); - params: sc.MutableDepositParams = new sc.MutableDepositParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncDeposit); + params: sc.MutableDepositParams = new sc.MutableDepositParams(); } export class HarvestCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncHarvest); - params: sc.MutableHarvestParams = new sc.MutableHarvestParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncHarvest); + params: sc.MutableHarvestParams = new sc.MutableHarvestParams(); } export class WithdrawCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncWithdraw); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncWithdraw); } export class AccountsCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewAccounts); - results: sc.ImmutableAccountsResults = new sc.ImmutableAccountsResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewAccounts); + results: sc.ImmutableAccountsResults = new sc.ImmutableAccountsResults(); } export class BalanceCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewBalance); - params: sc.MutableBalanceParams = new sc.MutableBalanceParams(); - results: sc.ImmutableBalanceResults = new sc.ImmutableBalanceResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewBalance); + params: sc.MutableBalanceParams = new sc.MutableBalanceParams(); + results: sc.ImmutableBalanceResults = new sc.ImmutableBalanceResults(); } export class GetAccountNonceCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetAccountNonce); - params: sc.MutableGetAccountNonceParams = new sc.MutableGetAccountNonceParams(); - results: sc.ImmutableGetAccountNonceResults = new sc.ImmutableGetAccountNonceResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetAccountNonce); + params: sc.MutableGetAccountNonceParams = new sc.MutableGetAccountNonceParams(); + results: sc.ImmutableGetAccountNonceResults = new sc.ImmutableGetAccountNonceResults(); } export class TotalAssetsCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewTotalAssets); - results: sc.ImmutableTotalAssetsResults = new sc.ImmutableTotalAssetsResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewTotalAssets); + results: sc.ImmutableTotalAssetsResults = new sc.ImmutableTotalAssetsResults(); } export class ScFuncs { @@ -59,8 +59,7 @@ export class ScFuncs { } static withdraw(ctx: wasmlib.ScFuncCallContext): WithdrawCall { - let f = new WithdrawCall(); - return f; + return new WithdrawCall(); } static accounts(ctx: wasmlib.ScViewCallContext): AccountsCall { diff --git a/packages/vm/wasmlib/ts/wasmlib/coreaccounts/params.ts b/packages/vm/wasmlib/ts/wasmlib/coreaccounts/params.ts index 3ab645fd6e..355c64978c 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreaccounts/params.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreaccounts/params.ts @@ -5,69 +5,69 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableDepositParams extends wasmlib.ScMapID { agentID(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamAgentID)); - } + return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamAgentID)); + } } export class MutableDepositParams extends wasmlib.ScMapID { agentID(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamAgentID)); - } + return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamAgentID)); + } } export class ImmutableHarvestParams extends wasmlib.ScMapID { withdrawAmount(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamWithdrawAmount)); - } + return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamWithdrawAmount)); + } withdrawColor(): wasmlib.ScImmutableColor { - return new wasmlib.ScImmutableColor(this.mapID, wasmlib.Key32.fromString(sc.ParamWithdrawColor)); - } + return new wasmlib.ScImmutableColor(this.mapID, wasmlib.Key32.fromString(sc.ParamWithdrawColor)); + } } export class MutableHarvestParams extends wasmlib.ScMapID { withdrawAmount(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamWithdrawAmount)); - } + return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamWithdrawAmount)); + } withdrawColor(): wasmlib.ScMutableColor { - return new wasmlib.ScMutableColor(this.mapID, wasmlib.Key32.fromString(sc.ParamWithdrawColor)); - } + return new wasmlib.ScMutableColor(this.mapID, wasmlib.Key32.fromString(sc.ParamWithdrawColor)); + } } export class ImmutableBalanceParams extends wasmlib.ScMapID { agentID(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamAgentID)); - } + return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamAgentID)); + } } export class MutableBalanceParams extends wasmlib.ScMapID { agentID(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamAgentID)); - } + return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamAgentID)); + } } export class ImmutableGetAccountNonceParams extends wasmlib.ScMapID { agentID(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamAgentID)); - } + return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamAgentID)); + } } export class MutableGetAccountNonceParams extends wasmlib.ScMapID { agentID(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamAgentID)); - } + return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamAgentID)); + } } diff --git a/packages/vm/wasmlib/ts/wasmlib/coreaccounts/results.ts b/packages/vm/wasmlib/ts/wasmlib/coreaccounts/results.ts index e0eb7ca6ea..77a27821b3 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreaccounts/results.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreaccounts/results.ts @@ -5,11 +5,11 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class MapAgentIDToImmutableBytes { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -23,19 +23,19 @@ export class MapAgentIDToImmutableBytes { export class ImmutableAccountsResults extends wasmlib.ScMapID { agents(): sc.MapAgentIDToImmutableBytes { - return new sc.MapAgentIDToImmutableBytes(this.mapID); - } + return new sc.MapAgentIDToImmutableBytes(this.mapID); + } } export class MapAgentIDToMutableBytes { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; } clear(): void { - wasmlib.clear(this.objID) + wasmlib.clear(this.objID); } getBytes(key: wasmlib.ScAgentID): wasmlib.ScMutableBytes { @@ -46,12 +46,12 @@ export class MapAgentIDToMutableBytes { export class MutableAccountsResults extends wasmlib.ScMapID { agents(): sc.MapAgentIDToMutableBytes { - return new sc.MapAgentIDToMutableBytes(this.mapID); - } + return new sc.MapAgentIDToMutableBytes(this.mapID); + } } export class MapColorToImmutableInt64 { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -65,19 +65,19 @@ export class MapColorToImmutableInt64 { export class ImmutableBalanceResults extends wasmlib.ScMapID { balances(): sc.MapColorToImmutableInt64 { - return new sc.MapColorToImmutableInt64(this.mapID); - } + return new sc.MapColorToImmutableInt64(this.mapID); + } } export class MapColorToMutableInt64 { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; } clear(): void { - wasmlib.clear(this.objID) + wasmlib.clear(this.objID); } getInt64(key: wasmlib.ScColor): wasmlib.ScMutableInt64 { @@ -88,34 +88,34 @@ export class MapColorToMutableInt64 { export class MutableBalanceResults extends wasmlib.ScMapID { balances(): sc.MapColorToMutableInt64 { - return new sc.MapColorToMutableInt64(this.mapID); - } + return new sc.MapColorToMutableInt64(this.mapID); + } } export class ImmutableGetAccountNonceResults extends wasmlib.ScMapID { accountNonce(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultAccountNonce)); - } + return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultAccountNonce)); + } } export class MutableGetAccountNonceResults extends wasmlib.ScMapID { accountNonce(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultAccountNonce)); - } + return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultAccountNonce)); + } } export class ImmutableTotalAssetsResults extends wasmlib.ScMapID { balances(): sc.MapColorToImmutableInt64 { - return new sc.MapColorToImmutableInt64(this.mapID); - } + return new sc.MapColorToImmutableInt64(this.mapID); + } } export class MutableTotalAssetsResults extends wasmlib.ScMapID { balances(): sc.MapColorToMutableInt64 { - return new sc.MapColorToMutableInt64(this.mapID); - } + return new sc.MapColorToMutableInt64(this.mapID); + } } diff --git a/packages/vm/wasmlib/ts/wasmlib/coreblob/consts.ts b/packages/vm/wasmlib/ts/wasmlib/coreblob/consts.ts index 0e49977214..d9b309478b 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreblob/consts.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreblob/consts.ts @@ -5,24 +5,26 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; export const ScName = "blob"; export const ScDescription = "Core blob contract"; export const HScName = new wasmlib.ScHname(0xfd91bc63); +export const ParamBlobs = "this"; export const ParamField = "field"; -export const ParamHash = "hash"; +export const ParamHash = "hash"; +export const ResultBlobSizes = "this"; export const ResultBytes = "bytes"; -export const ResultHash = "hash"; +export const ResultHash = "hash"; -export const FuncStoreBlob = "storeBlob"; +export const FuncStoreBlob = "storeBlob"; export const ViewGetBlobField = "getBlobField"; -export const ViewGetBlobInfo = "getBlobInfo"; -export const ViewListBlobs = "listBlobs"; +export const ViewGetBlobInfo = "getBlobInfo"; +export const ViewListBlobs = "listBlobs"; -export const HFuncStoreBlob = new wasmlib.ScHname(0xddd4c281); +export const HFuncStoreBlob = new wasmlib.ScHname(0xddd4c281); export const HViewGetBlobField = new wasmlib.ScHname(0x1f448130); -export const HViewGetBlobInfo = new wasmlib.ScHname(0xfde4ab46); -export const HViewListBlobs = new wasmlib.ScHname(0x62ca7990); +export const HViewGetBlobInfo = new wasmlib.ScHname(0xfde4ab46); +export const HViewListBlobs = new wasmlib.ScHname(0x62ca7990); diff --git a/packages/vm/wasmlib/ts/wasmlib/coreblob/contract.ts b/packages/vm/wasmlib/ts/wasmlib/coreblob/contract.ts index 7fd8422de0..9180a863fd 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreblob/contract.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreblob/contract.ts @@ -5,30 +5,30 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class StoreBlobCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncStoreBlob); - params: sc.MutableStoreBlobParams = new sc.MutableStoreBlobParams(); - results: sc.ImmutableStoreBlobResults = new sc.ImmutableStoreBlobResults(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncStoreBlob); + params: sc.MutableStoreBlobParams = new sc.MutableStoreBlobParams(); + results: sc.ImmutableStoreBlobResults = new sc.ImmutableStoreBlobResults(); } export class GetBlobFieldCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetBlobField); - params: sc.MutableGetBlobFieldParams = new sc.MutableGetBlobFieldParams(); - results: sc.ImmutableGetBlobFieldResults = new sc.ImmutableGetBlobFieldResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetBlobField); + params: sc.MutableGetBlobFieldParams = new sc.MutableGetBlobFieldParams(); + results: sc.ImmutableGetBlobFieldResults = new sc.ImmutableGetBlobFieldResults(); } export class GetBlobInfoCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetBlobInfo); - params: sc.MutableGetBlobInfoParams = new sc.MutableGetBlobInfoParams(); - results: sc.ImmutableGetBlobInfoResults = new sc.ImmutableGetBlobInfoResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetBlobInfo); + params: sc.MutableGetBlobInfoParams = new sc.MutableGetBlobInfoParams(); + results: sc.ImmutableGetBlobInfoResults = new sc.ImmutableGetBlobInfoResults(); } export class ListBlobsCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewListBlobs); - results: sc.ImmutableListBlobsResults = new sc.ImmutableListBlobsResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewListBlobs); + results: sc.ImmutableListBlobsResults = new sc.ImmutableListBlobsResults(); } export class ScFuncs { diff --git a/packages/vm/wasmlib/ts/wasmlib/coreblob/params.ts b/packages/vm/wasmlib/ts/wasmlib/coreblob/params.ts index 0c86f3ab50..1447252c98 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreblob/params.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreblob/params.ts @@ -5,11 +5,11 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class MapStringToImmutableBytes { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -23,19 +23,19 @@ export class MapStringToImmutableBytes { export class ImmutableStoreBlobParams extends wasmlib.ScMapID { blobs(): sc.MapStringToImmutableBytes { - return new sc.MapStringToImmutableBytes(this.mapID); - } + return new sc.MapStringToImmutableBytes(this.mapID); + } } export class MapStringToMutableBytes { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; } clear(): void { - wasmlib.clear(this.objID) + wasmlib.clear(this.objID); } getBytes(key: string): wasmlib.ScMutableBytes { @@ -46,42 +46,42 @@ export class MapStringToMutableBytes { export class MutableStoreBlobParams extends wasmlib.ScMapID { blobs(): sc.MapStringToMutableBytes { - return new sc.MapStringToMutableBytes(this.mapID); - } + return new sc.MapStringToMutableBytes(this.mapID); + } } export class ImmutableGetBlobFieldParams extends wasmlib.ScMapID { field(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, wasmlib.Key32.fromString(sc.ParamField)); - } + return new wasmlib.ScImmutableString(this.mapID, wasmlib.Key32.fromString(sc.ParamField)); + } hash(): wasmlib.ScImmutableHash { - return new wasmlib.ScImmutableHash(this.mapID, wasmlib.Key32.fromString(sc.ParamHash)); - } + return new wasmlib.ScImmutableHash(this.mapID, wasmlib.Key32.fromString(sc.ParamHash)); + } } export class MutableGetBlobFieldParams extends wasmlib.ScMapID { field(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, wasmlib.Key32.fromString(sc.ParamField)); - } + return new wasmlib.ScMutableString(this.mapID, wasmlib.Key32.fromString(sc.ParamField)); + } hash(): wasmlib.ScMutableHash { - return new wasmlib.ScMutableHash(this.mapID, wasmlib.Key32.fromString(sc.ParamHash)); - } + return new wasmlib.ScMutableHash(this.mapID, wasmlib.Key32.fromString(sc.ParamHash)); + } } export class ImmutableGetBlobInfoParams extends wasmlib.ScMapID { hash(): wasmlib.ScImmutableHash { - return new wasmlib.ScImmutableHash(this.mapID, wasmlib.Key32.fromString(sc.ParamHash)); - } + return new wasmlib.ScImmutableHash(this.mapID, wasmlib.Key32.fromString(sc.ParamHash)); + } } export class MutableGetBlobInfoParams extends wasmlib.ScMapID { hash(): wasmlib.ScMutableHash { - return new wasmlib.ScMutableHash(this.mapID, wasmlib.Key32.fromString(sc.ParamHash)); - } + return new wasmlib.ScMutableHash(this.mapID, wasmlib.Key32.fromString(sc.ParamHash)); + } } diff --git a/packages/vm/wasmlib/ts/wasmlib/coreblob/results.ts b/packages/vm/wasmlib/ts/wasmlib/coreblob/results.ts index ec64602e60..512f6ad85e 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreblob/results.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreblob/results.ts @@ -5,39 +5,39 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableStoreBlobResults extends wasmlib.ScMapID { hash(): wasmlib.ScImmutableHash { - return new wasmlib.ScImmutableHash(this.mapID, wasmlib.Key32.fromString(sc.ResultHash)); - } + return new wasmlib.ScImmutableHash(this.mapID, wasmlib.Key32.fromString(sc.ResultHash)); + } } export class MutableStoreBlobResults extends wasmlib.ScMapID { hash(): wasmlib.ScMutableHash { - return new wasmlib.ScMutableHash(this.mapID, wasmlib.Key32.fromString(sc.ResultHash)); - } + return new wasmlib.ScMutableHash(this.mapID, wasmlib.Key32.fromString(sc.ResultHash)); + } } export class ImmutableGetBlobFieldResults extends wasmlib.ScMapID { bytes(): wasmlib.ScImmutableBytes { - return new wasmlib.ScImmutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultBytes)); - } + return new wasmlib.ScImmutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultBytes)); + } } export class MutableGetBlobFieldResults extends wasmlib.ScMapID { bytes(): wasmlib.ScMutableBytes { - return new wasmlib.ScMutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultBytes)); - } + return new wasmlib.ScMutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultBytes)); + } } export class MapStringToImmutableInt32 { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -51,19 +51,19 @@ export class MapStringToImmutableInt32 { export class ImmutableGetBlobInfoResults extends wasmlib.ScMapID { blobSizes(): sc.MapStringToImmutableInt32 { - return new sc.MapStringToImmutableInt32(this.mapID); - } + return new sc.MapStringToImmutableInt32(this.mapID); + } } export class MapStringToMutableInt32 { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; } clear(): void { - wasmlib.clear(this.objID) + wasmlib.clear(this.objID); } getInt32(key: string): wasmlib.ScMutableInt32 { @@ -74,12 +74,12 @@ export class MapStringToMutableInt32 { export class MutableGetBlobInfoResults extends wasmlib.ScMapID { blobSizes(): sc.MapStringToMutableInt32 { - return new sc.MapStringToMutableInt32(this.mapID); - } + return new sc.MapStringToMutableInt32(this.mapID); + } } export class MapHashToImmutableInt32 { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -93,19 +93,19 @@ export class MapHashToImmutableInt32 { export class ImmutableListBlobsResults extends wasmlib.ScMapID { blobSizes(): sc.MapHashToImmutableInt32 { - return new sc.MapHashToImmutableInt32(this.mapID); - } + return new sc.MapHashToImmutableInt32(this.mapID); + } } export class MapHashToMutableInt32 { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; } clear(): void { - wasmlib.clear(this.objID) + wasmlib.clear(this.objID); } getInt32(key: wasmlib.ScHash): wasmlib.ScMutableInt32 { @@ -116,6 +116,6 @@ export class MapHashToMutableInt32 { export class MutableListBlobsResults extends wasmlib.ScMapID { blobSizes(): sc.MapHashToMutableInt32 { - return new sc.MapHashToMutableInt32(this.mapID); - } + return new sc.MapHashToMutableInt32(this.mapID); + } } diff --git a/packages/vm/wasmlib/ts/wasmlib/coreblocklog/consts.ts b/packages/vm/wasmlib/ts/wasmlib/coreblocklog/consts.ts index 11238f332a..1b8b4b8884 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreblocklog/consts.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreblocklog/consts.ts @@ -5,46 +5,46 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; export const ScName = "blocklog"; export const ScDescription = "Core block log contract"; export const HScName = new wasmlib.ScHname(0xf538ef2b); -export const ParamBlockIndex = "n"; +export const ParamBlockIndex = "n"; export const ParamContractHname = "h"; -export const ParamFromBlock = "f"; -export const ParamRequestID = "u"; -export const ParamToBlock = "t"; +export const ParamFromBlock = "f"; +export const ParamRequestID = "u"; +export const ParamToBlock = "t"; -export const ResultBlockIndex = "n"; -export const ResultBlockInfo = "i"; -export const ResultEvent = "e"; -export const ResultGoverningAddress = "g"; -export const ResultRequestID = "u"; -export const ResultRequestIndex = "r"; -export const ResultRequestProcessed = "p"; -export const ResultRequestRecord = "d"; +export const ResultBlockIndex = "n"; +export const ResultBlockInfo = "i"; +export const ResultEvent = "e"; +export const ResultGoverningAddress = "g"; +export const ResultRequestID = "u"; +export const ResultRequestIndex = "r"; +export const ResultRequestProcessed = "p"; +export const ResultRequestRecord = "d"; export const ResultStateControllerAddress = "s"; -export const ViewControlAddresses = "controlAddresses"; -export const ViewGetBlockInfo = "getBlockInfo"; -export const ViewGetEventsForBlock = "getEventsForBlock"; -export const ViewGetEventsForContract = "getEventsForContract"; -export const ViewGetEventsForRequest = "getEventsForRequest"; -export const ViewGetLatestBlockInfo = "getLatestBlockInfo"; -export const ViewGetRequestIDsForBlock = "getRequestIDsForBlock"; -export const ViewGetRequestReceipt = "getRequestReceipt"; +export const ViewControlAddresses = "controlAddresses"; +export const ViewGetBlockInfo = "getBlockInfo"; +export const ViewGetEventsForBlock = "getEventsForBlock"; +export const ViewGetEventsForContract = "getEventsForContract"; +export const ViewGetEventsForRequest = "getEventsForRequest"; +export const ViewGetLatestBlockInfo = "getLatestBlockInfo"; +export const ViewGetRequestIDsForBlock = "getRequestIDsForBlock"; +export const ViewGetRequestReceipt = "getRequestReceipt"; export const ViewGetRequestReceiptsForBlock = "getRequestReceiptsForBlock"; -export const ViewIsRequestProcessed = "isRequestProcessed"; +export const ViewIsRequestProcessed = "isRequestProcessed"; -export const HViewControlAddresses = new wasmlib.ScHname(0x796bd223); -export const HViewGetBlockInfo = new wasmlib.ScHname(0xbe89f9b3); -export const HViewGetEventsForBlock = new wasmlib.ScHname(0x36232798); -export const HViewGetEventsForContract = new wasmlib.ScHname(0x682a1922); -export const HViewGetEventsForRequest = new wasmlib.ScHname(0x4f8d68e4); -export const HViewGetLatestBlockInfo = new wasmlib.ScHname(0x084a1760); -export const HViewGetRequestIDsForBlock = new wasmlib.ScHname(0x5a20327a); -export const HViewGetRequestReceipt = new wasmlib.ScHname(0xb7f9534f); +export const HViewControlAddresses = new wasmlib.ScHname(0x796bd223); +export const HViewGetBlockInfo = new wasmlib.ScHname(0xbe89f9b3); +export const HViewGetEventsForBlock = new wasmlib.ScHname(0x36232798); +export const HViewGetEventsForContract = new wasmlib.ScHname(0x682a1922); +export const HViewGetEventsForRequest = new wasmlib.ScHname(0x4f8d68e4); +export const HViewGetLatestBlockInfo = new wasmlib.ScHname(0x084a1760); +export const HViewGetRequestIDsForBlock = new wasmlib.ScHname(0x5a20327a); +export const HViewGetRequestReceipt = new wasmlib.ScHname(0xb7f9534f); export const HViewGetRequestReceiptsForBlock = new wasmlib.ScHname(0x77e3beef); -export const HViewIsRequestProcessed = new wasmlib.ScHname(0xd57d50a9); +export const HViewIsRequestProcessed = new wasmlib.ScHname(0xd57d50a9); diff --git a/packages/vm/wasmlib/ts/wasmlib/coreblocklog/contract.ts b/packages/vm/wasmlib/ts/wasmlib/coreblocklog/contract.ts index ffc38aef7e..a8160f9572 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreblocklog/contract.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreblocklog/contract.ts @@ -5,65 +5,65 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ControlAddressesCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewControlAddresses); - results: sc.ImmutableControlAddressesResults = new sc.ImmutableControlAddressesResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewControlAddresses); + results: sc.ImmutableControlAddressesResults = new sc.ImmutableControlAddressesResults(); } export class GetBlockInfoCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetBlockInfo); - params: sc.MutableGetBlockInfoParams = new sc.MutableGetBlockInfoParams(); - results: sc.ImmutableGetBlockInfoResults = new sc.ImmutableGetBlockInfoResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetBlockInfo); + params: sc.MutableGetBlockInfoParams = new sc.MutableGetBlockInfoParams(); + results: sc.ImmutableGetBlockInfoResults = new sc.ImmutableGetBlockInfoResults(); } export class GetEventsForBlockCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetEventsForBlock); - params: sc.MutableGetEventsForBlockParams = new sc.MutableGetEventsForBlockParams(); - results: sc.ImmutableGetEventsForBlockResults = new sc.ImmutableGetEventsForBlockResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetEventsForBlock); + params: sc.MutableGetEventsForBlockParams = new sc.MutableGetEventsForBlockParams(); + results: sc.ImmutableGetEventsForBlockResults = new sc.ImmutableGetEventsForBlockResults(); } export class GetEventsForContractCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetEventsForContract); - params: sc.MutableGetEventsForContractParams = new sc.MutableGetEventsForContractParams(); - results: sc.ImmutableGetEventsForContractResults = new sc.ImmutableGetEventsForContractResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetEventsForContract); + params: sc.MutableGetEventsForContractParams = new sc.MutableGetEventsForContractParams(); + results: sc.ImmutableGetEventsForContractResults = new sc.ImmutableGetEventsForContractResults(); } export class GetEventsForRequestCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetEventsForRequest); - params: sc.MutableGetEventsForRequestParams = new sc.MutableGetEventsForRequestParams(); - results: sc.ImmutableGetEventsForRequestResults = new sc.ImmutableGetEventsForRequestResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetEventsForRequest); + params: sc.MutableGetEventsForRequestParams = new sc.MutableGetEventsForRequestParams(); + results: sc.ImmutableGetEventsForRequestResults = new sc.ImmutableGetEventsForRequestResults(); } export class GetLatestBlockInfoCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetLatestBlockInfo); - results: sc.ImmutableGetLatestBlockInfoResults = new sc.ImmutableGetLatestBlockInfoResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetLatestBlockInfo); + results: sc.ImmutableGetLatestBlockInfoResults = new sc.ImmutableGetLatestBlockInfoResults(); } export class GetRequestIDsForBlockCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetRequestIDsForBlock); - params: sc.MutableGetRequestIDsForBlockParams = new sc.MutableGetRequestIDsForBlockParams(); - results: sc.ImmutableGetRequestIDsForBlockResults = new sc.ImmutableGetRequestIDsForBlockResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetRequestIDsForBlock); + params: sc.MutableGetRequestIDsForBlockParams = new sc.MutableGetRequestIDsForBlockParams(); + results: sc.ImmutableGetRequestIDsForBlockResults = new sc.ImmutableGetRequestIDsForBlockResults(); } export class GetRequestReceiptCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetRequestReceipt); - params: sc.MutableGetRequestReceiptParams = new sc.MutableGetRequestReceiptParams(); - results: sc.ImmutableGetRequestReceiptResults = new sc.ImmutableGetRequestReceiptResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetRequestReceipt); + params: sc.MutableGetRequestReceiptParams = new sc.MutableGetRequestReceiptParams(); + results: sc.ImmutableGetRequestReceiptResults = new sc.ImmutableGetRequestReceiptResults(); } export class GetRequestReceiptsForBlockCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetRequestReceiptsForBlock); - params: sc.MutableGetRequestReceiptsForBlockParams = new sc.MutableGetRequestReceiptsForBlockParams(); - results: sc.ImmutableGetRequestReceiptsForBlockResults = new sc.ImmutableGetRequestReceiptsForBlockResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetRequestReceiptsForBlock); + params: sc.MutableGetRequestReceiptsForBlockParams = new sc.MutableGetRequestReceiptsForBlockParams(); + results: sc.ImmutableGetRequestReceiptsForBlockResults = new sc.ImmutableGetRequestReceiptsForBlockResults(); } export class IsRequestProcessedCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewIsRequestProcessed); - params: sc.MutableIsRequestProcessedParams = new sc.MutableIsRequestProcessedParams(); - results: sc.ImmutableIsRequestProcessedResults = new sc.ImmutableIsRequestProcessedResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewIsRequestProcessed); + params: sc.MutableIsRequestProcessedParams = new sc.MutableIsRequestProcessedParams(); + results: sc.ImmutableIsRequestProcessedResults = new sc.ImmutableIsRequestProcessedResults(); } export class ScFuncs { diff --git a/packages/vm/wasmlib/ts/wasmlib/coreblocklog/params.ts b/packages/vm/wasmlib/ts/wasmlib/coreblocklog/params.ts index a9907bfb27..aa4fbef70e 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreblocklog/params.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreblocklog/params.ts @@ -5,133 +5,133 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableGetBlockInfoParams extends wasmlib.ScMapID { blockIndex(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); - } + return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); + } } export class MutableGetBlockInfoParams extends wasmlib.ScMapID { blockIndex(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); - } + return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); + } } export class ImmutableGetEventsForBlockParams extends wasmlib.ScMapID { blockIndex(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); - } + return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); + } } export class MutableGetEventsForBlockParams extends wasmlib.ScMapID { blockIndex(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); - } + return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); + } } export class ImmutableGetEventsForContractParams extends wasmlib.ScMapID { contractHname(): wasmlib.ScImmutableHname { - return new wasmlib.ScImmutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamContractHname)); - } + return new wasmlib.ScImmutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamContractHname)); + } fromBlock(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamFromBlock)); - } + return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamFromBlock)); + } toBlock(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamToBlock)); - } + return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamToBlock)); + } } export class MutableGetEventsForContractParams extends wasmlib.ScMapID { contractHname(): wasmlib.ScMutableHname { - return new wasmlib.ScMutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamContractHname)); - } + return new wasmlib.ScMutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamContractHname)); + } fromBlock(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamFromBlock)); - } + return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamFromBlock)); + } toBlock(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamToBlock)); - } + return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamToBlock)); + } } export class ImmutableGetEventsForRequestParams extends wasmlib.ScMapID { requestID(): wasmlib.ScImmutableRequestID { - return new wasmlib.ScImmutableRequestID(this.mapID, wasmlib.Key32.fromString(sc.ParamRequestID)); - } + return new wasmlib.ScImmutableRequestID(this.mapID, wasmlib.Key32.fromString(sc.ParamRequestID)); + } } export class MutableGetEventsForRequestParams extends wasmlib.ScMapID { requestID(): wasmlib.ScMutableRequestID { - return new wasmlib.ScMutableRequestID(this.mapID, wasmlib.Key32.fromString(sc.ParamRequestID)); - } + return new wasmlib.ScMutableRequestID(this.mapID, wasmlib.Key32.fromString(sc.ParamRequestID)); + } } export class ImmutableGetRequestIDsForBlockParams extends wasmlib.ScMapID { blockIndex(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); - } + return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); + } } export class MutableGetRequestIDsForBlockParams extends wasmlib.ScMapID { blockIndex(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); - } + return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); + } } export class ImmutableGetRequestReceiptParams extends wasmlib.ScMapID { requestID(): wasmlib.ScImmutableRequestID { - return new wasmlib.ScImmutableRequestID(this.mapID, wasmlib.Key32.fromString(sc.ParamRequestID)); - } + return new wasmlib.ScImmutableRequestID(this.mapID, wasmlib.Key32.fromString(sc.ParamRequestID)); + } } export class MutableGetRequestReceiptParams extends wasmlib.ScMapID { requestID(): wasmlib.ScMutableRequestID { - return new wasmlib.ScMutableRequestID(this.mapID, wasmlib.Key32.fromString(sc.ParamRequestID)); - } + return new wasmlib.ScMutableRequestID(this.mapID, wasmlib.Key32.fromString(sc.ParamRequestID)); + } } export class ImmutableGetRequestReceiptsForBlockParams extends wasmlib.ScMapID { blockIndex(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); - } + return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); + } } export class MutableGetRequestReceiptsForBlockParams extends wasmlib.ScMapID { blockIndex(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); - } + return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); + } } export class ImmutableIsRequestProcessedParams extends wasmlib.ScMapID { requestID(): wasmlib.ScImmutableRequestID { - return new wasmlib.ScImmutableRequestID(this.mapID, wasmlib.Key32.fromString(sc.ParamRequestID)); - } + return new wasmlib.ScImmutableRequestID(this.mapID, wasmlib.Key32.fromString(sc.ParamRequestID)); + } } export class MutableIsRequestProcessedParams extends wasmlib.ScMapID { requestID(): wasmlib.ScMutableRequestID { - return new wasmlib.ScMutableRequestID(this.mapID, wasmlib.Key32.fromString(sc.ParamRequestID)); - } + return new wasmlib.ScMutableRequestID(this.mapID, wasmlib.Key32.fromString(sc.ParamRequestID)); + } } diff --git a/packages/vm/wasmlib/ts/wasmlib/coreblocklog/results.ts b/packages/vm/wasmlib/ts/wasmlib/coreblocklog/results.ts index 01852ab376..565f8a079d 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreblocklog/results.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreblocklog/results.ts @@ -5,55 +5,55 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableControlAddressesResults extends wasmlib.ScMapID { blockIndex(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockIndex)); - } + return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockIndex)); + } governingAddress(): wasmlib.ScImmutableAddress { - return new wasmlib.ScImmutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ResultGoverningAddress)); - } + return new wasmlib.ScImmutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ResultGoverningAddress)); + } stateControllerAddress(): wasmlib.ScImmutableAddress { - return new wasmlib.ScImmutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ResultStateControllerAddress)); - } + return new wasmlib.ScImmutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ResultStateControllerAddress)); + } } export class MutableControlAddressesResults extends wasmlib.ScMapID { blockIndex(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockIndex)); - } + return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockIndex)); + } governingAddress(): wasmlib.ScMutableAddress { - return new wasmlib.ScMutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ResultGoverningAddress)); - } + return new wasmlib.ScMutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ResultGoverningAddress)); + } stateControllerAddress(): wasmlib.ScMutableAddress { - return new wasmlib.ScMutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ResultStateControllerAddress)); - } + return new wasmlib.ScMutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ResultStateControllerAddress)); + } } export class ImmutableGetBlockInfoResults extends wasmlib.ScMapID { blockInfo(): wasmlib.ScImmutableBytes { - return new wasmlib.ScImmutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockInfo)); - } + return new wasmlib.ScImmutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockInfo)); + } } export class MutableGetBlockInfoResults extends wasmlib.ScMapID { blockInfo(): wasmlib.ScMutableBytes { - return new wasmlib.ScMutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockInfo)); - } + return new wasmlib.ScMutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockInfo)); + } } export class ArrayOfImmutableBytes { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -71,13 +71,13 @@ export class ArrayOfImmutableBytes { export class ImmutableGetEventsForBlockResults extends wasmlib.ScMapID { event(): sc.ArrayOfImmutableBytes { - let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); - return new sc.ArrayOfImmutableBytes(arrID) - } + let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); + return new sc.ArrayOfImmutableBytes(arrID); + } } export class ArrayOfMutableBytes { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -99,67 +99,67 @@ export class ArrayOfMutableBytes { export class MutableGetEventsForBlockResults extends wasmlib.ScMapID { event(): sc.ArrayOfMutableBytes { - let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); - return new sc.ArrayOfMutableBytes(arrID) - } + let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); + return new sc.ArrayOfMutableBytes(arrID); + } } export class ImmutableGetEventsForContractResults extends wasmlib.ScMapID { event(): sc.ArrayOfImmutableBytes { - let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); - return new sc.ArrayOfImmutableBytes(arrID) - } + let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); + return new sc.ArrayOfImmutableBytes(arrID); + } } export class MutableGetEventsForContractResults extends wasmlib.ScMapID { event(): sc.ArrayOfMutableBytes { - let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); - return new sc.ArrayOfMutableBytes(arrID) - } + let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); + return new sc.ArrayOfMutableBytes(arrID); + } } export class ImmutableGetEventsForRequestResults extends wasmlib.ScMapID { event(): sc.ArrayOfImmutableBytes { - let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); - return new sc.ArrayOfImmutableBytes(arrID) - } + let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); + return new sc.ArrayOfImmutableBytes(arrID); + } } export class MutableGetEventsForRequestResults extends wasmlib.ScMapID { event(): sc.ArrayOfMutableBytes { - let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); - return new sc.ArrayOfMutableBytes(arrID) - } + let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); + return new sc.ArrayOfMutableBytes(arrID); + } } export class ImmutableGetLatestBlockInfoResults extends wasmlib.ScMapID { blockIndex(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockIndex)); - } + return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockIndex)); + } blockInfo(): wasmlib.ScImmutableBytes { - return new wasmlib.ScImmutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockInfo)); - } + return new wasmlib.ScImmutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockInfo)); + } } export class MutableGetLatestBlockInfoResults extends wasmlib.ScMapID { blockIndex(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockIndex)); - } + return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockIndex)); + } blockInfo(): wasmlib.ScMutableBytes { - return new wasmlib.ScMutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockInfo)); - } + return new wasmlib.ScMutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockInfo)); + } } export class ArrayOfImmutableRequestID { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -177,13 +177,13 @@ export class ArrayOfImmutableRequestID { export class ImmutableGetRequestIDsForBlockResults extends wasmlib.ScMapID { requestID(): sc.ArrayOfImmutableRequestID { - let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestID), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_REQUEST_ID); - return new sc.ArrayOfImmutableRequestID(arrID) - } + let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestID), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_REQUEST_ID); + return new sc.ArrayOfImmutableRequestID(arrID); + } } export class ArrayOfMutableRequestID { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -205,67 +205,67 @@ export class ArrayOfMutableRequestID { export class MutableGetRequestIDsForBlockResults extends wasmlib.ScMapID { requestID(): sc.ArrayOfMutableRequestID { - let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestID), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_REQUEST_ID); - return new sc.ArrayOfMutableRequestID(arrID) - } + let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestID), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_REQUEST_ID); + return new sc.ArrayOfMutableRequestID(arrID); + } } export class ImmutableGetRequestReceiptResults extends wasmlib.ScMapID { blockIndex(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockIndex)); - } + return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockIndex)); + } requestIndex(): wasmlib.ScImmutableInt16 { - return new wasmlib.ScImmutableInt16(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestIndex)); - } + return new wasmlib.ScImmutableInt16(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestIndex)); + } requestRecord(): wasmlib.ScImmutableBytes { - return new wasmlib.ScImmutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestRecord)); - } + return new wasmlib.ScImmutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestRecord)); + } } export class MutableGetRequestReceiptResults extends wasmlib.ScMapID { blockIndex(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockIndex)); - } + return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockIndex)); + } requestIndex(): wasmlib.ScMutableInt16 { - return new wasmlib.ScMutableInt16(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestIndex)); - } + return new wasmlib.ScMutableInt16(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestIndex)); + } requestRecord(): wasmlib.ScMutableBytes { - return new wasmlib.ScMutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestRecord)); - } + return new wasmlib.ScMutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestRecord)); + } } export class ImmutableGetRequestReceiptsForBlockResults extends wasmlib.ScMapID { requestRecord(): sc.ArrayOfImmutableBytes { - let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestRecord), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); - return new sc.ArrayOfImmutableBytes(arrID) - } + let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestRecord), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); + return new sc.ArrayOfImmutableBytes(arrID); + } } export class MutableGetRequestReceiptsForBlockResults extends wasmlib.ScMapID { requestRecord(): sc.ArrayOfMutableBytes { - let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestRecord), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); - return new sc.ArrayOfMutableBytes(arrID) - } + let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestRecord), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); + return new sc.ArrayOfMutableBytes(arrID); + } } export class ImmutableIsRequestProcessedResults extends wasmlib.ScMapID { requestProcessed(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestProcessed)); - } + return new wasmlib.ScImmutableString(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestProcessed)); + } } export class MutableIsRequestProcessedResults extends wasmlib.ScMapID { requestProcessed(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestProcessed)); - } + return new wasmlib.ScMutableString(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestProcessed)); + } } diff --git a/packages/vm/wasmlib/ts/wasmlib/coregovernance/consts.ts b/packages/vm/wasmlib/ts/wasmlib/coregovernance/consts.ts index c3ea510454..96ebdc9e74 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coregovernance/consts.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coregovernance/consts.ts @@ -5,57 +5,57 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; export const ScName = "governance"; export const ScDescription = "Core governance contract"; export const HScName = new wasmlib.ScHname(0x17cf909f); -export const ParamChainOwner = "oi"; -export const ParamFeeColor = "fc"; -export const ParamHname = "hn"; -export const ParamMaxBlobSize = "bs"; -export const ParamMaxEventSize = "es"; -export const ParamMaxEventsPerReq = "ne"; -export const ParamOwnerFee = "of"; +export const ParamChainOwner = "oi"; +export const ParamFeeColor = "fc"; +export const ParamHname = "hn"; +export const ParamMaxBlobSize = "bs"; +export const ParamMaxEventSize = "es"; +export const ParamMaxEventsPerReq = "ne"; +export const ParamOwnerFee = "of"; export const ParamStateControllerAddress = "S"; -export const ParamValidatorFee = "vf"; +export const ParamValidatorFee = "vf"; export const ResultAllowedStateControllerAddresses = "a"; -export const ResultChainID = "c"; -export const ResultChainOwnerID = "o"; -export const ResultDefaultOwnerFee = "do"; -export const ResultDefaultValidatorFee = "dv"; -export const ResultDescription = "d"; -export const ResultFeeColor = "f"; -export const ResultMaxBlobSize = "mb"; -export const ResultMaxEventSize = "me"; -export const ResultMaxEventsPerReq = "mr"; -export const ResultOwnerFee = "of"; -export const ResultValidatorFee = "vf"; +export const ResultChainID = "c"; +export const ResultChainOwnerID = "o"; +export const ResultDefaultOwnerFee = "do"; +export const ResultDefaultValidatorFee = "dv"; +export const ResultDescription = "d"; +export const ResultFeeColor = "f"; +export const ResultMaxBlobSize = "mb"; +export const ResultMaxEventSize = "me"; +export const ResultMaxEventsPerReq = "mr"; +export const ResultOwnerFee = "of"; +export const ResultValidatorFee = "vf"; -export const FuncAddAllowedStateControllerAddress = "addAllowedStateControllerAddress"; -export const FuncClaimChainOwnership = "claimChainOwnership"; -export const FuncDelegateChainOwnership = "delegateChainOwnership"; +export const FuncAddAllowedStateControllerAddress = "addAllowedStateControllerAddress"; +export const FuncClaimChainOwnership = "claimChainOwnership"; +export const FuncDelegateChainOwnership = "delegateChainOwnership"; export const FuncRemoveAllowedStateControllerAddress = "removeAllowedStateControllerAddress"; -export const FuncRotateStateController = "rotateStateController"; -export const FuncSetChainInfo = "setChainInfo"; -export const FuncSetContractFee = "setContractFee"; -export const FuncSetDefaultFee = "setDefaultFee"; -export const ViewGetAllowedStateControllerAddresses = "getAllowedStateControllerAddresses"; -export const ViewGetChainInfo = "getChainInfo"; -export const ViewGetFeeInfo = "getFeeInfo"; -export const ViewGetMaxBlobSize = "getMaxBlobSize"; +export const FuncRotateStateController = "rotateStateController"; +export const FuncSetChainInfo = "setChainInfo"; +export const FuncSetContractFee = "setContractFee"; +export const FuncSetDefaultFee = "setDefaultFee"; +export const ViewGetAllowedStateControllerAddresses = "getAllowedStateControllerAddresses"; +export const ViewGetChainInfo = "getChainInfo"; +export const ViewGetFeeInfo = "getFeeInfo"; +export const ViewGetMaxBlobSize = "getMaxBlobSize"; -export const HFuncAddAllowedStateControllerAddress = new wasmlib.ScHname(0x9469d567); -export const HFuncClaimChainOwnership = new wasmlib.ScHname(0x03ff0fc0); -export const HFuncDelegateChainOwnership = new wasmlib.ScHname(0x93ecb6ad); +export const HFuncAddAllowedStateControllerAddress = new wasmlib.ScHname(0x9469d567); +export const HFuncClaimChainOwnership = new wasmlib.ScHname(0x03ff0fc0); +export const HFuncDelegateChainOwnership = new wasmlib.ScHname(0x93ecb6ad); export const HFuncRemoveAllowedStateControllerAddress = new wasmlib.ScHname(0x31f69447); -export const HFuncRotateStateController = new wasmlib.ScHname(0x244d1038); -export const HFuncSetChainInfo = new wasmlib.ScHname(0x702f5d2b); -export const HFuncSetContractFee = new wasmlib.ScHname(0x8421a42b); -export const HFuncSetDefaultFee = new wasmlib.ScHname(0x3310ecd0); -export const HViewGetAllowedStateControllerAddresses = new wasmlib.ScHname(0xf3505183); -export const HViewGetChainInfo = new wasmlib.ScHname(0x434477e2); -export const HViewGetFeeInfo = new wasmlib.ScHname(0x9fe54b48); -export const HViewGetMaxBlobSize = new wasmlib.ScHname(0xe1db3d28); +export const HFuncRotateStateController = new wasmlib.ScHname(0x244d1038); +export const HFuncSetChainInfo = new wasmlib.ScHname(0x702f5d2b); +export const HFuncSetContractFee = new wasmlib.ScHname(0x8421a42b); +export const HFuncSetDefaultFee = new wasmlib.ScHname(0x3310ecd0); +export const HViewGetAllowedStateControllerAddresses = new wasmlib.ScHname(0xf3505183); +export const HViewGetChainInfo = new wasmlib.ScHname(0x434477e2); +export const HViewGetFeeInfo = new wasmlib.ScHname(0x9fe54b48); +export const HViewGetMaxBlobSize = new wasmlib.ScHname(0xe1db3d28); diff --git a/packages/vm/wasmlib/ts/wasmlib/coregovernance/contract.ts b/packages/vm/wasmlib/ts/wasmlib/coregovernance/contract.ts index dfc45e5702..d5218719c8 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coregovernance/contract.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coregovernance/contract.ts @@ -5,67 +5,67 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class AddAllowedStateControllerAddressCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncAddAllowedStateControllerAddress); - params: sc.MutableAddAllowedStateControllerAddressParams = new sc.MutableAddAllowedStateControllerAddressParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncAddAllowedStateControllerAddress); + params: sc.MutableAddAllowedStateControllerAddressParams = new sc.MutableAddAllowedStateControllerAddressParams(); } export class ClaimChainOwnershipCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncClaimChainOwnership); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncClaimChainOwnership); } export class DelegateChainOwnershipCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncDelegateChainOwnership); - params: sc.MutableDelegateChainOwnershipParams = new sc.MutableDelegateChainOwnershipParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncDelegateChainOwnership); + params: sc.MutableDelegateChainOwnershipParams = new sc.MutableDelegateChainOwnershipParams(); } export class RemoveAllowedStateControllerAddressCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncRemoveAllowedStateControllerAddress); - params: sc.MutableRemoveAllowedStateControllerAddressParams = new sc.MutableRemoveAllowedStateControllerAddressParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncRemoveAllowedStateControllerAddress); + params: sc.MutableRemoveAllowedStateControllerAddressParams = new sc.MutableRemoveAllowedStateControllerAddressParams(); } export class RotateStateControllerCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncRotateStateController); - params: sc.MutableRotateStateControllerParams = new sc.MutableRotateStateControllerParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncRotateStateController); + params: sc.MutableRotateStateControllerParams = new sc.MutableRotateStateControllerParams(); } export class SetChainInfoCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncSetChainInfo); - params: sc.MutableSetChainInfoParams = new sc.MutableSetChainInfoParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncSetChainInfo); + params: sc.MutableSetChainInfoParams = new sc.MutableSetChainInfoParams(); } export class SetContractFeeCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncSetContractFee); - params: sc.MutableSetContractFeeParams = new sc.MutableSetContractFeeParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncSetContractFee); + params: sc.MutableSetContractFeeParams = new sc.MutableSetContractFeeParams(); } export class SetDefaultFeeCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncSetDefaultFee); - params: sc.MutableSetDefaultFeeParams = new sc.MutableSetDefaultFeeParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncSetDefaultFee); + params: sc.MutableSetDefaultFeeParams = new sc.MutableSetDefaultFeeParams(); } export class GetAllowedStateControllerAddressesCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetAllowedStateControllerAddresses); - results: sc.ImmutableGetAllowedStateControllerAddressesResults = new sc.ImmutableGetAllowedStateControllerAddressesResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetAllowedStateControllerAddresses); + results: sc.ImmutableGetAllowedStateControllerAddressesResults = new sc.ImmutableGetAllowedStateControllerAddressesResults(); } export class GetChainInfoCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetChainInfo); - results: sc.ImmutableGetChainInfoResults = new sc.ImmutableGetChainInfoResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetChainInfo); + results: sc.ImmutableGetChainInfoResults = new sc.ImmutableGetChainInfoResults(); } export class GetFeeInfoCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetFeeInfo); - params: sc.MutableGetFeeInfoParams = new sc.MutableGetFeeInfoParams(); - results: sc.ImmutableGetFeeInfoResults = new sc.ImmutableGetFeeInfoResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetFeeInfo); + params: sc.MutableGetFeeInfoParams = new sc.MutableGetFeeInfoParams(); + results: sc.ImmutableGetFeeInfoResults = new sc.ImmutableGetFeeInfoResults(); } export class GetMaxBlobSizeCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetMaxBlobSize); - results: sc.ImmutableGetMaxBlobSizeResults = new sc.ImmutableGetMaxBlobSizeResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetMaxBlobSize); + results: sc.ImmutableGetMaxBlobSizeResults = new sc.ImmutableGetMaxBlobSizeResults(); } export class ScFuncs { @@ -77,8 +77,7 @@ export class ScFuncs { } static claimChainOwnership(ctx: wasmlib.ScFuncCallContext): ClaimChainOwnershipCall { - let f = new ClaimChainOwnershipCall(); - return f; + return new ClaimChainOwnershipCall(); } static delegateChainOwnership(ctx: wasmlib.ScFuncCallContext): DelegateChainOwnershipCall { diff --git a/packages/vm/wasmlib/ts/wasmlib/coregovernance/params.ts b/packages/vm/wasmlib/ts/wasmlib/coregovernance/params.ts index 7a42ac6c0f..d1b56a563a 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coregovernance/params.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coregovernance/params.ts @@ -5,189 +5,189 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableAddAllowedStateControllerAddressParams extends wasmlib.ScMapID { chainOwner(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamChainOwner)); - } + return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamChainOwner)); + } feeColor(): wasmlib.ScImmutableColor { - return new wasmlib.ScImmutableColor(this.mapID, wasmlib.Key32.fromString(sc.ParamFeeColor)); - } + return new wasmlib.ScImmutableColor(this.mapID, wasmlib.Key32.fromString(sc.ParamFeeColor)); + } stateControllerAddress(): wasmlib.ScImmutableAddress { - return new wasmlib.ScImmutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ParamStateControllerAddress)); - } + return new wasmlib.ScImmutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ParamStateControllerAddress)); + } } export class MutableAddAllowedStateControllerAddressParams extends wasmlib.ScMapID { chainOwner(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamChainOwner)); - } + return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamChainOwner)); + } feeColor(): wasmlib.ScMutableColor { - return new wasmlib.ScMutableColor(this.mapID, wasmlib.Key32.fromString(sc.ParamFeeColor)); - } + return new wasmlib.ScMutableColor(this.mapID, wasmlib.Key32.fromString(sc.ParamFeeColor)); + } stateControllerAddress(): wasmlib.ScMutableAddress { - return new wasmlib.ScMutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ParamStateControllerAddress)); - } + return new wasmlib.ScMutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ParamStateControllerAddress)); + } } export class ImmutableDelegateChainOwnershipParams extends wasmlib.ScMapID { chainOwner(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamChainOwner)); - } + return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamChainOwner)); + } } export class MutableDelegateChainOwnershipParams extends wasmlib.ScMapID { chainOwner(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamChainOwner)); - } + return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamChainOwner)); + } } export class ImmutableRemoveAllowedStateControllerAddressParams extends wasmlib.ScMapID { stateControllerAddress(): wasmlib.ScImmutableAddress { - return new wasmlib.ScImmutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ParamStateControllerAddress)); - } + return new wasmlib.ScImmutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ParamStateControllerAddress)); + } } export class MutableRemoveAllowedStateControllerAddressParams extends wasmlib.ScMapID { stateControllerAddress(): wasmlib.ScMutableAddress { - return new wasmlib.ScMutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ParamStateControllerAddress)); - } + return new wasmlib.ScMutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ParamStateControllerAddress)); + } } export class ImmutableRotateStateControllerParams extends wasmlib.ScMapID { stateControllerAddress(): wasmlib.ScImmutableAddress { - return new wasmlib.ScImmutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ParamStateControllerAddress)); - } + return new wasmlib.ScImmutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ParamStateControllerAddress)); + } } export class MutableRotateStateControllerParams extends wasmlib.ScMapID { stateControllerAddress(): wasmlib.ScMutableAddress { - return new wasmlib.ScMutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ParamStateControllerAddress)); - } + return new wasmlib.ScMutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ParamStateControllerAddress)); + } } export class ImmutableSetChainInfoParams extends wasmlib.ScMapID { maxBlobSize(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamMaxBlobSize)); - } + return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamMaxBlobSize)); + } maxEventSize(): wasmlib.ScImmutableInt16 { - return new wasmlib.ScImmutableInt16(this.mapID, wasmlib.Key32.fromString(sc.ParamMaxEventSize)); - } + return new wasmlib.ScImmutableInt16(this.mapID, wasmlib.Key32.fromString(sc.ParamMaxEventSize)); + } maxEventsPerReq(): wasmlib.ScImmutableInt16 { - return new wasmlib.ScImmutableInt16(this.mapID, wasmlib.Key32.fromString(sc.ParamMaxEventsPerReq)); - } + return new wasmlib.ScImmutableInt16(this.mapID, wasmlib.Key32.fromString(sc.ParamMaxEventsPerReq)); + } ownerFee(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamOwnerFee)); - } + return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamOwnerFee)); + } validatorFee(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamValidatorFee)); - } + return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamValidatorFee)); + } } export class MutableSetChainInfoParams extends wasmlib.ScMapID { maxBlobSize(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamMaxBlobSize)); - } + return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamMaxBlobSize)); + } maxEventSize(): wasmlib.ScMutableInt16 { - return new wasmlib.ScMutableInt16(this.mapID, wasmlib.Key32.fromString(sc.ParamMaxEventSize)); - } + return new wasmlib.ScMutableInt16(this.mapID, wasmlib.Key32.fromString(sc.ParamMaxEventSize)); + } maxEventsPerReq(): wasmlib.ScMutableInt16 { - return new wasmlib.ScMutableInt16(this.mapID, wasmlib.Key32.fromString(sc.ParamMaxEventsPerReq)); - } + return new wasmlib.ScMutableInt16(this.mapID, wasmlib.Key32.fromString(sc.ParamMaxEventsPerReq)); + } ownerFee(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamOwnerFee)); - } + return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamOwnerFee)); + } validatorFee(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamValidatorFee)); - } + return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamValidatorFee)); + } } export class ImmutableSetContractFeeParams extends wasmlib.ScMapID { hname(): wasmlib.ScImmutableHname { - return new wasmlib.ScImmutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamHname)); - } + return new wasmlib.ScImmutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamHname)); + } ownerFee(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamOwnerFee)); - } + return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamOwnerFee)); + } validatorFee(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamValidatorFee)); - } + return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamValidatorFee)); + } } export class MutableSetContractFeeParams extends wasmlib.ScMapID { hname(): wasmlib.ScMutableHname { - return new wasmlib.ScMutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamHname)); - } + return new wasmlib.ScMutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamHname)); + } ownerFee(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamOwnerFee)); - } + return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamOwnerFee)); + } validatorFee(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamValidatorFee)); - } + return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamValidatorFee)); + } } export class ImmutableSetDefaultFeeParams extends wasmlib.ScMapID { ownerFee(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamOwnerFee)); - } + return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamOwnerFee)); + } validatorFee(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamValidatorFee)); - } + return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamValidatorFee)); + } } export class MutableSetDefaultFeeParams extends wasmlib.ScMapID { ownerFee(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamOwnerFee)); - } + return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamOwnerFee)); + } validatorFee(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamValidatorFee)); - } + return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamValidatorFee)); + } } export class ImmutableGetFeeInfoParams extends wasmlib.ScMapID { hname(): wasmlib.ScImmutableHname { - return new wasmlib.ScImmutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamHname)); - } + return new wasmlib.ScImmutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamHname)); + } } export class MutableGetFeeInfoParams extends wasmlib.ScMapID { hname(): wasmlib.ScMutableHname { - return new wasmlib.ScMutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamHname)); - } + return new wasmlib.ScMutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamHname)); + } } diff --git a/packages/vm/wasmlib/ts/wasmlib/coregovernance/results.ts b/packages/vm/wasmlib/ts/wasmlib/coregovernance/results.ts index 8404346f4b..ac122e3d04 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coregovernance/results.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coregovernance/results.ts @@ -5,11 +5,11 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ArrayOfImmutableBytes { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -27,13 +27,13 @@ export class ArrayOfImmutableBytes { export class ImmutableGetAllowedStateControllerAddressesResults extends wasmlib.ScMapID { allowedStateControllerAddresses(): sc.ArrayOfImmutableBytes { - let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultAllowedStateControllerAddresses), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); - return new sc.ArrayOfImmutableBytes(arrID) - } + let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultAllowedStateControllerAddresses), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); + return new sc.ArrayOfImmutableBytes(arrID); + } } export class ArrayOfMutableBytes { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -55,129 +55,129 @@ export class ArrayOfMutableBytes { export class MutableGetAllowedStateControllerAddressesResults extends wasmlib.ScMapID { allowedStateControllerAddresses(): sc.ArrayOfMutableBytes { - let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultAllowedStateControllerAddresses), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); - return new sc.ArrayOfMutableBytes(arrID) - } + let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultAllowedStateControllerAddresses), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); + return new sc.ArrayOfMutableBytes(arrID); + } } export class ImmutableGetChainInfoResults extends wasmlib.ScMapID { chainID(): wasmlib.ScImmutableChainID { - return new wasmlib.ScImmutableChainID(this.mapID, wasmlib.Key32.fromString(sc.ResultChainID)); - } + return new wasmlib.ScImmutableChainID(this.mapID, wasmlib.Key32.fromString(sc.ResultChainID)); + } chainOwnerID(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ResultChainOwnerID)); - } + return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ResultChainOwnerID)); + } defaultOwnerFee(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultDefaultOwnerFee)); - } + return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultDefaultOwnerFee)); + } defaultValidatorFee(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultDefaultValidatorFee)); - } + return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultDefaultValidatorFee)); + } description(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, wasmlib.Key32.fromString(sc.ResultDescription)); - } + return new wasmlib.ScImmutableString(this.mapID, wasmlib.Key32.fromString(sc.ResultDescription)); + } feeColor(): wasmlib.ScImmutableColor { - return new wasmlib.ScImmutableColor(this.mapID, wasmlib.Key32.fromString(sc.ResultFeeColor)); - } + return new wasmlib.ScImmutableColor(this.mapID, wasmlib.Key32.fromString(sc.ResultFeeColor)); + } maxBlobSize(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultMaxBlobSize)); - } + return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultMaxBlobSize)); + } maxEventSize(): wasmlib.ScImmutableInt16 { - return new wasmlib.ScImmutableInt16(this.mapID, wasmlib.Key32.fromString(sc.ResultMaxEventSize)); - } + return new wasmlib.ScImmutableInt16(this.mapID, wasmlib.Key32.fromString(sc.ResultMaxEventSize)); + } maxEventsPerReq(): wasmlib.ScImmutableInt16 { - return new wasmlib.ScImmutableInt16(this.mapID, wasmlib.Key32.fromString(sc.ResultMaxEventsPerReq)); - } + return new wasmlib.ScImmutableInt16(this.mapID, wasmlib.Key32.fromString(sc.ResultMaxEventsPerReq)); + } } export class MutableGetChainInfoResults extends wasmlib.ScMapID { chainID(): wasmlib.ScMutableChainID { - return new wasmlib.ScMutableChainID(this.mapID, wasmlib.Key32.fromString(sc.ResultChainID)); - } + return new wasmlib.ScMutableChainID(this.mapID, wasmlib.Key32.fromString(sc.ResultChainID)); + } chainOwnerID(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ResultChainOwnerID)); - } + return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ResultChainOwnerID)); + } defaultOwnerFee(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultDefaultOwnerFee)); - } + return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultDefaultOwnerFee)); + } defaultValidatorFee(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultDefaultValidatorFee)); - } + return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultDefaultValidatorFee)); + } description(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, wasmlib.Key32.fromString(sc.ResultDescription)); - } + return new wasmlib.ScMutableString(this.mapID, wasmlib.Key32.fromString(sc.ResultDescription)); + } feeColor(): wasmlib.ScMutableColor { - return new wasmlib.ScMutableColor(this.mapID, wasmlib.Key32.fromString(sc.ResultFeeColor)); - } + return new wasmlib.ScMutableColor(this.mapID, wasmlib.Key32.fromString(sc.ResultFeeColor)); + } maxBlobSize(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultMaxBlobSize)); - } + return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultMaxBlobSize)); + } maxEventSize(): wasmlib.ScMutableInt16 { - return new wasmlib.ScMutableInt16(this.mapID, wasmlib.Key32.fromString(sc.ResultMaxEventSize)); - } + return new wasmlib.ScMutableInt16(this.mapID, wasmlib.Key32.fromString(sc.ResultMaxEventSize)); + } maxEventsPerReq(): wasmlib.ScMutableInt16 { - return new wasmlib.ScMutableInt16(this.mapID, wasmlib.Key32.fromString(sc.ResultMaxEventsPerReq)); - } + return new wasmlib.ScMutableInt16(this.mapID, wasmlib.Key32.fromString(sc.ResultMaxEventsPerReq)); + } } export class ImmutableGetFeeInfoResults extends wasmlib.ScMapID { feeColor(): wasmlib.ScImmutableColor { - return new wasmlib.ScImmutableColor(this.mapID, wasmlib.Key32.fromString(sc.ResultFeeColor)); - } + return new wasmlib.ScImmutableColor(this.mapID, wasmlib.Key32.fromString(sc.ResultFeeColor)); + } ownerFee(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultOwnerFee)); - } + return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultOwnerFee)); + } validatorFee(): wasmlib.ScImmutableInt64 { - return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultValidatorFee)); - } + return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultValidatorFee)); + } } export class MutableGetFeeInfoResults extends wasmlib.ScMapID { feeColor(): wasmlib.ScMutableColor { - return new wasmlib.ScMutableColor(this.mapID, wasmlib.Key32.fromString(sc.ResultFeeColor)); - } + return new wasmlib.ScMutableColor(this.mapID, wasmlib.Key32.fromString(sc.ResultFeeColor)); + } ownerFee(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultOwnerFee)); - } + return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultOwnerFee)); + } validatorFee(): wasmlib.ScMutableInt64 { - return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultValidatorFee)); - } + return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultValidatorFee)); + } } export class ImmutableGetMaxBlobSizeResults extends wasmlib.ScMapID { maxBlobSize(): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultMaxBlobSize)); - } + return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultMaxBlobSize)); + } } export class MutableGetMaxBlobSizeResults extends wasmlib.ScMapID { maxBlobSize(): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultMaxBlobSize)); - } + return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultMaxBlobSize)); + } } diff --git a/packages/vm/wasmlib/ts/wasmlib/coreroot/consts.ts b/packages/vm/wasmlib/ts/wasmlib/coreroot/consts.ts index 48b60cfd17..4701098e81 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreroot/consts.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreroot/consts.ts @@ -5,30 +5,30 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; export const ScName = "root"; export const ScDescription = "Core root contract"; export const HScName = new wasmlib.ScHname(0xcebf5908); -export const ParamDeployer = "dp"; +export const ParamDeployer = "dp"; export const ParamDescription = "ds"; -export const ParamHname = "hn"; -export const ParamName = "nm"; +export const ParamHname = "hn"; +export const ParamName = "nm"; export const ParamProgramHash = "ph"; -export const ResultContractFound = "cf"; -export const ResultContractRecData = "dt"; +export const ResultContractFound = "cf"; +export const ResultContractRecData = "dt"; export const ResultContractRegistry = "r"; -export const FuncDeployContract = "deployContract"; -export const FuncGrantDeployPermission = "grantDeployPermission"; +export const FuncDeployContract = "deployContract"; +export const FuncGrantDeployPermission = "grantDeployPermission"; export const FuncRevokeDeployPermission = "revokeDeployPermission"; -export const ViewFindContract = "findContract"; -export const ViewGetContractRecords = "getContractRecords"; +export const ViewFindContract = "findContract"; +export const ViewGetContractRecords = "getContractRecords"; -export const HFuncDeployContract = new wasmlib.ScHname(0x28232c27); -export const HFuncGrantDeployPermission = new wasmlib.ScHname(0xf440263a); +export const HFuncDeployContract = new wasmlib.ScHname(0x28232c27); +export const HFuncGrantDeployPermission = new wasmlib.ScHname(0xf440263a); export const HFuncRevokeDeployPermission = new wasmlib.ScHname(0x850744f1); -export const HViewFindContract = new wasmlib.ScHname(0xc145ca00); -export const HViewGetContractRecords = new wasmlib.ScHname(0x078b3ef3); +export const HViewFindContract = new wasmlib.ScHname(0xc145ca00); +export const HViewGetContractRecords = new wasmlib.ScHname(0x078b3ef3); diff --git a/packages/vm/wasmlib/ts/wasmlib/coreroot/contract.ts b/packages/vm/wasmlib/ts/wasmlib/coreroot/contract.ts index f4617d16b2..f9589a3ffa 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreroot/contract.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreroot/contract.ts @@ -5,33 +5,33 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class DeployContractCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncDeployContract); - params: sc.MutableDeployContractParams = new sc.MutableDeployContractParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncDeployContract); + params: sc.MutableDeployContractParams = new sc.MutableDeployContractParams(); } export class GrantDeployPermissionCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncGrantDeployPermission); - params: sc.MutableGrantDeployPermissionParams = new sc.MutableGrantDeployPermissionParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncGrantDeployPermission); + params: sc.MutableGrantDeployPermissionParams = new sc.MutableGrantDeployPermissionParams(); } export class RevokeDeployPermissionCall { - func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncRevokeDeployPermission); - params: sc.MutableRevokeDeployPermissionParams = new sc.MutableRevokeDeployPermissionParams(); + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncRevokeDeployPermission); + params: sc.MutableRevokeDeployPermissionParams = new sc.MutableRevokeDeployPermissionParams(); } export class FindContractCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewFindContract); - params: sc.MutableFindContractParams = new sc.MutableFindContractParams(); - results: sc.ImmutableFindContractResults = new sc.ImmutableFindContractResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewFindContract); + params: sc.MutableFindContractParams = new sc.MutableFindContractParams(); + results: sc.ImmutableFindContractResults = new sc.ImmutableFindContractResults(); } export class GetContractRecordsCall { - func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetContractRecords); - results: sc.ImmutableGetContractRecordsResults = new sc.ImmutableGetContractRecordsResults(); + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetContractRecords); + results: sc.ImmutableGetContractRecordsResults = new sc.ImmutableGetContractRecordsResults(); } export class ScFuncs { diff --git a/packages/vm/wasmlib/ts/wasmlib/coreroot/params.ts b/packages/vm/wasmlib/ts/wasmlib/coreroot/params.ts index 065688b604..ada0c18029 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreroot/params.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreroot/params.ts @@ -5,77 +5,77 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableDeployContractParams extends wasmlib.ScMapID { description(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, wasmlib.Key32.fromString(sc.ParamDescription)); - } + return new wasmlib.ScImmutableString(this.mapID, wasmlib.Key32.fromString(sc.ParamDescription)); + } name(): wasmlib.ScImmutableString { - return new wasmlib.ScImmutableString(this.mapID, wasmlib.Key32.fromString(sc.ParamName)); - } + return new wasmlib.ScImmutableString(this.mapID, wasmlib.Key32.fromString(sc.ParamName)); + } programHash(): wasmlib.ScImmutableHash { - return new wasmlib.ScImmutableHash(this.mapID, wasmlib.Key32.fromString(sc.ParamProgramHash)); - } + return new wasmlib.ScImmutableHash(this.mapID, wasmlib.Key32.fromString(sc.ParamProgramHash)); + } } export class MutableDeployContractParams extends wasmlib.ScMapID { description(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, wasmlib.Key32.fromString(sc.ParamDescription)); - } + return new wasmlib.ScMutableString(this.mapID, wasmlib.Key32.fromString(sc.ParamDescription)); + } name(): wasmlib.ScMutableString { - return new wasmlib.ScMutableString(this.mapID, wasmlib.Key32.fromString(sc.ParamName)); - } + return new wasmlib.ScMutableString(this.mapID, wasmlib.Key32.fromString(sc.ParamName)); + } programHash(): wasmlib.ScMutableHash { - return new wasmlib.ScMutableHash(this.mapID, wasmlib.Key32.fromString(sc.ParamProgramHash)); - } + return new wasmlib.ScMutableHash(this.mapID, wasmlib.Key32.fromString(sc.ParamProgramHash)); + } } export class ImmutableGrantDeployPermissionParams extends wasmlib.ScMapID { deployer(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamDeployer)); - } + return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamDeployer)); + } } export class MutableGrantDeployPermissionParams extends wasmlib.ScMapID { deployer(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamDeployer)); - } + return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamDeployer)); + } } export class ImmutableRevokeDeployPermissionParams extends wasmlib.ScMapID { deployer(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamDeployer)); - } + return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamDeployer)); + } } export class MutableRevokeDeployPermissionParams extends wasmlib.ScMapID { deployer(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamDeployer)); - } + return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamDeployer)); + } } export class ImmutableFindContractParams extends wasmlib.ScMapID { hname(): wasmlib.ScImmutableHname { - return new wasmlib.ScImmutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamHname)); - } + return new wasmlib.ScImmutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamHname)); + } } export class MutableFindContractParams extends wasmlib.ScMapID { hname(): wasmlib.ScMutableHname { - return new wasmlib.ScMutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamHname)); - } + return new wasmlib.ScMutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamHname)); + } } diff --git a/packages/vm/wasmlib/ts/wasmlib/coreroot/results.ts b/packages/vm/wasmlib/ts/wasmlib/coreroot/results.ts index 5448e3f722..fe194d1eb4 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreroot/results.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreroot/results.ts @@ -5,33 +5,33 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -import * as wasmlib from "wasmlib" +import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableFindContractResults extends wasmlib.ScMapID { contractFound(): wasmlib.ScImmutableBytes { - return new wasmlib.ScImmutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultContractFound)); - } + return new wasmlib.ScImmutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultContractFound)); + } contractRecData(): wasmlib.ScImmutableBytes { - return new wasmlib.ScImmutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultContractRecData)); - } + return new wasmlib.ScImmutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultContractRecData)); + } } export class MutableFindContractResults extends wasmlib.ScMapID { contractFound(): wasmlib.ScMutableBytes { - return new wasmlib.ScMutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultContractFound)); - } + return new wasmlib.ScMutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultContractFound)); + } contractRecData(): wasmlib.ScMutableBytes { - return new wasmlib.ScMutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultContractRecData)); - } + return new wasmlib.ScMutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultContractRecData)); + } } export class MapHnameToImmutableBytes { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; @@ -45,20 +45,20 @@ export class MapHnameToImmutableBytes { export class ImmutableGetContractRecordsResults extends wasmlib.ScMapID { contractRegistry(): sc.MapHnameToImmutableBytes { - let mapID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultContractRegistry), wasmlib.TYPE_MAP); - return new sc.MapHnameToImmutableBytes(mapID); - } + let mapID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultContractRegistry), wasmlib.TYPE_MAP); + return new sc.MapHnameToImmutableBytes(mapID); + } } export class MapHnameToMutableBytes { - objID: i32; + objID: i32; constructor(objID: i32) { this.objID = objID; } clear(): void { - wasmlib.clear(this.objID) + wasmlib.clear(this.objID); } getBytes(key: wasmlib.ScHname): wasmlib.ScMutableBytes { @@ -69,7 +69,7 @@ export class MapHnameToMutableBytes { export class MutableGetContractRecordsResults extends wasmlib.ScMapID { contractRegistry(): sc.MapHnameToMutableBytes { - let mapID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultContractRegistry), wasmlib.TYPE_MAP); - return new sc.MapHnameToMutableBytes(mapID); - } + let mapID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultContractRegistry), wasmlib.TYPE_MAP); + return new sc.MapHnameToMutableBytes(mapID); + } } diff --git a/tools/schema/generator/generator.go b/tools/schema/generator/generator.go index 5049fc4afe..0bb725cb1f 100644 --- a/tools/schema/generator/generator.go +++ b/tools/schema/generator/generator.go @@ -63,9 +63,6 @@ type Generator interface { init(s *Schema) funcName(f *Func) string generateLanguageSpecificFiles() error - generateProxyArray(field *Field, mutability, arrayType, proxyType string) - generateProxyMap(field *Field, mutability, mapType, proxyType string) - generateProxyReference(field *Field, mutability, typeName string) setFieldKeys() setFuncKeys() writeConsts() @@ -502,29 +499,6 @@ func (g *GenBase) generateFuncs() error { return os.Remove(scOriginal) } -func (g *GenBase) generateProxy(field *Field, mutability string) { - if field.Array { - proxyType := mutability + field.Type - arrayType := "ArrayOf" + proxyType - if !g.newTypes[arrayType] { - g.newTypes[arrayType] = true - g.gen.generateProxyArray(field, mutability, arrayType, proxyType) - } - g.gen.generateProxyReference(field, mutability, arrayType) - return - } - - if field.MapKey != "" { - proxyType := mutability + field.Type - mapType := "Map" + field.MapKey + "To" + proxyType - if !g.newTypes[mapType] { - g.newTypes[mapType] = true - g.gen.generateProxyMap(field, mutability, mapType, proxyType) - } - g.gen.generateProxyReference(field, mutability, mapType) - } -} - func (g *GenBase) generateTests() error { err := os.MkdirAll("test", 0o755) if err != nil { diff --git a/tools/schema/generator/generator_go.go b/tools/schema/generator/generator_go.go index 1409750d4a..cb47170221 100644 --- a/tools/schema/generator/generator_go.go +++ b/tools/schema/generator/generator_go.go @@ -85,18 +85,6 @@ func (g *GoGenerator) generateLanguageSpecificFiles() error { return g.createSourceFile("../main", g.writeSpecialMain) } -func (g *GoGenerator) generateProxyArray(field *Field, mutability, arrayType, proxyType string) { - panic("generateProxyArray") -} - -func (g *GoGenerator) generateProxyMap(field *Field, mutability, mapType, proxyType string) { - panic("generateProxyMap") -} - -func (g *GoGenerator) generateProxyReference(field *Field, mutability, typeName string) { - panic("generateProxyReference") -} - func (g *GoGenerator) writeConsts() { g.emit("consts.go") } diff --git a/tools/schema/generator/generator_rust.go b/tools/schema/generator/generator_rust.go index 1bf145127c..2ae8f2ef1c 100644 --- a/tools/schema/generator/generator_rust.go +++ b/tools/schema/generator/generator_rust.go @@ -134,18 +134,6 @@ func (g *RustGenerator) generateModLines(format string) { } } -func (g *RustGenerator) generateProxyArray(field *Field, mutability, arrayType, proxyType string) { - panic("generateProxyArray") -} - -func (g *RustGenerator) generateProxyMap(field *Field, mutability, mapType, proxyType string) { - panic("generateProxyMap") -} - -func (g *RustGenerator) generateProxyReference(field *Field, mutability, typeName string) { - panic("generateProxyReference") -} - func (g *RustGenerator) writeConsts() { g.emit("consts.rs") } diff --git a/tools/schema/generator/generator_ts.go b/tools/schema/generator/generator_ts.go index 3dedabe1f1..5d633d96e5 100644 --- a/tools/schema/generator/generator_ts.go +++ b/tools/schema/generator/generator_ts.go @@ -5,15 +5,9 @@ package generator import ( "regexp" - "strconv" "strings" - "github.com/iotaledger/wasp/packages/iscp" -) - -const ( - tsImportSelf = "import * as sc from \"./index\";" - tsImportWasmLib = "import * as wasmlib from \"wasmlib\"" + "github.com/iotaledger/wasp/tools/schema/generator/tstemplates" ) var tsTypes = StringMap{ @@ -72,11 +66,6 @@ var tsTypeIds = StringMap{ "String": "wasmlib.TYPE_STRING", } -const ( - tsTypeBytes = "wasmlib.TYPE_BYTES" - tsTypeMap = "wasmlib.TYPE_MAP" -) - type TypeScriptGenerator struct { GenBase } @@ -93,111 +82,16 @@ func NewTypeScriptGenerator() *TypeScriptGenerator { func (g *TypeScriptGenerator) init(s *Schema) { g.GenBase.init(s) - // g.templates["exportLine"] = goExportLine -} - -func (g *TypeScriptGenerator) flushConsts() { - if len(g.s.ConstNames) == 0 { - return + for _, template := range tstemplates.TsTemplates { + g.addTemplates(template) } - - g.println() - g.s.flushConsts(func(name string, value string, padLen int) { - g.printf("export const %s = %s;\n", pad(name, padLen), value) - }) + g.emitters["accessCheck"] = emitterTsAccessCheck } func (g *TypeScriptGenerator) funcName(f *Func) string { return f.FuncName } -func (g *TypeScriptGenerator) generateArrayType(varType string) string { - // native core contracts use Array16 instead of our nested array type - if g.s.CoreContracts { - return "wasmlib.TYPE_ARRAY16|" + varType - } - return "wasmlib.TYPE_ARRAY|" + varType -} - -func (g *TypeScriptGenerator) generateConstsFields(fields []*Field, prefix string) { - if len(fields) != 0 { - for _, field := range fields { - if field.Alias == AliasThis { - continue - } - name := prefix + capitalize(field.Name) - value := "\"" + field.Alias + "\"" - g.s.appendConst(name, value) - } - g.flushConsts() - } -} - -func (g *TypeScriptGenerator) generateContractFuncs() { - g.println("\nexport class ScFuncs {") - for _, f := range g.s.Funcs { - g.printf("\n static %s(ctx: wasmlib.Sc%sCallContext): %sCall {\n", uncapitalize(f.Type), f.Kind, f.Type) - g.printf(" let f = new %sCall();\n", f.Type) - - paramsID := "null" - if len(f.Params) != 0 { - paramsID = "f.params" - } - resultsID := "null" - if len(f.Results) != 0 { - resultsID = "f.results" - } - if len(f.Params) != 0 || len(f.Results) != 0 { - g.printf(" f.func.setPtrs(%s, %s);\n", paramsID, resultsID) - } - g.printf(" return f;\n") - g.printf(" }\n") - } - g.printf("}\n") -} - -func (g *TypeScriptGenerator) generateFuncSignature(f *Func) { - g.printf("\nexport function %s(ctx: wasmlib.Sc%sContext, f: sc.%sContext): void {\n", f.FuncName, f.Kind, f.Type) - switch f.FuncName { - case SpecialFuncInit: - g.printf(" if (f.params.owner().exists()) {\n") - g.printf(" f.state.owner().setValue(f.params.owner().value());\n") - g.printf(" return;\n") - g.printf(" }\n") - g.printf(" f.state.owner().setValue(ctx.contractCreator());\n") - case SpecialFuncSetOwner: - g.printf(" f.state.owner().setValue(f.params.owner().value());\n") - case SpecialViewGetOwner: - g.printf(" f.results.owner().setValue(f.state.owner().value());\n") - default: - } - g.printf("}\n") -} - -func (g *TypeScriptGenerator) generateKeysArray(fields []*Field, prefix string) { - for _, field := range fields { - if field.Alias == AliasThis { - continue - } - name := prefix + capitalize(field.Name) - g.printf(" sc.%s,\n", name) - g.s.KeyID++ - } -} - -func (g *TypeScriptGenerator) generateKeysIndexes(fields []*Field, prefix string) { - for _, field := range fields { - if field.Alias == AliasThis { - continue - } - name := "Idx" + prefix + capitalize(field.Name) - field.KeyID = g.s.KeyID - value := strconv.Itoa(field.KeyID) - g.s.KeyID++ - g.s.appendConst(name, value) - } -} - func (g *TypeScriptGenerator) generateLanguageSpecificFiles() error { err := g.createSourceFile("index", g.writeSpecialIndex) if err != nil { @@ -206,461 +100,32 @@ func (g *TypeScriptGenerator) generateLanguageSpecificFiles() error { return g.writeSpecialConfigJSON() } -func (g *TypeScriptGenerator) generateProxyArray(field *Field, mutability, arrayType, proxyType string) { - g.printf("\nexport class %s {\n", arrayType) - g.printf(" objID: i32;\n") - - g.printf("\n constructor(objID: i32) {\n") - g.printf(" this.objID = objID;\n") - g.printf(" }\n") - - if mutability == PropMutable { - g.printf("\n clear(): void {\n") - g.printf(" wasmlib.clear(this.objID);\n") - g.printf(" }\n") - } - - g.printf("\n length(): i32 {\n") - g.printf(" return wasmlib.getLength(this.objID);\n") - g.printf(" }\n") - - if field.TypeID == 0 { - g.generateProxyArrayNewType(field, proxyType) - g.printf("}\n") - return - } - - // array of predefined type - g.printf("\n get%s(index: i32): wasmlib.Sc%s {\n", field.Type, proxyType) - g.printf(" return new wasmlib.Sc%s(this.objID, new wasmlib.Key32(index));\n", proxyType) - g.printf(" }\n") - - g.printf("}\n") -} - -func (g *TypeScriptGenerator) generateProxyArrayNewType(field *Field, proxyType string) { - for _, subtype := range g.s.Typedefs { - if subtype.Name != field.Type { - continue - } - varType := tsTypeMap - if subtype.Array { - varType = tsTypeIds[subtype.Type] - if varType == "" { - varType = tsTypeBytes - } - varType = g.generateArrayType(varType) - } - g.printf("\n get%s(index: i32): sc.%s {\n", field.Type, proxyType) - g.printf(" let subID = wasmlib.getObjectID(this.objID, new wasmlib.Key32(index), %s);\n", varType) - g.printf(" return new sc.%s(subID);\n", proxyType) - g.printf(" }\n") - return - } - - g.printf("\n get%s(index: i32): sc.%s {\n", field.Type, proxyType) - g.printf(" return new sc.%s(this.objID, new wasmlib.Key32(index));\n", proxyType) - g.printf(" }\n") -} - -func (g *TypeScriptGenerator) generateProxyMap(field *Field, mutability, mapType, proxyType string) { - keyType := tsTypes[field.MapKey] - keyValue := tsKeys[field.MapKey] - - g.printf("\nexport class %s {\n", mapType) - g.printf(" objID: i32;\n") - - g.printf("\n constructor(objID: i32) {\n") - g.printf(" this.objID = objID;\n") - g.printf(" }\n") - - if mutability == PropMutable { - g.printf("\n clear(): void {\n") - g.printf(" wasmlib.clear(this.objID)\n") - g.printf(" }\n") - } - - if field.TypeID == 0 { - g.generateProxyMapNewType(field, proxyType, keyType, keyValue) - g.printf("}\n") - return - } - - // map of predefined type - g.printf("\n get%s(key: %s): wasmlib.Sc%s {\n", field.Type, keyType, proxyType) - g.printf(" return new wasmlib.Sc%s(this.objID, %s.getKeyID());\n", proxyType, keyValue) - g.printf(" }\n") - - g.printf("}\n") -} - -func (g *TypeScriptGenerator) generateProxyMapNewType(field *Field, proxyType, keyType, keyValue string) { - for _, subtype := range g.s.Typedefs { - if subtype.Name != field.Type { - continue - } - varType := tsTypeMap - if subtype.Array { - varType = tsTypeIds[subtype.Type] - if varType == "" { - varType = tsTypeBytes - } - varType = g.generateArrayType(varType) - } - g.printf("\n get%s(key: %s): sc.%s {\n", field.Type, keyType, proxyType) - g.printf(" let subID = wasmlib.getObjectID(this.objID, %s.getKeyID(), %s);\n", keyValue, varType) - g.printf(" return new sc.%s(subID);\n", proxyType) - g.printf(" }\n") - return - } - - g.printf("\n get%s(key: %s): sc.%s {\n", field.Type, keyType, proxyType) - g.printf(" return new sc.%s(this.objID, %s.getKeyID());\n", proxyType, keyValue) - g.printf(" }\n") -} - -func (g *TypeScriptGenerator) generateProxyReference(field *Field, mutability, typeName string) { - if field.Name[0] >= 'A' && field.Name[0] <= 'Z' { - g.printf("\nexport class %s%s extends %s {\n};\n", mutability, field.Name, typeName) - } -} - -func (g *TypeScriptGenerator) generateProxyStruct(fields []*Field, mutability, typeName, kind string) { - typeName = mutability + typeName + kind - kind = strings.TrimSuffix(kind, "s") - - // first generate necessary array and map types - for _, field := range fields { - g.generateProxy(field, mutability) - } - - g.printf("\nexport class %s extends wasmlib.ScMapID {\n", typeName) - - for _, field := range fields { - varName := field.Name - varID := "sc.idxMap[sc.Idx" + kind + capitalize(varName) + "]" - if g.s.CoreContracts { - varID = "wasmlib.Key32.fromString(sc." + kind + capitalize(varName) + ")" - } - varType := tsTypeIds[field.Type] - if varType == "" { - varType = tsTypeBytes - } - if field.Array { - varType = g.generateArrayType(varType) - arrayType := "ArrayOf" + mutability + field.Type - g.printf("\n %s(): sc.%s {\n", varName, arrayType) - g.printf(" let arrID = wasmlib.getObjectID(this.mapID, %s, %s);\n", varID, varType) - g.printf(" return new sc.%s(arrID)\n", arrayType) - g.printf(" }\n") - continue - } - if field.MapKey != "" { - varType = tsTypeMap - mapType := "Map" + field.MapKey + "To" + mutability + field.Type - g.printf("\n %s(): sc.%s {\n", varName, mapType) - mapID := "this.mapID" - if field.Alias != AliasThis { - mapID = "mapID" - g.printf(" let mapID = wasmlib.getObjectID(this.mapID, %s, %s);\n", varID, varType) - } - g.printf(" return new sc.%s(%s);\n", mapType, mapID) - g.printf(" }\n") - continue - } - - proxyType := mutability + field.Type - if field.TypeID == 0 { - g.printf("\n %s(): sc.%s {\n", varName, proxyType) - g.printf(" return new sc.%s(this.mapID, %s);\n", proxyType, varID) - g.printf(" }\n") - continue - } - - g.printf("\n %s(): wasmlib.Sc%s {\n", varName, proxyType) - g.printf(" return new wasmlib.Sc%s(this.mapID, %s);\n", proxyType, varID) - g.printf(" }\n") - } - g.printf("}\n") -} - -func (g *TypeScriptGenerator) generateStruct(typeDef *Struct) { - nameLen, typeLen := calculatePadding(typeDef.Fields, tsTypes, false) - - g.printf("\nexport class %s {\n", typeDef.Name) - for _, field := range typeDef.Fields { - fldName := pad(field.Name, nameLen) - fldType := tsTypes[field.Type] + " = " + tsInits[field.Type] + ";" - if field.Comment != "" { - fldType = pad(fldType, typeLen) - } - g.printf(" %s: %s%s\n", fldName, fldType, field.Comment) - } - - // write encoder and decoder for struct - g.printf("\n static fromBytes(bytes: u8[]): %s {\n", typeDef.Name) - g.printf(" let decode = new wasmlib.BytesDecoder(bytes);\n") - g.printf(" let data = new %s();\n", typeDef.Name) - for _, field := range typeDef.Fields { - name := field.Name - g.printf(" data.%s = decode.%s();\n", name, uncapitalize(field.Type)) - } - g.printf(" decode.close();\n") - g.printf(" return data;\n }\n") - - g.printf("\n bytes(): u8[] {\n") - g.printf(" return new wasmlib.BytesEncoder().\n") - for _, field := range typeDef.Fields { - name := field.Name - g.printf(" %s(this.%s).\n", uncapitalize(field.Type), name) - } - g.printf(" data();\n }\n") - - g.printf("}\n") - - g.generateStructProxy(typeDef, false) - g.generateStructProxy(typeDef, true) -} - -func (g *TypeScriptGenerator) generateStructProxy(typeDef *Struct, mutable bool) { - typeName := PropImmutable + typeDef.Name - if mutable { - typeName = PropMutable + typeDef.Name - } - - g.printf("\nexport class %s {\n", typeName) - g.printf(" objID: i32;\n") - g.printf(" keyID: wasmlib.Key32;\n") - - g.printf("\n constructor(objID: i32, keyID: wasmlib.Key32) {\n") - g.printf(" this.objID = objID;\n") - g.printf(" this.keyID = keyID;\n") - g.printf(" }\n") - - g.printf("\n exists(): boolean {\n") - g.printf(" return wasmlib.exists(this.objID, this.keyID, wasmlib.TYPE_BYTES);\n") - g.printf(" }\n") - - if mutable { - g.printf("\n setValue(value: %s): void {\n", typeDef.Name) - g.printf(" wasmlib.setBytes(this.objID, this.keyID, wasmlib.TYPE_BYTES, value.bytes());\n") - g.printf(" }\n") - } - - g.printf("\n value(): %s {\n", typeDef.Name) - g.printf(" return %s.fromBytes(wasmlib.getBytes(this.objID, this.keyID,wasmlib. TYPE_BYTES));\n", typeDef.Name) - g.printf(" }\n") - - g.printf("}\n") -} - -func (g *TypeScriptGenerator) generateThunk(f *Func) { - g.printf("\nfunction %sThunk(ctx: wasmlib.Sc%sContext): void {\n", f.FuncName, f.Kind) - g.printf(" ctx.log(\"%s.%s\");\n", g.s.Name, f.FuncName) - - if f.Access != "" { - g.generateThunkAccessCheck(f) - } - - g.printf(" let f = new sc.%sContext();\n", f.Type) - - if len(f.Params) != 0 { - g.printf(" f.params.mapID = wasmlib.OBJ_ID_PARAMS;\n") - } - - if len(f.Results) != 0 { - g.printf(" f.results.mapID = wasmlib.OBJ_ID_RESULTS;\n") - } - - g.printf(" f.state.mapID = wasmlib.OBJ_ID_STATE;\n") - - for _, param := range f.Params { - if !param.Optional { - name := param.Name - g.printf(" ctx.require(f.params.%s().exists(), \"missing mandatory %s\")\n", name, param.Name) - } - } - - g.printf(" sc.%s(ctx, f);\n", f.FuncName) - g.printf(" ctx.log(\"%s.%s ok\");\n", g.s.Name, f.FuncName) - g.printf("}\n") -} - -func (g *TypeScriptGenerator) generateThunkAccessCheck(f *Func) { - grant := f.Access - index := strings.Index(grant, "//") - if index >= 0 { - g.printf(" %s\n", grant[index:]) - grant = strings.TrimSpace(grant[:index]) - } - switch grant { - case AccessSelf: - grant = "ctx.accountID()" - case AccessChain: - grant = "ctx.chainOwnerID()" - case AccessCreator: - grant = "ctx.contractCreator()" - default: - g.printf(" let access = ctx.state().getAgentID(wasmlib.Key32.fromString(\"%s\"));\n", grant) - g.printf(" ctx.require(access.exists(), \"access not set: %s\");\n", grant) - grant = "access.value()" - } - g.printf(" ctx.require(ctx.caller().equals(%s), \"no permission\");\n\n", grant) -} - func (g *TypeScriptGenerator) writeConsts() { - g.println(tsImportWasmLib) - - scName := g.s.Name - if g.s.CoreContracts { - // remove 'core' prefix - scName = scName[4:] - } - g.s.appendConst("ScName", "\""+scName+"\"") - if g.s.Description != "" { - g.s.appendConst("ScDescription", "\""+g.s.Description+"\"") - } - hName := iscp.Hn(scName) - hNameType := "new wasmlib.ScHname" - g.s.appendConst("HScName", hNameType+"(0x"+hName.String()+")") - g.flushConsts() - - g.generateConstsFields(g.s.Params, "Param") - g.generateConstsFields(g.s.Results, "Result") - g.generateConstsFields(g.s.StateVars, "State") - - if len(g.s.Funcs) != 0 { - for _, f := range g.s.Funcs { - constName := capitalize(f.FuncName) - g.s.appendConst(constName, "\""+f.String+"\"") - } - g.flushConsts() - - for _, f := range g.s.Funcs { - constHname := "H" + capitalize(f.FuncName) - g.s.appendConst(constHname, hNameType+"(0x"+f.Hname.String()+")") - } - g.flushConsts() - } + g.emit("consts.ts") } func (g *TypeScriptGenerator) writeContract() { - g.println(tsImportWasmLib) - g.println(tsImportSelf) - - for _, f := range g.s.Funcs { - kind := f.Kind - if f.Type == InitFunc { - kind = f.Type + f.Kind - } - g.printf("\nexport class %sCall {\n", f.Type) - g.printf(" func: wasmlib.Sc%s = new wasmlib.Sc%s(sc.HScName, sc.H%s%s);\n", kind, kind, f.Kind, f.Type) - if len(f.Params) != 0 { - g.printf(" params: sc.Mutable%sParams = new sc.Mutable%sParams();\n", f.Type, f.Type) - } - if len(f.Results) != 0 { - g.printf(" results: sc.Immutable%sResults = new sc.Immutable%sResults();\n", f.Type, f.Type) - } - g.printf("}\n") - - if !g.s.CoreContracts { - mutability := PropMutable - if f.Kind == KindView { - mutability = PropImmutable - } - g.printf("\nexport class %sContext {\n", f.Type) - if len(f.Params) != 0 { - g.printf(" params: sc.Immutable%sParams = new sc.Immutable%sParams();\n", f.Type, f.Type) - } - if len(f.Results) != 0 { - g.printf(" results: sc.Mutable%sResults = new sc.Mutable%sResults();\n", f.Type, f.Type) - } - g.printf(" state: sc.%s%sState = new sc.%s%sState();\n", mutability, g.s.FullName, mutability, g.s.FullName) - g.printf("}\n") - } - } - - g.generateContractFuncs() + g.emit("contract.ts") } func (g *TypeScriptGenerator) writeInitialFuncs() { - g.println(tsImportWasmLib) - g.println(tsImportSelf) - - for _, f := range g.s.Funcs { - g.generateFuncSignature(f) - } + g.emit("funcs.ts") } func (g *TypeScriptGenerator) writeKeys() { - g.println(tsImportWasmLib) - g.println(tsImportSelf) - - g.s.KeyID = 0 - g.generateKeysIndexes(g.s.Params, "Param") - g.generateKeysIndexes(g.s.Results, "Result") - g.generateKeysIndexes(g.s.StateVars, "State") - g.flushConsts() - - g.printf("\nexport let keyMap: string[] = [\n") - g.generateKeysArray(g.s.Params, "Param") - g.generateKeysArray(g.s.Results, "Result") - g.generateKeysArray(g.s.StateVars, "State") - g.printf("];\n") - g.printf("\nexport let idxMap: wasmlib.Key32[] = new Array(keyMap.length);\n") + g.emit("keys.ts") } func (g *TypeScriptGenerator) writeLib() { - g.println(tsImportWasmLib) - g.println(tsImportSelf) - - g.printf("\nexport function on_call(index: i32): void {\n") - g.printf(" return wasmlib.onCall(index);\n") - g.printf("}\n") - - g.printf("\nexport function on_load(): void {\n") - g.printf(" let exports = new wasmlib.ScExports();\n") - for _, f := range g.s.Funcs { - constName := capitalize(f.FuncName) - g.printf(" exports.add%s(sc.%s, %sThunk);\n", f.Kind, constName, f.FuncName) - } - - g.printf("\n for (let i = 0; i < sc.keyMap.length; i++) {\n") - g.printf(" sc.idxMap[i] = wasmlib.Key32.fromString(sc.keyMap[i]);\n") - g.printf(" }\n") - - g.printf("}\n") - - // generate parameter structs and thunks to set up and check parameters - for _, f := range g.s.Funcs { - g.generateThunk(f) - } + g.emit("lib.ts") } func (g *TypeScriptGenerator) writeParams() { - g.println(tsImportWasmLib) - g.println(tsImportSelf) - - for _, f := range g.s.Funcs { - if len(f.Params) == 0 { - continue - } - g.generateProxyStruct(f.Params, PropImmutable, f.Type, "Params") - g.generateProxyStruct(f.Params, PropMutable, f.Type, "Params") - } + g.emit("params.ts") } func (g *TypeScriptGenerator) writeResults() { - g.println(tsImportWasmLib) - g.println(tsImportSelf) - - for _, f := range g.s.Funcs { - if len(f.Results) == 0 { - continue - } - g.generateProxyStruct(f.Results, PropImmutable, f.Type, "Results") - g.generateProxyStruct(f.Results, PropMutable, f.Type, "Results") - } + g.emit("results.ts") } func (g *TypeScriptGenerator) writeSpecialConfigJSON() error { @@ -713,67 +178,61 @@ func (g *TypeScriptGenerator) writeSpecialIndex() { } func (g *TypeScriptGenerator) writeState() { - g.println(tsImportWasmLib) - g.println(tsImportSelf) - - g.generateProxyStruct(g.s.StateVars, PropImmutable, g.s.FullName, "State") - g.generateProxyStruct(g.s.StateVars, PropMutable, g.s.FullName, "State") + g.emit("state.ts") } func (g *TypeScriptGenerator) writeStructs() { - g.println(tsImportWasmLib) - - for _, typeDef := range g.s.Structs { - g.generateStruct(typeDef) - } + g.emit("structs.ts") } func (g *TypeScriptGenerator) writeTypeDefs() { - g.println(tsImportWasmLib) - g.println(tsImportSelf) + g.emit("typedefs.ts") +} - for _, subtype := range g.s.Typedefs { - g.generateProxy(subtype, PropImmutable) - g.generateProxy(subtype, PropMutable) +func emitterTsAccessCheck(g *GenBase) { + if g.currentFunc.Access == "" { + return + } + grant := g.currentFunc.Access + index := strings.Index(grant, "//") + if index >= 0 { + g.printf(" %s\n", grant[index:]) + grant = strings.TrimSpace(grant[:index]) } + switch grant { + case AccessSelf: + grant = "ctx.accountID()" + case AccessChain: + grant = "ctx.chainOwnerID()" + case AccessCreator: + grant = "ctx.contractCreator()" + default: + g.keys["grant"] = grant + g.emit("grantForKey") + grant = "access.value()" + } + g.keys["grant"] = grant + g.emit("grantRequire") } func (g *TypeScriptGenerator) setFieldKeys() { g.GenBase.setFieldKeys() - fldTypeID := rustTypeIds[g.currentField.Type] + fldTypeID := tsTypeIds[g.currentField.Type] if fldTypeID == "" { - fldTypeID = "TYPE_BYTES" + fldTypeID = "wasmlib.TYPE_BYTES" } g.keys["FldTypeID"] = fldTypeID - g.keys["FldTypeKey"] = rustKeys[g.currentField.Type] - g.keys["FldLangType"] = rustTypes[g.currentField.Type] - g.keys["FldMapKeyLangType"] = rustTypes[g.currentField.MapKey] - g.keys["FldMapKeyKey"] = rustKeys[g.currentField.MapKey] - - // native core contracts use Array16 instead of our nested array type - arrayTypeID := "TYPE_ARRAY" - if g.s.CoreContracts { - arrayTypeID = "TYPE_ARRAY16" - } - g.keys["arrayTypeID"] = arrayTypeID + g.keys["FldTypeKey"] = tsKeys[g.currentField.Type] + g.keys["FldTypeInit"] = tsInits[g.currentField.Type] + g.keys["FldLangType"] = tsTypes[g.currentField.Type] + g.keys["FldMapKeyLangType"] = tsTypes[g.currentField.MapKey] + g.keys["FldMapKeyKey"] = tsKeys[g.currentField.MapKey] } func (g *TypeScriptGenerator) setFuncKeys() { g.GenBase.setFuncKeys() - paramsID := "nil" - if len(g.currentFunc.Params) != 0 { - paramsID = "&f.Params.id" - } - g.keys["paramsID"] = paramsID - - resultsID := "nil" - if len(g.currentFunc.Results) != 0 { - resultsID = "&f.Results.id" - } - g.keys["resultsID"] = resultsID - initFunc := "" initMap := "" if g.currentFunc.Type == InitFunc { diff --git a/tools/schema/generator/schema.go b/tools/schema/generator/schema.go index 29ec7ccaa1..b4f026e8fd 100644 --- a/tools/schema/generator/schema.go +++ b/tools/schema/generator/schema.go @@ -75,14 +75,6 @@ func NewSchema() *Schema { return &Schema{} } -func (s *Schema) appendConst(name, value string) { - if s.ConstLen < len(name) { - s.ConstLen = len(name) - } - s.ConstNames = append(s.ConstNames, name) - s.ConstValues = append(s.ConstValues, value) -} - func (s *Schema) Compile(schemaDef *SchemaDef) error { s.FullName = strings.TrimSpace(schemaDef.Name) if s.FullName == "" { @@ -274,12 +266,3 @@ func (s *Schema) compileTypeDefs(schemaDef *SchemaDef) error { } return nil } - -func (s *Schema) flushConsts(printer func(name string, value string, padLen int)) { - for i, name := range s.ConstNames { - printer(name, s.ConstValues[i], s.ConstLen) - } - s.ConstLen = 0 - s.ConstNames = nil - s.ConstValues = nil -} diff --git a/tools/schema/generator/tstemplates/alltemplates.go b/tools/schema/generator/tstemplates/alltemplates.go index c27970fed4..31d5f5a50a 100644 --- a/tools/schema/generator/tstemplates/alltemplates.go +++ b/tools/schema/generator/tstemplates/alltemplates.go @@ -18,65 +18,19 @@ var TsTemplates = []map[string]string{ var tsCommon = map[string]string{ // ******************************* "initGlobals": ` -$#set arrayTypeID TYPE_ARRAY -$#set crate +$#set arrayTypeID wasmlib.TYPE_ARRAY $#if core setArrayTypeID `, // ******************************* "setArrayTypeID": ` -$#set arrayTypeID TYPE_ARRAY16 -$#set crate (crate) +$#set arrayTypeID wasmlib.TYPE_ARRAY16 `, // ******************************* - "tsHeader": ` -$#if core useCrate useWasmLib + "importWasmLib": ` +import * as wasmlib from "wasmlib"; `, // ******************************* - "modParams": ` -mod params; -`, - // ******************************* - "modResults": ` -mod results; -`, - // ******************************* - "modStructs": ` -mod structs; -`, - // ******************************* - "modTypeDefs": ` -mod typedefs; -`, - // ******************************* - "useCrate": ` -use crate::*; -`, - // ******************************* - "useCoreContract": ` -use crate::$package::*; -`, - // ******************************* - "useHost": ` -use crate::host::*; -`, - // ******************************* - "useParams": ` -use crate::params::*; -`, - // ******************************* - "useResults": ` -use crate::results::*; -`, - // ******************************* - "useStructs": ` -use crate::structs::*; -`, - // ******************************* - "useTypeDefs": ` -use crate::typedefs::*; -`, - // ******************************* - "useWasmLib": ` -use wasmlib::*; + "importSc": ` +import * as sc from "./index"; `, } diff --git a/tools/schema/generator/tstemplates/consts.go b/tools/schema/generator/tstemplates/consts.go index 12864f155a..0094577b15 100644 --- a/tools/schema/generator/tstemplates/consts.go +++ b/tools/schema/generator/tstemplates/consts.go @@ -3,15 +3,11 @@ package tstemplates var constsTs = map[string]string{ // ******************************* "consts.ts": ` -// @formatter:off +$#emit importWasmLib -#![allow(dead_code)] - -$#if core useCrate useWasmLib - -pub const SC_NAME: &str = "$scName"; -pub const SC_DESCRIPTION: &str = "$scDesc"; -pub const HSC_NAME: ScHname = ScHname(0x$hscName); +export const ScName = "$scName"; +export const ScDescription = "$scDesc"; +export const HScName = new wasmlib.ScHname(0x$hscName); $#if params constParams $#if results constResults $#if state constState @@ -19,37 +15,35 @@ $#if state constState $#each func constFunc $#each func constHFunc - -// @formatter:on `, // ******************************* "constParams": ` -$#set constPrefix PARAM_ +$#set constPrefix Param $#each params constField `, // ******************************* "constResults": ` -$#set constPrefix RESULT_ +$#set constPrefix Result $#each results constField `, // ******************************* "constState": ` -$#set constPrefix STATE_ +$#set constPrefix State $#each state constField `, // ******************************* "constField": ` -pub$crate const $constPrefix$FLD_NAME: &str = "$fldAlias"; +export const $constPrefix$FldName = "$fldAlias"; `, // ******************************* "constFunc": ` -pub$crate const $KIND$+_$FUNC_NAME: &str = "$funcName"; +export const $Kind$FuncName = "$funcName"; `, // ******************************* "constHFunc": ` -pub$crate const H$KIND$+_$FUNC_NAME: ScHname = ScHname(0x$funcHName); +export const H$Kind$FuncName = new wasmlib.ScHname(0x$funcHName); `, } diff --git a/tools/schema/generator/tstemplates/contract.go b/tools/schema/generator/tstemplates/contract.go index 499c1a877c..4bc7d553ec 100644 --- a/tools/schema/generator/tstemplates/contract.go +++ b/tools/schema/generator/tstemplates/contract.go @@ -3,54 +3,64 @@ package tstemplates var contractTs = map[string]string{ // ******************************* "contract.ts": ` -// @formatter:off - -#![allow(dead_code)] - -use std::ptr; - -$#if core useCrate useWasmLib -$#if core useCoreContract contractUses +$#emit importWasmLib +$#emit importSc $#each func FuncNameCall -pub struct ScFuncs { -} - -impl ScFuncs { +export class ScFuncs { $#each func FuncNameForCall } - -// @formatter:on -`, - // ******************************* - "contractUses": ` - -use crate::consts::*; -$#if params useParams -$#if results useResults `, // ******************************* "FuncNameCall": ` -pub struct $FuncName$+Call { - pub func: Sc$initFunc$Kind, +export class $FuncName$+Call { + func: wasmlib.Sc$initFunc$Kind = new wasmlib.Sc$initFunc$Kind(sc.HScName, sc.H$Kind$FuncName); $#if param MutableFuncNameParams $#if result ImmutableFuncNameResults } +$#if core else FuncNameContext +`, + // ******************************* + "FuncNameContext": ` + +export class $FuncName$+Context { +$#if param ImmutableFuncNameParams +$#if result MutableFuncNameResults +$#if func MutablePackageState +$#if view ImmutablePackageState +} +`, + // ******************************* + "ImmutableFuncNameParams": ` + params: sc.Immutable$FuncName$+Params = new sc.Immutable$FuncName$+Params(); `, // ******************************* "MutableFuncNameParams": ` - pub params: Mutable$FuncName$+Params, + params: sc.Mutable$FuncName$+Params = new sc.Mutable$FuncName$+Params(); `, // ******************************* "ImmutableFuncNameResults": ` - pub results: Immutable$FuncName$+Results, + results: sc.Immutable$FuncName$+Results = new sc.Immutable$FuncName$+Results(); +`, + // ******************************* + "MutableFuncNameResults": ` + results: sc.Mutable$FuncName$+Results = new sc.Mutable$FuncName$+Results(); +`, + // ******************************* + "ImmutablePackageState": ` + state: sc.Immutable$Package$+State = new sc.Immutable$Package$+State(); +`, + // ******************************* + "MutablePackageState": ` + state: sc.Mutable$Package$+State = new sc.Mutable$Package$+State(); `, // ******************************* "FuncNameForCall": ` - pub fn $func_name(_ctx: & dyn Sc$Kind$+CallContext) -> $FuncName$+Call { -$#set paramsID ptr::null_mut() -$#set resultsID ptr::null_mut() + + static $funcName(ctx: wasmlib.Sc$Kind$+CallContext): $FuncName$+Call { +$#set paramsID null +$#set resultsID null $#if param setParamsID $#if result setResultsID $#if ptrs setPtrs noPtrs @@ -58,34 +68,20 @@ $#if ptrs setPtrs noPtrs `, // ******************************* "setPtrs": ` - let mut f = $FuncName$+Call { - func: Sc$initFunc$Kind::new(HSC_NAME, H$KIND$+_$FUNC_NAME), -$#if param FuncNameParamsInit -$#if result FuncNameResultsInit - }; - f.func.set_ptrs($paramsID, $resultsID); - f -`, - // ******************************* - "FuncNameParamsInit": ` - params: Mutable$FuncName$+Params { id: 0 }, -`, - // ******************************* - "FuncNameResultsInit": ` - results: Immutable$FuncName$+Results { id: 0 }, + let f = new $FuncName$+Call(); + f.func.setPtrs($paramsID, $resultsID); + return f; `, // ******************************* "setParamsID": ` -$#set paramsID &mut f.params.id +$#set paramsID f.params `, // ******************************* "setResultsID": ` -$#set resultsID &mut f.results.id +$#set resultsID f.results `, // ******************************* "noPtrs": ` - $FuncName$+Call { - func: Sc$initFunc$Kind::new(HSC_NAME, H$KIND$+_$FUNC_NAME), - } + return new $FuncName$+Call(); `, } diff --git a/tools/schema/generator/tstemplates/funcs.go b/tools/schema/generator/tstemplates/funcs.go index 7a0ad2943d..8e1b488a0b 100644 --- a/tools/schema/generator/tstemplates/funcs.go +++ b/tools/schema/generator/tstemplates/funcs.go @@ -3,34 +3,31 @@ package tstemplates var funcsTs = map[string]string{ // ******************************* "funcs.ts": ` -use wasmlib::*; - -use crate::*; -$#if structs useStructs -$#if typedefs useTypeDefs +$#emit importWasmLib +$#emit importSc $#each func funcSignature `, // ******************************* "funcSignature": ` -pub fn $kind&+_$func_name(ctx: &Sc$Kind$+Context, f: &$FuncName$+Context) { +$kind&+$FuncName(ctx: wasmlib.Sc$Kind$+Context, f: $FuncName$+Context): void { $#emit init$FuncName } `, // ******************************* "initFuncInit": ` if f.params.owner().exists() { - f.state.owner().set_value(&f.params.owner().value()); + f.state.owner().setValue(&f.params.owner().value()); return; } - f.state.owner().set_value(&ctx.contract_creator()); + f.state.owner().setValue(ctx.contractCreator()); `, // ******************************* "initGetOwner": ` - f.results.owner().set_value(&f.state.owner().value()); + f.results.owner().setValue(f.state.owner().value()); `, // ******************************* "initSetOwner": ` - f.state.owner().set_value(&f.params.owner().value()); + f.state.owner().setValue(f.params.owner().value()); `, } diff --git a/tools/schema/generator/tstemplates/keys.go b/tools/schema/generator/tstemplates/keys.go index 47a074cba4..88b0b7dd8c 100644 --- a/tools/schema/generator/tstemplates/keys.go +++ b/tools/schema/generator/tstemplates/keys.go @@ -3,48 +3,33 @@ package tstemplates var keysTs = map[string]string{ // ******************************* "keys.ts": ` -// @formatter:off +$#emit importWasmLib +$#emit importSc -#![allow(dead_code)] - -use wasmlib::*; - -use crate::*; - -$#set constPrefix PARAM_ +$#set constPrefix Param $#each params constFieldIdx -$#set constPrefix RESULT_ +$#set constPrefix Result $#each results constFieldIdx -$#set constPrefix STATE_ +$#set constPrefix State $#each state constFieldIdx -pub const KEY_MAP_LEN: usize = $maxIndex; - -pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ -$#set constPrefix PARAM_ +export let keyMap: string[] = [ +$#set constPrefix Param $#each params constFieldKey -$#set constPrefix RESULT_ +$#set constPrefix Result $#each results constFieldKey -$#set constPrefix STATE_ +$#set constPrefix State $#each state constFieldKey ]; -pub static mut IDX_MAP: [Key32; KEY_MAP_LEN] = [Key32(0); KEY_MAP_LEN]; - -pub fn idx_map(idx: usize) -> Key32 { - unsafe { - IDX_MAP[idx] - } -} - -// @formatter:on +export let idxMap: wasmlib.Key32[] = new Array(keyMap.length); `, // ******************************* "constFieldIdx": ` -pub(crate) const IDX_$constPrefix$FLD_NAME: usize = $fldIndex; +export const Idx$constPrefix$FldName = $fldIndex; `, // ******************************* "constFieldKey": ` - $constPrefix$FLD_NAME, + sc.$constPrefix$FldName, `, } diff --git a/tools/schema/generator/tstemplates/lib.go b/tools/schema/generator/tstemplates/lib.go index 70547dbba3..02d2842d15 100644 --- a/tools/schema/generator/tstemplates/lib.go +++ b/tools/schema/generator/tstemplates/lib.go @@ -3,126 +3,62 @@ package tstemplates var libTs = map[string]string{ // ******************************* "lib.ts": ` -// @formatter:off +$#emit importWasmLib +$#emit importSc -#![allow(dead_code)] -#![allow(unused_imports)] - -use $package::*; -use wasmlib::*; -use wasmlib::host::*; - -use crate::consts::*; -use crate::keys::*; -$#if params useParams -$#if results useResults -use crate::state::*; - -mod consts; -mod contract; -mod keys; -$#if params modParams -$#if results modResults -mod state; -$#if structs modStructs -$#if typedefs modTypeDefs -mod $package; +export function on_call(index: i32): void { + return wasmlib.onCall(index); +} -#[no_mangle] -fn on_load() { - let exports = ScExports::new(); +export function on_load(): void { + let exports = new wasmlib.ScExports(); $#each func libExportFunc - unsafe { - for i in 0..KEY_MAP_LEN { - IDX_MAP[i] = get_key_id_from_string(KEY_MAP[i]); - } + for (let i = 0; i < sc.keyMap.length; i++) { + sc.idxMap[i] = wasmlib.Key32.fromString(sc.keyMap[i]); } } $#each func libThunk - -// @formatter:on `, // ******************************* "libExportFunc": ` - exports.add_$kind($KIND$+_$FUNC_NAME, $kind$+_$func_name$+_thunk); + exports.add$Kind(sc.$Kind$FuncName, $kind$FuncName$+Thunk); `, // ******************************* "libThunk": ` -pub struct $FuncName$+Context { -$#if param ImmutableFuncNameParams -$#if result MutableFuncNameResults -$#if func MutablePackageState -$#if view ImmutablePackageState -} - -fn $kind$+_$func_name$+_thunk(ctx: &Sc$Kind$+Context) { +function $kind$FuncName$+Thunk(ctx: wasmlib.Sc$Kind$+Context): void { ctx.log("$package.$kind$FuncName"); $#func accessCheck - let f = $FuncName$+Context { + let f = new sc.$FuncName$+Context(); $#if param ImmutableFuncNameParamsInit $#if result MutableFuncNameResultsInit -$#if func MutablePackageStateInit -$#if view ImmutablePackageStateInit - }; + f.state.mapID = wasmlib.OBJ_ID_STATE; $#each mandatory requireMandatory - $kind$+_$func_name(ctx, &f); + sc.$kind$FuncName(ctx, f); ctx.log("$package.$kind$FuncName ok"); } -`, - // ******************************* - "ImmutableFuncNameParams": ` - params: Immutable$FuncName$+Params, `, // ******************************* "ImmutableFuncNameParamsInit": ` - params: Immutable$FuncName$+Params { - id: OBJ_ID_PARAMS, - }, -`, - // ******************************* - "MutableFuncNameResults": ` - results: Mutable$FuncName$+Results, + f.params.mapID = wasmlib.OBJ_ID_PARAMS; `, // ******************************* "MutableFuncNameResultsInit": ` - results: Mutable$FuncName$+Results { - id: OBJ_ID_RESULTS, - }, -`, - // ******************************* - "MutablePackageState": ` - state: Mutable$Package$+State, -`, - // ******************************* - "MutablePackageStateInit": ` - state: Mutable$Package$+State { - id: OBJ_ID_STATE, - }, -`, - // ******************************* - "ImmutablePackageState": ` - state: Immutable$Package$+State, -`, - // ******************************* - "ImmutablePackageStateInit": ` - state: Immutable$Package$+State { - id: OBJ_ID_STATE, - }, + f.results.mapID = wasmlib.OBJ_ID_RESULTS; `, // ******************************* "requireMandatory": ` - ctx.require(f.params.$fld_name().exists(), "missing mandatory $fldName"); + ctx.require(f.params.$fldName().exists(), "missing mandatory $fldName"); `, // ******************************* "grantForKey": ` - let access = ctx.state().get_agent_id("$grant"); + let access = ctx.state().getAgentID(wasmlib.Key32.fromString("$grant")); ctx.require(access.exists(), "access not set: $grant"); `, // ******************************* "grantRequire": ` - ctx.require(ctx.caller() == $grant, "no permission"); + ctx.require(ctx.caller().equals($grant), "no permission"); `, } diff --git a/tools/schema/generator/tstemplates/params.go b/tools/schema/generator/tstemplates/params.go index 7331af6728..b823b5bc23 100644 --- a/tools/schema/generator/tstemplates/params.go +++ b/tools/schema/generator/tstemplates/params.go @@ -3,20 +3,9 @@ package tstemplates var paramsTs = map[string]string{ // ******************************* "params.ts": ` -#![allow(dead_code)] -#![allow(unused_imports)] - -$#if core useCrate useWasmLib -$#if core useCoreContract -$#if core useHost paramsUses +$#emit importWasmLib +$#emit importSc $#each func paramsFunc -`, - // ******************************* - "paramsUses": ` -use wasmlib::host::*; - -use crate::*; -use crate::keys::*; `, // ******************************* "paramsFunc": ` @@ -24,7 +13,7 @@ $#if params paramsFuncParams `, // ******************************* "paramsFuncParams": ` -$#set Kind PARAM_ +$#set Kind Param $#set mut Immutable $#if param paramsProxyStruct $#set mut Mutable @@ -35,12 +24,7 @@ $#if param paramsProxyStruct $#set TypeName $mut$FuncName$+Params $#each param proxyContainers -#[derive(Clone, Copy)] -pub struct $TypeName { - pub(crate) id: i32, -} - -impl $TypeName { +export class $TypeName extends wasmlib.ScMapID { $#each param proxyMethods } `, diff --git a/tools/schema/generator/tstemplates/proxy.go b/tools/schema/generator/tstemplates/proxy.go index 3fdefc01a7..609b1da9d0 100644 --- a/tools/schema/generator/tstemplates/proxy.go +++ b/tools/schema/generator/tstemplates/proxy.go @@ -8,7 +8,7 @@ $#if map typedefProxyMap `, // ******************************* "proxyMethods": ` -$#set varID idx_map(IDX_$Kind$FLD_NAME) +$#set varID sc.idxMap[sc.Idx$Kind$FldName] $#if core setCoreVarID $#if array proxyArray proxyMethods2 `, @@ -22,14 +22,14 @@ $#if basetype proxyBaseType proxyNewType `, // ******************************* "setCoreVarID": ` -$#set varID $Kind$FLD_NAME.get_key_id() +$#set varID wasmlib.Key32.fromString(sc.$Kind$FldName) `, // ******************************* "proxyArray": ` - pub fn $fld_name(&self) -> ArrayOf$mut$FldType { - let arr_id = get_object_id(self.id, $varID, $arrayTypeID | $FldTypeID); - ArrayOf$mut$FldType { obj_id: arr_id } + $fldName(): sc.ArrayOf$mut$FldType { + let arrID = wasmlib.getObjectID(this.mapID, $varID, $arrayTypeID|$FldTypeID); + return new sc.ArrayOf$mut$FldType(arrID); } `, // ******************************* @@ -39,30 +39,30 @@ $#if this proxyMapThis proxyMapOther // ******************************* "proxyMapThis": ` - pub fn $fld_name(&self) -> Map$FldMapKey$+To$mut$FldType { - Map$FldMapKey$+To$mut$FldType { obj_id: self.id } + $fldName(): sc.Map$FldMapKey$+To$mut$FldType { + return new sc.Map$FldMapKey$+To$mut$FldType(this.mapID); } `, // ******************************* - "proxyMapOther": `55544444.0 + "proxyMapOther": ` - pub fn $fld_name(&self) -> Map$FldMapKey$+To$mut$FldType { - let map_id = get_object_id(self.id, $varID, TYPE_MAP); - Map$FldMapKey$+To$mut$FldType { obj_id: map_id } + $fldName(): sc.Map$FldMapKey$+To$mut$FldType { + let mapID = wasmlib.getObjectID(this.mapID, $varID, wasmlib.TYPE_MAP); + return new sc.Map$FldMapKey$+To$mut$FldType(mapID); } `, // ******************************* "proxyBaseType": ` - pub fn $fld_name(&self) -> Sc$mut$FldType { - Sc$mut$FldType::new(self.id, $varID) + $fldName(): wasmlib.Sc$mut$FldType { + return new wasmlib.Sc$mut$FldType(this.mapID, $varID); } `, // ******************************* "proxyNewType": ` - pub fn $fld_name(&self) -> $mut$FldType { - $mut$FldType { obj_id: self.id, key_id: $varID } + $fldName(): sc.$mut$FldType { + return new sc.$mut$FldType(this.mapID, $varID); } `, } diff --git a/tools/schema/generator/tstemplates/results.go b/tools/schema/generator/tstemplates/results.go index a8d3d9e17d..f12517282f 100644 --- a/tools/schema/generator/tstemplates/results.go +++ b/tools/schema/generator/tstemplates/results.go @@ -3,21 +3,9 @@ package tstemplates var resultsTs = map[string]string{ // ******************************* "results.ts": ` -#![allow(dead_code)] -#![allow(unused_imports)] - -$#if core useCrate useWasmLib -$#if core useCoreContract -$#if core useHost resultsUses +$#emit importWasmLib +$#emit importSc $#each func resultsFunc -`, - // ******************************* - "resultsUses": ` -use wasmlib::host::*; - -use crate::*; -use crate::keys::*; -$#if structs useStructs `, // ******************************* "resultsFunc": ` @@ -25,7 +13,7 @@ $#if results resultsFuncResults `, // ******************************* "resultsFuncResults": ` -$#set Kind RESULT_ +$#set Kind Result $#set mut Immutable $#if result resultsProxyStruct $#set mut Mutable @@ -36,12 +24,7 @@ $#if result resultsProxyStruct $#set TypeName $mut$FuncName$+Results $#each result proxyContainers -#[derive(Clone, Copy)] -pub struct $TypeName { - pub(crate) id: i32, -} - -impl $TypeName { +export class $TypeName extends wasmlib.ScMapID { $#each result proxyMethods } `, diff --git a/tools/schema/generator/tstemplates/state.go b/tools/schema/generator/tstemplates/state.go index bd2cc24352..501d4c9cdd 100644 --- a/tools/schema/generator/tstemplates/state.go +++ b/tools/schema/generator/tstemplates/state.go @@ -3,17 +3,9 @@ package tstemplates var stateTs = map[string]string{ // ******************************* "state.ts": ` -#![allow(dead_code)] -#![allow(unused_imports)] - -use wasmlib::*; -use wasmlib::host::*; - -use crate::*; -use crate::keys::*; -$#if structs useStructs -$#if typedefs useTypeDefs -$#set Kind STATE_ +$#emit importWasmLib +$#emit importSc +$#set Kind State $#set mut Immutable $#emit stateProxyStruct $#set mut Mutable @@ -24,16 +16,7 @@ $#emit stateProxyStruct $#set TypeName $mut$Package$+State $#each state proxyContainers -#[derive(Clone, Copy)] -pub struct $TypeName { - pub(crate) id: i32, -} -$#if state stateProxyImpl -`, - // ******************************* - "stateProxyImpl": ` - -impl $TypeName { +export class $TypeName extends wasmlib.ScMapID { $#each state proxyMethods } `, diff --git a/tools/schema/generator/tstemplates/structs.go b/tools/schema/generator/tstemplates/structs.go index d2491e852c..0f8195d2e7 100644 --- a/tools/schema/generator/tstemplates/structs.go +++ b/tools/schema/generator/tstemplates/structs.go @@ -3,35 +3,27 @@ package tstemplates var structsTs = map[string]string{ // ******************************* "structs.ts": ` -// @formatter:off - -#![allow(dead_code)] - -use wasmlib::*; -use wasmlib::host::*; +$#emit importWasmLib $#each structs structType - -// @formatter:on `, // ******************************* "structType": ` -pub struct $StrName { +export class $StrName { $#each struct structField -} -impl $StrName { - pub fn from_bytes(bytes: &[u8]) -> $StrName { - let mut decode = BytesDecoder::new(bytes); - $StrName { + static fromBytes(bytes: u8[]): $StrName { + let decode = new wasmlib.BytesDecoder(bytes); + let data = new $StrName(); $#each struct structDecode - } + decode.close(); + return data; } - pub fn to_bytes(&self) -> Vec { - let mut encode = BytesEncoder::new(); + bytes(): u8[] { + return new wasmlib.BytesEncoder(). $#each struct structEncode - return encode.data(); + data(); } } $#set mut Immutable @@ -41,40 +33,43 @@ $#emit structMethods `, // ******************************* "structField": ` - pub $fld_name: $FldLangType, $FldComment + $fldName: $FldLangType = $FldTypeInit; $FldComment `, // ******************************* "structDecode": ` - $fld_name: decode.$fld_type(), + data.$fldName = decode.$fldType(); `, // ******************************* "structEncode": ` - encode.$fld_type($ref$+self.$fld_name); + $fldType(this.$fldName). `, // ******************************* "structMethods": ` -pub struct $mut$StrName { - pub(crate) obj_id: i32, - pub(crate) key_id: Key32, -} +export class $mut$StrName { + objID: i32; + keyID: wasmlib.Key32; + + constructor(objID: i32, keyID: wasmlib.Key32) { + this.objID = objID; + this.keyID = keyID; + } -impl $mut$StrName { - pub fn exists(&self) -> bool { - exists(self.obj_id, self.key_id, TYPE_BYTES) + exists(): boolean { + return wasmlib.exists(this.objID, this.keyID, wasmlib.TYPE_BYTES); } $#if mut structMethodSetValue - pub fn value(&self) -> $StrName { - $StrName::from_bytes(&get_bytes(self.obj_id, self.key_id, TYPE_BYTES)) + value(): $StrName { + return $StrName.fromBytes(wasmlib.getBytes(this.objID, this.keyID, wasmlib.TYPE_BYTES)); } } `, // ******************************* "structMethodSetValue": ` - pub fn set_value(&self, value: &$StrName) { - set_bytes(self.obj_id, self.key_id, TYPE_BYTES, &value.to_bytes()); + setValue(value: $StrName): void { + wasmlib.setBytes(this.objID, this.keyID, wasmlib.TYPE_BYTES, value.bytes()); } `, } diff --git a/tools/schema/generator/tstemplates/typedefs.go b/tools/schema/generator/tstemplates/typedefs.go index 25ea2fd2b6..3271ab5f60 100644 --- a/tools/schema/generator/tstemplates/typedefs.go +++ b/tools/schema/generator/tstemplates/typedefs.go @@ -3,16 +3,9 @@ package tstemplates var typedefsTs = map[string]string{ // ******************************* "typedefs.ts": ` -// @formatter:off - -#![allow(dead_code)] - -use wasmlib::*; -use wasmlib::host::*; -$#if structs useStructs +$#emit importWasmLib +$#emit importSc $#each typedef typedefProxy - -// @formatter:on `, // ******************************* "typedefProxy": ` @@ -30,7 +23,8 @@ $#if map typedefProxyAlias // ******************************* "typedefProxyAlias": ` -pub type $mut$FldName = $proxy; +export class $mut$FldName extends $proxy { +}; `, // ******************************* "typedefProxyArray": ` @@ -40,31 +34,33 @@ $#if exist else typedefProxyArrayNew // ******************************* "typedefProxyArrayNew": ` -pub struct $proxy { - pub(crate) obj_id: i32, -} +export class $proxy { + objID: i32; -impl $proxy { -$#if mut typedefProxyArrayClear - pub fn length(&self) -> i32 { - get_length(self.obj_id) + constructor(objID: i32) { + this.objID = objID; } +$#if mut typedefProxyArrayClear + length(): i32 { + return wasmlib.getLength(this.objID); + } $#if basetype typedefProxyArrayNewBaseType typedefProxyArrayNewOtherType } $#set exist $proxy `, // ******************************* "typedefProxyArrayClear": ` - pub fn clear(&self) { - clear(self.obj_id); - } + clear(): void { + wasmlib.clear(this.objID); + } `, // ******************************* "typedefProxyArrayNewBaseType": ` - pub fn get_$fld_type(&self, index: i32) -> Sc$mut$FldType { - Sc$mut$FldType::new(self.obj_id, Key32(index)) + + get$FldType(index: i32): wasmlib.Sc$mut$FldType { + return new wasmlib.Sc$mut$FldType(this.objID, new wasmlib.Key32(index)); } `, // ******************************* @@ -74,18 +70,19 @@ $#if typedef typedefProxyArrayNewOtherTypeTypeDef typedefProxyArrayNewOtherTypeS `, // ******************************* "typedefProxyArrayNewOtherTypeTypeDef": ` -$#set varType TYPE_MAP +$#set varType wasmlib.TYPE_MAP $#if array setVarTypeArray - pub fn Get$OldType(&self, index: i32) -> $mut$OldType { - let sub_id = get_object_id(self.obj_id, Key32(index), $varType); - $mut$OldType { obj_id: sub_id } + Get$OldType(index: i32): sc.$mut$OldType { + let subID = wasmlib.getObjectID(this.objID, new wasmlib.Key32(index), $varType); + return new sc.$mut$OldType(subID); } `, // ******************************* "typedefProxyArrayNewOtherTypeStruct": ` - pub fn get_$fld_type(&self, index: i32) -> $mut$FldType { - $mut$FldType { obj_id: self.obj_id, key_id: Key32(index) } + + get$FldType(index: i32): sc.$mut$FldType { + return new sc.$mut$FldType(this.objID, new wasmlib.Key32(index)); } `, // ******************************* @@ -96,11 +93,12 @@ $#if exist else typedefProxyMapNew // ******************************* "typedefProxyMapNew": ` -pub struct $proxy { - pub(crate) obj_id: i32, -} +export class $proxy { + objID: i32; -impl $proxy { + constructor(objID: i32) { + this.objID = objID; + } $#if mut typedefProxyMapClear $#if basetype typedefProxyMapNewBaseType typedefProxyMapNewOtherType } @@ -108,20 +106,21 @@ $#set exist $proxy `, // ******************************* "typedefProxyMapClear": ` - pub fn clear(&self) { - clear(self.obj_id); - } + clear(): void { + wasmlib.clear(this.objID); + } `, // ******************************* "typedefProxyMapNewBaseType": ` - pub fn get_$fld_type(&self, key: $FldMapKeyLangType) -> Sc$mut$FldType { - Sc$mut$FldType::new(self.obj_id, key.get_key_id()) + + get$FldType(key: $FldMapKeyLangType): wasmlib.Sc$mut$FldType { + return new wasmlib.Sc$mut$FldType(this.objID, $FldMapKeyKey.getKeyID()); } `, // ******************************* "typedefProxyMapNewOtherType": ` -$#set old_type $fld_type +$#set oldType $fldType $#set OldType $FldType $#set OldMapKeyLangType $FldMapKeyLangType $#set OldMapKeyKey $FldMapKeyKey @@ -129,21 +128,23 @@ $#if typedef typedefProxyMapNewOtherTypeTypeDef typedefProxyMapNewOtherTypeStruc `, // ******************************* "typedefProxyMapNewOtherTypeTypeDef": ` -$#set varType TYPE_MAP +$#set varType wasmlib.TYPE_MAP $#if array setVarTypeArray - pub fn get_$old_type(&self, key: $OldMapKeyLangType) -> $mut$OldType { - let sub_id = get_object_id(self.obj_id, key.get_key_id(), $varType); - $mut$OldType { obj_id: sub_id } + + get$OldType(key: $OldMapKeyLangType): sc.$mut$OldType { + let subID = wasmlib.getObjectID(this.objID, $OldMapKeyKey.getKeyID(), $varType); + return new sc.$mut$OldType(subID); } `, // ******************************* "typedefProxyMapNewOtherTypeStruct": ` - pub fn get_$old_type(&self, key: $OldMapKeyLangType) -> $mut$OldType { - $mut$OldType { obj_id: self.obj_id, key_id: key.get_key_id() } + + get$OldType(key: $OldMapKeyLangType): sc.$mut$OldType { + return new sc.$mut$OldType(this.objID, $OldMapKeyKey.getKeyID()); } `, // ******************************* "setVarTypeArray": ` -$#set varType $arrayTypeID | $FldTypeID +$#set varType $arrayTypeID|$FldTypeID `, } From 938b5921b04801ff1161fd8c376be693b33234fb Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Sat, 6 Nov 2021 04:51:10 -0700 Subject: [PATCH 033/198] Cleanup --- tools/schema/generator/emitter.go | 242 +++++++++++++++++ tools/schema/generator/generator.go | 319 +++-------------------- tools/schema/generator/generator_go.go | 36 --- tools/schema/generator/generator_rust.go | 36 --- tools/schema/generator/generator_ts.go | 36 --- 5 files changed, 278 insertions(+), 391 deletions(-) create mode 100644 tools/schema/generator/emitter.go diff --git a/tools/schema/generator/emitter.go b/tools/schema/generator/emitter.go new file mode 100644 index 0000000000..898b3ed5ec --- /dev/null +++ b/tools/schema/generator/emitter.go @@ -0,0 +1,242 @@ +package generator + +import ( + "regexp" + "strings" +) + +const ( + KeyArray = "array" + KeyBaseType = "basetype" + KeyCore = "core" + KeyExist = "exist" + KeyMap = "map" + KeyMut = "mut" + KeyFunc = "func" + KeyMandatory = "mandatory" + KeyParam = "param" + KeyParams = "params" + KeyProxy = "proxy" + KeyPtrs = "ptrs" + KeyResult = "result" + KeyResults = "results" + KeyState = "state" + KeyStruct = "struct" + KeyStructs = "structs" + KeyThis = "this" + KeyTypeDef = "typedef" + KeyTypeDefs = "typedefs" + KeyView = "view" +) + +var emitKeyRegExp = regexp.MustCompile(`\$[a-zA-Z_]+`) + +func (g *GenBase) emit(template string) { + lines := strings.Split(g.templates[template], "\n") + for i := 1; i < len(lines)-1; i++ { + line := lines[i] + + // replace any placeholder keys + line = emitKeyRegExp.ReplaceAllStringFunc(line, func(key string) string { + text, ok := g.keys[key[1:]] + if ok { + return text + } + return "???:" + key + }) + + // remove concatenation markers + line = strings.ReplaceAll(line, "$+", "") + + // now process special commands + if strings.HasPrefix(line, "$#") { + if strings.HasPrefix(line, "$#emit ") { + g.emit(strings.TrimSpace(line[7:])) + continue + } + if strings.HasPrefix(line, "$#each ") { + g.emitEach(line) + continue + } + if strings.HasPrefix(line, "$#func ") { + g.emitFunc(line) + continue + } + if strings.HasPrefix(line, "$#if ") { + g.emitIf(line) + continue + } + if strings.HasPrefix(line, "$#set ") { + g.emitSet(line) + continue + } + g.println("???:" + line) + continue + } + + g.println(line) + } +} + +func (g *GenBase) emitEach(key string) { + parts := strings.Split(key, " ") + if len(parts) != 3 { + g.println("???:" + key) + return + } + + template := parts[2] + switch parts[1] { + case KeyFunc: + for _, g.currentFunc = range g.s.Funcs { + g.gen.setFuncKeys() + g.emit(template) + } + case KeyMandatory: + mandatory := make([]*Field, 0) + for _, g.currentField = range g.currentFunc.Params { + if !g.currentField.Optional { + mandatory = append(mandatory, g.currentField) + } + } + g.emitFields(mandatory, template) + case KeyParam: + g.emitFields(g.currentFunc.Params, template) + case KeyParams: + g.emitFields(g.s.Params, template) + case KeyResult: + g.emitFields(g.currentFunc.Results, template) + case KeyResults: + g.emitFields(g.s.Results, template) + case KeyState: + g.emitFields(g.s.StateVars, template) + case KeyStruct: + g.emitFields(g.currentStruct.Fields, template) + case KeyStructs: + for _, g.currentStruct = range g.s.Structs { + g.setMultiKeyValues("strName", g.currentStruct.Name) + g.emit(template) + } + case KeyTypeDef: + g.emitFields(g.s.Typedefs, template) + default: + g.println("???:" + key) + } +} + +func (g *GenBase) emitFields(fields []*Field, template string) { + for _, g.currentField = range fields { + //if g.currentField.Alias == KeyThis { + // continue + //} + g.gen.setFieldKeys() + g.emit(template) + } +} + +func (g *GenBase) emitFunc(key string) { + parts := strings.Split(key, " ") + if len(parts) != 2 { + g.println("???:" + key) + return + } + + emitter, ok := g.emitters[parts[1]] + if ok { + emitter(g) + return + } + g.println("???:" + key) +} + +//nolint:funlen +func (g *GenBase) emitIf(key string) { + parts := strings.Split(key, " ") + if len(parts) < 3 || len(parts) > 4 { + g.println("???:" + key) + return + } + + conditionKey := parts[1] + template := parts[2] + + condition := false + switch conditionKey { + case KeyArray: + condition = g.currentField.Array + case KeyBaseType: + condition = g.currentField.TypeID != 0 + case KeyExist: + proxy := g.keys[KeyProxy] + condition = g.newTypes[proxy] + case KeyMap: + condition = g.currentField.MapKey != "" + case KeyMut: + condition = g.keys[KeyMut] == "Mutable" + case KeyCore: + condition = g.s.CoreContracts + case KeyFunc, KeyView: + condition = g.keys["kind"] == conditionKey + case KeyParam: + condition = len(g.currentFunc.Params) != 0 + case KeyParams: + condition = len(g.s.Params) != 0 + case KeyResult: + condition = len(g.currentFunc.Results) != 0 + case KeyResults: + condition = len(g.s.Results) != 0 + case KeyState: + condition = len(g.s.StateVars) != 0 + case KeyStructs: + condition = len(g.s.Structs) != 0 + case KeyThis: + condition = g.currentField.Alias == KeyThis + case KeyTypeDef: + condition = g.fieldIsTypeDef() + case KeyTypeDefs: + condition = len(g.s.Typedefs) != 0 + case KeyPtrs: + condition = len(g.currentFunc.Params) != 0 || len(g.currentFunc.Results) != 0 + default: + g.println("???:" + key) + return + } + + if condition { + g.emit(template) + return + } + + // else branch? + if len(parts) == 4 { + template = parts[3] + g.emit(template) + } +} + +func (g *GenBase) emitSet(line string) { + parts := strings.Split(line, " ") + if len(parts) < 3 { + g.println("???:" + line) + return + } + + key := parts[1] + value := line[len(parts[0])+len(key)+2:] + g.keys[key] = value + + if key == KeyExist { + g.newTypes[value] = true + } +} + +func (g *GenBase) fieldIsTypeDef() bool { + for _, typeDef := range g.s.Typedefs { + if typeDef.Name == g.currentField.Type { + g.currentField = typeDef + g.gen.setFieldKeys() + return true + } + } + return false +} diff --git a/tools/schema/generator/generator.go b/tools/schema/generator/generator.go index 0bb725cb1f..e55c7d793b 100644 --- a/tools/schema/generator/generator.go +++ b/tools/schema/generator/generator.go @@ -18,39 +18,12 @@ import ( // TODO handle case where owner is type AgentID[] const ( - AccessChain = "chain" - AccessCreator = "creator" - AccessSelf = "self" - AliasThis = "this" - InitFunc = "Init" - KeyArray = "array" - KeyBaseType = "basetype" - KeyCore = "core" - KeyExist = "exist" - KeyMap = "map" - KeyMut = "mut" - KeyFunc = "func" - KeyMandatory = "mandatory" - KeyParam = "param" - KeyParams = "params" - KeyProxy = "proxy" - KeyPtrs = "ptrs" - KeyResult = "result" - KeyResults = "results" - KeyState = "state" - KeyStruct = "struct" - KeyStructs = "structs" - KeyThis = "this" - KeyTypeDef = "typedef" - KeyTypeDefs = "typedefs" - KeyView = "view" - KindFunc = "Func" - KindView = "View" - PropImmutable = "Immutable" - PropMutable = "Mutable" - SpecialFuncInit = "funcInit" - SpecialFuncSetOwner = "setOwner" - SpecialViewGetOwner = "getOwner" + AccessChain = "chain" + AccessCreator = "creator" + AccessSelf = "self" + InitFunc = "Init" + KindFunc = "Func" + KindView = "View" ) var ( @@ -65,16 +38,7 @@ type Generator interface { generateLanguageSpecificFiles() error setFieldKeys() setFuncKeys() - writeConsts() - writeContract() writeInitialFuncs() - writeKeys() - writeLib() - writeParams() - writeResults() - writeState() - writeStructs() - writeTypeDefs() } type GenBase struct { @@ -103,7 +67,7 @@ func (g *GenBase) init(s *Schema) { g.keys = map[string]string{} g.templates = map[string]string{} g.addTemplates(templates) - g.setKeys() + g.setCommonKeys() } func (g *GenBase) addTemplates(t map[string]string) { @@ -145,217 +109,6 @@ func (g *GenBase) createSourceFile(name string, generator ...func()) error { return nil } -var emitKeyRegExp = regexp.MustCompile(`\$[a-zA-Z_]+`) - -func (g *GenBase) emit(template string) { - lines := strings.Split(g.templates[template], "\n") - for i := 1; i < len(lines)-1; i++ { - line := lines[i] - - // replace any placeholder keys - line = emitKeyRegExp.ReplaceAllStringFunc(line, func(key string) string { - text, ok := g.keys[key[1:]] - if ok { - return text - } - return "???:" + key - }) - - // remove concatenation markers - line = strings.ReplaceAll(line, "$+", "") - - // now process special commands - if strings.HasPrefix(line, "$#") { - if strings.HasPrefix(line, "$#emit ") { - g.emit(strings.TrimSpace(line[7:])) - continue - } - if strings.HasPrefix(line, "$#each ") { - g.emitEach(line) - continue - } - if strings.HasPrefix(line, "$#func ") { - g.emitFunc(line) - continue - } - if strings.HasPrefix(line, "$#if ") { - g.emitIf(line) - continue - } - if strings.HasPrefix(line, "$#set ") { - g.emitSet(line) - continue - } - g.println("???:" + line) - continue - } - - g.println(line) - } -} - -func (g *GenBase) emitEach(key string) { - parts := strings.Split(key, " ") - if len(parts) != 3 { - g.println("???:" + key) - return - } - - template := parts[2] - switch parts[1] { - case KeyFunc: - for _, g.currentFunc = range g.s.Funcs { - g.gen.setFuncKeys() - g.emit(template) - } - case KeyMandatory: - mandatory := []*Field{} - for _, g.currentField = range g.currentFunc.Params { - if !g.currentField.Optional { - mandatory = append(mandatory, g.currentField) - } - } - g.emitFields(mandatory, template) - case KeyParam: - g.emitFields(g.currentFunc.Params, template) - case KeyParams: - g.emitFields(g.s.Params, template) - case KeyResult: - g.emitFields(g.currentFunc.Results, template) - case KeyResults: - g.emitFields(g.s.Results, template) - case KeyState: - g.emitFields(g.s.StateVars, template) - case KeyStruct: - g.emitFields(g.currentStruct.Fields, template) - case KeyStructs: - for _, g.currentStruct = range g.s.Structs { - g.setKeyValues("strName", g.currentStruct.Name) - g.emit(template) - } - case KeyTypeDef: - g.emitFields(g.s.Typedefs, template) - default: - g.println("???:" + key) - } -} - -func (g *GenBase) emitFields(fields []*Field, template string) { - for _, g.currentField = range fields { - //if g.currentField.Alias == KeyThis { - // continue - //} - g.gen.setFieldKeys() - g.emit(template) - } -} - -func (g *GenBase) emitFunc(key string) { - parts := strings.Split(key, " ") - if len(parts) != 2 { - g.println("???:" + key) - return - } - - emitter, ok := g.emitters[parts[1]] - if ok { - emitter(g) - return - } - g.println("???:" + key) -} - -func (g *GenBase) emitIf(key string) { - parts := strings.Split(key, " ") - if len(parts) < 3 || len(parts) > 4 { - g.println("???:" + key) - return - } - - conditionKey := parts[1] - template := parts[2] - - condition := false - switch conditionKey { - case KeyArray: - condition = g.currentField.Array - case KeyBaseType: - condition = g.currentField.TypeID != 0 - case KeyExist: - proxy := g.keys[KeyProxy] - condition = g.newTypes[proxy] - case KeyMap: - condition = g.currentField.MapKey != "" - case KeyMut: - condition = g.keys[KeyMut] == "Mutable" - case KeyCore: - condition = g.s.CoreContracts - case KeyFunc, KeyView: - condition = g.keys["kind"] == conditionKey - case KeyParam: - condition = len(g.currentFunc.Params) != 0 - case KeyParams: - condition = len(g.s.Params) != 0 - case KeyResult: - condition = len(g.currentFunc.Results) != 0 - case KeyResults: - condition = len(g.s.Results) != 0 - case KeyState: - condition = len(g.s.StateVars) != 0 - case KeyStructs: - condition = len(g.s.Structs) != 0 - case KeyThis: - condition = g.currentField.Alias == KeyThis - case KeyTypeDef: - condition = g.fieldIsTypeDef() - case KeyTypeDefs: - condition = len(g.s.Typedefs) != 0 - case KeyPtrs: - condition = len(g.currentFunc.Params) != 0 || len(g.currentFunc.Results) != 0 - default: - g.println("???:" + key) - return - } - - if condition { - g.emit(template) - return - } - - // else branch? - if len(parts) == 4 { - template = parts[3] - g.emit(template) - } -} - -func (g *GenBase) fieldIsTypeDef() bool { - for _, typeDef := range g.s.Typedefs { - if typeDef.Name == g.currentField.Type { - g.currentField = typeDef - g.gen.setFieldKeys() - return true - } - } - return false -} - -func (g *GenBase) emitSet(line string) { - parts := strings.Split(line, " ") - if len(parts) < 3 { - g.println("???:" + line) - return - } - - key := parts[1] - value := line[len(parts[0])+len(key)+2:] - g.keys[key] = value - - if key == KeyExist { - g.newTypes[value] = true - } -} - func (g *GenBase) exists(path string) (err error) { _, err = os.Stat(path) return err @@ -399,49 +152,49 @@ func (g *GenBase) Generate(s *Schema) error { } func (g *GenBase) generateCode() error { - err := g.createSourceFile("consts", g.gen.writeConsts) + err := g.createSourceFile("consts") if err != nil { return err } if len(g.s.Structs) != 0 { - err = g.createSourceFile("structs", g.gen.writeStructs) + err = g.createSourceFile("structs") if err != nil { return err } } if len(g.s.Typedefs) != 0 { - err = g.createSourceFile("typedefs", g.gen.writeTypeDefs) + err = g.createSourceFile("typedefs") if err != nil { return err } } if len(g.s.Params) != 0 { - err = g.createSourceFile("params", g.gen.writeParams) + err = g.createSourceFile("params") if err != nil { return err } } if len(g.s.Results) != 0 { - err = g.createSourceFile("results", g.gen.writeResults) + err = g.createSourceFile("results") if err != nil { return err } } - err = g.createSourceFile("contract", g.gen.writeContract) + err = g.createSourceFile("contract") if err != nil { return err } if !g.s.CoreContracts { - err = g.createSourceFile("keys", g.gen.writeKeys) + err = g.createSourceFile("keys") if err != nil { return err } - err = g.createSourceFile("state", g.gen.writeState) + err = g.createSourceFile("state") if err != nil { return err } - err = g.createSourceFile("lib", g.gen.writeLib) + err = g.createSourceFile("lib") if err != nil { return err } @@ -571,9 +324,24 @@ func (g *GenBase) scanExistingCode() ([]string, StringMap, error) { return lines, existing, nil } +func (g *GenBase) setCommonKeys() { + g.keys["space"] = " " + g.keys["package"] = g.s.Name + g.keys["Package"] = g.s.FullName + g.keys["module"] = ModuleName + strings.Replace(ModuleCwd[len(ModulePath):], "\\", "/", -1) + scName := g.s.Name + if g.s.CoreContracts { + // strip off "core" prefix + scName = scName[4:] + } + g.keys["scName"] = scName + g.keys["hscName"] = iscp.Hn(scName).String() + g.keys["scDesc"] = g.s.Description +} + func (g *GenBase) setFieldKeys() { - g.setKeyValues("fldName", g.currentField.Name) - g.setKeyValues("fldType", g.currentField.Type) + g.setMultiKeyValues("fldName", g.currentField.Name) + g.setMultiKeyValues("fldType", g.currentField.Type) g.keys["fldAlias"] = g.currentField.Alias g.keys["FldComment"] = g.currentField.Comment @@ -585,27 +353,12 @@ func (g *GenBase) setFieldKeys() { } func (g *GenBase) setFuncKeys() { - g.setKeyValues("funcName", g.currentFunc.FuncName[4:]) - g.setKeyValues("kind", g.currentFunc.FuncName[:4]) + g.setMultiKeyValues("funcName", g.currentFunc.FuncName[4:]) + g.setMultiKeyValues("kind", g.currentFunc.FuncName[:4]) g.keys["funcHName"] = iscp.Hn(g.keys["funcName"]).String() } -func (g *GenBase) setKeys() { - g.keys["space"] = " " - g.keys["package"] = g.s.Name - g.keys["Package"] = g.s.FullName - g.keys["module"] = ModuleName + strings.Replace(ModuleCwd[len(ModulePath):], "\\", "/", -1) - scName := g.s.Name - if g.s.CoreContracts { - // strip off "core" prefix - scName = scName[4:] - } - g.keys["scName"] = scName - g.keys["hscName"] = iscp.Hn(scName).String() - g.keys["scDesc"] = g.s.Description -} - -func (g *GenBase) setKeyValues(key, value string) { +func (g *GenBase) setMultiKeyValues(key, value string) { value = uncapitalize(value) g.keys[key] = value g.keys[capitalize(key)] = capitalize(value) diff --git a/tools/schema/generator/generator_go.go b/tools/schema/generator/generator_go.go index cb47170221..2985e04d8f 100644 --- a/tools/schema/generator/generator_go.go +++ b/tools/schema/generator/generator_go.go @@ -85,50 +85,14 @@ func (g *GoGenerator) generateLanguageSpecificFiles() error { return g.createSourceFile("../main", g.writeSpecialMain) } -func (g *GoGenerator) writeConsts() { - g.emit("consts.go") -} - -func (g *GoGenerator) writeContract() { - g.emit("contract.go") -} - func (g *GoGenerator) writeInitialFuncs() { g.emit("funcs.go") } -func (g *GoGenerator) writeKeys() { - g.emit("keys.go") -} - -func (g *GoGenerator) writeLib() { - g.emit("lib.go") -} - -func (g *GoGenerator) writeParams() { - g.emit("params.go") -} - -func (g *GoGenerator) writeResults() { - g.emit("results.go") -} - func (g *GoGenerator) writeSpecialMain() { g.emit("main.go") } -func (g *GoGenerator) writeState() { - g.emit("state.go") -} - -func (g *GoGenerator) writeStructs() { - g.emit("structs.go") -} - -func (g *GoGenerator) writeTypeDefs() { - g.emit("typedefs.go") -} - func emitterGoAccessCheck(g *GenBase) { if g.currentFunc.Access == "" { return diff --git a/tools/schema/generator/generator_rust.go b/tools/schema/generator/generator_rust.go index 2ae8f2ef1c..f4df250b3b 100644 --- a/tools/schema/generator/generator_rust.go +++ b/tools/schema/generator/generator_rust.go @@ -134,34 +134,10 @@ func (g *RustGenerator) generateModLines(format string) { } } -func (g *RustGenerator) writeConsts() { - g.emit("consts.rs") -} - -func (g *RustGenerator) writeContract() { - g.emit("contract.rs") -} - func (g *RustGenerator) writeInitialFuncs() { g.emit("funcs.rs") } -func (g *RustGenerator) writeKeys() { - g.emit("keys.rs") -} - -func (g *RustGenerator) writeLib() { - g.emit("lib.rs") -} - -func (g *RustGenerator) writeParams() { - g.emit("params.rs") -} - -func (g *RustGenerator) writeResults() { - g.emit("results.rs") -} - func (g *RustGenerator) writeSpecialCargoToml() error { cargoToml := "Cargo.toml" err := g.exists(cargoToml) @@ -186,18 +162,6 @@ func (g *RustGenerator) writeSpecialMod() { g.generateModLines("pub mod %s;\n") } -func (g *RustGenerator) writeState() { - g.emit("state.rs") -} - -func (g *RustGenerator) writeStructs() { - g.emit("structs.rs") -} - -func (g *RustGenerator) writeTypeDefs() { - g.emit("typedefs.rs") -} - func emitterRsAccessCheck(g *GenBase) { if g.currentFunc.Access == "" { return diff --git a/tools/schema/generator/generator_ts.go b/tools/schema/generator/generator_ts.go index 5d633d96e5..999e4fd02b 100644 --- a/tools/schema/generator/generator_ts.go +++ b/tools/schema/generator/generator_ts.go @@ -100,34 +100,10 @@ func (g *TypeScriptGenerator) generateLanguageSpecificFiles() error { return g.writeSpecialConfigJSON() } -func (g *TypeScriptGenerator) writeConsts() { - g.emit("consts.ts") -} - -func (g *TypeScriptGenerator) writeContract() { - g.emit("contract.ts") -} - func (g *TypeScriptGenerator) writeInitialFuncs() { g.emit("funcs.ts") } -func (g *TypeScriptGenerator) writeKeys() { - g.emit("keys.ts") -} - -func (g *TypeScriptGenerator) writeLib() { - g.emit("lib.ts") -} - -func (g *TypeScriptGenerator) writeParams() { - g.emit("params.ts") -} - -func (g *TypeScriptGenerator) writeResults() { - g.emit("results.ts") -} - func (g *TypeScriptGenerator) writeSpecialConfigJSON() error { err := g.exists(g.folder + "tsconfig.json") if err == nil { @@ -177,18 +153,6 @@ func (g *TypeScriptGenerator) writeSpecialIndex() { } } -func (g *TypeScriptGenerator) writeState() { - g.emit("state.ts") -} - -func (g *TypeScriptGenerator) writeStructs() { - g.emit("structs.ts") -} - -func (g *TypeScriptGenerator) writeTypeDefs() { - g.emit("typedefs.ts") -} - func emitterTsAccessCheck(g *GenBase) { if g.currentFunc.Access == "" { return From 5a4c6fc3a85bc9231aa61af22a4cf9f9371be577 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Sat, 6 Nov 2021 12:18:54 -0700 Subject: [PATCH 034/198] Replace access rights emitter --- contracts/wasm/donatewithfeedback/src/lib.rs | 2 +- contracts/wasm/fairauction/src/lib.rs | 2 +- contracts/wasm/fairroulette/src/lib.rs | 6 +- contracts/wasm/testcore/src/lib.rs | 2 +- contracts/wasm/tokenregistry/src/lib.rs | 4 +- tools/schema/generator/generator.go | 9 +++ tools/schema/generator/generator_go.go | 28 -------- tools/schema/generator/generator_rust.go | 28 -------- tools/schema/generator/generator_ts.go | 65 ++----------------- tools/schema/generator/gotemplates/lib.go | 41 ++++++++++-- tools/schema/generator/rstemplates/lib.go | 41 ++++++++++-- .../generator/tstemplates/alltemplates.go | 7 ++ tools/schema/generator/tstemplates/index.go | 50 ++++++++++++++ tools/schema/generator/tstemplates/lib.go | 41 ++++++++++-- tools/schema/main.go | 1 + 15 files changed, 185 insertions(+), 142 deletions(-) create mode 100644 tools/schema/generator/tstemplates/index.go diff --git a/contracts/wasm/donatewithfeedback/src/lib.rs b/contracts/wasm/donatewithfeedback/src/lib.rs index fda5b49d22..67c47e4f19 100644 --- a/contracts/wasm/donatewithfeedback/src/lib.rs +++ b/contracts/wasm/donatewithfeedback/src/lib.rs @@ -71,7 +71,7 @@ pub struct WithdrawContext { fn func_withdraw_thunk(ctx: &ScFuncContext) { ctx.log("donatewithfeedback.funcWithdraw"); // only SC creator can withdraw donated funds - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); let f = WithdrawContext { params: ImmutableWithdrawParams { diff --git a/contracts/wasm/fairauction/src/lib.rs b/contracts/wasm/fairauction/src/lib.rs index 1c5129b4d9..7ee46714c2 100644 --- a/contracts/wasm/fairauction/src/lib.rs +++ b/contracts/wasm/fairauction/src/lib.rs @@ -97,7 +97,7 @@ pub struct SetOwnerMarginContext { fn func_set_owner_margin_thunk(ctx: &ScFuncContext) { ctx.log("fairauction.funcSetOwnerMargin"); // only SC creator can set owner margin - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); let f = SetOwnerMarginContext { params: ImmutableSetOwnerMarginParams { diff --git a/contracts/wasm/fairroulette/src/lib.rs b/contracts/wasm/fairroulette/src/lib.rs index b100022194..24ccf76830 100644 --- a/contracts/wasm/fairroulette/src/lib.rs +++ b/contracts/wasm/fairroulette/src/lib.rs @@ -56,7 +56,7 @@ pub struct ForcePayoutContext { fn func_force_payout_thunk(ctx: &ScFuncContext) { ctx.log("fairroulette.funcForcePayout"); // only SC creator can restart the round forcefully - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); let f = ForcePayoutContext { state: MutableFairRouletteState { @@ -74,7 +74,7 @@ pub struct ForceResetContext { fn func_force_reset_thunk(ctx: &ScFuncContext) { ctx.log("fairroulette.funcForceReset"); // only SC creator can restart the round forcefully - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); let f = ForceResetContext { state: MutableFairRouletteState { @@ -131,7 +131,7 @@ pub struct PlayPeriodContext { fn func_play_period_thunk(ctx: &ScFuncContext) { ctx.log("fairroulette.funcPlayPeriod"); // only SC creator can update the play period - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); let f = PlayPeriodContext { params: ImmutablePlayPeriodParams { diff --git a/contracts/wasm/testcore/src/lib.rs b/contracts/wasm/testcore/src/lib.rs index 46ed315a60..ba4e8fbdc7 100644 --- a/contracts/wasm/testcore/src/lib.rs +++ b/contracts/wasm/testcore/src/lib.rs @@ -248,7 +248,7 @@ pub struct SendToAddressContext { fn func_send_to_address_thunk(ctx: &ScFuncContext) { ctx.log("testcore.funcSendToAddress"); - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); let f = SendToAddressContext { params: ImmutableSendToAddressParams { diff --git a/contracts/wasm/tokenregistry/src/lib.rs b/contracts/wasm/tokenregistry/src/lib.rs index 7d743c54fd..03bdde1652 100644 --- a/contracts/wasm/tokenregistry/src/lib.rs +++ b/contracts/wasm/tokenregistry/src/lib.rs @@ -69,7 +69,7 @@ pub struct TransferOwnershipContext { fn func_transfer_ownership_thunk(ctx: &ScFuncContext) { ctx.log("tokenregistry.funcTransferOwnership"); // TODO the one who can transfer token ownership - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); let f = TransferOwnershipContext { params: ImmutableTransferOwnershipParams { @@ -92,7 +92,7 @@ pub struct UpdateMetadataContext { fn func_update_metadata_thunk(ctx: &ScFuncContext) { ctx.log("tokenregistry.funcUpdateMetadata"); // TODO the one who can change the token info - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); let f = UpdateMetadataContext { params: ImmutableUpdateMetadataParams { diff --git a/tools/schema/generator/generator.go b/tools/schema/generator/generator.go index e55c7d793b..f748abb540 100644 --- a/tools/schema/generator/generator.go +++ b/tools/schema/generator/generator.go @@ -356,6 +356,15 @@ func (g *GenBase) setFuncKeys() { g.setMultiKeyValues("funcName", g.currentFunc.FuncName[4:]) g.setMultiKeyValues("kind", g.currentFunc.FuncName[:4]) g.keys["funcHName"] = iscp.Hn(g.keys["funcName"]).String() + grant := g.currentFunc.Access + comment := "" + index := strings.Index(grant, "//") + if index >= 0 { + comment = fmt.Sprintf(" %s\n", grant[index:]) + grant = strings.TrimSpace(grant[:index]) + } + g.keys["funcAccess"] = grant + g.keys["funcAccessComment"] = comment } func (g *GenBase) setMultiKeyValues(key, value string) { diff --git a/tools/schema/generator/generator_go.go b/tools/schema/generator/generator_go.go index 2985e04d8f..c650a27aa3 100644 --- a/tools/schema/generator/generator_go.go +++ b/tools/schema/generator/generator_go.go @@ -5,7 +5,6 @@ package generator import ( "regexp" - "strings" "github.com/iotaledger/wasp/tools/schema/generator/gotemplates" ) @@ -71,7 +70,6 @@ func (g *GoGenerator) init(s *Schema) { for _, template := range gotemplates.GoTemplates { g.addTemplates(template) } - g.emitters["accessCheck"] = emitterGoAccessCheck } func (g *GoGenerator) funcName(f *Func) string { @@ -93,32 +91,6 @@ func (g *GoGenerator) writeSpecialMain() { g.emit("main.go") } -func emitterGoAccessCheck(g *GenBase) { - if g.currentFunc.Access == "" { - return - } - grant := g.currentFunc.Access - index := strings.Index(grant, "//") - if index >= 0 { - g.printf("\t%s\n", grant[index:]) - grant = strings.TrimSpace(grant[:index]) - } - switch grant { - case AccessSelf: - grant = "ctx.AccountID()" - case AccessChain: - grant = "ctx.ChainOwnerID()" - case AccessCreator: - grant = "ctx.ContractCreator()" - default: - g.keys["grant"] = grant - g.emit("grantForKey") - grant = "access.Value()" - } - g.keys["grant"] = grant - g.emit("grantRequire") -} - func (g *GoGenerator) setFieldKeys() { g.GenBase.setFieldKeys() diff --git a/tools/schema/generator/generator_rust.go b/tools/schema/generator/generator_rust.go index f4df250b3b..b2b4dd2077 100644 --- a/tools/schema/generator/generator_rust.go +++ b/tools/schema/generator/generator_rust.go @@ -5,7 +5,6 @@ package generator import ( "regexp" - "strings" "github.com/iotaledger/wasp/tools/schema/generator/rstemplates" ) @@ -89,7 +88,6 @@ func (g *RustGenerator) init(s *Schema) { for _, template := range rstemplates.RsTemplates { g.addTemplates(template) } - g.emitters["accessCheck"] = emitterRsAccessCheck } func (g *RustGenerator) funcName(f *Func) string { @@ -162,32 +160,6 @@ func (g *RustGenerator) writeSpecialMod() { g.generateModLines("pub mod %s;\n") } -func emitterRsAccessCheck(g *GenBase) { - if g.currentFunc.Access == "" { - return - } - grant := g.currentFunc.Access - index := strings.Index(grant, "//") - if index >= 0 { - g.printf(" %s\n", grant[index:]) - grant = strings.TrimSpace(grant[:index]) - } - switch grant { - case AccessSelf: - grant = "ctx.account_id()" - case AccessChain: - grant = "ctx.chain_owner_id()" - case AccessCreator: - grant = "ctx.contract_creator()" - default: - g.keys["grant"] = grant - g.emit("grantForKey") - grant = "access.value()" - } - g.keys["grant"] = grant - g.emit("grantRequire") -} - func (g *RustGenerator) setFieldKeys() { g.GenBase.setFieldKeys() diff --git a/tools/schema/generator/generator_ts.go b/tools/schema/generator/generator_ts.go index 999e4fd02b..fb900f18d9 100644 --- a/tools/schema/generator/generator_ts.go +++ b/tools/schema/generator/generator_ts.go @@ -5,7 +5,6 @@ package generator import ( "regexp" - "strings" "github.com/iotaledger/wasp/tools/schema/generator/tstemplates" ) @@ -85,7 +84,6 @@ func (g *TypeScriptGenerator) init(s *Schema) { for _, template := range tstemplates.TsTemplates { g.addTemplates(template) } - g.emitters["accessCheck"] = emitterTsAccessCheck } func (g *TypeScriptGenerator) funcName(f *Func) string { @@ -105,78 +103,25 @@ func (g *TypeScriptGenerator) writeInitialFuncs() { } func (g *TypeScriptGenerator) writeSpecialConfigJSON() error { - err := g.exists(g.folder + "tsconfig.json") + tsconfig := "tsconfig.json" + err := g.exists(g.folder + tsconfig) if err == nil { // already exists return nil } - err = g.create(g.folder + "tsconfig.json") + err = g.create(g.folder + tsconfig) if err != nil { return err } defer g.close() - g.println("{") - g.println(" \"extends\": \"assemblyscript/std/assembly.json\",") - g.println(" \"include\": [\"./*.ts\"]") - g.println("}") - + g.emit(tsconfig) return nil } func (g *TypeScriptGenerator) writeSpecialIndex() { - if !g.s.CoreContracts { - g.printf("export * from \"./%s\";\n\n", g.s.Name) - } - - g.println("export * from \"./consts\";") - g.println("export * from \"./contract\";") - if !g.s.CoreContracts { - g.println("export * from \"./keys\";") - g.println("export * from \"./lib\";") - } - if len(g.s.Params) != 0 { - g.println("export * from \"./params\";") - } - if len(g.s.Results) != 0 { - g.println("export * from \"./results\";") - } - if !g.s.CoreContracts { - g.println("export * from \"./state\";") - if len(g.s.Structs) != 0 { - g.println("export * from \"./structs\";") - } - if len(g.s.Typedefs) != 0 { - g.println("export * from \"./typedefs\";") - } - } -} - -func emitterTsAccessCheck(g *GenBase) { - if g.currentFunc.Access == "" { - return - } - grant := g.currentFunc.Access - index := strings.Index(grant, "//") - if index >= 0 { - g.printf(" %s\n", grant[index:]) - grant = strings.TrimSpace(grant[:index]) - } - switch grant { - case AccessSelf: - grant = "ctx.accountID()" - case AccessChain: - grant = "ctx.chainOwnerID()" - case AccessCreator: - grant = "ctx.contractCreator()" - default: - g.keys["grant"] = grant - g.emit("grantForKey") - grant = "access.value()" - } - g.keys["grant"] = grant - g.emit("grantRequire") + g.emit("index.ts") } func (g *TypeScriptGenerator) setFieldKeys() { diff --git a/tools/schema/generator/gotemplates/lib.go b/tools/schema/generator/gotemplates/lib.go index baad75b17f..dc81f324f9 100644 --- a/tools/schema/generator/gotemplates/lib.go +++ b/tools/schema/generator/gotemplates/lib.go @@ -32,7 +32,7 @@ $#if view ImmutablePackageState func $kind$FuncName$+Thunk(ctx wasmlib.Sc$Kind$+Context) { ctx.Log("$package.$kind$FuncName") -$#func accessCheck +$#emit accessCheck f := &$FuncName$+Context{ $#if param ImmutableFuncNameParamsInit $#if result MutableFuncNameResultsInit @@ -87,15 +87,44 @@ $#each mandatory requireMandatory // ******************************* "requireMandatory": ` ctx.Require(f.Params.$FldName().Exists(), "missing mandatory $fldName") +`, + + // ******************************* + "accessCheck": ` +$#set accessFinalize accessOther +$#emit caseAccess$funcAccess +$#emit $accessFinalize +`, + // ******************************* + "caseAccess": ` +$#set accessFinalize accessDone +`, + // ******************************* + "caseAccessself": ` +$funcAccessComment ctx.Require(ctx.Caller() == ctx.AccountID(), "no permission") + +$#set accessFinalize accessDone `, // ******************************* - "grantForKey": ` - access := ctx.State().GetAgentID(wasmlib.Key("$grant")) - ctx.Require(access.Exists(), "access not set: $grant") + "caseAccesschain": ` +$funcAccessComment ctx.Require(ctx.Caller() == ctx.ChainOwnerID(), "no permission") + +$#set accessFinalize accessDone `, // ******************************* - "grantRequire": ` - ctx.Require(ctx.Caller() == $grant, "no permission") + "caseAccesscreator": ` +$funcAccessComment ctx.Require(ctx.Caller() == ctx.ContractCreator(), "no permission") +$#set accessFinalize accessDone +`, + // ******************************* + "accessOther": ` +$funcAccessComment access := ctx.State().GetAgentID(wasmlib.Key("$funcAccess")) + ctx.Require(access.Exists(), "access not set: $funcAccess") + ctx.Require(ctx.Caller() == access.Value(), "no permission") + +`, + // ******************************* + "accessDone": ` `, } diff --git a/tools/schema/generator/rstemplates/lib.go b/tools/schema/generator/rstemplates/lib.go index 20714a6d47..c13f3a67c4 100644 --- a/tools/schema/generator/rstemplates/lib.go +++ b/tools/schema/generator/rstemplates/lib.go @@ -59,7 +59,7 @@ $#if view ImmutablePackageState fn $kind$+_$func_name$+_thunk(ctx: &Sc$Kind$+Context) { ctx.log("$package.$kind$FuncName"); -$#func accessCheck +$#emit accessCheck let f = $FuncName$+Context { $#if param ImmutableFuncNameParamsInit $#if result MutableFuncNameResultsInit @@ -114,15 +114,44 @@ $#each mandatory requireMandatory // ******************************* "requireMandatory": ` ctx.require(f.params.$fld_name().exists(), "missing mandatory $fldName"); +`, + + // ******************************* + "accessCheck": ` +$#set accessFinalize accessOther +$#emit caseAccess$funcAccess +$#emit $accessFinalize +`, + // ******************************* + "caseAccess": ` +$#set accessFinalize accessDone +`, + // ******************************* + "caseAccessself": ` +$funcAccessComment ctx.require(ctx.caller() == ctx.account_id(), "no permission"); + +$#set accessFinalize accessDone `, // ******************************* - "grantForKey": ` - let access = ctx.state().get_agent_id("$grant"); - ctx.require(access.exists(), "access not set: $grant"); + "caseAccesschain": ` +$funcAccessComment ctx.require(ctx.caller() == ctx.chain_owner_id(), "no permission"); + +$#set accessFinalize accessDone `, // ******************************* - "grantRequire": ` - ctx.require(ctx.caller() == $grant, "no permission"); + "caseAccesscreator": ` +$funcAccessComment ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); +$#set accessFinalize accessDone +`, + // ******************************* + "accessOther": ` +$funcAccessComment let access = ctx.state().get_agent_id("$funcAccess"); + ctx.require(access.exists(), "access not set: $funcAccess"); + ctx.require(ctx.caller() == access.value(), "no permission"); + +`, + // ******************************* + "accessDone": ` `, } diff --git a/tools/schema/generator/tstemplates/alltemplates.go b/tools/schema/generator/tstemplates/alltemplates.go index 31d5f5a50a..a060298c3a 100644 --- a/tools/schema/generator/tstemplates/alltemplates.go +++ b/tools/schema/generator/tstemplates/alltemplates.go @@ -5,6 +5,7 @@ var TsTemplates = []map[string]string{ constsTs, contractTs, funcsTs, + indexTs, keysTs, libTs, paramsTs, @@ -33,4 +34,10 @@ import * as wasmlib from "wasmlib"; "importSc": ` import * as sc from "./index"; `, + // ******************************* + "tsconfig.json": ` +{ + "extends": "assemblyscript/std/assembly.json", + "include": ["./*.ts"] +}`, } diff --git a/tools/schema/generator/tstemplates/index.go b/tools/schema/generator/tstemplates/index.go new file mode 100644 index 0000000000..ab682fd8b8 --- /dev/null +++ b/tools/schema/generator/tstemplates/index.go @@ -0,0 +1,50 @@ +package tstemplates + +var indexTs = map[string]string{ + // ******************************* + "index.ts": ` +$#if core else exportName +export * from "./consts"; +export * from "./contract"; +$#if core else exportKeys +$#if core else exportLib +$#if params exportParams +$#if results exportResults +$#if core else exportRest +`, + // ******************************* + "exportName": ` +export * from "./$package"; + +`, + // ******************************* + "exportKeys": ` +export * from "./keys"; +`, + // ******************************* + "exportLib": ` +export * from "./lib"; +`, + // ******************************* + "exportParams": ` +export * from "./params"; +`, + // ******************************* + "exportResults": ` +export * from "./results"; +`, + // ******************************* + "exportRest": ` +export * from "./state"; +$#if structs exportStructs +$#if typedefs exportTypedefs +`, + // ******************************* + "exportStructs": ` +export * from "./structs"; +`, + // ******************************* + "exportTypedefs": ` +export * from "./typedefs"; +`, +} diff --git a/tools/schema/generator/tstemplates/lib.go b/tools/schema/generator/tstemplates/lib.go index 02d2842d15..97eafbb785 100644 --- a/tools/schema/generator/tstemplates/lib.go +++ b/tools/schema/generator/tstemplates/lib.go @@ -29,7 +29,7 @@ $#each func libThunk function $kind$FuncName$+Thunk(ctx: wasmlib.Sc$Kind$+Context): void { ctx.log("$package.$kind$FuncName"); -$#func accessCheck +$#emit accessCheck let f = new sc.$FuncName$+Context(); $#if param ImmutableFuncNameParamsInit $#if result MutableFuncNameResultsInit @@ -50,15 +50,44 @@ $#each mandatory requireMandatory // ******************************* "requireMandatory": ` ctx.require(f.params.$fldName().exists(), "missing mandatory $fldName"); +`, + + // ******************************* + "accessCheck": ` +$#set accessFinalize accessOther +$#emit caseAccess$funcAccess +$#emit $accessFinalize +`, + // ******************************* + "caseAccess": ` +$#set accessFinalize accessDone +`, + // ******************************* + "caseAccessself": ` +$funcAccessComment ctx.require(ctx.caller().equals(ctx.accountID()), "no permission"); + +$#set accessFinalize accessDone `, // ******************************* - "grantForKey": ` - let access = ctx.state().getAgentID(wasmlib.Key32.fromString("$grant")); - ctx.require(access.exists(), "access not set: $grant"); + "caseAccesschain": ` +$funcAccessComment ctx.require(ctx.caller().equals(ctx.chainOwnerID()), "no permission"); + +$#set accessFinalize accessDone `, // ******************************* - "grantRequire": ` - ctx.require(ctx.caller().equals($grant), "no permission"); + "caseAccesscreator": ` +$funcAccessComment ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); +$#set accessFinalize accessDone +`, + // ******************************* + "accessOther": ` +$funcAccessComment let access = ctx.state().getAgentID(wasmlib.Key32.fromString("$funcAccess")); + ctx.require(access.exists(), "access not set: $funcAccess"); + ctx.require(ctx.caller().equals(access.value()), "no permission"); + +`, + // ******************************* + "accessDone": ` `, } diff --git a/tools/schema/main.go b/tools/schema/main.go index 216a5abb20..31f6269733 100644 --- a/tools/schema/main.go +++ b/tools/schema/main.go @@ -140,6 +140,7 @@ func generateSchema(file *os.File) error { } func generateSchemaNew() error { + // TODO make sure name is valid: no path characters name := *flagInit fmt.Println("initializing " + name) From 25e562ee7c13711abe781674aab8c9b392120520 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Sat, 6 Nov 2021 17:42:40 -0700 Subject: [PATCH 035/198] Fixed random number generator --- contracts/wasm/dividend/test/dividend_bg.wasm | Bin 32172 -> 32172 bytes .../test/donatewithfeedback_bg.wasm | Bin 36272 -> 36272 bytes contracts/wasm/erc20/test/erc20_bg.wasm | Bin 34328 -> 34328 bytes .../wasm/fairauction/test/fairauction_bg.wasm | Bin 42516 -> 42516 bytes .../go/fairroulette/fairroulette.go | 2 +- .../wasm/fairroulette/src/fairroulette.rs | 2 +- .../fairroulette/test/fairroulette_bg.wasm | Bin 40889 -> 41044 bytes .../ts/fairroulette/fairroulette.ts | 2 +- .../wasm/inccounter/test/inccounter_bg.wasm | Bin 36836 -> 36836 bytes contracts/wasm/testcore/test/testcore_bg.wasm | Bin 50571 -> 50571 bytes .../wasm/testwasmlib/go/testwasmlib/consts.go | 6 +++ .../testwasmlib/go/testwasmlib/contract.go | 19 +++++++ .../wasm/testwasmlib/go/testwasmlib/keys.go | 12 +++-- .../wasm/testwasmlib/go/testwasmlib/lib.go | 36 +++++++++++++ .../testwasmlib/go/testwasmlib/results.go | 16 ++++++ .../wasm/testwasmlib/go/testwasmlib/state.go | 8 +++ .../testwasmlib/go/testwasmlib/testwasmlib.go | 8 +++ contracts/wasm/testwasmlib/schema.yaml | 5 ++ contracts/wasm/testwasmlib/src/consts.rs | 6 +++ contracts/wasm/testwasmlib/src/contract.rs | 22 ++++++++ contracts/wasm/testwasmlib/src/keys.rs | 12 +++-- contracts/wasm/testwasmlib/src/lib.rs | 36 +++++++++++++ contracts/wasm/testwasmlib/src/results.rs | 24 +++++++++ contracts/wasm/testwasmlib/src/state.rs | 8 +++ contracts/wasm/testwasmlib/src/testwasmlib.rs | 8 +++ .../wasm/testwasmlib/test/testwasmlib_bg.wasm | Bin 38377 -> 39463 bytes .../wasm/testwasmlib/test/testwasmlib_test.go | 38 ++++++++++++++ .../wasm/testwasmlib/ts/testwasmlib/consts.ts | 6 +++ .../testwasmlib/ts/testwasmlib/contract.ts | 28 ++++++++++ .../wasm/testwasmlib/ts/testwasmlib/keys.ts | 10 ++-- .../wasm/testwasmlib/ts/testwasmlib/lib.ts | 19 +++++++ .../testwasmlib/ts/testwasmlib/results.ts | 14 +++++ .../wasm/testwasmlib/ts/testwasmlib/state.ts | 8 +++ .../testwasmlib/ts/testwasmlib/testwasmlib.ts | 8 +++ .../tokenregistry/test/tokenregistry_bg.wasm | Bin 31896 -> 31896 bytes .../test/example_tutorial_bg.wasm | Bin 16802 -> 16802 bytes .../sbtests/sbtestsc/testcore_bg.wasm | Bin 50571 -> 50571 bytes packages/vm/wasmlib/go/wasmlib/context.go | 19 ++++--- packages/vm/wasmlib/go/wasmlib/mutable.go | 2 +- packages/vm/wasmlib/src/context.rs | 23 ++++++--- packages/vm/wasmlib/ts/wasmlib/context.ts | 21 +++++--- packages/vm/wasmproc/sccontext.go | 3 ++ packages/vm/wasmproc/scutility.go | 41 +-------------- tools/cluster/tests/wasm/inccounter_bg.wasm | Bin 36836 -> 36836 bytes tools/schema/generator/generator.go | 9 ++-- tools/schema/generator/generator_go.go | 5 +- tools/schema/generator/generator_rust.go | 48 +----------------- tools/schema/generator/generator_ts.go | 5 +- .../generator/rstemplates/alltemplates.go | 1 + tools/schema/generator/rstemplates/funcs.go | 2 +- tools/schema/generator/rstemplates/mod.go | 18 +++++++ tools/schema/generator/templates.go | 2 +- tools/schema/generator/tstemplates/funcs.go | 2 +- 53 files changed, 427 insertions(+), 137 deletions(-) create mode 100644 tools/schema/generator/rstemplates/mod.go diff --git a/contracts/wasm/dividend/test/dividend_bg.wasm b/contracts/wasm/dividend/test/dividend_bg.wasm index 5680a3756ce070b5af680a7433f3f9412345a7b3..96142c1f21b4888fe8ec73343c0f979c98f8dfe5 100644 GIT binary patch delta 88 zcmV-e0H^<~`vI)`0k9AO0|Ej8lM?}$4p@c(h5?rWD3<{wmjPL`xdG2p0Y#IERgVEh uvl&(^0h5STBeQ2$P6m_zU80k=orD;{)@I|&UwlPj;)R@kwGMzDE^G?R|!INFWl_#$b%>~h$ zt;0AO8Qmv$hAM4N5BFo693JO2d28&V%?smFStc7L+fQaoR_1V3U~&}5QeoI!kZdCb E0G^m2{Qv*} diff --git a/contracts/wasm/donatewithfeedback/test/donatewithfeedback_bg.wasm b/contracts/wasm/donatewithfeedback/test/donatewithfeedback_bg.wasm index 909efc28997078673a7dab8a2a9a5602581e6327..9a69d35a578a58ae55737d2f2e03c4aadab86198 100644 GIT binary patch delta 110 zcmdlmn`r|ODKWAzF)=YtR%4vWmpFlO0^>qP{e_I03mKC(pJmJlX7t@`7J8P4(R*@E ziqd4Yq+AGV^R}d|jFXv@lsEUKl(0?q$^JK)DcftaSI$3{$?b*89DWK+jsjUK43pgp L9X4++{3{Iry|pF( delta 103 zcmdlmn`r|ODKWAzGBGhtR%4vWmo$NK0^>qP{e_I03mFqPpJmJlX7t-^7J8Ova(0UH zWVNJR5WRU@(pE-B-_1EG)7U2Ecui)?{{P0$C~yn>Q8y GlLi3vTqHRF diff --git a/contracts/wasm/erc20/test/erc20_bg.wasm b/contracts/wasm/erc20/test/erc20_bg.wasm index 68e2d7e73ce6ea861e471e124a46ebcec11e6cff..787d828b0fe1b24bbf5617ebef9f038d83b11933 100644 GIT binary patch delta 80 zcmV-W0I&a;i~^X90rros`cz~m^9 XrNS`TuFYZd>b4uKK*L&kCP)GR`PVA{ delta 126 zcmbPohH1(frVU1nEKCdx43o_m*YTCCV_e60gwgN_qs|e=;?18JWwID!H}mKGVV^v+ zM0v7aNj785WS$bG$$Lt2K_Z)dN;w%JLYphfj&e-4Yw+G|ThGY2xwBy#>*Sm^`^olg aDjZP?OpXFsDh!)fwcTU|8rae^K@tGxcr5q; diff --git a/contracts/wasm/fairroulette/go/fairroulette/fairroulette.go b/contracts/wasm/fairroulette/go/fairroulette/fairroulette.go index a26a299a70..6b9efa05d3 100644 --- a/contracts/wasm/fairroulette/go/fairroulette/fairroulette.go +++ b/contracts/wasm/fairroulette/go/fairroulette/fairroulette.go @@ -133,7 +133,7 @@ func funcPayWinners(ctx wasmlib.ScFuncContext, f *PayWinnersContext) { // generator will use the next 8 bytes from the hash as its random Int64 number and once // it runs out of data it simply hashes the previous hash for a next pseudo-random sequence. // Here we determine the winning number for this round in the range of 1 thru MaxNumber. - winningNumber := ctx.Utility().Random(MaxNumber-1) + 1 + winningNumber := ctx.Random(MaxNumber-1) + 1 // Save the last winning number in state storage under 'lastWinningNumber' so that there // is (limited) time for people to call the 'getLastWinningNumber' View to verify the last diff --git a/contracts/wasm/fairroulette/src/fairroulette.rs b/contracts/wasm/fairroulette/src/fairroulette.rs index f955a59d1c..ebdaabd71d 100644 --- a/contracts/wasm/fairroulette/src/fairroulette.rs +++ b/contracts/wasm/fairroulette/src/fairroulette.rs @@ -145,7 +145,7 @@ pub fn func_pay_winners(ctx: &ScFuncContext, f: &PayWinnersContext) { // generator will use the next 8 bytes from the hash as its random Int64 number and once // it runs out of data it simply hashes the previous hash for a next pseudo-random sequence. // Here we determine the winning number for this round in the range of 1 thru MAX_NUMBER. - let winning_number: i64 = ctx.utility().random(MAX_NUMBER - 1) + 1; + let winning_number: i64 = ctx.random(MAX_NUMBER - 1) + 1; // Save the last winning number in state storage under 'lastWinningNumber' so that there // is (limited) time for people to call the 'getLastWinningNumber' View to verify the last diff --git a/contracts/wasm/fairroulette/test/fairroulette_bg.wasm b/contracts/wasm/fairroulette/test/fairroulette_bg.wasm index 40dc5968cce212c1782d35c3dc4616ce61dff124..597abd63875b69716915cecea717517ae885eef9 100644 GIT binary patch delta 12398 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 dypP4zd%>eRKRx`I5lUh)tTxCxI)cqqt? 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 diff --git a/contracts/wasm/fairroulette/ts/fairroulette/fairroulette.ts b/contracts/wasm/fairroulette/ts/fairroulette/fairroulette.ts index 83db2978ca..020388b334 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/fairroulette.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/fairroulette.ts @@ -136,7 +136,7 @@ export function funcPayWinners(ctx: wasmlib.ScFuncContext, f: sc.PayWinnersConte // generator will use the next 8 bytes from the hash as its random Int64 number and once // it runs out of data it simply hashes the previous hash for a next pseudo-random sequence. // Here we determine the winning number for this round in the range of 1 thru MAX_NUMBER. - let winningNumber: i64 = ctx.utility().random(MAX_NUMBER - 1) + 1; + let winningNumber: i64 = ctx.random(MAX_NUMBER - 1) + 1; // Save the last winning number in state storage under 'lastWinningNumber' so that there // is (limited) time for people to call the 'getLastWinningNumber' View to verify the last diff --git a/contracts/wasm/inccounter/test/inccounter_bg.wasm b/contracts/wasm/inccounter/test/inccounter_bg.wasm index bb828e396aa956a6b73fafd3d41339f7e1a6d5e1..e3d9a2038628ad2bf748a7e028a82294f4128e8d 100644 GIT binary patch delta 132 zcmaDdpXtebrVYl7EX>TzjFZh7ck-1iXI##>ol$2yquO@H(#`)E%as{JHkYYxGhhsv ztQ)oi$axkviJ38Ia$Ky^Cu>IMLPR$2j9$VB658AlE6ug}Svn)*V delta 128 zcmV-`0Du4Fp918c0`>XySiJc{r8eVa`%2}_a@7L-o2$B*7$@s> z`E0J~{?9Ra&lDAoG6g0_fh-k<$yHOFHou%QLsE;4k%57efq@}8F)uzjF()U!EHkwn z$iKrcz~BL-CqU&>1SX%~ux@hX`t^(qlR1GdPMI9JAy`mZNPxi=s4NGFC4g9Y^S%vd FMF3-@L@59O delta 220 zcmeC~X7280-VngZ!py|Pv^j*4laX=Ovb_PZm#M6&oOz$6vxTcQ&c#L6_^|avQ!v0znC&pQj3?7fq|2Ofgw3DFFrXjCnvrv zGqoJZzr!!U-~psNq4FsLlh1EhH#u_sdd8H=oErirM{NieVo(wiU~mPh$^l{tAXeJE IZ^Ky;0Q-7J-2eap diff --git a/contracts/wasm/testwasmlib/go/testwasmlib/consts.go b/contracts/wasm/testwasmlib/go/testwasmlib/consts.go index 132d9d5162..9daa6b1e88 100644 --- a/contracts/wasm/testwasmlib/go/testwasmlib/consts.go +++ b/contracts/wasm/testwasmlib/go/testwasmlib/consts.go @@ -40,12 +40,14 @@ const ( ResultCount = wasmlib.Key("count") ResultIotas = wasmlib.Key("iotas") ResultLength = wasmlib.Key("length") + ResultRandom = wasmlib.Key("random") ResultRecord = wasmlib.Key("record") ResultValue = wasmlib.Key("value") ) const ( StateArrays = wasmlib.Key("arrays") + StateRandom = wasmlib.Key("random") ) const ( @@ -53,10 +55,12 @@ const ( FuncArrayCreate = "arrayCreate" FuncArraySet = "arraySet" FuncParamTypes = "paramTypes" + FuncRandom = "random" ViewArrayLength = "arrayLength" ViewArrayValue = "arrayValue" ViewBlockRecord = "blockRecord" ViewBlockRecords = "blockRecords" + ViewGetRandom = "getRandom" ViewIotaBalance = "iotaBalance" ) @@ -65,9 +69,11 @@ const ( HFuncArrayCreate = wasmlib.ScHname(0x1ed5b23b) HFuncArraySet = wasmlib.ScHname(0x2c4150b3) HFuncParamTypes = wasmlib.ScHname(0x6921c4cd) + HFuncRandom = wasmlib.ScHname(0xe86c97ca) HViewArrayLength = wasmlib.ScHname(0x3a831021) HViewArrayValue = wasmlib.ScHname(0x662dbd81) HViewBlockRecord = wasmlib.ScHname(0xad13b2f8) HViewBlockRecords = wasmlib.ScHname(0x16e249ea) + HViewGetRandom = wasmlib.ScHname(0x46263045) HViewIotaBalance = wasmlib.ScHname(0x9d3920bd) ) diff --git a/contracts/wasm/testwasmlib/go/testwasmlib/contract.go b/contracts/wasm/testwasmlib/go/testwasmlib/contract.go index b4e9802136..816dc14035 100644 --- a/contracts/wasm/testwasmlib/go/testwasmlib/contract.go +++ b/contracts/wasm/testwasmlib/go/testwasmlib/contract.go @@ -29,6 +29,10 @@ type ParamTypesCall struct { Params MutableParamTypesParams } +type RandomCall struct { + Func *wasmlib.ScFunc +} + type ArrayLengthCall struct { Func *wasmlib.ScView Params MutableArrayLengthParams @@ -53,6 +57,11 @@ type BlockRecordsCall struct { Results ImmutableBlockRecordsResults } +type GetRandomCall struct { + Func *wasmlib.ScView + Results ImmutableGetRandomResults +} + type IotaBalanceCall struct { Func *wasmlib.ScView Results ImmutableIotaBalanceResults @@ -86,6 +95,10 @@ func (sc Funcs) ParamTypes(ctx wasmlib.ScFuncCallContext) *ParamTypesCall { return f } +func (sc Funcs) Random(ctx wasmlib.ScFuncCallContext) *RandomCall { + return &RandomCall{Func: wasmlib.NewScFunc(ctx, HScName, HFuncRandom)} +} + func (sc Funcs) ArrayLength(ctx wasmlib.ScViewCallContext) *ArrayLengthCall { f := &ArrayLengthCall{Func: wasmlib.NewScView(ctx, HScName, HViewArrayLength)} f.Func.SetPtrs(&f.Params.id, &f.Results.id) @@ -110,6 +123,12 @@ func (sc Funcs) BlockRecords(ctx wasmlib.ScViewCallContext) *BlockRecordsCall { return f } +func (sc Funcs) GetRandom(ctx wasmlib.ScViewCallContext) *GetRandomCall { + f := &GetRandomCall{Func: wasmlib.NewScView(ctx, HScName, HViewGetRandom)} + f.Func.SetPtrs(nil, &f.Results.id) + return f +} + func (sc Funcs) IotaBalance(ctx wasmlib.ScViewCallContext) *IotaBalanceCall { f := &IotaBalanceCall{Func: wasmlib.NewScView(ctx, HScName, HViewIotaBalance)} f.Func.SetPtrs(nil, &f.Results.id) diff --git a/contracts/wasm/testwasmlib/go/testwasmlib/keys.go b/contracts/wasm/testwasmlib/go/testwasmlib/keys.go index 1962dca503..c69cf0cc72 100644 --- a/contracts/wasm/testwasmlib/go/testwasmlib/keys.go +++ b/contracts/wasm/testwasmlib/go/testwasmlib/keys.go @@ -31,12 +31,14 @@ const ( IdxResultCount = 18 IdxResultIotas = 19 IdxResultLength = 20 - IdxResultRecord = 21 - IdxResultValue = 22 - IdxStateArrays = 23 + IdxResultRandom = 21 + IdxResultRecord = 22 + IdxResultValue = 23 + IdxStateArrays = 24 + IdxStateRandom = 25 ) -const keyMapLen = 24 +const keyMapLen = 26 var keyMap = [keyMapLen]wasmlib.Key{ ParamAddress, @@ -60,9 +62,11 @@ var keyMap = [keyMapLen]wasmlib.Key{ ResultCount, ResultIotas, ResultLength, + ResultRandom, ResultRecord, ResultValue, StateArrays, + StateRandom, } var idxMap [keyMapLen]wasmlib.Key32 diff --git a/contracts/wasm/testwasmlib/go/testwasmlib/lib.go b/contracts/wasm/testwasmlib/go/testwasmlib/lib.go index d5b74fed67..19543d3317 100644 --- a/contracts/wasm/testwasmlib/go/testwasmlib/lib.go +++ b/contracts/wasm/testwasmlib/go/testwasmlib/lib.go @@ -15,10 +15,12 @@ func OnLoad() { exports.AddFunc(FuncArrayCreate, funcArrayCreateThunk) exports.AddFunc(FuncArraySet, funcArraySetThunk) exports.AddFunc(FuncParamTypes, funcParamTypesThunk) + exports.AddFunc(FuncRandom, funcRandomThunk) exports.AddView(ViewArrayLength, viewArrayLengthThunk) exports.AddView(ViewArrayValue, viewArrayValueThunk) exports.AddView(ViewBlockRecord, viewBlockRecordThunk) exports.AddView(ViewBlockRecords, viewBlockRecordsThunk) + exports.AddView(ViewGetRandom, viewGetRandomThunk) exports.AddView(ViewIotaBalance, viewIotaBalanceThunk) for i, key := range keyMap { @@ -107,6 +109,21 @@ func funcParamTypesThunk(ctx wasmlib.ScFuncContext) { ctx.Log("testwasmlib.funcParamTypes ok") } +type RandomContext struct { + State MutableTestWasmLibState +} + +func funcRandomThunk(ctx wasmlib.ScFuncContext) { + ctx.Log("testwasmlib.funcRandom") + f := &RandomContext{ + State: MutableTestWasmLibState{ + id: wasmlib.OBJ_ID_STATE, + }, + } + funcRandom(ctx, f) + ctx.Log("testwasmlib.funcRandom ok") +} + type ArrayLengthContext struct { Params ImmutableArrayLengthParams Results MutableArrayLengthResults @@ -205,6 +222,25 @@ func viewBlockRecordsThunk(ctx wasmlib.ScViewContext) { ctx.Log("testwasmlib.viewBlockRecords ok") } +type GetRandomContext struct { + Results MutableGetRandomResults + State ImmutableTestWasmLibState +} + +func viewGetRandomThunk(ctx wasmlib.ScViewContext) { + ctx.Log("testwasmlib.viewGetRandom") + f := &GetRandomContext{ + Results: MutableGetRandomResults{ + id: wasmlib.OBJ_ID_RESULTS, + }, + State: ImmutableTestWasmLibState{ + id: wasmlib.OBJ_ID_STATE, + }, + } + viewGetRandom(ctx, f) + ctx.Log("testwasmlib.viewGetRandom ok") +} + type IotaBalanceContext struct { Results MutableIotaBalanceResults State ImmutableTestWasmLibState diff --git a/contracts/wasm/testwasmlib/go/testwasmlib/results.go b/contracts/wasm/testwasmlib/go/testwasmlib/results.go index 2d85a02d1f..9cb62e01e0 100644 --- a/contracts/wasm/testwasmlib/go/testwasmlib/results.go +++ b/contracts/wasm/testwasmlib/go/testwasmlib/results.go @@ -73,6 +73,22 @@ func (s MutableBlockRecordsResults) Count() wasmlib.ScMutableInt32 { return wasmlib.NewScMutableInt32(s.id, idxMap[IdxResultCount]) } +type ImmutableGetRandomResults struct { + id int32 +} + +func (s ImmutableGetRandomResults) Random() wasmlib.ScImmutableInt64 { + return wasmlib.NewScImmutableInt64(s.id, idxMap[IdxResultRandom]) +} + +type MutableGetRandomResults struct { + id int32 +} + +func (s MutableGetRandomResults) Random() wasmlib.ScMutableInt64 { + return wasmlib.NewScMutableInt64(s.id, idxMap[IdxResultRandom]) +} + type ImmutableIotaBalanceResults struct { id int32 } diff --git a/contracts/wasm/testwasmlib/go/testwasmlib/state.go b/contracts/wasm/testwasmlib/go/testwasmlib/state.go index 5389e238b3..7d08d8f873 100644 --- a/contracts/wasm/testwasmlib/go/testwasmlib/state.go +++ b/contracts/wasm/testwasmlib/go/testwasmlib/state.go @@ -27,6 +27,10 @@ func (s ImmutableTestWasmLibState) Arrays() MapStringToImmutableStringArray { return MapStringToImmutableStringArray{objID: mapID} } +func (s ImmutableTestWasmLibState) Random() wasmlib.ScImmutableInt64 { + return wasmlib.NewScImmutableInt64(s.id, idxMap[IdxStateRandom]) +} + type MapStringToMutableStringArray struct { objID int32 } @@ -48,3 +52,7 @@ func (s MutableTestWasmLibState) Arrays() MapStringToMutableStringArray { mapID := wasmlib.GetObjectID(s.id, idxMap[IdxStateArrays], wasmlib.TYPE_MAP) return MapStringToMutableStringArray{objID: mapID} } + +func (s MutableTestWasmLibState) Random() wasmlib.ScMutableInt64 { + return wasmlib.NewScMutableInt64(s.id, idxMap[IdxStateRandom]) +} diff --git a/contracts/wasm/testwasmlib/go/testwasmlib/testwasmlib.go b/contracts/wasm/testwasmlib/go/testwasmlib/testwasmlib.go index b466b76b91..fcf6fab30a 100644 --- a/contracts/wasm/testwasmlib/go/testwasmlib/testwasmlib.go +++ b/contracts/wasm/testwasmlib/go/testwasmlib/testwasmlib.go @@ -107,3 +107,11 @@ func viewArrayValue(ctx wasmlib.ScViewContext, f *ArrayValueContext) { func viewIotaBalance(ctx wasmlib.ScViewContext, f *IotaBalanceContext) { f.Results.Iotas().SetValue(ctx.Balances().Balance(wasmlib.IOTA)) } + +func funcRandom(ctx wasmlib.ScFuncContext, f *RandomContext) { + f.State.Random().SetValue(ctx.Random(1000)) +} + +func viewGetRandom(ctx wasmlib.ScViewContext, f *GetRandomContext) { + f.Results.Random().SetValue(f.State.Random().Value()) +} diff --git a/contracts/wasm/testwasmlib/schema.yaml b/contracts/wasm/testwasmlib/schema.yaml index 06829b46f6..c1f0aee3e5 100644 --- a/contracts/wasm/testwasmlib/schema.yaml +++ b/contracts/wasm/testwasmlib/schema.yaml @@ -5,6 +5,7 @@ typedefs: StringArray: String[] state: arrays: map[String]StringArray + random: Int64 funcs: arrayClear: params: @@ -32,6 +33,7 @@ funcs: param=this: map[String]Bytes? // special hook to be able to pass key/values as raw bytes requestID: RequestID? string: String? + random: views: arrayLength: params: @@ -58,3 +60,6 @@ views: iotaBalance: results: iotas: Int64 + getRandom: + results: + random: Int64 diff --git a/contracts/wasm/testwasmlib/src/consts.rs b/contracts/wasm/testwasmlib/src/consts.rs index 00f9d53a40..f97702d79c 100644 --- a/contracts/wasm/testwasmlib/src/consts.rs +++ b/contracts/wasm/testwasmlib/src/consts.rs @@ -37,29 +37,35 @@ pub const PARAM_VALUE: &str = "value"; pub const RESULT_COUNT: &str = "count"; pub const RESULT_IOTAS: &str = "iotas"; pub const RESULT_LENGTH: &str = "length"; +pub const RESULT_RANDOM: &str = "random"; pub const RESULT_RECORD: &str = "record"; pub const RESULT_VALUE: &str = "value"; pub const STATE_ARRAYS: &str = "arrays"; +pub const STATE_RANDOM: &str = "random"; pub const FUNC_ARRAY_CLEAR: &str = "arrayClear"; pub const FUNC_ARRAY_CREATE: &str = "arrayCreate"; pub const FUNC_ARRAY_SET: &str = "arraySet"; pub const FUNC_PARAM_TYPES: &str = "paramTypes"; +pub const FUNC_RANDOM: &str = "random"; pub const VIEW_ARRAY_LENGTH: &str = "arrayLength"; pub const VIEW_ARRAY_VALUE: &str = "arrayValue"; pub const VIEW_BLOCK_RECORD: &str = "blockRecord"; pub const VIEW_BLOCK_RECORDS: &str = "blockRecords"; +pub const VIEW_GET_RANDOM: &str = "getRandom"; pub const VIEW_IOTA_BALANCE: &str = "iotaBalance"; pub const HFUNC_ARRAY_CLEAR: ScHname = ScHname(0x88021821); pub const HFUNC_ARRAY_CREATE: ScHname = ScHname(0x1ed5b23b); pub const HFUNC_ARRAY_SET: ScHname = ScHname(0x2c4150b3); pub const HFUNC_PARAM_TYPES: ScHname = ScHname(0x6921c4cd); +pub const HFUNC_RANDOM: ScHname = ScHname(0xe86c97ca); pub const HVIEW_ARRAY_LENGTH: ScHname = ScHname(0x3a831021); pub const HVIEW_ARRAY_VALUE: ScHname = ScHname(0x662dbd81); pub const HVIEW_BLOCK_RECORD: ScHname = ScHname(0xad13b2f8); pub const HVIEW_BLOCK_RECORDS: ScHname = ScHname(0x16e249ea); +pub const HVIEW_GET_RANDOM: ScHname = ScHname(0x46263045); pub const HVIEW_IOTA_BALANCE: ScHname = ScHname(0x9d3920bd); // @formatter:on diff --git a/contracts/wasm/testwasmlib/src/contract.rs b/contracts/wasm/testwasmlib/src/contract.rs index 3bb521e0db..0b34918fc0 100644 --- a/contracts/wasm/testwasmlib/src/contract.rs +++ b/contracts/wasm/testwasmlib/src/contract.rs @@ -37,6 +37,10 @@ pub struct ParamTypesCall { pub params: MutableParamTypesParams, } +pub struct RandomCall { + pub func: ScFunc, +} + pub struct ArrayLengthCall { pub func: ScView, pub params: MutableArrayLengthParams, @@ -61,6 +65,11 @@ pub struct BlockRecordsCall { pub results: ImmutableBlockRecordsResults, } +pub struct GetRandomCall { + pub func: ScView, + pub results: ImmutableGetRandomResults, +} + pub struct IotaBalanceCall { pub func: ScView, pub results: ImmutableIotaBalanceResults, @@ -102,6 +111,11 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn random(_ctx: & dyn ScFuncCallContext) -> RandomCall { + RandomCall { + func: ScFunc::new(HSC_NAME, HFUNC_RANDOM), + } + } pub fn array_length(_ctx: & dyn ScViewCallContext) -> ArrayLengthCall { let mut f = ArrayLengthCall { func: ScView::new(HSC_NAME, HVIEW_ARRAY_LENGTH), @@ -138,6 +152,14 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn get_random(_ctx: & dyn ScViewCallContext) -> GetRandomCall { + let mut f = GetRandomCall { + func: ScView::new(HSC_NAME, HVIEW_GET_RANDOM), + results: ImmutableGetRandomResults { id: 0 }, + }; + f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); + f + } pub fn iota_balance(_ctx: & dyn ScViewCallContext) -> IotaBalanceCall { let mut f = IotaBalanceCall { func: ScView::new(HSC_NAME, HVIEW_IOTA_BALANCE), diff --git a/contracts/wasm/testwasmlib/src/keys.rs b/contracts/wasm/testwasmlib/src/keys.rs index 641d73f3ec..d5b49bd14c 100644 --- a/contracts/wasm/testwasmlib/src/keys.rs +++ b/contracts/wasm/testwasmlib/src/keys.rs @@ -34,11 +34,13 @@ pub(crate) const IDX_PARAM_VALUE: usize = 17; pub(crate) const IDX_RESULT_COUNT: usize = 18; pub(crate) const IDX_RESULT_IOTAS: usize = 19; pub(crate) const IDX_RESULT_LENGTH: usize = 20; -pub(crate) const IDX_RESULT_RECORD: usize = 21; -pub(crate) const IDX_RESULT_VALUE: usize = 22; -pub(crate) const IDX_STATE_ARRAYS: usize = 23; +pub(crate) const IDX_RESULT_RANDOM: usize = 21; +pub(crate) const IDX_RESULT_RECORD: usize = 22; +pub(crate) const IDX_RESULT_VALUE: usize = 23; +pub(crate) const IDX_STATE_ARRAYS: usize = 24; +pub(crate) const IDX_STATE_RANDOM: usize = 25; -pub const KEY_MAP_LEN: usize = 24; +pub const KEY_MAP_LEN: usize = 26; pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ PARAM_ADDRESS, @@ -62,9 +64,11 @@ pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ RESULT_COUNT, RESULT_IOTAS, RESULT_LENGTH, + RESULT_RANDOM, RESULT_RECORD, RESULT_VALUE, STATE_ARRAYS, + STATE_RANDOM, ]; pub static mut IDX_MAP: [Key32; KEY_MAP_LEN] = [Key32(0); KEY_MAP_LEN]; diff --git a/contracts/wasm/testwasmlib/src/lib.rs b/contracts/wasm/testwasmlib/src/lib.rs index fcafaf1385..d2c2f5b460 100644 --- a/contracts/wasm/testwasmlib/src/lib.rs +++ b/contracts/wasm/testwasmlib/src/lib.rs @@ -36,10 +36,12 @@ fn on_load() { exports.add_func(FUNC_ARRAY_CREATE, func_array_create_thunk); exports.add_func(FUNC_ARRAY_SET, func_array_set_thunk); exports.add_func(FUNC_PARAM_TYPES, func_param_types_thunk); + exports.add_func(FUNC_RANDOM, func_random_thunk); exports.add_view(VIEW_ARRAY_LENGTH, view_array_length_thunk); exports.add_view(VIEW_ARRAY_VALUE, view_array_value_thunk); exports.add_view(VIEW_BLOCK_RECORD, view_block_record_thunk); exports.add_view(VIEW_BLOCK_RECORDS, view_block_records_thunk); + exports.add_view(VIEW_GET_RANDOM, view_get_random_thunk); exports.add_view(VIEW_IOTA_BALANCE, view_iota_balance_thunk); unsafe { @@ -130,6 +132,21 @@ fn func_param_types_thunk(ctx: &ScFuncContext) { ctx.log("testwasmlib.funcParamTypes ok"); } +pub struct RandomContext { + state: MutableTestWasmLibState, +} + +fn func_random_thunk(ctx: &ScFuncContext) { + ctx.log("testwasmlib.funcRandom"); + let f = RandomContext { + state: MutableTestWasmLibState { + id: OBJ_ID_STATE, + }, + }; + func_random(ctx, &f); + ctx.log("testwasmlib.funcRandom ok"); +} + pub struct ArrayLengthContext { params: ImmutableArrayLengthParams, results: MutableArrayLengthResults, @@ -228,6 +245,25 @@ fn view_block_records_thunk(ctx: &ScViewContext) { ctx.log("testwasmlib.viewBlockRecords ok"); } +pub struct GetRandomContext { + results: MutableGetRandomResults, + state: ImmutableTestWasmLibState, +} + +fn view_get_random_thunk(ctx: &ScViewContext) { + ctx.log("testwasmlib.viewGetRandom"); + let f = GetRandomContext { + results: MutableGetRandomResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableTestWasmLibState { + id: OBJ_ID_STATE, + }, + }; + view_get_random(ctx, &f); + ctx.log("testwasmlib.viewGetRandom ok"); +} + pub struct IotaBalanceContext { results: MutableIotaBalanceResults, state: ImmutableTestWasmLibState, diff --git a/contracts/wasm/testwasmlib/src/results.rs b/contracts/wasm/testwasmlib/src/results.rs index f548fabae4..d3257eb4db 100644 --- a/contracts/wasm/testwasmlib/src/results.rs +++ b/contracts/wasm/testwasmlib/src/results.rs @@ -110,6 +110,30 @@ impl MutableBlockRecordsResults { } } +#[derive(Clone, Copy)] +pub struct ImmutableGetRandomResults { + pub(crate) id: i32, +} + +impl ImmutableGetRandomResults { + + pub fn random(&self) -> ScImmutableInt64 { + ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_RANDOM)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableGetRandomResults { + pub(crate) id: i32, +} + +impl MutableGetRandomResults { + + pub fn random(&self) -> ScMutableInt64 { + ScMutableInt64::new(self.id, idx_map(IDX_RESULT_RANDOM)) + } +} + #[derive(Clone, Copy)] pub struct ImmutableIotaBalanceResults { pub(crate) id: i32, diff --git a/contracts/wasm/testwasmlib/src/state.rs b/contracts/wasm/testwasmlib/src/state.rs index b1839a8c56..246c4049b9 100644 --- a/contracts/wasm/testwasmlib/src/state.rs +++ b/contracts/wasm/testwasmlib/src/state.rs @@ -37,6 +37,10 @@ impl ImmutableTestWasmLibState { let map_id = get_object_id(self.id, idx_map(IDX_STATE_ARRAYS), TYPE_MAP); MapStringToImmutableStringArray { obj_id: map_id } } + + pub fn random(&self) -> ScImmutableInt64 { + ScImmutableInt64::new(self.id, idx_map(IDX_STATE_RANDOM)) + } } pub struct MapStringToMutableStringArray { @@ -65,4 +69,8 @@ impl MutableTestWasmLibState { let map_id = get_object_id(self.id, idx_map(IDX_STATE_ARRAYS), TYPE_MAP); MapStringToMutableStringArray { obj_id: map_id } } + + pub fn random(&self) -> ScMutableInt64 { + ScMutableInt64::new(self.id, idx_map(IDX_STATE_RANDOM)) + } } diff --git a/contracts/wasm/testwasmlib/src/testwasmlib.rs b/contracts/wasm/testwasmlib/src/testwasmlib.rs index 3c40d4a018..6aa8067034 100644 --- a/contracts/wasm/testwasmlib/src/testwasmlib.rs +++ b/contracts/wasm/testwasmlib/src/testwasmlib.rs @@ -102,3 +102,11 @@ pub fn view_block_records(ctx: &ScViewContext, f: &BlockRecordsContext) { pub fn view_iota_balance(ctx: &ScViewContext, f: &IotaBalanceContext) { f.results.iotas().set_value(ctx.balances().balance(&ScColor::IOTA)); } + +pub fn func_random(ctx: &ScFuncContext, f: &RandomContext) { + f.state.random().set_value(ctx.random(1000)); +} + +pub fn view_get_random(_ctx: &ScViewContext, f: &GetRandomContext) { + f.results.random().set_value(f.state.random().value()); +} diff --git a/contracts/wasm/testwasmlib/test/testwasmlib_bg.wasm b/contracts/wasm/testwasmlib/test/testwasmlib_bg.wasm index 279d30263ba4b0cc76ac6bd93a2e9363fdb69ffd..90d483c1f05bbd9368d8969d034bd3859bff29ed 100644 GIT binary patch delta 15704 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 xpps0BLR4cc9xC1TRMd$?w>=5= 0 && random < 1000) + fmt.Printf("Random value: %d\n", random) +} + +func TestMultiRandom(t *testing.T) { + ctx := setupTest(t) + + numbers := make([]int64, 0) + for i := 0; i < 10; i++ { + f := testwasmlib.ScFuncs.Random(ctx) + f.Func.TransferIotas(1).Post() + require.NoError(t, ctx.Err) + + v := testwasmlib.ScFuncs.GetRandom(ctx) + v.Func.Call() + require.NoError(t, ctx.Err) + random := v.Results.Random().Value() + require.True(t, random >= 0 && random < 1000) + numbers = append(numbers, random) + } + + for _, number := range numbers { + fmt.Printf("Random value: %d\n", number) + } +} diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/consts.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/consts.ts index f89139c319..91b0386d25 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/consts.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/consts.ts @@ -33,27 +33,33 @@ export const ParamValue = "value"; export const ResultCount = "count"; export const ResultIotas = "iotas"; export const ResultLength = "length"; +export const ResultRandom = "random"; export const ResultRecord = "record"; export const ResultValue = "value"; export const StateArrays = "arrays"; +export const StateRandom = "random"; export const FuncArrayClear = "arrayClear"; export const FuncArrayCreate = "arrayCreate"; export const FuncArraySet = "arraySet"; export const FuncParamTypes = "paramTypes"; +export const FuncRandom = "random"; export const ViewArrayLength = "arrayLength"; export const ViewArrayValue = "arrayValue"; export const ViewBlockRecord = "blockRecord"; export const ViewBlockRecords = "blockRecords"; +export const ViewGetRandom = "getRandom"; export const ViewIotaBalance = "iotaBalance"; export const HFuncArrayClear = new wasmlib.ScHname(0x88021821); export const HFuncArrayCreate = new wasmlib.ScHname(0x1ed5b23b); export const HFuncArraySet = new wasmlib.ScHname(0x2c4150b3); export const HFuncParamTypes = new wasmlib.ScHname(0x6921c4cd); +export const HFuncRandom = new wasmlib.ScHname(0xe86c97ca); export const HViewArrayLength = new wasmlib.ScHname(0x3a831021); export const HViewArrayValue = new wasmlib.ScHname(0x662dbd81); export const HViewBlockRecord = new wasmlib.ScHname(0xad13b2f8); export const HViewBlockRecords = new wasmlib.ScHname(0x16e249ea); +export const HViewGetRandom = new wasmlib.ScHname(0x46263045); export const HViewIotaBalance = new wasmlib.ScHname(0x9d3920bd); diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/contract.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/contract.ts index fcc1b7eed1..ee2aaefb4b 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/contract.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/contract.ts @@ -48,6 +48,14 @@ export class ParamTypesContext { state: sc.MutableTestWasmLibState = new sc.MutableTestWasmLibState(); } +export class RandomCall { + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncRandom); +} + +export class RandomContext { + state: sc.MutableTestWasmLibState = new sc.MutableTestWasmLibState(); +} + export class ArrayLengthCall { func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewArrayLength); params: sc.MutableArrayLengthParams = new sc.MutableArrayLengthParams(); @@ -96,6 +104,16 @@ export class BlockRecordsContext { state: sc.ImmutableTestWasmLibState = new sc.ImmutableTestWasmLibState(); } +export class GetRandomCall { + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetRandom); + results: sc.ImmutableGetRandomResults = new sc.ImmutableGetRandomResults(); +} + +export class GetRandomContext { + results: sc.MutableGetRandomResults = new sc.MutableGetRandomResults(); + state: sc.ImmutableTestWasmLibState = new sc.ImmutableTestWasmLibState(); +} + export class IotaBalanceCall { func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewIotaBalance); results: sc.ImmutableIotaBalanceResults = new sc.ImmutableIotaBalanceResults(); @@ -132,6 +150,10 @@ export class ScFuncs { return f; } + static random(ctx: wasmlib.ScFuncCallContext): RandomCall { + return new RandomCall(); + } + static arrayLength(ctx: wasmlib.ScViewCallContext): ArrayLengthCall { let f = new ArrayLengthCall(); f.func.setPtrs(f.params, f.results); @@ -156,6 +178,12 @@ export class ScFuncs { return f; } + static getRandom(ctx: wasmlib.ScViewCallContext): GetRandomCall { + let f = new GetRandomCall(); + f.func.setPtrs(null, f.results); + return f; + } + static iotaBalance(ctx: wasmlib.ScViewCallContext): IotaBalanceCall { let f = new IotaBalanceCall(); f.func.setPtrs(null, f.results); diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/keys.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/keys.ts index b6c2ec7a7e..e4d3341df9 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/keys.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/keys.ts @@ -29,9 +29,11 @@ export const IdxParamValue = 17; export const IdxResultCount = 18; export const IdxResultIotas = 19; export const IdxResultLength = 20; -export const IdxResultRecord = 21; -export const IdxResultValue = 22; -export const IdxStateArrays = 23; +export const IdxResultRandom = 21; +export const IdxResultRecord = 22; +export const IdxResultValue = 23; +export const IdxStateArrays = 24; +export const IdxStateRandom = 25; export let keyMap: string[] = [ sc.ParamAddress, @@ -55,9 +57,11 @@ export let keyMap: string[] = [ sc.ResultCount, sc.ResultIotas, sc.ResultLength, + sc.ResultRandom, sc.ResultRecord, sc.ResultValue, sc.StateArrays, + sc.StateRandom, ]; export let idxMap: wasmlib.Key32[] = new Array(keyMap.length); diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/lib.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/lib.ts index 781370df76..46eeb4e5e0 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/lib.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/lib.ts @@ -18,10 +18,12 @@ export function on_load(): void { exports.addFunc(sc.FuncArrayCreate, funcArrayCreateThunk); exports.addFunc(sc.FuncArraySet, funcArraySetThunk); exports.addFunc(sc.FuncParamTypes, funcParamTypesThunk); + exports.addFunc(sc.FuncRandom, funcRandomThunk); exports.addView(sc.ViewArrayLength, viewArrayLengthThunk); exports.addView(sc.ViewArrayValue, viewArrayValueThunk); exports.addView(sc.ViewBlockRecord, viewBlockRecordThunk); exports.addView(sc.ViewBlockRecords, viewBlockRecordsThunk); + exports.addView(sc.ViewGetRandom, viewGetRandomThunk); exports.addView(sc.ViewIotaBalance, viewIotaBalanceThunk); for (let i = 0; i < sc.keyMap.length; i++) { @@ -70,6 +72,14 @@ function funcParamTypesThunk(ctx: wasmlib.ScFuncContext): void { ctx.log("testwasmlib.funcParamTypes ok"); } +function funcRandomThunk(ctx: wasmlib.ScFuncContext): void { + ctx.log("testwasmlib.funcRandom"); + let f = new sc.RandomContext(); + f.state.mapID = wasmlib.OBJ_ID_STATE; + sc.funcRandom(ctx, f); + ctx.log("testwasmlib.funcRandom ok"); +} + function viewArrayLengthThunk(ctx: wasmlib.ScViewContext): void { ctx.log("testwasmlib.viewArrayLength"); let f = new sc.ArrayLengthContext(); @@ -116,6 +126,15 @@ function viewBlockRecordsThunk(ctx: wasmlib.ScViewContext): void { ctx.log("testwasmlib.viewBlockRecords ok"); } +function viewGetRandomThunk(ctx: wasmlib.ScViewContext): void { + ctx.log("testwasmlib.viewGetRandom"); + let f = new sc.GetRandomContext(); + f.results.mapID = wasmlib.OBJ_ID_RESULTS; + f.state.mapID = wasmlib.OBJ_ID_STATE; + sc.viewGetRandom(ctx, f); + ctx.log("testwasmlib.viewGetRandom ok"); +} + function viewIotaBalanceThunk(ctx: wasmlib.ScViewContext): void { ctx.log("testwasmlib.viewIotaBalance"); let f = new sc.IotaBalanceContext(); diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/results.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/results.ts index 7d055b16b1..c86afff8b1 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/results.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/results.ts @@ -64,6 +64,20 @@ export class MutableBlockRecordsResults extends wasmlib.ScMapID { } } +export class ImmutableGetRandomResults extends wasmlib.ScMapID { + + random(): wasmlib.ScImmutableInt64 { + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultRandom]); + } +} + +export class MutableGetRandomResults extends wasmlib.ScMapID { + + random(): wasmlib.ScMutableInt64 { + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultRandom]); + } +} + export class ImmutableIotaBalanceResults extends wasmlib.ScMapID { iotas(): wasmlib.ScImmutableInt64 { diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/state.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/state.ts index e2514c7a67..d32fb0c4aa 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/state.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/state.ts @@ -27,6 +27,10 @@ export class ImmutableTestWasmLibState extends wasmlib.ScMapID { let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateArrays], wasmlib.TYPE_MAP); return new sc.MapStringToImmutableStringArray(mapID); } + + random(): wasmlib.ScImmutableInt64 { + return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateRandom]); + } } export class MapStringToMutableStringArray { @@ -52,4 +56,8 @@ export class MutableTestWasmLibState extends wasmlib.ScMapID { let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateArrays], wasmlib.TYPE_MAP); return new sc.MapStringToMutableStringArray(mapID); } + + random(): wasmlib.ScMutableInt64 { + return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateRandom]); + } } diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/testwasmlib.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/testwasmlib.ts index 79592fd43b..f6a42c4294 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/testwasmlib.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/testwasmlib.ts @@ -102,3 +102,11 @@ export function viewBlockRecords(ctx: wasmlib.ScViewContext, f: sc.BlockRecordsC export function viewIotaBalance(ctx: wasmlib.ScViewContext, f: sc.IotaBalanceContext): void { f.results.iotas().setValue(ctx.balances().balance(wasmlib.ScColor.IOTA)); } + +export function funcRandom(ctx: wasmlib.ScFuncContext, f: sc.RandomContext): void { + f.state.random().setValue(ctx.random(1000)); +} + +export function viewGetRandom(ctx: wasmlib.ScViewContext, f: sc.GetRandomContext): void { + f.results.random().setValue(f.state.random().value()); +} diff --git a/contracts/wasm/tokenregistry/test/tokenregistry_bg.wasm b/contracts/wasm/tokenregistry/test/tokenregistry_bg.wasm index 31ceef70e043a14abe8bed200993a721b268b055..e5f33ba1464f3cc77a4ab83cf50185eb163d2789 100644 GIT binary patch delta 102 zcmV-s0Ga=o`2m>u0k9PT1OfsA0h1X4mJU>g0fqsV0V$RNB$feHv%LYGBePOi`~;JjUH+3!T}rc-Ua$j`g<>NJMj!$~5Nadu0k9PT1OWm90+Sg5mJU^h0fqsV0V$RNB$feGv%LY`>XySiJc{r8eVa`%2}_a@7L-o2$B*7$@s> z`E0J~{?9Ra&lDAoG6g0_fh-k<$yHOFHou%QLsE;4k%57efq@}8F)uzjF()U!EHkwn z$iKrcz~BL-CqU&>1SX%~ux@hX`t^(qlR1GdPMI9JAy`mZNPxi=s4NGFC4g9Y^S%vd FMF3-@L@59O delta 220 zcmeC~X7280-VngZ!py|Pv^j*4laX=Ovb_PZm#M6&oOz$6vxTcQ&c#L6_^|avQ!v0znC&pQj3?7fq|2Ofgw3DFFrXjCnvrv zGqoJZzr!!U-~psNq4FsLlh1EhH#u_sdd8H=oErirM{NieVo(wiU~mPh$^l{tAXeJE IZ^Ky;0Q-7J-2eap diff --git a/packages/vm/wasmlib/go/wasmlib/context.go b/packages/vm/wasmlib/go/wasmlib/context.go index 6cd4cbfb75..cc9474198a 100644 --- a/packages/vm/wasmlib/go/wasmlib/context.go +++ b/packages/vm/wasmlib/go/wasmlib/context.go @@ -137,13 +137,6 @@ func (ctx ScUtility) Hname(value string) ScHname { return NewScHnameFromBytes(result) } -// generates a random value from 0 to max (exclusive max) using a deterministic RNG -func (ctx ScUtility) Random(max int64) int64 { - result := ctx.utility.CallFunc(KeyRandom, nil) - rnd := binary.LittleEndian.Uint64(result) - return int64(rnd % uint64(max)) -} - // converts an integer to its string representation func (ctx ScUtility) String(value int64) string { return strconv.FormatInt(value, 10) @@ -328,6 +321,18 @@ func (ctx ScFuncContext) PostSelf(hFunction ScHname, params *ScMutableMap, trans ctx.Post(ctx.ChainID(), ctx.Contract(), hFunction, params, transfer, delay) } +// generates a random value from 0 to max (exclusive max) using a deterministic RNG +func (ctx ScFuncContext) Random(max int64) int64 { + state := ScMutableMap{objID: OBJ_ID_STATE} + rnd := state.GetBytes(KeyRandom) + seed := rnd.Value() + if len(seed) == 0 { + seed = Root.GetBytes(KeyRandom).Value() + } + rnd.SetValue(ctx.Utility().HashSha3(seed).Bytes()) + return int64(binary.LittleEndian.Uint64(seed[:8]) % uint64(max)) +} + // retrieve the request id of this transaction func (ctx ScFuncContext) RequestID() ScRequestID { return Root.GetRequestID(KeyRequestID).Value() diff --git a/packages/vm/wasmlib/go/wasmlib/mutable.go b/packages/vm/wasmlib/go/wasmlib/mutable.go index b7ae157c6b..362aedb48a 100644 --- a/packages/vm/wasmlib/go/wasmlib/mutable.go +++ b/packages/vm/wasmlib/go/wasmlib/mutable.go @@ -8,7 +8,7 @@ import ( "strconv" ) -var Root = ScMutableMap{objID: 1} +var Root = ScMutableMap{objID: OBJ_ID_ROOT} // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ diff --git a/packages/vm/wasmlib/src/context.rs b/packages/vm/wasmlib/src/context.rs index 7a024fc9de..59707638d5 100644 --- a/packages/vm/wasmlib/src/context.rs +++ b/packages/vm/wasmlib/src/context.rs @@ -14,7 +14,7 @@ use crate::keys::*; use crate::mutable::*; // all access to the objects in host's object tree starts here -pub(crate) static ROOT: ScMutableMap = ScMutableMap { obj_id: 1 }; +pub(crate) static ROOT: ScMutableMap = ScMutableMap { obj_id: OBJ_ID_ROOT }; // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ @@ -163,13 +163,6 @@ impl ScUtility { let result = self.utility.call_func(KEY_HNAME, value.as_bytes()); ScHname::from_bytes(&result) } - - // generates a random value from 0 to max (exclusive max) using a deterministic RNG - pub fn random(&self, max: i64) -> i64 { - let result = self.utility.call_func(KEY_RANDOM, &vec![0_u8; 0]); - let rnd = i64::from_le_bytes(result.try_into().expect("invalid i64 length")); - (rnd as u64 % max as u64) as i64 - } } // wrapper function for simplified internal access to base58 encoding @@ -360,6 +353,20 @@ impl ScFuncContext { self.post(&self.chain_id(), self.contract(), hfunction, params, transfer, delay); } + // generates a random value from 0 to max (exclusive max) using a deterministic RNG + pub fn random(&self, max: i64) -> i64 { + let state = ScMutableMap { obj_id: OBJ_ID_STATE }; + let rnd = state.get_bytes(&KEY_RANDOM); + let mut seed = rnd.value(); + if seed.is_empty() { + // get initial entropy from sandbox + seed = ROOT.get_bytes(&KEY_RANDOM).value(); + } + rnd.set_value(&self.utility().hash_sha3(&seed).to_bytes()); + let rnd = i64::from_le_bytes(seed[0..8].try_into().expect("invalid i64 length")); + (rnd as u64 % max as u64) as i64 + } + // retrieve the request id of this transaction pub fn request_id(&self) -> ScRequestID { ROOT.get_request_id(&KEY_REQUEST_ID).value() diff --git a/packages/vm/wasmlib/ts/wasmlib/context.ts b/packages/vm/wasmlib/ts/wasmlib/context.ts index f6bddb0c90..1cbc77c712 100644 --- a/packages/vm/wasmlib/ts/wasmlib/context.ts +++ b/packages/vm/wasmlib/ts/wasmlib/context.ts @@ -7,7 +7,7 @@ import {BytesDecoder, BytesEncoder} from "./bytes"; import {Convert} from "./convert"; import {ScFuncCallContext, ScViewCallContext} from "./contract"; import {ScAddress, ScAgentID, ScChainID, ScColor, ScHash, ScHname, ScRequestID} from "./hashtypes"; -import {log, OBJ_ID_ROOT, panic} from "./host"; +import {log, OBJ_ID_ROOT, OBJ_ID_STATE, panic} from "./host"; import {ScImmutableColorArray, ScImmutableMap} from "./immutable"; import * as keys from "./keys"; import {ScMutableMap} from "./mutable"; @@ -163,13 +163,6 @@ export class ScUtility { let result = this.utility.callFunc(keys.KEY_HNAME, Convert.fromString(name)); return ScHname.fromBytes(result); } - - // generates a random value from 0 to max (exclusive max) using a deterministic RNG - random(max: i64): i64 { - let result = this.utility.callFunc(keys.KEY_RANDOM, []); - let rnd = Convert.toI64(result); - return (rnd as u64 % max as u64) as i64; - } } // wrapper function for simplified internal access to base58 encoding @@ -334,6 +327,18 @@ export class ScFuncContext extends ScBaseContext implements ScViewCallContext, S this.post(this.chainID(), this.contract(), hfunction, params, transfer, delay); } + // generates a random value from 0 to max (exclusive max) using a deterministic RNG + random(max: i64): i64 { + let state = new ScMutableMap(OBJ_ID_STATE); + let rnd = state.getBytes(keys.KEY_RANDOM); + let seed = rnd.value(); + if (seed.length == 0) { + seed = ROOT.getBytes(keys.KEY_RANDOM).value(); + } + rnd.setValue(this.utility().hashSha3(seed).toBytes()); + return (Convert.toI64(seed.slice(0, 8)) as u64 % max as u64) as i64; + } + // retrieve the request id of this transaction requestID(): ScRequestID { return ROOT.getRequestID(keys.KEY_REQUEST_ID).value(); diff --git a/packages/vm/wasmproc/sccontext.go b/packages/vm/wasmproc/sccontext.go index e6dd4df4e4..7f7e1d59bd 100644 --- a/packages/vm/wasmproc/sccontext.go +++ b/packages/vm/wasmproc/sccontext.go @@ -35,6 +35,7 @@ var typeIds = map[int32]int32{ wasmhost.KeyPanic: wasmhost.OBJTYPE_STRING, wasmhost.KeyParams: wasmhost.OBJTYPE_MAP, wasmhost.KeyPost: wasmhost.OBJTYPE_BYTES, + wasmhost.KeyRandom: wasmhost.OBJTYPE_BYTES, wasmhost.KeyRequestID: wasmhost.OBJTYPE_REQUEST_ID, wasmhost.KeyResults: wasmhost.OBJTYPE_MAP, wasmhost.KeyReturn: wasmhost.OBJTYPE_MAP, @@ -89,6 +90,8 @@ func (o *ScContext) GetBytes(keyID, typeID int32) []byte { return ctx.Contract().Bytes() case wasmhost.KeyContractCreator: return ctx.ContractCreator().Bytes() + case wasmhost.KeyRandom: + return ctx.GetEntropy().Bytes() case wasmhost.KeyRequestID: return ctx.Request().ID().Bytes() case wasmhost.KeyTimestamp: diff --git a/packages/vm/wasmproc/scutility.go b/packages/vm/wasmproc/scutility.go index e9e5657e89..1933238c02 100644 --- a/packages/vm/wasmproc/scutility.go +++ b/packages/vm/wasmproc/scutility.go @@ -4,39 +4,22 @@ package wasmproc import ( - "github.com/iotaledger/wasp/packages/hashing" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/kv/codec" "github.com/iotaledger/wasp/packages/vm/sandbox/sandbox_utils" "github.com/iotaledger/wasp/packages/vm/wasmhost" ) -var TestMode = false - type ScUtility struct { ScSandboxObject - nextRandom int - random []byte - utils iscp.Utils - wc *WasmContext + utils iscp.Utils + wc *WasmContext } func NewScUtility(wc *WasmContext) *ScUtility { return &ScUtility{utils: sandbox_utils.NewUtils(), wc: wc} } -func (o *ScUtility) InitObj(id, keyID int32, owner *ScDict) { - o.ScSandboxObject.InitObj(id, keyID, owner) - if TestMode { - // preset randomizer to generate sequence 1..8 before - // continuing with proper hashed values - o.random = make([]byte, 8*8) - for i := 0; i < len(o.random); i += 8 { - o.random[i] = byte(i + 1) - } - } -} - func (o *ScUtility) CallFunc(keyID int32, bytes []byte) []byte { utils := o.utils switch keyID { @@ -80,8 +63,6 @@ func (o *ScUtility) CallFunc(keyID int32, bytes []byte) []byte { return utils.Hashing().Sha3(bytes).Bytes() case wasmhost.KeyHname: return codec.EncodeHname(utils.Hashing().Hname(string(bytes))) - case wasmhost.KeyRandom: - return o.getRandom8Bytes() } o.InvalidKey(keyID) return nil @@ -91,24 +72,6 @@ func (o *ScUtility) Exists(keyID, typeID int32) bool { return o.GetTypeID(keyID) > 0 } -func (o *ScUtility) getRandom8Bytes() []byte { - if o.random == nil { - // need to initialize pseudo-random generator with - // a sufficiently random, yet deterministic, value - id := o.wc.ctx.GetEntropy() - o.random = id[:] - } - i := o.nextRandom - if i+8 > len(o.random) { - // not enough bytes left, generate more bytes - h := hashing.HashData(o.random) - o.random = h[:] - i = 0 - } - o.nextRandom = i + 8 - return o.random[i : i+8] -} - func (o *ScUtility) GetTypeID(keyID int32) int32 { return wasmhost.OBJTYPE_BYTES } diff --git a/tools/cluster/tests/wasm/inccounter_bg.wasm b/tools/cluster/tests/wasm/inccounter_bg.wasm index bb828e396aa956a6b73fafd3d41339f7e1a6d5e1..e3d9a2038628ad2bf748a7e028a82294f4128e8d 100644 GIT binary patch delta 132 zcmaDdpXtebrVYl7EX>TzjFZh7ck-1iXI##>ol$2yquO@H(#`)E%as{JHkYYxGhhsv ztQ)oi$axkviJ38Ia$Ky^Cu>IMLPR$2j9$VB658AlE6ug}Svn)*V delta 128 zcmV-`0Du4Fp918c0 Date: Sat, 6 Nov 2021 17:59:00 -0700 Subject: [PATCH 036/198] Extra lint fix due to lint v1.43.0 --- tools/schema/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/schema/main.go b/tools/schema/main.go index 31f6269733..7db4b87894 100644 --- a/tools/schema/main.go +++ b/tools/schema/main.go @@ -9,8 +9,8 @@ import ( "errors" "flag" "fmt" + "io" "io/fs" - "io/ioutil" "os" "path/filepath" "strings" @@ -198,7 +198,7 @@ func loadSchema(file *os.File) (s *generator.Schema, err error) { err = WriteYAMLSchema(schemaDef) } case ".yaml": - fileByteArray, _ := ioutil.ReadAll(file) + fileByteArray, _ := io.ReadAll(file) err = yaml.Unmarshal(fileByteArray, schemaDef) if err == nil && *flagType == "convert" { err = WriteJSONSchema(schemaDef) From c58afe18bde43f93f24359ab1688ee270a4ea72a Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Sat, 6 Nov 2021 20:37:18 -0700 Subject: [PATCH 037/198] Some cleanup --- contracts/wasm/dividend/src/consts.rs | 4 --- contracts/wasm/dividend/src/contract.rs | 4 --- contracts/wasm/dividend/src/keys.rs | 4 --- contracts/wasm/dividend/src/lib.rs | 4 --- .../wasm/donatewithfeedback/src/consts.rs | 4 --- .../wasm/donatewithfeedback/src/contract.rs | 4 --- contracts/wasm/donatewithfeedback/src/keys.rs | 4 --- contracts/wasm/donatewithfeedback/src/lib.rs | 4 --- .../wasm/donatewithfeedback/src/structs.rs | 4 --- contracts/wasm/erc20/src/consts.rs | 4 --- contracts/wasm/erc20/src/contract.rs | 4 --- contracts/wasm/erc20/src/keys.rs | 4 --- contracts/wasm/erc20/src/lib.rs | 4 --- contracts/wasm/erc20/src/typedefs.rs | 4 --- contracts/wasm/fairauction/src/consts.rs | 4 --- contracts/wasm/fairauction/src/contract.rs | 4 --- contracts/wasm/fairauction/src/keys.rs | 4 --- contracts/wasm/fairauction/src/lib.rs | 4 --- contracts/wasm/fairauction/src/structs.rs | 4 --- contracts/wasm/fairauction/src/typedefs.rs | 4 --- contracts/wasm/fairroulette/src/consts.rs | 4 --- contracts/wasm/fairroulette/src/contract.rs | 4 --- contracts/wasm/fairroulette/src/keys.rs | 4 --- contracts/wasm/fairroulette/src/lib.rs | 4 --- contracts/wasm/fairroulette/src/structs.rs | 4 --- contracts/wasm/helloworld/src/consts.rs | 4 --- contracts/wasm/helloworld/src/contract.rs | 4 --- contracts/wasm/helloworld/src/keys.rs | 4 --- contracts/wasm/helloworld/src/lib.rs | 4 --- contracts/wasm/inccounter/src/consts.rs | 4 --- contracts/wasm/inccounter/src/contract.rs | 4 --- contracts/wasm/inccounter/src/keys.rs | 4 --- contracts/wasm/inccounter/src/lib.rs | 4 --- contracts/wasm/testcore/src/consts.rs | 4 --- contracts/wasm/testcore/src/contract.rs | 4 --- contracts/wasm/testcore/src/keys.rs | 4 --- contracts/wasm/testcore/src/lib.rs | 4 --- contracts/wasm/testwasmlib/src/consts.rs | 4 --- contracts/wasm/testwasmlib/src/contract.rs | 4 --- contracts/wasm/testwasmlib/src/keys.rs | 4 --- contracts/wasm/testwasmlib/src/lib.rs | 4 --- contracts/wasm/testwasmlib/src/typedefs.rs | 4 --- contracts/wasm/timestamp/src/consts.rs | 4 --- contracts/wasm/timestamp/src/contract.rs | 4 --- contracts/wasm/timestamp/src/keys.rs | 4 --- contracts/wasm/timestamp/src/lib.rs | 4 --- contracts/wasm/tokenregistry/src/consts.rs | 4 --- contracts/wasm/tokenregistry/src/contract.rs | 4 --- contracts/wasm/tokenregistry/src/keys.rs | 4 --- contracts/wasm/tokenregistry/src/lib.rs | 4 --- contracts/wasm/tokenregistry/src/structs.rs | 4 --- contracts/wasm/ts_build.cmd | 1 + .../vm/wasmlib/src/coreaccounts/consts.rs | 4 --- .../vm/wasmlib/src/coreaccounts/contract.rs | 4 --- packages/vm/wasmlib/src/coreblob/consts.rs | 4 --- packages/vm/wasmlib/src/coreblob/contract.rs | 4 --- .../vm/wasmlib/src/coreblocklog/consts.rs | 4 --- .../vm/wasmlib/src/coreblocklog/contract.rs | 4 --- .../vm/wasmlib/src/coregovernance/consts.rs | 4 --- .../vm/wasmlib/src/coregovernance/contract.rs | 4 --- packages/vm/wasmlib/src/coreroot/consts.rs | 4 --- packages/vm/wasmlib/src/coreroot/contract.rs | 4 --- tools/schema/generator/generator.go | 26 +++---------------- tools/schema/generator/generator_go.go | 10 +------ tools/schema/generator/generator_rust.go | 7 ----- tools/schema/generator/generator_ts.go | 15 ++--------- tools/schema/generator/gotemplates/funcs.go | 10 +++---- tools/schema/generator/gotemplates/main.go | 2 +- tools/schema/generator/rstemplates/consts.go | 4 --- .../schema/generator/rstemplates/contract.go | 4 --- tools/schema/generator/rstemplates/funcs.go | 10 +++---- tools/schema/generator/rstemplates/keys.go | 4 --- tools/schema/generator/rstemplates/lib.go | 4 --- tools/schema/generator/rstemplates/structs.go | 4 --- .../schema/generator/rstemplates/typedefs.go | 4 --- tools/schema/generator/templates.go | 20 +++++++++++++- .../generator/tstemplates/alltemplates.go | 8 +++++- .../schema/generator/tstemplates/contract.go | 3 +-- tools/schema/generator/tstemplates/funcs.go | 17 ++++++------ tools/schema/generator/tstemplates/keys.go | 3 +-- tools/schema/generator/tstemplates/lib.go | 3 +-- tools/schema/generator/tstemplates/params.go | 3 +-- tools/schema/generator/tstemplates/results.go | 3 +-- tools/schema/generator/tstemplates/state.go | 3 +-- .../schema/generator/tstemplates/typedefs.go | 3 +-- 85 files changed, 60 insertions(+), 355 deletions(-) diff --git a/contracts/wasm/dividend/src/consts.rs b/contracts/wasm/dividend/src/consts.rs index f07bfa8410..b2d8406e75 100644 --- a/contracts/wasm/dividend/src/consts.rs +++ b/contracts/wasm/dividend/src/consts.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -40,5 +38,3 @@ pub const HFUNC_MEMBER: ScHname = ScHname(0xc07da2cb); pub const HFUNC_SET_OWNER: ScHname = ScHname(0x2a15fe7b); pub const HVIEW_GET_FACTOR: ScHname = ScHname(0x0ee668fe); pub const HVIEW_GET_OWNER: ScHname = ScHname(0x137107a6); - -// @formatter:on diff --git a/contracts/wasm/dividend/src/contract.rs b/contracts/wasm/dividend/src/contract.rs index 4db2acb901..29c11380e9 100644 --- a/contracts/wasm/dividend/src/contract.rs +++ b/contracts/wasm/dividend/src/contract.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use std::ptr; @@ -98,5 +96,3 @@ impl ScFuncs { f } } - -// @formatter:on diff --git a/contracts/wasm/dividend/src/keys.rs b/contracts/wasm/dividend/src/keys.rs index 057e25b20f..5a837e51cf 100644 --- a/contracts/wasm/dividend/src/keys.rs +++ b/contracts/wasm/dividend/src/keys.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -44,5 +42,3 @@ pub fn idx_map(idx: usize) -> Key32 { IDX_MAP[idx] } } - -// @formatter:on diff --git a/contracts/wasm/dividend/src/lib.rs b/contracts/wasm/dividend/src/lib.rs index 9e80107f6f..29145101a1 100644 --- a/contracts/wasm/dividend/src/lib.rs +++ b/contracts/wasm/dividend/src/lib.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] #![allow(unused_imports)] @@ -172,5 +170,3 @@ fn view_get_owner_thunk(ctx: &ScViewContext) { view_get_owner(ctx, &f); ctx.log("dividend.viewGetOwner ok"); } - -// @formatter:on diff --git a/contracts/wasm/donatewithfeedback/src/consts.rs b/contracts/wasm/donatewithfeedback/src/consts.rs index 1213470668..8b7d938ce0 100644 --- a/contracts/wasm/donatewithfeedback/src/consts.rs +++ b/contracts/wasm/donatewithfeedback/src/consts.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -41,5 +39,3 @@ pub const HFUNC_DONATE: ScHname = ScHname(0xdc9b133a); pub const HFUNC_WITHDRAW: ScHname = ScHname(0x9dcc0f41); pub const HVIEW_DONATION: ScHname = ScHname(0xbdb245ba); pub const HVIEW_DONATION_INFO: ScHname = ScHname(0xc8f7c726); - -// @formatter:on diff --git a/contracts/wasm/donatewithfeedback/src/contract.rs b/contracts/wasm/donatewithfeedback/src/contract.rs index 741500c9d3..69a43c1288 100644 --- a/contracts/wasm/donatewithfeedback/src/contract.rs +++ b/contracts/wasm/donatewithfeedback/src/contract.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use std::ptr; @@ -76,5 +74,3 @@ impl ScFuncs { f } } - -// @formatter:on diff --git a/contracts/wasm/donatewithfeedback/src/keys.rs b/contracts/wasm/donatewithfeedback/src/keys.rs index cf3da41b2e..176049a9c5 100644 --- a/contracts/wasm/donatewithfeedback/src/keys.rs +++ b/contracts/wasm/donatewithfeedback/src/keys.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -54,5 +52,3 @@ pub fn idx_map(idx: usize) -> Key32 { IDX_MAP[idx] } } - -// @formatter:on diff --git a/contracts/wasm/donatewithfeedback/src/lib.rs b/contracts/wasm/donatewithfeedback/src/lib.rs index 67c47e4f19..0504a54d03 100644 --- a/contracts/wasm/donatewithfeedback/src/lib.rs +++ b/contracts/wasm/donatewithfeedback/src/lib.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] #![allow(unused_imports)] @@ -127,5 +125,3 @@ fn view_donation_info_thunk(ctx: &ScViewContext) { view_donation_info(ctx, &f); ctx.log("donatewithfeedback.viewDonationInfo ok"); } - -// @formatter:on diff --git a/contracts/wasm/donatewithfeedback/src/structs.rs b/contracts/wasm/donatewithfeedback/src/structs.rs index 14b51dac7c..392284bd3a 100644 --- a/contracts/wasm/donatewithfeedback/src/structs.rs +++ b/contracts/wasm/donatewithfeedback/src/structs.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -76,5 +74,3 @@ impl MutableDonation { Donation::from_bytes(&get_bytes(self.obj_id, self.key_id, TYPE_BYTES)) } } - -// @formatter:on diff --git a/contracts/wasm/erc20/src/consts.rs b/contracts/wasm/erc20/src/consts.rs index 92e25125dd..a872c77ce2 100644 --- a/contracts/wasm/erc20/src/consts.rs +++ b/contracts/wasm/erc20/src/consts.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -44,5 +42,3 @@ pub const HFUNC_TRANSFER_FROM: ScHname = ScHname(0xd5e0a602); pub const HVIEW_ALLOWANCE: ScHname = ScHname(0x5e16006a); pub const HVIEW_BALANCE_OF: ScHname = ScHname(0x67ef8df4); pub const HVIEW_TOTAL_SUPPLY: ScHname = ScHname(0x9505e6ca); - -// @formatter:on diff --git a/contracts/wasm/erc20/src/contract.rs b/contracts/wasm/erc20/src/contract.rs index 4a45a9ec40..9442eae9ce 100644 --- a/contracts/wasm/erc20/src/contract.rs +++ b/contracts/wasm/erc20/src/contract.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use std::ptr; @@ -117,5 +115,3 @@ impl ScFuncs { f } } - -// @formatter:on diff --git a/contracts/wasm/erc20/src/keys.rs b/contracts/wasm/erc20/src/keys.rs index ce25fdf63a..b5cd843122 100644 --- a/contracts/wasm/erc20/src/keys.rs +++ b/contracts/wasm/erc20/src/keys.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -48,5 +46,3 @@ pub fn idx_map(idx: usize) -> Key32 { IDX_MAP[idx] } } - -// @formatter:on diff --git a/contracts/wasm/erc20/src/lib.rs b/contracts/wasm/erc20/src/lib.rs index a12d40e8a6..5d821aecdb 100644 --- a/contracts/wasm/erc20/src/lib.rs +++ b/contracts/wasm/erc20/src/lib.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] #![allow(unused_imports)] @@ -199,5 +197,3 @@ fn view_total_supply_thunk(ctx: &ScViewContext) { view_total_supply(ctx, &f); ctx.log("erc20.viewTotalSupply ok"); } - -// @formatter:on diff --git a/contracts/wasm/erc20/src/typedefs.rs b/contracts/wasm/erc20/src/typedefs.rs index e5e37f89b9..530075de78 100644 --- a/contracts/wasm/erc20/src/typedefs.rs +++ b/contracts/wasm/erc20/src/typedefs.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -39,5 +37,3 @@ impl MapAgentIDToMutableInt64 { } pub type MutableAllowancesForAgent = MapAgentIDToMutableInt64; - -// @formatter:on diff --git a/contracts/wasm/fairauction/src/consts.rs b/contracts/wasm/fairauction/src/consts.rs index 011f1e8037..9933066149 100644 --- a/contracts/wasm/fairauction/src/consts.rs +++ b/contracts/wasm/fairauction/src/consts.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -50,5 +48,3 @@ pub const HFUNC_PLACE_BID: ScHname = ScHname(0x9bd72fa9); pub const HFUNC_SET_OWNER_MARGIN: ScHname = ScHname(0x1774461a); pub const HFUNC_START_AUCTION: ScHname = ScHname(0xd5b7bacb); pub const HVIEW_GET_INFO: ScHname = ScHname(0xcfedba5f); - -// @formatter:on diff --git a/contracts/wasm/fairauction/src/contract.rs b/contracts/wasm/fairauction/src/contract.rs index 29ac58e97e..eedbe31941 100644 --- a/contracts/wasm/fairauction/src/contract.rs +++ b/contracts/wasm/fairauction/src/contract.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use std::ptr; @@ -89,5 +87,3 @@ impl ScFuncs { f } } - -// @formatter:on diff --git a/contracts/wasm/fairauction/src/keys.rs b/contracts/wasm/fairauction/src/keys.rs index cb75fdd3b9..5b93458202 100644 --- a/contracts/wasm/fairauction/src/keys.rs +++ b/contracts/wasm/fairauction/src/keys.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -68,5 +66,3 @@ pub fn idx_map(idx: usize) -> Key32 { IDX_MAP[idx] } } - -// @formatter:on diff --git a/contracts/wasm/fairauction/src/lib.rs b/contracts/wasm/fairauction/src/lib.rs index 7ee46714c2..23c000e6b8 100644 --- a/contracts/wasm/fairauction/src/lib.rs +++ b/contracts/wasm/fairauction/src/lib.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] #![allow(unused_imports)] @@ -156,5 +154,3 @@ fn view_get_info_thunk(ctx: &ScViewContext) { view_get_info(ctx, &f); ctx.log("fairauction.viewGetInfo ok"); } - -// @formatter:on diff --git a/contracts/wasm/fairauction/src/structs.rs b/contracts/wasm/fairauction/src/structs.rs index b5db0c0c97..bbede307d0 100644 --- a/contracts/wasm/fairauction/src/structs.rs +++ b/contracts/wasm/fairauction/src/structs.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -153,5 +151,3 @@ impl MutableBid { Bid::from_bytes(&get_bytes(self.obj_id, self.key_id, TYPE_BYTES)) } } - -// @formatter:on diff --git a/contracts/wasm/fairauction/src/typedefs.rs b/contracts/wasm/fairauction/src/typedefs.rs index 41dbc79344..dc306d8ad5 100644 --- a/contracts/wasm/fairauction/src/typedefs.rs +++ b/contracts/wasm/fairauction/src/typedefs.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -76,5 +74,3 @@ impl MapAgentIDToMutableBid { } pub type MutableBids = MapAgentIDToMutableBid; - -// @formatter:on diff --git a/contracts/wasm/fairroulette/src/consts.rs b/contracts/wasm/fairroulette/src/consts.rs index 6087aea9e8..825e7da869 100644 --- a/contracts/wasm/fairroulette/src/consts.rs +++ b/contracts/wasm/fairroulette/src/consts.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -49,5 +47,3 @@ pub const HVIEW_LAST_WINNING_NUMBER: ScHname = ScHname(0x2f5f09fe); pub const HVIEW_ROUND_NUMBER: ScHname = ScHname(0x0dcfe520); pub const HVIEW_ROUND_STARTED_AT: ScHname = ScHname(0x725de8b4); pub const HVIEW_ROUND_STATUS: ScHname = ScHname(0x145053b5); - -// @formatter:on diff --git a/contracts/wasm/fairroulette/src/contract.rs b/contracts/wasm/fairroulette/src/contract.rs index c30443bf34..729e69008e 100644 --- a/contracts/wasm/fairroulette/src/contract.rs +++ b/contracts/wasm/fairroulette/src/contract.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use std::ptr; @@ -127,5 +125,3 @@ impl ScFuncs { f } } - -// @formatter:on diff --git a/contracts/wasm/fairroulette/src/keys.rs b/contracts/wasm/fairroulette/src/keys.rs index a362646823..fe64401049 100644 --- a/contracts/wasm/fairroulette/src/keys.rs +++ b/contracts/wasm/fairroulette/src/keys.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -50,5 +48,3 @@ pub fn idx_map(idx: usize) -> Key32 { IDX_MAP[idx] } } - -// @formatter:on diff --git a/contracts/wasm/fairroulette/src/lib.rs b/contracts/wasm/fairroulette/src/lib.rs index 24ccf76830..dee9ebffc8 100644 --- a/contracts/wasm/fairroulette/src/lib.rs +++ b/contracts/wasm/fairroulette/src/lib.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] #![allow(unused_imports)] @@ -221,5 +219,3 @@ fn view_round_status_thunk(ctx: &ScViewContext) { view_round_status(ctx, &f); ctx.log("fairroulette.viewRoundStatus ok"); } - -// @formatter:on diff --git a/contracts/wasm/fairroulette/src/structs.rs b/contracts/wasm/fairroulette/src/structs.rs index 8429eb3687..fda6a8429e 100644 --- a/contracts/wasm/fairroulette/src/structs.rs +++ b/contracts/wasm/fairroulette/src/structs.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -70,5 +68,3 @@ impl MutableBet { Bet::from_bytes(&get_bytes(self.obj_id, self.key_id, TYPE_BYTES)) } } - -// @formatter:on diff --git a/contracts/wasm/helloworld/src/consts.rs b/contracts/wasm/helloworld/src/consts.rs index d260e55488..c6c0be16f7 100644 --- a/contracts/wasm/helloworld/src/consts.rs +++ b/contracts/wasm/helloworld/src/consts.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -22,5 +20,3 @@ pub const VIEW_GET_HELLO_WORLD: &str = "getHelloWorld"; pub const HFUNC_HELLO_WORLD: ScHname = ScHname(0x9d042e65); pub const HVIEW_GET_HELLO_WORLD: ScHname = ScHname(0x210439ce); - -// @formatter:on diff --git a/contracts/wasm/helloworld/src/contract.rs b/contracts/wasm/helloworld/src/contract.rs index abafa9cda4..1813698fe1 100644 --- a/contracts/wasm/helloworld/src/contract.rs +++ b/contracts/wasm/helloworld/src/contract.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use std::ptr; @@ -43,5 +41,3 @@ impl ScFuncs { f } } - -// @formatter:on diff --git a/contracts/wasm/helloworld/src/keys.rs b/contracts/wasm/helloworld/src/keys.rs index c7cc3df75d..16a1c5a808 100644 --- a/contracts/wasm/helloworld/src/keys.rs +++ b/contracts/wasm/helloworld/src/keys.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -28,5 +26,3 @@ pub fn idx_map(idx: usize) -> Key32 { IDX_MAP[idx] } } - -// @formatter:on diff --git a/contracts/wasm/helloworld/src/lib.rs b/contracts/wasm/helloworld/src/lib.rs index b5b13a3b9a..ccc2b092df 100644 --- a/contracts/wasm/helloworld/src/lib.rs +++ b/contracts/wasm/helloworld/src/lib.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] #![allow(unused_imports)] @@ -72,5 +70,3 @@ fn view_get_hello_world_thunk(ctx: &ScViewContext) { view_get_hello_world(ctx, &f); ctx.log("helloworld.viewGetHelloWorld ok"); } - -// @formatter:on diff --git a/contracts/wasm/inccounter/src/consts.rs b/contracts/wasm/inccounter/src/consts.rs index b8e8a1cc79..f0476eaa86 100644 --- a/contracts/wasm/inccounter/src/consts.rs +++ b/contracts/wasm/inccounter/src/consts.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -54,5 +52,3 @@ pub const HFUNC_REPEAT_MANY: ScHname = ScHname(0x4ff450d3); pub const HFUNC_TEST_LEB128: ScHname = ScHname(0xd8364cb9); pub const HFUNC_WHEN_MUST_INCREMENT: ScHname = ScHname(0xb4c3e7a6); pub const HVIEW_GET_COUNTER: ScHname = ScHname(0xb423e607); - -// @formatter:on diff --git a/contracts/wasm/inccounter/src/contract.rs b/contracts/wasm/inccounter/src/contract.rs index 7129a92010..81262cdf82 100644 --- a/contracts/wasm/inccounter/src/contract.rs +++ b/contracts/wasm/inccounter/src/contract.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use std::ptr; @@ -168,5 +166,3 @@ impl ScFuncs { f } } - -// @formatter:on diff --git a/contracts/wasm/inccounter/src/keys.rs b/contracts/wasm/inccounter/src/keys.rs index 9ef429d2e8..ba196a423b 100644 --- a/contracts/wasm/inccounter/src/keys.rs +++ b/contracts/wasm/inccounter/src/keys.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -40,5 +38,3 @@ pub fn idx_map(idx: usize) -> Key32 { IDX_MAP[idx] } } - -// @formatter:on diff --git a/contracts/wasm/inccounter/src/lib.rs b/contracts/wasm/inccounter/src/lib.rs index f58f47fc17..1c99d08755 100644 --- a/contracts/wasm/inccounter/src/lib.rs +++ b/contracts/wasm/inccounter/src/lib.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] #![allow(unused_imports)] @@ -283,5 +281,3 @@ fn view_get_counter_thunk(ctx: &ScViewContext) { view_get_counter(ctx, &f); ctx.log("inccounter.viewGetCounter ok"); } - -// @formatter:on diff --git a/contracts/wasm/testcore/src/consts.rs b/contracts/wasm/testcore/src/consts.rs index 2708b5d7ef..9707d7b550 100644 --- a/contracts/wasm/testcore/src/consts.rs +++ b/contracts/wasm/testcore/src/consts.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -118,5 +116,3 @@ pub const HVIEW_TEST_CALL_PANIC_VIEW_EP_FROM_VIEW: ScHname = ScHname(0x91b10c99) pub const HVIEW_TEST_CHAIN_OWNER_ID_VIEW: ScHname = ScHname(0x26586c33); pub const HVIEW_TEST_PANIC_VIEW_EP: ScHname = ScHname(0x22bc4d72); pub const HVIEW_TEST_SANDBOX_CALL: ScHname = ScHname(0x42d72b63); - -// @formatter:on diff --git a/contracts/wasm/testcore/src/contract.rs b/contracts/wasm/testcore/src/contract.rs index 4319013ea1..3c611ea492 100644 --- a/contracts/wasm/testcore/src/contract.rs +++ b/contracts/wasm/testcore/src/contract.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use std::ptr; @@ -400,5 +398,3 @@ impl ScFuncs { f } } - -// @formatter:on diff --git a/contracts/wasm/testcore/src/keys.rs b/contracts/wasm/testcore/src/keys.rs index 38556d158a..988b0ebe48 100644 --- a/contracts/wasm/testcore/src/keys.rs +++ b/contracts/wasm/testcore/src/keys.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -96,5 +94,3 @@ pub fn idx_map(idx: usize) -> Key32 { IDX_MAP[idx] } } - -// @formatter:on diff --git a/contracts/wasm/testcore/src/lib.rs b/contracts/wasm/testcore/src/lib.rs index ba4e8fbdc7..81777168b5 100644 --- a/contracts/wasm/testcore/src/lib.rs +++ b/contracts/wasm/testcore/src/lib.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] #![allow(unused_imports)] @@ -694,5 +692,3 @@ fn view_test_sandbox_call_thunk(ctx: &ScViewContext) { view_test_sandbox_call(ctx, &f); ctx.log("testcore.viewTestSandboxCall ok"); } - -// @formatter:on diff --git a/contracts/wasm/testwasmlib/src/consts.rs b/contracts/wasm/testwasmlib/src/consts.rs index f97702d79c..8a1e0bb47f 100644 --- a/contracts/wasm/testwasmlib/src/consts.rs +++ b/contracts/wasm/testwasmlib/src/consts.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -67,5 +65,3 @@ pub const HVIEW_BLOCK_RECORD: ScHname = ScHname(0xad13b2f8); pub const HVIEW_BLOCK_RECORDS: ScHname = ScHname(0x16e249ea); pub const HVIEW_GET_RANDOM: ScHname = ScHname(0x46263045); pub const HVIEW_IOTA_BALANCE: ScHname = ScHname(0x9d3920bd); - -// @formatter:on diff --git a/contracts/wasm/testwasmlib/src/contract.rs b/contracts/wasm/testwasmlib/src/contract.rs index 0b34918fc0..0018676707 100644 --- a/contracts/wasm/testwasmlib/src/contract.rs +++ b/contracts/wasm/testwasmlib/src/contract.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use std::ptr; @@ -169,5 +167,3 @@ impl ScFuncs { f } } - -// @formatter:on diff --git a/contracts/wasm/testwasmlib/src/keys.rs b/contracts/wasm/testwasmlib/src/keys.rs index d5b49bd14c..4b5a96df37 100644 --- a/contracts/wasm/testwasmlib/src/keys.rs +++ b/contracts/wasm/testwasmlib/src/keys.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -78,5 +76,3 @@ pub fn idx_map(idx: usize) -> Key32 { IDX_MAP[idx] } } - -// @formatter:on diff --git a/contracts/wasm/testwasmlib/src/lib.rs b/contracts/wasm/testwasmlib/src/lib.rs index d2c2f5b460..9dc7e7fe78 100644 --- a/contracts/wasm/testwasmlib/src/lib.rs +++ b/contracts/wasm/testwasmlib/src/lib.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] #![allow(unused_imports)] @@ -282,5 +280,3 @@ fn view_iota_balance_thunk(ctx: &ScViewContext) { view_iota_balance(ctx, &f); ctx.log("testwasmlib.viewIotaBalance ok"); } - -// @formatter:on diff --git a/contracts/wasm/testwasmlib/src/typedefs.rs b/contracts/wasm/testwasmlib/src/typedefs.rs index efc5d9f0bb..7c8e0d9e73 100644 --- a/contracts/wasm/testwasmlib/src/typedefs.rs +++ b/contracts/wasm/testwasmlib/src/typedefs.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -47,5 +45,3 @@ impl ArrayOfMutableString { } pub type MutableStringArray = ArrayOfMutableString; - -// @formatter:on diff --git a/contracts/wasm/timestamp/src/consts.rs b/contracts/wasm/timestamp/src/consts.rs index 57e7196b82..17e42c5599 100644 --- a/contracts/wasm/timestamp/src/consts.rs +++ b/contracts/wasm/timestamp/src/consts.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -24,5 +22,3 @@ pub const VIEW_GET_TIMESTAMP: &str = "getTimestamp"; pub const HFUNC_NOW: ScHname = ScHname(0xd73b7fc9); pub const HVIEW_GET_TIMESTAMP: ScHname = ScHname(0x40c6376a); - -// @formatter:on diff --git a/contracts/wasm/timestamp/src/contract.rs b/contracts/wasm/timestamp/src/contract.rs index fc0a0d1370..20fb3c9e91 100644 --- a/contracts/wasm/timestamp/src/contract.rs +++ b/contracts/wasm/timestamp/src/contract.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use std::ptr; @@ -43,5 +41,3 @@ impl ScFuncs { f } } - -// @formatter:on diff --git a/contracts/wasm/timestamp/src/keys.rs b/contracts/wasm/timestamp/src/keys.rs index f761e250f5..cfcf92beb7 100644 --- a/contracts/wasm/timestamp/src/keys.rs +++ b/contracts/wasm/timestamp/src/keys.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -30,5 +28,3 @@ pub fn idx_map(idx: usize) -> Key32 { IDX_MAP[idx] } } - -// @formatter:on diff --git a/contracts/wasm/timestamp/src/lib.rs b/contracts/wasm/timestamp/src/lib.rs index 752dd0026d..9234734fcf 100644 --- a/contracts/wasm/timestamp/src/lib.rs +++ b/contracts/wasm/timestamp/src/lib.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] #![allow(unused_imports)] @@ -72,5 +70,3 @@ fn view_get_timestamp_thunk(ctx: &ScViewContext) { view_get_timestamp(ctx, &f); ctx.log("timestamp.viewGetTimestamp ok"); } - -// @formatter:on diff --git a/contracts/wasm/tokenregistry/src/consts.rs b/contracts/wasm/tokenregistry/src/consts.rs index 55db606e64..4248459bb6 100644 --- a/contracts/wasm/tokenregistry/src/consts.rs +++ b/contracts/wasm/tokenregistry/src/consts.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -31,5 +29,3 @@ pub const HFUNC_MINT_SUPPLY: ScHname = ScHname(0x564349a7); pub const HFUNC_TRANSFER_OWNERSHIP: ScHname = ScHname(0xbb9eb5af); pub const HFUNC_UPDATE_METADATA: ScHname = ScHname(0xa26b23b6); pub const HVIEW_GET_INFO: ScHname = ScHname(0xcfedba5f); - -// @formatter:on diff --git a/contracts/wasm/tokenregistry/src/contract.rs b/contracts/wasm/tokenregistry/src/contract.rs index 9e3889c0a8..b344e00ad3 100644 --- a/contracts/wasm/tokenregistry/src/contract.rs +++ b/contracts/wasm/tokenregistry/src/contract.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use std::ptr; @@ -73,5 +71,3 @@ impl ScFuncs { f } } - -// @formatter:on diff --git a/contracts/wasm/tokenregistry/src/keys.rs b/contracts/wasm/tokenregistry/src/keys.rs index 3579998671..ec71db1211 100644 --- a/contracts/wasm/tokenregistry/src/keys.rs +++ b/contracts/wasm/tokenregistry/src/keys.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -36,5 +34,3 @@ pub fn idx_map(idx: usize) -> Key32 { IDX_MAP[idx] } } - -// @formatter:on diff --git a/contracts/wasm/tokenregistry/src/lib.rs b/contracts/wasm/tokenregistry/src/lib.rs index 03bdde1652..6545bc0ca6 100644 --- a/contracts/wasm/tokenregistry/src/lib.rs +++ b/contracts/wasm/tokenregistry/src/lib.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] #![allow(unused_imports)] @@ -126,5 +124,3 @@ fn view_get_info_thunk(ctx: &ScViewContext) { view_get_info(ctx, &f); ctx.log("tokenregistry.viewGetInfo ok"); } - -// @formatter:on diff --git a/contracts/wasm/tokenregistry/src/structs.rs b/contracts/wasm/tokenregistry/src/structs.rs index 416ed9bde8..0ca617fb06 100644 --- a/contracts/wasm/tokenregistry/src/structs.rs +++ b/contracts/wasm/tokenregistry/src/structs.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -82,5 +80,3 @@ impl MutableToken { Token::from_bytes(&get_bytes(self.obj_id, self.key_id, TYPE_BYTES)) } } - -// @formatter:on diff --git a/contracts/wasm/ts_build.cmd b/contracts/wasm/ts_build.cmd index 17634aa427..2450d76056 100644 --- a/contracts/wasm/ts_build.cmd +++ b/contracts/wasm/ts_build.cmd @@ -3,6 +3,7 @@ cd %1 if not exist schema.yaml goto :xit echo Building %1 schema -ts %2 +echo compiling %1_ts.wasm call asc ts/%1/lib.ts --lib d:/work/node_modules --binaryFile ts/pkg/%1_ts.wasm rem call asc ts/%1/lib.ts --lib d:/work/node_modules --binaryFile ts/pkg/%1_ts.wasm --textFile ts/pkg/%1_ts.wat :xit diff --git a/packages/vm/wasmlib/src/coreaccounts/consts.rs b/packages/vm/wasmlib/src/coreaccounts/consts.rs index d219a7642a..969a653e7c 100644 --- a/packages/vm/wasmlib/src/coreaccounts/consts.rs +++ b/packages/vm/wasmlib/src/coreaccounts/consts.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use crate::*; @@ -38,5 +36,3 @@ pub(crate) const HVIEW_ACCOUNTS: ScHname = ScHname(0x3c4b5e02); pub(crate) const HVIEW_BALANCE: ScHname = ScHname(0x84168cb4); pub(crate) const HVIEW_GET_ACCOUNT_NONCE: ScHname = ScHname(0x529d7df9); pub(crate) const HVIEW_TOTAL_ASSETS: ScHname = ScHname(0xfab0f8d2); - -// @formatter:on diff --git a/packages/vm/wasmlib/src/coreaccounts/contract.rs b/packages/vm/wasmlib/src/coreaccounts/contract.rs index db364df74c..afa4cc6d91 100644 --- a/packages/vm/wasmlib/src/coreaccounts/contract.rs +++ b/packages/vm/wasmlib/src/coreaccounts/contract.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use std::ptr; @@ -110,5 +108,3 @@ impl ScFuncs { f } } - -// @formatter:on diff --git a/packages/vm/wasmlib/src/coreblob/consts.rs b/packages/vm/wasmlib/src/coreblob/consts.rs index 2ea81feee9..b8f53f6cd9 100644 --- a/packages/vm/wasmlib/src/coreblob/consts.rs +++ b/packages/vm/wasmlib/src/coreblob/consts.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use crate::*; @@ -32,5 +30,3 @@ pub(crate) const HFUNC_STORE_BLOB: ScHname = ScHname(0xddd4c281); pub(crate) const HVIEW_GET_BLOB_FIELD: ScHname = ScHname(0x1f448130); pub(crate) const HVIEW_GET_BLOB_INFO: ScHname = ScHname(0xfde4ab46); pub(crate) const HVIEW_LIST_BLOBS: ScHname = ScHname(0x62ca7990); - -// @formatter:on diff --git a/packages/vm/wasmlib/src/coreblob/contract.rs b/packages/vm/wasmlib/src/coreblob/contract.rs index ffab194dfc..83949d5d0c 100644 --- a/packages/vm/wasmlib/src/coreblob/contract.rs +++ b/packages/vm/wasmlib/src/coreblob/contract.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use std::ptr; @@ -77,5 +75,3 @@ impl ScFuncs { f } } - -// @formatter:on diff --git a/packages/vm/wasmlib/src/coreblocklog/consts.rs b/packages/vm/wasmlib/src/coreblocklog/consts.rs index ceb811734b..03eb5efc34 100644 --- a/packages/vm/wasmlib/src/coreblocklog/consts.rs +++ b/packages/vm/wasmlib/src/coreblocklog/consts.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use crate::*; @@ -52,5 +50,3 @@ pub(crate) const HVIEW_GET_REQUEST_I_DS_FOR_BLOCK: ScHname = ScHname(0x5a20327a) pub(crate) const HVIEW_GET_REQUEST_RECEIPT: ScHname = ScHname(0xb7f9534f); pub(crate) const HVIEW_GET_REQUEST_RECEIPTS_FOR_BLOCK: ScHname = ScHname(0x77e3beef); pub(crate) const HVIEW_IS_REQUEST_PROCESSED: ScHname = ScHname(0xd57d50a9); - -// @formatter:on diff --git a/packages/vm/wasmlib/src/coreblocklog/contract.rs b/packages/vm/wasmlib/src/coreblocklog/contract.rs index fbd7dd8d49..b4ae59d384 100644 --- a/packages/vm/wasmlib/src/coreblocklog/contract.rs +++ b/packages/vm/wasmlib/src/coreblocklog/contract.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use std::ptr; @@ -165,5 +163,3 @@ impl ScFuncs { f } } - -// @formatter:on diff --git a/packages/vm/wasmlib/src/coregovernance/consts.rs b/packages/vm/wasmlib/src/coregovernance/consts.rs index 9cba42da54..cf3f96194a 100644 --- a/packages/vm/wasmlib/src/coregovernance/consts.rs +++ b/packages/vm/wasmlib/src/coregovernance/consts.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use crate::*; @@ -63,5 +61,3 @@ pub(crate) const HVIEW_GET_ALLOWED_STATE_CONTROLLER_ADDRESSES: ScHname = ScHname pub(crate) const HVIEW_GET_CHAIN_INFO: ScHname = ScHname(0x434477e2); pub(crate) const HVIEW_GET_FEE_INFO: ScHname = ScHname(0x9fe54b48); pub(crate) const HVIEW_GET_MAX_BLOB_SIZE: ScHname = ScHname(0xe1db3d28); - -// @formatter:on diff --git a/packages/vm/wasmlib/src/coregovernance/contract.rs b/packages/vm/wasmlib/src/coregovernance/contract.rs index 95d05f6cda..461139a606 100644 --- a/packages/vm/wasmlib/src/coregovernance/contract.rs +++ b/packages/vm/wasmlib/src/coregovernance/contract.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use std::ptr; @@ -173,5 +171,3 @@ impl ScFuncs { f } } - -// @formatter:on diff --git a/packages/vm/wasmlib/src/coreroot/consts.rs b/packages/vm/wasmlib/src/coreroot/consts.rs index 444a1aedaa..14f6bc2be2 100644 --- a/packages/vm/wasmlib/src/coreroot/consts.rs +++ b/packages/vm/wasmlib/src/coreroot/consts.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use crate::*; @@ -36,5 +34,3 @@ pub(crate) const HFUNC_GRANT_DEPLOY_PERMISSION: ScHname = ScHname(0xf440263a); pub(crate) const HFUNC_REVOKE_DEPLOY_PERMISSION: ScHname = ScHname(0x850744f1); pub(crate) const HVIEW_FIND_CONTRACT: ScHname = ScHname(0xc145ca00); pub(crate) const HVIEW_GET_CONTRACT_RECORDS: ScHname = ScHname(0x078b3ef3); - -// @formatter:on diff --git a/packages/vm/wasmlib/src/coreroot/contract.rs b/packages/vm/wasmlib/src/coreroot/contract.rs index bdd90b5c30..ace1553977 100644 --- a/packages/vm/wasmlib/src/coreroot/contract.rs +++ b/packages/vm/wasmlib/src/coreroot/contract.rs @@ -5,8 +5,6 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead -// @formatter:off - #![allow(dead_code)] use std::ptr; @@ -86,5 +84,3 @@ impl ScFuncs { f } } - -// @formatter:on diff --git a/tools/schema/generator/generator.go b/tools/schema/generator/generator.go index 0c309d6fb4..c6856b69b9 100644 --- a/tools/schema/generator/generator.go +++ b/tools/schema/generator/generator.go @@ -38,7 +38,6 @@ type Generator interface { generateLanguageSpecificFiles() error setFieldKeys() setFuncKeys() - writeInitialFuncs() } type GenBase struct { @@ -216,7 +215,9 @@ func (g *GenBase) generateFuncs() error { if err != nil { // generate initial SC function file g.skipWarning = true - return g.createSourceFile(g.s.Name, g.gen.writeInitialFuncs) + return g.createSourceFile(g.s.Name, func() { + g.emit("funcs" + g.extension) + }) } // append missing function signatures to existing code file @@ -275,22 +276,7 @@ func (g *GenBase) generateTests() error { } defer g.close() - module := ModuleName + strings.ReplaceAll(ModuleCwd[len(ModulePath):], "\\", "/") - g.println("package test") - g.println() - g.println("import (") - g.println("\t\"testing\"") - g.println() - g.printf("\t\"%s/go/%s\"\n", module, g.s.Name) - g.println("\t\"github.com/iotaledger/wasp/packages/vm/wasmsolo\"") - g.println("\t\"github.com/stretchr/testify/require\"") - g.println(")") - g.println() - g.println("func TestDeploy(t *testing.T) {") - g.printf("\tctx := wasmsolo.NewSoloContext(t, %s.ScName, %s.OnLoad)\n", name, name) - g.printf("\trequire.NoError(t, ctx.ContractExists(%s.ScName))\n", name) - g.println("}") - + g.emit("test.go") return nil } @@ -299,10 +285,6 @@ func (g *GenBase) open(path string) (err error) { return err } -func (g *GenBase) printf(format string, a ...interface{}) { - _, _ = fmt.Fprintf(g.file, format, a...) -} - func (g *GenBase) println(a ...interface{}) { _, _ = fmt.Fprintln(g.file, a...) } diff --git a/tools/schema/generator/generator_go.go b/tools/schema/generator/generator_go.go index cb6dae1e99..328ef76c12 100644 --- a/tools/schema/generator/generator_go.go +++ b/tools/schema/generator/generator_go.go @@ -77,15 +77,7 @@ func (g *GoGenerator) generateLanguageSpecificFiles() error { if g.s.CoreContracts { return nil } - return g.createSourceFile("../main", g.writeSpecialMain) -} - -func (g *GoGenerator) writeInitialFuncs() { - g.emit("funcs.go") -} - -func (g *GoGenerator) writeSpecialMain() { - g.emit("main.go") + return g.createSourceFile("../main") } func (g *GoGenerator) setFieldKeys() { diff --git a/tools/schema/generator/generator_rust.go b/tools/schema/generator/generator_rust.go index 6598a77f31..56a1cc9f4e 100644 --- a/tools/schema/generator/generator_rust.go +++ b/tools/schema/generator/generator_rust.go @@ -91,14 +91,7 @@ func (g *RustGenerator) generateLanguageSpecificFiles() error { if g.s.CoreContracts { return g.createSourceFile("mod") } - return g.writeSpecialCargoToml() -} - -func (g *RustGenerator) writeInitialFuncs() { - g.emit("funcs.rs") -} -func (g *RustGenerator) writeSpecialCargoToml() error { cargoToml := "Cargo.toml" err := g.exists(cargoToml) if err == nil { diff --git a/tools/schema/generator/generator_ts.go b/tools/schema/generator/generator_ts.go index d47fbb96a3..2996ffe194 100644 --- a/tools/schema/generator/generator_ts.go +++ b/tools/schema/generator/generator_ts.go @@ -88,20 +88,13 @@ func (g *TypeScriptGenerator) funcName(f *Func) string { } func (g *TypeScriptGenerator) generateLanguageSpecificFiles() error { - err := g.createSourceFile("index", g.writeSpecialIndex) + err := g.createSourceFile("index") if err != nil { return err } - return g.writeSpecialConfigJSON() -} - -func (g *TypeScriptGenerator) writeInitialFuncs() { - g.emit("funcs.ts") -} -func (g *TypeScriptGenerator) writeSpecialConfigJSON() error { tsconfig := "tsconfig.json" - err := g.exists(g.folder + tsconfig) + err = g.exists(g.folder + tsconfig) if err == nil { // already exists return nil @@ -117,10 +110,6 @@ func (g *TypeScriptGenerator) writeSpecialConfigJSON() error { return nil } -func (g *TypeScriptGenerator) writeSpecialIndex() { - g.emit("index.ts") -} - func (g *TypeScriptGenerator) setFieldKeys() { g.GenBase.setFieldKeys() diff --git a/tools/schema/generator/gotemplates/funcs.go b/tools/schema/generator/gotemplates/funcs.go index 59b795cc0d..e235163ff6 100644 --- a/tools/schema/generator/gotemplates/funcs.go +++ b/tools/schema/generator/gotemplates/funcs.go @@ -10,7 +10,7 @@ $#each func funcSignature "funcSignature": ` func $kind$FuncName(ctx wasmlib.Sc$Kind$+Context, f *$FuncName$+Context) { -$#emit init$FuncName +$#emit init$Kind$FuncName } `, // ******************************* @@ -22,11 +22,11 @@ $#emit init$FuncName f.State.Owner().SetValue(ctx.ContractCreator()) `, // ******************************* - "intGetOwner": ` - f.Results.Owner().SetValue(f.State.Owner().Value()) + "initFuncSetOwner": ` + f.State.Owner().SetValue(f.Params.Owner().Value()) `, // ******************************* - "initSetOwner": ` - f.State.Owner().SetValue(f.Params.Owner().Value()) + "initViewGetOwner": ` + f.Results.Owner().SetValue(f.State.Owner().Value()) `, } diff --git a/tools/schema/generator/gotemplates/main.go b/tools/schema/generator/gotemplates/main.go index 20ffc7b321..e03d43c541 100644 --- a/tools/schema/generator/gotemplates/main.go +++ b/tools/schema/generator/gotemplates/main.go @@ -2,7 +2,7 @@ package gotemplates var mainGo = map[string]string{ // ******************************* - "main.go": ` + "../main.go": ` // +build wasm package main diff --git a/tools/schema/generator/rstemplates/consts.go b/tools/schema/generator/rstemplates/consts.go index f7b12f5d0e..fa605534aa 100644 --- a/tools/schema/generator/rstemplates/consts.go +++ b/tools/schema/generator/rstemplates/consts.go @@ -3,8 +3,6 @@ package rstemplates var constsRs = map[string]string{ // ******************************* "consts.rs": ` -// @formatter:off - #![allow(dead_code)] $#if core useCrate useWasmLib @@ -19,8 +17,6 @@ $#if state constState $#each func constFunc $#each func constHFunc - -// @formatter:on `, // ******************************* "constParams": ` diff --git a/tools/schema/generator/rstemplates/contract.go b/tools/schema/generator/rstemplates/contract.go index 7ed34e0508..5b3f38a13f 100644 --- a/tools/schema/generator/rstemplates/contract.go +++ b/tools/schema/generator/rstemplates/contract.go @@ -3,8 +3,6 @@ package rstemplates var contractRs = map[string]string{ // ******************************* "contract.rs": ` -// @formatter:off - #![allow(dead_code)] use std::ptr; @@ -19,8 +17,6 @@ pub struct ScFuncs { impl ScFuncs { $#each func FuncNameForCall } - -// @formatter:on `, // ******************************* "contractUses": ` diff --git a/tools/schema/generator/rstemplates/funcs.go b/tools/schema/generator/rstemplates/funcs.go index 3d095489fd..0ea4fb2983 100644 --- a/tools/schema/generator/rstemplates/funcs.go +++ b/tools/schema/generator/rstemplates/funcs.go @@ -14,7 +14,7 @@ $#each func funcSignature "funcSignature": ` pub fn $kind$+_$func_name(ctx: &Sc$Kind$+Context, f: &$FuncName$+Context) { -$#emit init$FuncName +$#emit init$Kind$FuncName } `, // ******************************* @@ -26,11 +26,11 @@ $#emit init$FuncName f.state.owner().set_value(&ctx.contract_creator()); `, // ******************************* - "initGetOwner": ` - f.results.owner().set_value(&f.state.owner().value()); + "initFuncSetOwner": ` + f.state.owner().set_value(&f.params.owner().value()); `, // ******************************* - "initSetOwner": ` - f.state.owner().set_value(&f.params.owner().value()); + "initViewGetOwner": ` + f.results.owner().set_value(&f.state.owner().value()); `, } diff --git a/tools/schema/generator/rstemplates/keys.go b/tools/schema/generator/rstemplates/keys.go index 367e64cfc1..581be4ff9f 100644 --- a/tools/schema/generator/rstemplates/keys.go +++ b/tools/schema/generator/rstemplates/keys.go @@ -3,8 +3,6 @@ package rstemplates var keysRs = map[string]string{ // ******************************* "keys.rs": ` -// @formatter:off - #![allow(dead_code)] use wasmlib::*; @@ -36,8 +34,6 @@ pub fn idx_map(idx: usize) -> Key32 { IDX_MAP[idx] } } - -// @formatter:on `, // ******************************* "constFieldIdx": ` diff --git a/tools/schema/generator/rstemplates/lib.go b/tools/schema/generator/rstemplates/lib.go index c13f3a67c4..e3dcc72d03 100644 --- a/tools/schema/generator/rstemplates/lib.go +++ b/tools/schema/generator/rstemplates/lib.go @@ -3,8 +3,6 @@ package rstemplates var libRs = map[string]string{ // ******************************* "lib.rs": ` -// @formatter:off - #![allow(dead_code)] #![allow(unused_imports)] @@ -40,8 +38,6 @@ $#each func libExportFunc } } $#each func libThunk - -// @formatter:on `, // ******************************* "libExportFunc": ` diff --git a/tools/schema/generator/rstemplates/structs.go b/tools/schema/generator/rstemplates/structs.go index b9a983013f..7d78aaec6a 100644 --- a/tools/schema/generator/rstemplates/structs.go +++ b/tools/schema/generator/rstemplates/structs.go @@ -3,15 +3,11 @@ package rstemplates var structsRs = map[string]string{ // ******************************* "structs.rs": ` -// @formatter:off - #![allow(dead_code)] use wasmlib::*; use wasmlib::host::*; $#each structs structType - -// @formatter:on `, // ******************************* "structType": ` diff --git a/tools/schema/generator/rstemplates/typedefs.go b/tools/schema/generator/rstemplates/typedefs.go index 824558ecbe..63c81c7a12 100644 --- a/tools/schema/generator/rstemplates/typedefs.go +++ b/tools/schema/generator/rstemplates/typedefs.go @@ -3,16 +3,12 @@ package rstemplates var typedefsRs = map[string]string{ // ******************************* "typedefs.rs": ` -// @formatter:off - #![allow(dead_code)] use wasmlib::*; use wasmlib::host::*; $#if structs useStructs $#each typedef typedefProxy - -// @formatter:on `, // ******************************* "typedefProxy": ` diff --git a/tools/schema/generator/templates.go b/tools/schema/generator/templates.go index db1c7d4829..9225b5eb6c 100644 --- a/tools/schema/generator/templates.go +++ b/tools/schema/generator/templates.go @@ -12,13 +12,31 @@ var commonTemplates = map[string]string{ $#emit initGlobals // Copyright 2020 IOTA Stiftung // SPDX-License-Identifier: Apache-2.0 + `, // ******************************* "warning": ` - // (Re-)generated by schema tool // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead +`, + // ******************************* + "test.go": ` +$#emit copyright +package test + +import ( + "testing" + + "$module/go/$package" + "github.com/iotaledger/wasp/packages/vm/wasmsolo" + "github.com/stretchr/testify/require" +) + +func TestDeploy(t *testing.T) { + ctx := wasmsolo.NewSoloContext(t, $package.ScName, $package.OnLoad) + require.NoError(t, ctx.ContractExists($package.ScName)) +} `, } diff --git a/tools/schema/generator/tstemplates/alltemplates.go b/tools/schema/generator/tstemplates/alltemplates.go index a060298c3a..99696e5e41 100644 --- a/tools/schema/generator/tstemplates/alltemplates.go +++ b/tools/schema/generator/tstemplates/alltemplates.go @@ -33,11 +33,17 @@ import * as wasmlib from "wasmlib"; // ******************************* "importSc": ` import * as sc from "./index"; +`, + // ******************************* + "tsImports": ` +$#emit importWasmLib +$#emit importSc `, // ******************************* "tsconfig.json": ` { "extends": "assemblyscript/std/assembly.json", "include": ["./*.ts"] -}`, +} +`, } diff --git a/tools/schema/generator/tstemplates/contract.go b/tools/schema/generator/tstemplates/contract.go index 4bc7d553ec..2c69588d51 100644 --- a/tools/schema/generator/tstemplates/contract.go +++ b/tools/schema/generator/tstemplates/contract.go @@ -3,8 +3,7 @@ package tstemplates var contractTs = map[string]string{ // ******************************* "contract.ts": ` -$#emit importWasmLib -$#emit importSc +$#emit tsImports $#each func FuncNameCall export class ScFuncs { diff --git a/tools/schema/generator/tstemplates/funcs.go b/tools/schema/generator/tstemplates/funcs.go index 1e73ca3490..271f248056 100644 --- a/tools/schema/generator/tstemplates/funcs.go +++ b/tools/schema/generator/tstemplates/funcs.go @@ -3,31 +3,30 @@ package tstemplates var funcsTs = map[string]string{ // ******************************* "funcs.ts": ` -$#emit importWasmLib -$#emit importSc +$#emit tsImports $#each func funcSignature `, // ******************************* "funcSignature": ` export function $kind$+$FuncName(ctx: wasmlib.Sc$Kind$+Context, f: sc.$FuncName$+Context): void { -$#emit init$FuncName +$#emit init$Kind$FuncName } `, // ******************************* "initFuncInit": ` - if f.params.owner().exists() { - f.state.owner().setValue(&f.params.owner().value()); + if (f.params.owner().exists()) { + f.state.owner().setValue(f.params.owner().value()); return; } f.state.owner().setValue(ctx.contractCreator()); `, // ******************************* - "initGetOwner": ` - f.results.owner().setValue(f.state.owner().value()); + "initFuncSetOwner": ` + f.state.owner().setValue(f.params.owner().value()); `, // ******************************* - "initSetOwner": ` - f.state.owner().setValue(f.params.owner().value()); + "initViewGetOwner": ` + f.results.owner().setValue(f.state.owner().value()); `, } diff --git a/tools/schema/generator/tstemplates/keys.go b/tools/schema/generator/tstemplates/keys.go index 88b0b7dd8c..6111ffccb7 100644 --- a/tools/schema/generator/tstemplates/keys.go +++ b/tools/schema/generator/tstemplates/keys.go @@ -3,8 +3,7 @@ package tstemplates var keysTs = map[string]string{ // ******************************* "keys.ts": ` -$#emit importWasmLib -$#emit importSc +$#emit tsImports $#set constPrefix Param $#each params constFieldIdx diff --git a/tools/schema/generator/tstemplates/lib.go b/tools/schema/generator/tstemplates/lib.go index 97eafbb785..a4fe5d3e97 100644 --- a/tools/schema/generator/tstemplates/lib.go +++ b/tools/schema/generator/tstemplates/lib.go @@ -3,8 +3,7 @@ package tstemplates var libTs = map[string]string{ // ******************************* "lib.ts": ` -$#emit importWasmLib -$#emit importSc +$#emit tsImports export function on_call(index: i32): void { return wasmlib.onCall(index); diff --git a/tools/schema/generator/tstemplates/params.go b/tools/schema/generator/tstemplates/params.go index b823b5bc23..2230957701 100644 --- a/tools/schema/generator/tstemplates/params.go +++ b/tools/schema/generator/tstemplates/params.go @@ -3,8 +3,7 @@ package tstemplates var paramsTs = map[string]string{ // ******************************* "params.ts": ` -$#emit importWasmLib -$#emit importSc +$#emit tsImports $#each func paramsFunc `, // ******************************* diff --git a/tools/schema/generator/tstemplates/results.go b/tools/schema/generator/tstemplates/results.go index f12517282f..33290f8e28 100644 --- a/tools/schema/generator/tstemplates/results.go +++ b/tools/schema/generator/tstemplates/results.go @@ -3,8 +3,7 @@ package tstemplates var resultsTs = map[string]string{ // ******************************* "results.ts": ` -$#emit importWasmLib -$#emit importSc +$#emit tsImports $#each func resultsFunc `, // ******************************* diff --git a/tools/schema/generator/tstemplates/state.go b/tools/schema/generator/tstemplates/state.go index 501d4c9cdd..497057b605 100644 --- a/tools/schema/generator/tstemplates/state.go +++ b/tools/schema/generator/tstemplates/state.go @@ -3,8 +3,7 @@ package tstemplates var stateTs = map[string]string{ // ******************************* "state.ts": ` -$#emit importWasmLib -$#emit importSc +$#emit tsImports $#set Kind State $#set mut Immutable $#emit stateProxyStruct diff --git a/tools/schema/generator/tstemplates/typedefs.go b/tools/schema/generator/tstemplates/typedefs.go index 3271ab5f60..84a1f5a972 100644 --- a/tools/schema/generator/tstemplates/typedefs.go +++ b/tools/schema/generator/tstemplates/typedefs.go @@ -3,8 +3,7 @@ package tstemplates var typedefsTs = map[string]string{ // ******************************* "typedefs.ts": ` -$#emit importWasmLib -$#emit importSc +$#emit tsImports $#each typedef typedefProxy `, // ******************************* From 45a9321ef1e481be6aa88aac150e7f52c3a7903e Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Sun, 7 Nov 2021 10:38:51 -0800 Subject: [PATCH 038/198] Even more cleanup --- tools/schema/generator/emitter.go | 10 +- tools/schema/generator/generator.go | 38 +- tools/schema/generator/generator_go.go | 26 +- tools/schema/generator/generator_java.go | 439 ------------------ tools/schema/generator/generator_rust.go | 21 +- tools/schema/generator/generator_ts.go | 28 +- .../schema/generator/gotemplates/contract.go | 2 + tools/schema/generator/gotemplates/proxy.go | 10 +- tools/schema/generator/gotemplates/structs.go | 2 +- .../schema/generator/gotemplates/typedefs.go | 20 +- .../schema/generator/rstemplates/contract.go | 2 + tools/schema/generator/rstemplates/proxy.go | 10 +- tools/schema/generator/rstemplates/structs.go | 2 +- .../schema/generator/rstemplates/typedefs.go | 14 +- tools/schema/generator/schema.go | 43 +- tools/schema/generator/templates.go | 11 + .../schema/generator/tstemplates/contract.go | 2 + tools/schema/generator/tstemplates/proxy.go | 10 +- tools/schema/generator/tstemplates/structs.go | 2 +- .../schema/generator/tstemplates/typedefs.go | 20 +- tools/schema/generator/utils.go | 72 +-- 21 files changed, 140 insertions(+), 644 deletions(-) delete mode 100644 tools/schema/generator/generator_java.go diff --git a/tools/schema/generator/emitter.go b/tools/schema/generator/emitter.go index 898b3ed5ec..504655558a 100644 --- a/tools/schema/generator/emitter.go +++ b/tools/schema/generator/emitter.go @@ -10,10 +10,11 @@ const ( KeyBaseType = "basetype" KeyCore = "core" KeyExist = "exist" - KeyMap = "map" - KeyMut = "mut" KeyFunc = "func" + KeyInit = "init" KeyMandatory = "mandatory" + KeyMap = "map" + KeyMut = "mut" KeyParam = "param" KeyParams = "params" KeyProxy = "proxy" @@ -126,9 +127,6 @@ func (g *GenBase) emitEach(key string) { func (g *GenBase) emitFields(fields []*Field, template string) { for _, g.currentField = range fields { - //if g.currentField.Alias == KeyThis { - // continue - //} g.gen.setFieldKeys() g.emit(template) } @@ -169,6 +167,8 @@ func (g *GenBase) emitIf(key string) { case KeyExist: proxy := g.keys[KeyProxy] condition = g.newTypes[proxy] + case KeyInit: + condition = g.currentFunc.Name == KeyInit case KeyMap: condition = g.currentField.MapKey != "" case KeyMut: diff --git a/tools/schema/generator/generator.go b/tools/schema/generator/generator.go index c6856b69b9..f58f09a7a3 100644 --- a/tools/schema/generator/generator.go +++ b/tools/schema/generator/generator.go @@ -17,21 +17,6 @@ import ( // TODO nested structs // TODO handle case where owner is type AgentID[] -const ( - AccessChain = "chain" - AccessCreator = "creator" - AccessSelf = "self" - InitFunc = "Init" - KindFunc = "Func" - KindView = "View" -) - -var ( - ModuleCwd = "???" - ModuleName = "???" - ModulePath = "???" -) - type Generator interface { init(s *Schema) funcName(f *Func) string @@ -102,7 +87,6 @@ func (g *GenBase) createSourceFile(name string, generator ...func()) error { g.emit("warning") } g.skipWarning = false - g.s.KeyID = 0 if len(generator) != 0 { generator[0]() return nil @@ -116,12 +100,16 @@ func (g *GenBase) exists(path string) (err error) { return err } +func (g *GenBase) funcName(f *Func) string { + return f.Kind + capitalize(f.Name) +} + func (g *GenBase) Generate(s *Schema) error { g.gen.init(s) g.folder = g.rootFolder + "/" if g.rootFolder != "src" { - module := strings.ReplaceAll(ModuleCwd, "\\", "/") + module := strings.ReplaceAll(moduleCwd, "\\", "/") module = module[strings.LastIndex(module, "/")+1:] g.folder += module + "/" } @@ -313,7 +301,7 @@ func (g *GenBase) setCommonKeys() { g.keys["space"] = " " g.keys["package"] = g.s.Name g.keys["Package"] = g.s.FullName - g.keys["module"] = ModuleName + strings.Replace(ModuleCwd[len(ModulePath):], "\\", "/", -1) + g.keys["module"] = moduleName + strings.Replace(moduleCwd[len(modulePath):], "\\", "/", -1) scName := g.s.Name if g.s.CoreContracts { // strip off "core" prefix @@ -322,6 +310,7 @@ func (g *GenBase) setCommonKeys() { g.keys["scName"] = scName g.keys["hscName"] = iscp.Hn(scName).String() g.keys["scDesc"] = g.s.Description + g.keys["maxIndex"] = strconv.Itoa(g.s.KeyID) } func (g *GenBase) setFieldKeys() { @@ -329,17 +318,14 @@ func (g *GenBase) setFieldKeys() { g.setMultiKeyValues("fldType", g.currentField.Type) g.keys["fldAlias"] = g.currentField.Alias - g.keys["FldComment"] = g.currentField.Comment - g.keys["FldMapKey"] = g.currentField.MapKey - - g.keys["fldIndex"] = strconv.Itoa(g.s.KeyID) - g.s.KeyID++ - g.keys["maxIndex"] = strconv.Itoa(g.s.KeyID) + g.keys["fldComment"] = g.currentField.Comment + g.keys["fldMapKey"] = g.currentField.MapKey + g.keys["fldIndex"] = strconv.Itoa(g.currentField.KeyID) } func (g *GenBase) setFuncKeys() { - g.setMultiKeyValues("funcName", g.currentFunc.FuncName[4:]) - g.setMultiKeyValues("kind", g.currentFunc.FuncName[:4]) + g.setMultiKeyValues("funcName", g.currentFunc.Name) + g.setMultiKeyValues("kind", g.currentFunc.Kind) g.keys["funcHName"] = iscp.Hn(g.keys["funcName"]).String() grant := g.currentFunc.Access comment := "" diff --git a/tools/schema/generator/generator_go.go b/tools/schema/generator/generator_go.go index 328ef76c12..40c398b25d 100644 --- a/tools/schema/generator/generator_go.go +++ b/tools/schema/generator/generator_go.go @@ -69,10 +69,6 @@ func (g *GoGenerator) init(s *Schema) { g.GenBase.init(s, gotemplates.GoTemplates) } -func (g *GoGenerator) funcName(f *Func) string { - return f.FuncName -} - func (g *GoGenerator) generateLanguageSpecificFiles() error { if g.s.CoreContracts { return nil @@ -87,22 +83,8 @@ func (g *GoGenerator) setFieldKeys() { if fldTypeID == "" { fldTypeID = "wasmlib.TYPE_BYTES" } - g.keys["FldTypeID"] = fldTypeID - g.keys["FldTypeKey"] = goKeys[g.currentField.Type] - g.keys["FldLangType"] = goTypes[g.currentField.Type] - g.keys["FldMapKeyLangType"] = goTypes[g.currentField.MapKey] - g.keys["FldMapKeyKey"] = goKeys[g.currentField.MapKey] -} - -func (g *GoGenerator) setFuncKeys() { - g.GenBase.setFuncKeys() - - initFunc := "" - initMap := "" - if g.currentFunc.Type == InitFunc { - initFunc = InitFunc - initMap = ", keyMap[:], idxMap[:]" - } - g.keys["initFunc"] = initFunc - g.keys["initMap"] = initMap + g.keys["fldTypeID"] = fldTypeID + g.keys["fldLangType"] = goTypes[g.currentField.Type] + g.keys["fldMapKeyLangType"] = goTypes[g.currentField.MapKey] + g.keys["fldMapKeyKey"] = goKeys[g.currentField.MapKey] } diff --git a/tools/schema/generator/generator_java.go b/tools/schema/generator/generator_java.go deleted file mode 100644 index 139dab062c..0000000000 --- a/tools/schema/generator/generator_java.go +++ /dev/null @@ -1,439 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -package generator - -import ( - "bufio" - "fmt" - "os" - "regexp" - "strings" - - "github.com/iotaledger/wasp/packages/iscp" -) - -var javaFuncRegexp = regexp.MustCompile(`public static void (\w+).+$`) - -var javaTypes = StringMap{ - "Address": "ScAddress", - "AgentID": "ScAgentID", - "ChainID": "ScChainID", - "Color": "ScColor", - "Hash": "ScHash", - "Hname": "Hname", - "Int16": "short", - "Int32": "int", - "Int64": "long", - "RequestID": "ScRequestID", - "String": "String", -} - -func (s *Schema) GenerateJava() error { - currentPath, err := os.Getwd() - if err != nil { - return err - } - javaPath := "../../java/src/org/iota/wasp/contracts/" + s.Name - err = os.MkdirAll(javaPath, 0o755) - if err != nil { - return err - } - err = os.Chdir(javaPath) - if err != nil { - return err - } - defer func() { - _ = os.Chdir(currentPath) - }() - - err = os.MkdirAll("test", 0o755) - if err != nil { - return err - } - // err = os.MkdirAll("wasmmain", 0755) - // if err != nil { - // return err - // } - - // err = s.GenerateJavaWasmMain() - // if err != nil { - // return err - // } - err = s.GenerateJavaLib() - if err != nil { - return err - } - err = s.GenerateJavaConsts() - if err != nil { - return err - } - err = s.GenerateJavaTypes() - if err != nil { - return err - } - // err = s.GenerateJavaFuncs() - // if err != nil { - // return err - // } - return nil -} - -func (s *Schema) GenerateJavaFunc(file *os.File, f *Func) error { - funcName := f.FuncName - funcKind := capitalize(f.FuncName[:4]) - fmt.Fprintf(file, "\npublic static void %s(Sc%sContext ctx, %sParams params) {\n", funcName, funcKind, capitalize(funcName)) - fmt.Fprintf(file, "}\n") - return nil -} - -func (s *Schema) GenerateJavaFuncs() error { - scFileName := s.Name + ".java" - file, err := os.Open(scFileName) - if err != nil { - return s.GenerateJavaFuncsNew(scFileName) - } - lines, existing, err := s.GenerateJavaFuncScanner(file) - if err != nil { - return err - } - - // save old one from overwrite - scOriginal := s.Name + ".bak" - err = os.Rename(scFileName, scOriginal) - if err != nil { - return err - } - file, err = os.Create(scFileName) - if err != nil { - return err - } - defer file.Close() - - // make copy of file - for _, line := range lines { - fmt.Fprintln(file, line) - } - - // append any new funcs - for _, f := range s.Funcs { - if existing[f.FuncName] == "" { - err = s.GenerateJavaFunc(file, f) - if err != nil { - return err - } - } - } - - return os.Remove(scOriginal) -} - -func (s *Schema) GenerateJavaFuncScanner(file *os.File) ([]string, StringMap, error) { - defer file.Close() - existing := make(StringMap) - lines := make([]string, 0) - scanner := bufio.NewScanner(file) - for scanner.Scan() { - line := scanner.Text() - matches := javaFuncRegexp.FindStringSubmatch(line) - if matches != nil { - existing[matches[1]] = line - } - lines = append(lines, line) - } - err := scanner.Err() - if err != nil { - return nil, nil, err - } - return lines, existing, nil -} - -func (s *Schema) GenerateJavaFuncsNew(scFileName string) error { - file, err := os.Create(scFileName) - if err != nil { - return err - } - defer file.Close() - - // write file header - // fmt.Fprintln(file, copyright(false)) - fmt.Fprintf(file, "package org.iota.wasp.contracts.%s;\n\n", s.Name) - fmt.Fprintf(file, "import org.iota.wasp.contracts.%s.lib.*;\n", s.Name) - fmt.Fprintf(file, "import org.iota.wasp.wasmlib.context.*;\n") - fmt.Fprintf(file, "import org.iota.wasp.wasmlib.hashtypes.*;\n") - fmt.Fprintf(file, "import org.iota.wasp.wasmlib.immutable.*;\n") - fmt.Fprintf(file, "import org.iota.wasp.wasmlib.mutable.*;\n\n") - - fmt.Fprintf(file, "public class %s {\n", s.FullName) - for _, f := range s.Funcs { - err = s.GenerateJavaFunc(file, f) - if err != nil { - return err - } - } - fmt.Fprintf(file, "}\n") - return nil -} - -func (s *Schema) GenerateJavaLib() error { - err := os.MkdirAll("lib", 0o755) - if err != nil { - return err - } - file, err := os.Create("lib/" + s.FullName + "Thunk.java") - if err != nil { - return err - } - defer file.Close() - - // write file header - // fmt.Fprintln(file, copyright(true)) - fmt.Fprintf(file, "package org.iota.wasp.contracts.%s.lib;\n\n", s.Name) - fmt.Fprintf(file, "import de.mirkosertic.bytecoder.api.*;\n") - fmt.Fprintf(file, "import org.iota.wasp.contracts.%s.*;\n", s.Name) - fmt.Fprintf(file, "import org.iota.wasp.wasmlib.context.*;\n") - fmt.Fprintf(file, "import org.iota.wasp.wasmlib.exports.*;\n") - fmt.Fprintf(file, "import org.iota.wasp.wasmlib.immutable.*;\n") - fmt.Fprintf(file, "import org.iota.wasp.wasmlib.keys.*;\n\n") - - fmt.Fprintf(file, "public class %sThunk {\n", s.FullName) - fmt.Fprintf(file, " public static void main(String[] args) {\n") - fmt.Fprintf(file, " }\n\n") - - fmt.Fprintf(file, " @Export(\"on_load\")\n") - fmt.Fprintf(file, " public static void onLoad() {\n") - fmt.Fprintf(file, " ScExports exports = new ScExports();\n") - for _, f := range s.Funcs { - name := capitalize(f.FuncName) - kind := capitalize(f.FuncName[:4]) - fmt.Fprintf(file, " exports.Add%s(Consts.%s, %sThunk::%sThunk);\n", kind, name, s.FullName, f.FuncName) - } - fmt.Fprintf(file, " }\n") - - // generate parameter structs and thunks to set up and check parameters - for _, f := range s.Funcs { - name := capitalize(f.FuncName) - params, err := os.Create("lib/" + name + "Params.java") - if err != nil { - return err - } - defer params.Close() - s.GenerateJavaThunk(file, params, f) - } - - fmt.Fprintf(file, "}\n") - return nil -} - -func (s *Schema) GenerateJavaConsts() error { - file, err := os.Create("lib/Consts.java") - if err != nil { - return err - } - defer file.Close() - - // write file header - // fmt.Fprintln(file, copyright(true)) - fmt.Fprintf(file, "package org.iota.wasp.contracts.%s.lib;\n\n", s.Name) - fmt.Fprintf(file, "import org.iota.wasp.wasmlib.hashtypes.*;\n") - fmt.Fprintf(file, "import org.iota.wasp.wasmlib.keys.*;\n") - fmt.Fprintf(file, "\npublic class Consts {\n") - - fmt.Fprintf(file, " public static final String ScName = \"%s\";\n", s.Name) - if s.Description != "" { - fmt.Fprintf(file, " public static final String ScDescription = \"%s\";\n", s.Description) - } - hName := iscp.Hn(s.Name) - fmt.Fprintf(file, " public static final ScHname HScName = new ScHname(0x%s);\n", hName.String()) - - if len(s.Params) != 0 { - fmt.Fprintln(file) - for _, param := range s.Params { - name := capitalize(param.Name) - fmt.Fprintf(file, " public static final Key Param%s = new Key(\"%s\");\n", name, param.Alias) - } - } - - if len(s.StateVars) != 0 { - fmt.Fprintln(file) - for _, field := range s.StateVars { - name := capitalize(field.Name) - fmt.Fprintf(file, " public static final Key Var%s = new Key(\"%s\");\n", name, field.Alias) - } - } - - if len(s.Funcs) != 0 { - fmt.Fprintln(file) - for _, f := range s.Funcs { - name := capitalize(f.FuncName) - fmt.Fprintf(file, " public static final String %s = \"%s\";\n", name, f.String) - } - - fmt.Fprintln(file) - for _, f := range s.Funcs { - name := capitalize(f.FuncName) - fmt.Fprintf(file, " public static final ScHname H%s = new ScHname(0x%s);\n", name, f.Hname.String()) - } - } - - fmt.Fprintf(file, "}\n") - return nil -} - -func (s *Schema) GenerateJavaThunk(file, params *os.File, f *Func) { - // calculate padding - nameLen, typeLen := calculatePadding(f.Params, javaTypes, false) - - funcName := capitalize(f.FuncName) - funcKind := capitalize(f.FuncName[:4]) - - // fmt.Fprintln(params, copyright(true)) - fmt.Fprintf(params, "package org.iota.wasp.contracts.%s.lib;\n", s.Name) - if len(f.Params) != 0 { - fmt.Fprintf(params, "\nimport org.iota.wasp.wasmlib.immutable.*;\n") - } - if len(f.Params) > 1 { - fmt.Fprintf(params, "\n// @formatter:off") - } - fmt.Fprintf(params, "\npublic class %sParams {\n", funcName) - for _, param := range f.Params { - fldName := capitalize(param.Name) + ";" - if param.Comment != "" { - fldName = pad(fldName, nameLen+1) - } - fldType := pad(param.Type, typeLen) - fmt.Fprintf(params, " public ScImmutable%s %s%s\n", fldType, fldName, param.Comment) - } - fmt.Fprintf(params, "}\n") - if len(f.Params) > 1 { - fmt.Fprintf(params, "// @formatter:on\n") - } - - fmt.Fprintf(file, "\n private static void %sThunk(Sc%sContext ctx) {\n", f.FuncName, funcKind) - fmt.Fprintf(file, " ctx.Log(\"%s.%s\");\n", s.Name, f.FuncName) - - if f.Access != "" { - s.generateJavaThunkAccessCheck(file, f) - } - - if len(f.Params) != 0 { - fmt.Fprintf(file, " var p = ctx.Params();\n") - } - fmt.Fprintf(file, " var params = new %sParams();\n", funcName) - for _, param := range f.Params { - name := capitalize(param.Name) - fmt.Fprintf(file, " params.%s = p.Get%s(Consts.Param%s);\n", name, param.Type, name) - } - for _, param := range f.Params { - if !param.Optional { - name := capitalize(param.Name) - fmt.Fprintf(file, " ctx.Require(params.%s.Exists(), \"missing mandatory %s\");\n", name, param.Name) - } - } - fmt.Fprintf(file, " %s.%s(ctx, params);\n", s.FullName, f.FuncName) - fmt.Fprintf(file, " ctx.Log(\"%s.%s ok\");\n", s.Name, f.FuncName) - fmt.Fprintf(file, " }\n") -} - -func (s *Schema) generateJavaThunkAccessCheck(file *os.File, f *Func) { - grant := f.Access - index := strings.Index(grant, "//") - if index >= 0 { - fmt.Fprintf(file, " %s\n", grant[index:]) - grant = strings.TrimSpace(grant[:index]) - } - switch grant { - case AccessSelf: - grant = "ctx.AccountID()" - case AccessChain: - grant = "ctx.ChainOwnerID()" - case AccessCreator: - grant = "ctx.ContractCreator()" - default: - fmt.Fprintf(file, " var access = ctx.State().GetAgentID(new Key(\"%s\"));\n", grant) - fmt.Fprintf(file, " ctx.Require(access.Exists(), \"access not set: %s\");\n", grant) - grant = "access.Value()" - } - fmt.Fprintf(file, " ctx.Require(ctx.Caller().equals(%s), \"no permission\");\n\n", grant) -} - -func (s *Schema) GenerateJavaTypes() error { - if len(s.Structs) == 0 { - return nil - } - - err := os.MkdirAll("structs", 0o755) - if err != nil { - return err - } - - // write structs - for _, typeDef := range s.Structs { - err = s.GenerateJavaType(typeDef) - if err != nil { - return err - } - } - - return nil -} - -func (s *Schema) GenerateJavaType(td *Struct) error { - file, err := os.Create("structs/" + td.Name + ".java") - if err != nil { - return err - } - defer file.Close() - - // calculate padding - nameLen, typeLen := calculatePadding(td.Fields, javaTypes, false) - - // write file header - // fmt.Fprint(file, copyright(true)) - fmt.Fprintf(file, "\npackage org.iota.wasp.contracts.%s.structs;\n\n", s.Name) - fmt.Fprint(file, "import org.iota.wasp.wasmlib.bytes.*;\n") - fmt.Fprint(file, "import org.iota.wasp.wasmlib.hashtypes.*;\n\n") - - fmt.Fprintf(file, "public class %s {\n", td.Name) - - // write struct layout - if len(td.Fields) > 1 { - fmt.Fprint(file, " // @formatter:off\n") - } - for _, field := range td.Fields { - fldName := capitalize(field.Name) + ";" - fldType := pad(javaTypes[field.Type], typeLen) - if field.Comment != "" { - fldName = pad(fldName, nameLen+1) - } - fmt.Fprintf(file, " public %s %s%s\n", fldType, fldName, field.Comment) - } - if len(td.Fields) > 1 { - fmt.Fprint(file, " // @formatter:on\n") - } - - // write default constructor - fmt.Fprintf(file, "\n public %s() {\n }\n", td.Name) - - // write constructor from byte array - fmt.Fprintf(file, "\n public %s(byte[] bytes) {\n", td.Name) - fmt.Fprintf(file, " BytesDecoder decode = new BytesDecoder(bytes);\n") - for _, field := range td.Fields { - name := capitalize(field.Name) - fmt.Fprintf(file, " %s = decode.%s();\n", name, field.Type) - } - fmt.Fprintf(file, " decode.Close();\n") - fmt.Fprintf(file, " }\n") - - // write conversion to byte array - fmt.Fprintf(file, "\n public byte[] toBytes() {\n") - fmt.Fprintf(file, " return new BytesEncoder().\n") - for _, field := range td.Fields { - name := capitalize(field.Name) - fmt.Fprintf(file, " %s(%s).\n", field.Type, name) - } - fmt.Fprintf(file, " Data();\n }\n") - - fmt.Fprintf(file, "}\n") - return nil -} diff --git a/tools/schema/generator/generator_rust.go b/tools/schema/generator/generator_rust.go index 56a1cc9f4e..49a4beb72a 100644 --- a/tools/schema/generator/generator_rust.go +++ b/tools/schema/generator/generator_rust.go @@ -84,7 +84,7 @@ func (g *RustGenerator) init(s *Schema) { } func (g *RustGenerator) funcName(f *Func) string { - return snake(f.FuncName) + return snake(g.GenBase.funcName(f)) } func (g *RustGenerator) generateLanguageSpecificFiles() error { @@ -123,19 +123,8 @@ func (g *RustGenerator) setFieldKeys() { if fldTypeID == "" { fldTypeID = "TYPE_BYTES" } - g.keys["FldTypeID"] = fldTypeID - g.keys["FldTypeKey"] = rustKeys[field.Type] - g.keys["FldLangType"] = rustTypes[field.Type] - g.keys["FldMapKeyLangType"] = rustKeyTypes[field.MapKey] - g.keys["FldMapKeyKey"] = rustKeys[field.MapKey] -} - -func (g *RustGenerator) setFuncKeys() { - g.GenBase.setFuncKeys() - - initFunc := "" - if g.currentFunc.Type == InitFunc { - initFunc = InitFunc - } - g.keys["initFunc"] = initFunc + g.keys["fldTypeID"] = fldTypeID + g.keys["fldLangType"] = rustTypes[field.Type] + g.keys["fldMapKeyLangType"] = rustKeyTypes[field.MapKey] + g.keys["fldMapKeyKey"] = rustKeys[field.MapKey] } diff --git a/tools/schema/generator/generator_ts.go b/tools/schema/generator/generator_ts.go index 2996ffe194..5eb83272ce 100644 --- a/tools/schema/generator/generator_ts.go +++ b/tools/schema/generator/generator_ts.go @@ -83,10 +83,6 @@ func (g *TypeScriptGenerator) init(s *Schema) { g.GenBase.init(s, tstemplates.TsTemplates) } -func (g *TypeScriptGenerator) funcName(f *Func) string { - return f.FuncName -} - func (g *TypeScriptGenerator) generateLanguageSpecificFiles() error { err := g.createSourceFile("index") if err != nil { @@ -117,23 +113,9 @@ func (g *TypeScriptGenerator) setFieldKeys() { if fldTypeID == "" { fldTypeID = "wasmlib.TYPE_BYTES" } - g.keys["FldTypeID"] = fldTypeID - g.keys["FldTypeKey"] = tsKeys[g.currentField.Type] - g.keys["FldTypeInit"] = tsInits[g.currentField.Type] - g.keys["FldLangType"] = tsTypes[g.currentField.Type] - g.keys["FldMapKeyLangType"] = tsTypes[g.currentField.MapKey] - g.keys["FldMapKeyKey"] = tsKeys[g.currentField.MapKey] -} - -func (g *TypeScriptGenerator) setFuncKeys() { - g.GenBase.setFuncKeys() - - initFunc := "" - initMap := "" - if g.currentFunc.Type == InitFunc { - initFunc = InitFunc - initMap = ", keyMap[:], idxMap[:]" - } - g.keys["initFunc"] = initFunc - g.keys["initMap"] = initMap + g.keys["fldTypeID"] = fldTypeID + g.keys["fldTypeInit"] = tsInits[g.currentField.Type] + g.keys["fldLangType"] = tsTypes[g.currentField.Type] + g.keys["fldMapKeyLangType"] = tsTypes[g.currentField.MapKey] + g.keys["fldMapKeyKey"] = tsKeys[g.currentField.MapKey] } diff --git a/tools/schema/generator/gotemplates/contract.go b/tools/schema/generator/gotemplates/contract.go index 1140663144..773be9aeec 100644 --- a/tools/schema/generator/gotemplates/contract.go +++ b/tools/schema/generator/gotemplates/contract.go @@ -14,6 +14,7 @@ $#if core coreOnload `, // ******************************* "FuncNameCall": ` +$#emit setupInitFunc type $FuncName$+Call struct { Func *wasmlib.Sc$initFunc$Kind @@ -31,6 +32,7 @@ $#if result ImmutableFuncNameResults `, // ******************************* "FuncNameForCall": ` +$#emit setupInitFunc func (sc Funcs) $FuncName(ctx wasmlib.Sc$Kind$+CallContext) *$FuncName$+Call { $#set paramsID nil diff --git a/tools/schema/generator/gotemplates/proxy.go b/tools/schema/generator/gotemplates/proxy.go index b64b702dad..41a4461eb3 100644 --- a/tools/schema/generator/gotemplates/proxy.go +++ b/tools/schema/generator/gotemplates/proxy.go @@ -28,7 +28,7 @@ $#set varID $Kind$FldName.KeyID() "proxyArray": ` func (s $TypeName) $FldName() ArrayOf$mut$FldType { - arrID := wasmlib.GetObjectID(s.id, $varID, $arrayTypeID|$FldTypeID) + arrID := wasmlib.GetObjectID(s.id, $varID, $arrayTypeID|$fldTypeID) return ArrayOf$mut$FldType{objID: arrID} } `, @@ -39,16 +39,16 @@ $#if this proxyMapThis proxyMapOther // ******************************* "proxyMapThis": ` -func (s $TypeName) $FldName() Map$FldMapKey$+To$mut$FldType { - return Map$FldMapKey$+To$mut$FldType{objID: s.id} +func (s $TypeName) $FldName() Map$fldMapKey$+To$mut$FldType { + return Map$fldMapKey$+To$mut$FldType{objID: s.id} } `, // ******************************* "proxyMapOther": `55544444.0 -func (s $TypeName) $FldName() Map$FldMapKey$+To$mut$FldType { +func (s $TypeName) $FldName() Map$fldMapKey$+To$mut$FldType { mapID := wasmlib.GetObjectID(s.id, $varID, wasmlib.TYPE_MAP) - return Map$FldMapKey$+To$mut$FldType{objID: mapID} + return Map$fldMapKey$+To$mut$FldType{objID: mapID} } `, // ******************************* diff --git a/tools/schema/generator/gotemplates/structs.go b/tools/schema/generator/gotemplates/structs.go index 58af2c2c71..1d77a9f965 100644 --- a/tools/schema/generator/gotemplates/structs.go +++ b/tools/schema/generator/gotemplates/structs.go @@ -33,7 +33,7 @@ $#emit structMethods `, // ******************************* "structField": ` - $FldName $FldLangType $FldComment + $FldName $fldLangType $fldComment `, // ******************************* "structDecode": ` diff --git a/tools/schema/generator/gotemplates/typedefs.go b/tools/schema/generator/gotemplates/typedefs.go index 84d373342d..5ce1ff1ecc 100644 --- a/tools/schema/generator/gotemplates/typedefs.go +++ b/tools/schema/generator/gotemplates/typedefs.go @@ -81,7 +81,7 @@ func (a $proxy) Get$FldType(index int32) $mut$FldType { `, // ******************************* "typedefProxyMap": ` -$#set proxy Map$FldMapKey$+To$mut$FldType +$#set proxy Map$fldMapKey$+To$mut$FldType $#if exist else typedefProxyMapNew `, // ******************************* @@ -104,15 +104,15 @@ func (m $proxy) Clear() { // ******************************* "typedefProxyMapNewBaseType": ` -func (m $proxy) Get$FldType(key $FldMapKeyLangType) wasmlib.Sc$mut$FldType { - return wasmlib.NewSc$mut$FldType(m.objID, $FldMapKeyKey.KeyID()) +func (m $proxy) Get$FldType(key $fldMapKeyLangType) wasmlib.Sc$mut$FldType { + return wasmlib.NewSc$mut$FldType(m.objID, $fldMapKeyKey.KeyID()) } `, // ******************************* "typedefProxyMapNewOtherType": ` $#set OldType $FldType -$#set OldMapKeyLangType $FldMapKeyLangType -$#set OldMapKeyKey $FldMapKeyKey +$#set oldMapKeyLangType $fldMapKeyLangType +$#set oldMapKeyKey $fldMapKeyKey $#if typedef typedefProxyMapNewOtherTypeTypeDef typedefProxyMapNewOtherTypeStruct `, // ******************************* @@ -120,20 +120,20 @@ $#if typedef typedefProxyMapNewOtherTypeTypeDef typedefProxyMapNewOtherTypeStruc $#set varType wasmlib.TYPE_MAP $#if array setVarTypeArray -func (m $proxy) Get$OldType(key $OldMapKeyLangType) $mut$OldType { - subID := wasmlib.GetObjectID(m.objID, $OldMapKeyKey.KeyID(), $varType) +func (m $proxy) Get$OldType(key $oldMapKeyLangType) $mut$OldType { + subID := wasmlib.GetObjectID(m.objID, $oldMapKeyKey.KeyID(), $varType) return $mut$OldType{objID: subID} } `, // ******************************* "typedefProxyMapNewOtherTypeStruct": ` -func (m $proxy) Get$FldType(key $FldMapKeyLangType) $mut$FldType { - return $mut$FldType{objID: m.objID, keyID: $FldMapKeyKey.KeyID()} +func (m $proxy) Get$FldType(key $fldMapKeyLangType) $mut$FldType { + return $mut$FldType{objID: m.objID, keyID: $fldMapKeyKey.KeyID()} } `, // ******************************* "setVarTypeArray": ` -$#set varType $arrayTypeID|$FldTypeID +$#set varType $arrayTypeID|$fldTypeID `, } diff --git a/tools/schema/generator/rstemplates/contract.go b/tools/schema/generator/rstemplates/contract.go index 5b3f38a13f..74d1a00336 100644 --- a/tools/schema/generator/rstemplates/contract.go +++ b/tools/schema/generator/rstemplates/contract.go @@ -27,6 +27,7 @@ $#if results useResults `, // ******************************* "FuncNameCall": ` +$#emit setupInitFunc pub struct $FuncName$+Call { pub func: Sc$initFunc$Kind, @@ -44,6 +45,7 @@ $#if result ImmutableFuncNameResults `, // ******************************* "FuncNameForCall": ` +$#emit setupInitFunc pub fn $func_name(_ctx: & dyn Sc$Kind$+CallContext) -> $FuncName$+Call { $#set paramsID ptr::null_mut() $#set resultsID ptr::null_mut() diff --git a/tools/schema/generator/rstemplates/proxy.go b/tools/schema/generator/rstemplates/proxy.go index 42ba6d3777..0b4faac3fe 100644 --- a/tools/schema/generator/rstemplates/proxy.go +++ b/tools/schema/generator/rstemplates/proxy.go @@ -28,7 +28,7 @@ $#set varID $Kind$FLD_NAME.get_key_id() "proxyArray": ` pub fn $fld_name(&self) -> ArrayOf$mut$FldType { - let arr_id = get_object_id(self.id, $varID, $arrayTypeID | $FldTypeID); + let arr_id = get_object_id(self.id, $varID, $arrayTypeID | $fldTypeID); ArrayOf$mut$FldType { obj_id: arr_id } } `, @@ -39,16 +39,16 @@ $#if this proxyMapThis proxyMapOther // ******************************* "proxyMapThis": ` - pub fn $fld_name(&self) -> Map$FldMapKey$+To$mut$FldType { - Map$FldMapKey$+To$mut$FldType { obj_id: self.id } + pub fn $fld_name(&self) -> Map$fldMapKey$+To$mut$FldType { + Map$fldMapKey$+To$mut$FldType { obj_id: self.id } } `, // ******************************* "proxyMapOther": `55544444.0 - pub fn $fld_name(&self) -> Map$FldMapKey$+To$mut$FldType { + pub fn $fld_name(&self) -> Map$fldMapKey$+To$mut$FldType { let map_id = get_object_id(self.id, $varID, TYPE_MAP); - Map$FldMapKey$+To$mut$FldType { obj_id: map_id } + Map$fldMapKey$+To$mut$FldType { obj_id: map_id } } `, // ******************************* diff --git a/tools/schema/generator/rstemplates/structs.go b/tools/schema/generator/rstemplates/structs.go index 7d78aaec6a..4481988513 100644 --- a/tools/schema/generator/rstemplates/structs.go +++ b/tools/schema/generator/rstemplates/structs.go @@ -37,7 +37,7 @@ $#emit structMethods `, // ******************************* "structField": ` - pub $fld_name: $FldLangType, $FldComment + pub $fld_name: $fldLangType, $fldComment `, // ******************************* "structDecode": ` diff --git a/tools/schema/generator/rstemplates/typedefs.go b/tools/schema/generator/rstemplates/typedefs.go index 63c81c7a12..ff6881477e 100644 --- a/tools/schema/generator/rstemplates/typedefs.go +++ b/tools/schema/generator/rstemplates/typedefs.go @@ -86,7 +86,7 @@ $#if array setVarTypeArray `, // ******************************* "typedefProxyMap": ` -$#set proxy Map$FldMapKey$+To$mut$FldType +$#set proxy Map$fldMapKey$+To$mut$FldType $#if exist else typedefProxyMapNew `, // ******************************* @@ -111,7 +111,7 @@ $#set exist $proxy `, // ******************************* "typedefProxyMapNewBaseType": ` - pub fn get_$fld_type(&self, key: $FldMapKeyLangType) -> Sc$mut$FldType { + pub fn get_$fld_type(&self, key: $fldMapKeyLangType) -> Sc$mut$FldType { Sc$mut$FldType::new(self.obj_id, key.get_key_id()) } `, @@ -119,27 +119,27 @@ $#set exist $proxy "typedefProxyMapNewOtherType": ` $#set old_type $fld_type $#set OldType $FldType -$#set OldMapKeyLangType $FldMapKeyLangType -$#set OldMapKeyKey $FldMapKeyKey +$#set oldMapKeyLangType $fldMapKeyLangType +$#set oldMapKeyKey $fldMapKeyKey $#if typedef typedefProxyMapNewOtherTypeTypeDef typedefProxyMapNewOtherTypeStruct `, // ******************************* "typedefProxyMapNewOtherTypeTypeDef": ` $#set varType TYPE_MAP $#if array setVarTypeArray - pub fn get_$old_type(&self, key: $OldMapKeyLangType) -> $mut$OldType { + pub fn get_$old_type(&self, key: $oldMapKeyLangType) -> $mut$OldType { let sub_id = get_object_id(self.obj_id, key.get_key_id(), $varType); $mut$OldType { obj_id: sub_id } } `, // ******************************* "typedefProxyMapNewOtherTypeStruct": ` - pub fn get_$old_type(&self, key: $OldMapKeyLangType) -> $mut$OldType { + pub fn get_$old_type(&self, key: $oldMapKeyLangType) -> $mut$OldType { $mut$OldType { obj_id: self.obj_id, key_id: key.get_key_id() } } `, // ******************************* "setVarTypeArray": ` -$#set varType $arrayTypeID | $FldTypeID +$#set varType $arrayTypeID | $fldTypeID `, } diff --git a/tools/schema/generator/schema.go b/tools/schema/generator/schema.go index 9daa5ec2ef..2fad7250d7 100644 --- a/tools/schema/generator/schema.go +++ b/tools/schema/generator/schema.go @@ -37,14 +37,12 @@ type SchemaDef struct { } type Func struct { - Access string - Kind string - FuncName string - Hname iscp.Hname - String string - Params []*Field - Results []*Field - Type string + Name string + Access string + Kind string + Hname iscp.Hname + Params []*Field + Results []*Field } type Struct struct { @@ -101,11 +99,18 @@ func (s *Schema) Compile(schemaDef *SchemaDef) error { if err != nil { return err } + s.KeyID = 0 for _, name := range sortedFields(params) { - s.Params = append(s.Params, params[name]) + param := params[name] + param.KeyID = s.KeyID + s.KeyID++ + s.Params = append(s.Params, param) } for _, name := range sortedFields(results) { - s.Results = append(s.Results, results[name]) + result := results[name] + result.KeyID = s.KeyID + s.KeyID++ + s.Results = append(s.Results, result) } return s.compileStateVars(schemaDef) } @@ -120,10 +125,10 @@ func (s *Schema) compileField(fldName, fldType string) (*Field, error) { } func (s *Schema) compileFuncs(schemaDef *SchemaDef, params, results *FieldMap, views bool) (err error) { - kind := lower(KindFunc) + funcKind := "func" templateFuncs := schemaDef.Funcs if views { - kind = lower(KindView) + funcKind = "view" templateFuncs = schemaDef.Views } for _, funcName := range sortedFuncDescs(templateFuncs) { @@ -134,19 +139,19 @@ func (s *Schema) compileFuncs(schemaDef *SchemaDef, params, results *FieldMap, v if funcDesc == nil { funcDesc = &FuncDef{} } + f := &Func{} - f.String = funcName + f.Name = funcName + f.Kind = funcKind f.Hname = iscp.Hn(funcName) - // check for Hname collision + // check for Hname collision for _, other := range s.Funcs { if other.Hname == f.Hname { - return fmt.Errorf("hname collision: %d (%s and %s)", f.Hname, f.String, other.String) + return fmt.Errorf("hname collision: %d (%s and %s)", f.Hname, f.Name, other.Name) } } - f.Kind = capitalize(kind) - f.Type = capitalize(funcName) - f.FuncName = kind + f.Type + f.Access = funcDesc.Access f.Params, err = s.compileFuncFields(funcDesc.Params, params, "param") if err != nil { @@ -212,6 +217,8 @@ func (s *Schema) compileStateVars(schemaDef *SchemaDef) error { return fmt.Errorf("duplicate var alias") } varAliases[varDef.Alias] = varDef.Alias + varDef.KeyID = s.KeyID + s.KeyID++ s.StateVars = append(s.StateVars, varDef) } return nil diff --git a/tools/schema/generator/templates.go b/tools/schema/generator/templates.go index 9225b5eb6c..7935fedc25 100644 --- a/tools/schema/generator/templates.go +++ b/tools/schema/generator/templates.go @@ -38,5 +38,16 @@ func TestDeploy(t *testing.T) { ctx := wasmsolo.NewSoloContext(t, $package.ScName, $package.OnLoad) require.NoError(t, ctx.ContractExists($package.ScName)) } +`, + // ******************************* + "setupInitFunc": ` +$#set initFunc +$#set initMap +$#if init setInitFunc +`, + // ******************************* + "setInitFunc": ` +$#set initFunc Init +$#set initMap , keyMap[:], idxMap[:] `, } diff --git a/tools/schema/generator/tstemplates/contract.go b/tools/schema/generator/tstemplates/contract.go index 2c69588d51..c5f12460f8 100644 --- a/tools/schema/generator/tstemplates/contract.go +++ b/tools/schema/generator/tstemplates/contract.go @@ -12,6 +12,7 @@ $#each func FuncNameForCall `, // ******************************* "FuncNameCall": ` +$#emit setupInitFunc export class $FuncName$+Call { func: wasmlib.Sc$initFunc$Kind = new wasmlib.Sc$initFunc$Kind(sc.HScName, sc.H$Kind$FuncName); @@ -56,6 +57,7 @@ $#if view ImmutablePackageState `, // ******************************* "FuncNameForCall": ` +$#emit setupInitFunc static $funcName(ctx: wasmlib.Sc$Kind$+CallContext): $FuncName$+Call { $#set paramsID null diff --git a/tools/schema/generator/tstemplates/proxy.go b/tools/schema/generator/tstemplates/proxy.go index 609b1da9d0..9bbe54b156 100644 --- a/tools/schema/generator/tstemplates/proxy.go +++ b/tools/schema/generator/tstemplates/proxy.go @@ -28,7 +28,7 @@ $#set varID wasmlib.Key32.fromString(sc.$Kind$FldName) "proxyArray": ` $fldName(): sc.ArrayOf$mut$FldType { - let arrID = wasmlib.getObjectID(this.mapID, $varID, $arrayTypeID|$FldTypeID); + let arrID = wasmlib.getObjectID(this.mapID, $varID, $arrayTypeID|$fldTypeID); return new sc.ArrayOf$mut$FldType(arrID); } `, @@ -39,16 +39,16 @@ $#if this proxyMapThis proxyMapOther // ******************************* "proxyMapThis": ` - $fldName(): sc.Map$FldMapKey$+To$mut$FldType { - return new sc.Map$FldMapKey$+To$mut$FldType(this.mapID); + $fldName(): sc.Map$fldMapKey$+To$mut$FldType { + return new sc.Map$fldMapKey$+To$mut$FldType(this.mapID); } `, // ******************************* "proxyMapOther": ` - $fldName(): sc.Map$FldMapKey$+To$mut$FldType { + $fldName(): sc.Map$fldMapKey$+To$mut$FldType { let mapID = wasmlib.getObjectID(this.mapID, $varID, wasmlib.TYPE_MAP); - return new sc.Map$FldMapKey$+To$mut$FldType(mapID); + return new sc.Map$fldMapKey$+To$mut$FldType(mapID); } `, // ******************************* diff --git a/tools/schema/generator/tstemplates/structs.go b/tools/schema/generator/tstemplates/structs.go index 0f8195d2e7..1a78ed8a6f 100644 --- a/tools/schema/generator/tstemplates/structs.go +++ b/tools/schema/generator/tstemplates/structs.go @@ -33,7 +33,7 @@ $#emit structMethods `, // ******************************* "structField": ` - $fldName: $FldLangType = $FldTypeInit; $FldComment + $fldName: $fldLangType = $fldTypeInit; $fldComment `, // ******************************* "structDecode": ` diff --git a/tools/schema/generator/tstemplates/typedefs.go b/tools/schema/generator/tstemplates/typedefs.go index 84a1f5a972..a087480dab 100644 --- a/tools/schema/generator/tstemplates/typedefs.go +++ b/tools/schema/generator/tstemplates/typedefs.go @@ -86,7 +86,7 @@ $#if array setVarTypeArray `, // ******************************* "typedefProxyMap": ` -$#set proxy Map$FldMapKey$+To$mut$FldType +$#set proxy Map$fldMapKey$+To$mut$FldType $#if exist else typedefProxyMapNew `, // ******************************* @@ -113,16 +113,16 @@ $#set exist $proxy // ******************************* "typedefProxyMapNewBaseType": ` - get$FldType(key: $FldMapKeyLangType): wasmlib.Sc$mut$FldType { - return new wasmlib.Sc$mut$FldType(this.objID, $FldMapKeyKey.getKeyID()); + get$FldType(key: $fldMapKeyLangType): wasmlib.Sc$mut$FldType { + return new wasmlib.Sc$mut$FldType(this.objID, $fldMapKeyKey.getKeyID()); } `, // ******************************* "typedefProxyMapNewOtherType": ` $#set oldType $fldType $#set OldType $FldType -$#set OldMapKeyLangType $FldMapKeyLangType -$#set OldMapKeyKey $FldMapKeyKey +$#set oldMapKeyLangType $fldMapKeyLangType +$#set oldMapKeyKey $fldMapKeyKey $#if typedef typedefProxyMapNewOtherTypeTypeDef typedefProxyMapNewOtherTypeStruct `, // ******************************* @@ -130,20 +130,20 @@ $#if typedef typedefProxyMapNewOtherTypeTypeDef typedefProxyMapNewOtherTypeStruc $#set varType wasmlib.TYPE_MAP $#if array setVarTypeArray - get$OldType(key: $OldMapKeyLangType): sc.$mut$OldType { - let subID = wasmlib.getObjectID(this.objID, $OldMapKeyKey.getKeyID(), $varType); + get$OldType(key: $oldMapKeyLangType): sc.$mut$OldType { + let subID = wasmlib.getObjectID(this.objID, $oldMapKeyKey.getKeyID(), $varType); return new sc.$mut$OldType(subID); } `, // ******************************* "typedefProxyMapNewOtherTypeStruct": ` - get$OldType(key: $OldMapKeyLangType): sc.$mut$OldType { - return new sc.$mut$OldType(this.objID, $OldMapKeyKey.getKeyID()); + get$OldType(key: $oldMapKeyLangType): sc.$mut$OldType { + return new sc.$mut$OldType(this.objID, $oldMapKeyKey.getKeyID()); } `, // ******************************* "setVarTypeArray": ` -$#set varType $arrayTypeID|$FldTypeID +$#set varType $arrayTypeID|$fldTypeID `, } diff --git a/tools/schema/generator/utils.go b/tools/schema/generator/utils.go index 9687ca39a0..479d2e26b3 100644 --- a/tools/schema/generator/utils.go +++ b/tools/schema/generator/utils.go @@ -10,60 +10,27 @@ import ( ) var ( - //nolint:unused - snakePart = regexp.MustCompile(`_[a-z]`) camelPart = regexp.MustCompile(`[a-z0-9][A-Z]`) camelPartWithID = regexp.MustCompile(`[A-Z][A-Z]+[a-z]`) + moduleCwd = "???" + moduleName = "???" + modulePath = "???" ) -func calculatePadding(fields []*Field, types StringMap, snakeName bool) (nameLen, typeLen int) { - for _, param := range fields { - fldName := param.Name - if snakeName { - fldName = snake(fldName) - } - if nameLen < len(fldName) { - nameLen = len(fldName) - } - fldType := param.Type - if types != nil { - fldType = types[fldType] - } - if typeLen < len(fldType) { - typeLen = len(fldType) - } - } - return -} - -// convert lowercase snake case to camel case -//nolint:deadcode,unused -func camel(name string) string { - // replace each underscore followed by [a-z] with [A-Z] - return snakePart.ReplaceAllStringFunc(name, func(sub string) string { - return strings.ToUpper(sub[1:]) - }) -} - // capitalize first letter func capitalize(name string) string { return upper(name[:1]) + name[1:] } -// convert to lower case -func lower(name string) string { - return strings.ToLower(name) -} - func FindModulePath() error { cwd, err := os.Getwd() if err != nil { return err } // we're going to walk up the path, make sure to restore - ModuleCwd = cwd + moduleCwd = cwd defer func() { - _ = os.Chdir(ModuleCwd) + _ = os.Chdir(moduleCwd) }() file, err := os.Open("go.mod") @@ -93,8 +60,8 @@ func FindModulePath() error { for scanner.Scan() { line := scanner.Text() if strings.HasPrefix(line, "module ") { - ModuleName = strings.TrimSpace(line[len("module"):]) - ModulePath = cwd + moduleName = strings.TrimSpace(line[len("module"):]) + modulePath = cwd return nil } } @@ -102,6 +69,11 @@ func FindModulePath() error { return fmt.Errorf("cannot find module definition in go.mod") } +// convert to lower case +func lower(name string) string { + return strings.ToLower(name) +} + // pad to specified size with spaces func pad(name string, size int) string { for i := len(name); i < size; i++ { @@ -127,16 +99,6 @@ func snake(name string) string { return lower(name) } -// uncapitalize first letter -func uncapitalize(name string) string { - return lower(name[:1]) + name[1:] -} - -// convert to upper case -func upper(name string) string { - return strings.ToUpper(name) -} - func sortedFields(dict FieldMap) []string { keys := make([]string, 0) for key := range dict { @@ -172,3 +134,13 @@ func sortedMaps(dict StringMapMap) []string { sort.Strings(keys) return keys } + +// uncapitalize first letter +func uncapitalize(name string) string { + return lower(name[:1]) + name[1:] +} + +// convert to upper case +func upper(name string) string { + return strings.ToUpper(name) +} From adec5bad892616f00f74b277c99ef2fcf258d034 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Sun, 7 Nov 2021 15:28:40 -0800 Subject: [PATCH 039/198] The return of the padding! --- contracts/wasm/dividend/go/dividend/consts.go | 18 +- contracts/wasm/dividend/go/dividend/keys.go | 12 +- contracts/wasm/dividend/src/consts.rs | 58 ++--- contracts/wasm/dividend/src/keys.rs | 20 +- contracts/wasm/dividend/src/lib.rs | 10 +- contracts/wasm/dividend/ts/dividend/consts.ts | 32 +-- contracts/wasm/dividend/ts/dividend/keys.ts | 14 +- contracts/wasm/dividend/ts/dividend/lib.ts | 10 +- .../go/donatewithfeedback/consts.go | 28 +-- .../go/donatewithfeedback/keys.go | 14 +- .../wasm/donatewithfeedback/src/consts.rs | 60 +++--- contracts/wasm/donatewithfeedback/src/keys.rs | 30 +-- contracts/wasm/donatewithfeedback/src/lib.rs | 6 +- .../wasm/donatewithfeedback/src/structs.rs | 20 +- .../ts/donatewithfeedback/consts.ts | 36 ++-- .../ts/donatewithfeedback/keys.ts | 24 ++- .../ts/donatewithfeedback/lib.ts | 6 +- .../ts/donatewithfeedback/structs.ts | 18 +- contracts/wasm/erc20/go/erc20/consts.go | 22 +- contracts/wasm/erc20/go/erc20/keys.go | 18 +- contracts/wasm/erc20/src/consts.rs | 66 +++--- contracts/wasm/erc20/src/keys.rs | 24 ++- contracts/wasm/erc20/src/lib.rs | 12 +- contracts/wasm/erc20/ts/erc20/consts.ts | 38 ++-- contracts/wasm/erc20/ts/erc20/keys.ts | 16 +- contracts/wasm/erc20/ts/erc20/lib.ts | 12 +- .../wasm/fairauction/go/fairauction/consts.go | 42 ++-- .../wasm/fairauction/go/fairauction/keys.go | 20 +- contracts/wasm/fairauction/src/consts.rs | 78 +++---- contracts/wasm/fairauction/src/keys.rs | 44 ++-- contracts/wasm/fairauction/src/lib.rs | 6 +- contracts/wasm/fairauction/src/structs.rs | 56 ++--- .../wasm/fairauction/ts/fairauction/consts.ts | 52 ++--- .../wasm/fairauction/ts/fairauction/keys.ts | 36 ++-- .../wasm/fairauction/ts/fairauction/lib.ts | 8 +- .../fairauction/ts/fairauction/structs.ts | 52 ++--- .../fairroulette/go/fairroulette/consts.go | 24 +-- .../wasm/fairroulette/go/fairroulette/keys.go | 18 +- contracts/wasm/fairroulette/src/consts.rs | 76 +++---- contracts/wasm/fairroulette/src/keys.rs | 26 +-- contracts/wasm/fairroulette/src/lib.rs | 16 +- contracts/wasm/fairroulette/src/structs.rs | 12 +- .../fairroulette/ts/fairroulette/consts.ts | 54 ++--- .../wasm/fairroulette/ts/fairroulette/keys.ts | 20 +- .../wasm/fairroulette/ts/fairroulette/lib.ts | 16 +- .../fairroulette/ts/fairroulette/structs.ts | 6 +- .../wasm/helloworld/go/helloworld/consts.go | 2 +- contracts/wasm/helloworld/src/consts.rs | 16 +- contracts/wasm/helloworld/src/keys.rs | 4 +- contracts/wasm/helloworld/src/lib.rs | 2 +- .../wasm/helloworld/ts/helloworld/consts.ts | 4 +- .../wasm/helloworld/ts/helloworld/keys.ts | 2 + .../wasm/helloworld/ts/helloworld/lib.ts | 2 +- .../wasm/inccounter/go/inccounter/consts.go | 14 +- .../wasm/inccounter/go/inccounter/keys.go | 4 +- contracts/wasm/inccounter/src/consts.rs | 86 ++++---- contracts/wasm/inccounter/src/keys.rs | 16 +- contracts/wasm/inccounter/src/lib.rs | 26 +-- .../wasm/inccounter/ts/inccounter/consts.ts | 58 ++--- .../wasm/inccounter/ts/inccounter/keys.ts | 10 +- .../wasm/inccounter/ts/inccounter/lib.ts | 24 +-- contracts/wasm/testcore/go/testcore/consts.go | 70 +++--- contracts/wasm/testcore/go/testcore/keys.go | 28 +-- .../wasm/testcore/go/testcore/testcore.go | 4 +- contracts/wasm/testcore/src/consts.rs | 204 +++++++++--------- contracts/wasm/testcore/src/keys.rs | 72 ++++--- contracts/wasm/testcore/src/lib.rs | 60 +++--- contracts/wasm/testcore/ts/testcore/consts.ts | 182 ++++++++-------- contracts/wasm/testcore/ts/testcore/keys.ts | 64 +++--- contracts/wasm/testcore/ts/testcore/lib.ts | 60 +++--- .../wasm/testwasmlib/go/testwasmlib/consts.go | 52 ++--- .../wasm/testwasmlib/go/testwasmlib/keys.go | 18 +- contracts/wasm/testwasmlib/src/consts.rs | 102 ++++----- contracts/wasm/testwasmlib/src/keys.rs | 54 ++--- contracts/wasm/testwasmlib/src/lib.rs | 20 +- .../wasm/testwasmlib/ts/testwasmlib/consts.ts | 80 +++---- .../wasm/testwasmlib/ts/testwasmlib/keys.ts | 42 ++-- .../wasm/testwasmlib/ts/testwasmlib/lib.ts | 20 +- .../wasm/timestamp/go/timestamp/consts.go | 4 +- contracts/wasm/timestamp/go/timestamp/keys.go | 3 +- contracts/wasm/timestamp/src/consts.rs | 18 +- contracts/wasm/timestamp/src/keys.rs | 6 +- contracts/wasm/timestamp/src/lib.rs | 2 +- .../wasm/timestamp/ts/timestamp/consts.ts | 4 +- contracts/wasm/timestamp/ts/timestamp/keys.ts | 2 + contracts/wasm/timestamp/ts/timestamp/lib.ts | 2 +- .../tokenregistry/go/tokenregistry/consts.go | 10 +- .../tokenregistry/go/tokenregistry/keys.go | 5 +- contracts/wasm/tokenregistry/src/consts.rs | 40 ++-- contracts/wasm/tokenregistry/src/keys.rs | 12 +- contracts/wasm/tokenregistry/src/lib.rs | 6 +- contracts/wasm/tokenregistry/src/structs.rs | 28 +-- .../tokenregistry/ts/tokenregistry/consts.ts | 16 +- .../tokenregistry/ts/tokenregistry/keys.ts | 6 +- .../tokenregistry/ts/tokenregistry/lib.ts | 6 +- .../tokenregistry/ts/tokenregistry/structs.ts | 24 +-- .../wasmlib/go/wasmlib/coreaccounts/consts.go | 12 +- .../wasmlib/go/wasmlib/coreaccounts/params.go | 20 +- .../go/wasmlib/coreaccounts/results.go | 4 +- .../vm/wasmlib/go/wasmlib/coreblob/consts.go | 12 +- .../vm/wasmlib/go/wasmlib/coreblob/params.go | 12 +- .../vm/wasmlib/go/wasmlib/coreblob/results.go | 8 +- .../wasmlib/go/wasmlib/coreblocklog/consts.go | 28 +-- .../wasmlib/go/wasmlib/coreblocklog/params.go | 40 ++-- .../go/wasmlib/coreblocklog/results.go | 60 +++--- .../go/wasmlib/coregovernance/consts.go | 42 ++-- .../go/wasmlib/coregovernance/params.go | 68 +++--- .../go/wasmlib/coregovernance/results.go | 56 ++--- .../vm/wasmlib/go/wasmlib/coreroot/consts.go | 16 +- .../vm/wasmlib/go/wasmlib/coreroot/params.go | 24 +-- .../vm/wasmlib/go/wasmlib/coreroot/results.go | 12 +- packages/vm/wasmlib/go/wasmlib/keys.go | 4 + .../vm/wasmlib/src/coreaccounts/consts.rs | 54 ++--- packages/vm/wasmlib/src/coreblob/consts.rs | 42 ++-- .../vm/wasmlib/src/coreblocklog/consts.rs | 82 +++---- .../vm/wasmlib/src/coregovernance/consts.rs | 104 ++++----- packages/vm/wasmlib/src/coreroot/consts.rs | 50 ++--- .../wasmlib/ts/wasmlib/coreaccounts/consts.ts | 32 +-- .../vm/wasmlib/ts/wasmlib/coreblob/consts.ts | 18 +- .../wasmlib/ts/wasmlib/coreblocklog/consts.ts | 60 +++--- .../ts/wasmlib/coregovernance/consts.ts | 82 +++---- .../vm/wasmlib/ts/wasmlib/coreroot/consts.ts | 26 +-- tools/schema/generator/emitter.go | 88 +++++--- tools/schema/generator/generator.go | 50 +++-- tools/schema/generator/generator_go.go | 4 +- tools/schema/generator/generator_rust.go | 4 +- tools/schema/generator/generator_ts.go | 4 +- tools/schema/generator/gotemplates/consts.go | 6 +- tools/schema/generator/gotemplates/keys.go | 4 +- tools/schema/generator/gotemplates/lib.go | 2 +- tools/schema/generator/gotemplates/proxy.go | 2 +- tools/schema/generator/gotemplates/structs.go | 4 +- tools/schema/generator/rstemplates/consts.go | 12 +- tools/schema/generator/rstemplates/keys.go | 4 +- tools/schema/generator/rstemplates/lib.go | 2 +- tools/schema/generator/rstemplates/structs.go | 4 +- tools/schema/generator/tstemplates/consts.go | 6 +- tools/schema/generator/tstemplates/keys.go | 4 +- tools/schema/generator/tstemplates/lib.go | 2 +- tools/schema/generator/tstemplates/structs.go | 4 +- tools/schema/generator/utils.go | 8 - 141 files changed, 2090 insertions(+), 1974 deletions(-) diff --git a/contracts/wasm/dividend/go/dividend/consts.go b/contracts/wasm/dividend/go/dividend/consts.go index c6ef2283ad..2e90e341e5 100644 --- a/contracts/wasm/dividend/go/dividend/consts.go +++ b/contracts/wasm/dividend/go/dividend/consts.go @@ -16,21 +16,21 @@ const ( ) const ( - ParamAddress = wasmlib.Key("address") - ParamFactor = wasmlib.Key("factor") - ParamOwner = wasmlib.Key("owner") + ParamAddress = "address" + ParamFactor = "factor" + ParamOwner = "owner" ) const ( - ResultFactor = wasmlib.Key("factor") - ResultOwner = wasmlib.Key("owner") + ResultFactor = "factor" + ResultOwner = "owner" ) const ( - StateMemberList = wasmlib.Key("memberList") - StateMembers = wasmlib.Key("members") - StateOwner = wasmlib.Key("owner") - StateTotalFactor = wasmlib.Key("totalFactor") + StateMemberList = "memberList" + StateMembers = "members" + StateOwner = "owner" + StateTotalFactor = "totalFactor" ) const ( diff --git a/contracts/wasm/dividend/go/dividend/keys.go b/contracts/wasm/dividend/go/dividend/keys.go index aa3708f338..d195ce5296 100644 --- a/contracts/wasm/dividend/go/dividend/keys.go +++ b/contracts/wasm/dividend/go/dividend/keys.go @@ -10,11 +10,13 @@ package dividend import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" const ( - IdxParamAddress = 0 - IdxParamFactor = 1 - IdxParamOwner = 2 - IdxResultFactor = 3 - IdxResultOwner = 4 + IdxParamAddress = 0 + IdxParamFactor = 1 + IdxParamOwner = 2 + + IdxResultFactor = 3 + IdxResultOwner = 4 + IdxStateMemberList = 5 IdxStateMembers = 6 IdxStateOwner = 7 diff --git a/contracts/wasm/dividend/src/consts.rs b/contracts/wasm/dividend/src/consts.rs index b2d8406e75..5d0faa11c5 100644 --- a/contracts/wasm/dividend/src/consts.rs +++ b/contracts/wasm/dividend/src/consts.rs @@ -9,32 +9,32 @@ use wasmlib::*; -pub const SC_NAME: &str = "dividend"; -pub const SC_DESCRIPTION: &str = "Simple dividend smart contract"; -pub const HSC_NAME: ScHname = ScHname(0xcce2e239); - -pub const PARAM_ADDRESS: &str = "address"; -pub const PARAM_FACTOR: &str = "factor"; -pub const PARAM_OWNER: &str = "owner"; - -pub const RESULT_FACTOR: &str = "factor"; -pub const RESULT_OWNER: &str = "owner"; - -pub const STATE_MEMBER_LIST: &str = "memberList"; -pub const STATE_MEMBERS: &str = "members"; -pub const STATE_OWNER: &str = "owner"; -pub const STATE_TOTAL_FACTOR: &str = "totalFactor"; - -pub const FUNC_DIVIDE: &str = "divide"; -pub const FUNC_INIT: &str = "init"; -pub const FUNC_MEMBER: &str = "member"; -pub const FUNC_SET_OWNER: &str = "setOwner"; -pub const VIEW_GET_FACTOR: &str = "getFactor"; -pub const VIEW_GET_OWNER: &str = "getOwner"; - -pub const HFUNC_DIVIDE: ScHname = ScHname(0xc7878107); -pub const HFUNC_INIT: ScHname = ScHname(0x1f44d644); -pub const HFUNC_MEMBER: ScHname = ScHname(0xc07da2cb); -pub const HFUNC_SET_OWNER: ScHname = ScHname(0x2a15fe7b); -pub const HVIEW_GET_FACTOR: ScHname = ScHname(0x0ee668fe); -pub const HVIEW_GET_OWNER: ScHname = ScHname(0x137107a6); +pub const SC_NAME : &str = "dividend"; +pub const SC_DESCRIPTION : &str = "Simple dividend smart contract"; +pub const HSC_NAME : ScHname = ScHname(0xcce2e239); + +pub const PARAM_ADDRESS : &str = "address"; +pub const PARAM_FACTOR : &str = "factor"; +pub const PARAM_OWNER : &str = "owner"; + +pub const RESULT_FACTOR : &str = "factor"; +pub const RESULT_OWNER : &str = "owner"; + +pub const STATE_MEMBER_LIST : &str = "memberList"; +pub const STATE_MEMBERS : &str = "members"; +pub const STATE_OWNER : &str = "owner"; +pub const STATE_TOTAL_FACTOR : &str = "totalFactor"; + +pub const FUNC_DIVIDE : &str = "divide"; +pub const FUNC_INIT : &str = "init"; +pub const FUNC_MEMBER : &str = "member"; +pub const FUNC_SET_OWNER : &str = "setOwner"; +pub const VIEW_GET_FACTOR : &str = "getFactor"; +pub const VIEW_GET_OWNER : &str = "getOwner"; + +pub const HFUNC_DIVIDE : ScHname = ScHname(0xc7878107); +pub const HFUNC_INIT : ScHname = ScHname(0x1f44d644); +pub const HFUNC_MEMBER : ScHname = ScHname(0xc07da2cb); +pub const HFUNC_SET_OWNER : ScHname = ScHname(0x2a15fe7b); +pub const HVIEW_GET_FACTOR : ScHname = ScHname(0x0ee668fe); +pub const HVIEW_GET_OWNER : ScHname = ScHname(0x137107a6); diff --git a/contracts/wasm/dividend/src/keys.rs b/contracts/wasm/dividend/src/keys.rs index 5a837e51cf..f15d21bcd6 100644 --- a/contracts/wasm/dividend/src/keys.rs +++ b/contracts/wasm/dividend/src/keys.rs @@ -11,15 +11,17 @@ use wasmlib::*; use crate::*; -pub(crate) const IDX_PARAM_ADDRESS: usize = 0; -pub(crate) const IDX_PARAM_FACTOR: usize = 1; -pub(crate) const IDX_PARAM_OWNER: usize = 2; -pub(crate) const IDX_RESULT_FACTOR: usize = 3; -pub(crate) const IDX_RESULT_OWNER: usize = 4; -pub(crate) const IDX_STATE_MEMBER_LIST: usize = 5; -pub(crate) const IDX_STATE_MEMBERS: usize = 6; -pub(crate) const IDX_STATE_OWNER: usize = 7; -pub(crate) const IDX_STATE_TOTAL_FACTOR: usize = 8; +pub(crate) const IDX_PARAM_ADDRESS : usize = 0; +pub(crate) const IDX_PARAM_FACTOR : usize = 1; +pub(crate) const IDX_PARAM_OWNER : usize = 2; + +pub(crate) const IDX_RESULT_FACTOR : usize = 3; +pub(crate) const IDX_RESULT_OWNER : usize = 4; + +pub(crate) const IDX_STATE_MEMBER_LIST : usize = 5; +pub(crate) const IDX_STATE_MEMBERS : usize = 6; +pub(crate) const IDX_STATE_OWNER : usize = 7; +pub(crate) const IDX_STATE_TOTAL_FACTOR : usize = 8; pub const KEY_MAP_LEN: usize = 9; diff --git a/contracts/wasm/dividend/src/lib.rs b/contracts/wasm/dividend/src/lib.rs index 29145101a1..35abe5bb9d 100644 --- a/contracts/wasm/dividend/src/lib.rs +++ b/contracts/wasm/dividend/src/lib.rs @@ -29,12 +29,12 @@ mod dividend; #[no_mangle] fn on_load() { let exports = ScExports::new(); - exports.add_func(FUNC_DIVIDE, func_divide_thunk); - exports.add_func(FUNC_INIT, func_init_thunk); - exports.add_func(FUNC_MEMBER, func_member_thunk); - exports.add_func(FUNC_SET_OWNER, func_set_owner_thunk); + exports.add_func(FUNC_DIVIDE, func_divide_thunk); + exports.add_func(FUNC_INIT, func_init_thunk); + exports.add_func(FUNC_MEMBER, func_member_thunk); + exports.add_func(FUNC_SET_OWNER, func_set_owner_thunk); exports.add_view(VIEW_GET_FACTOR, view_get_factor_thunk); - exports.add_view(VIEW_GET_OWNER, view_get_owner_thunk); + exports.add_view(VIEW_GET_OWNER, view_get_owner_thunk); unsafe { for i in 0..KEY_MAP_LEN { diff --git a/contracts/wasm/dividend/ts/dividend/consts.ts b/contracts/wasm/dividend/ts/dividend/consts.ts index 1f7b66fe47..4368c1405e 100644 --- a/contracts/wasm/dividend/ts/dividend/consts.ts +++ b/contracts/wasm/dividend/ts/dividend/consts.ts @@ -12,27 +12,27 @@ export const ScDescription = "Simple dividend smart contract"; export const HScName = new wasmlib.ScHname(0xcce2e239); export const ParamAddress = "address"; -export const ParamFactor = "factor"; -export const ParamOwner = "owner"; +export const ParamFactor = "factor"; +export const ParamOwner = "owner"; export const ResultFactor = "factor"; -export const ResultOwner = "owner"; +export const ResultOwner = "owner"; -export const StateMemberList = "memberList"; -export const StateMembers = "members"; -export const StateOwner = "owner"; +export const StateMemberList = "memberList"; +export const StateMembers = "members"; +export const StateOwner = "owner"; export const StateTotalFactor = "totalFactor"; -export const FuncDivide = "divide"; -export const FuncInit = "init"; -export const FuncMember = "member"; -export const FuncSetOwner = "setOwner"; +export const FuncDivide = "divide"; +export const FuncInit = "init"; +export const FuncMember = "member"; +export const FuncSetOwner = "setOwner"; export const ViewGetFactor = "getFactor"; -export const ViewGetOwner = "getOwner"; +export const ViewGetOwner = "getOwner"; -export const HFuncDivide = new wasmlib.ScHname(0xc7878107); -export const HFuncInit = new wasmlib.ScHname(0x1f44d644); -export const HFuncMember = new wasmlib.ScHname(0xc07da2cb); -export const HFuncSetOwner = new wasmlib.ScHname(0x2a15fe7b); +export const HFuncDivide = new wasmlib.ScHname(0xc7878107); +export const HFuncInit = new wasmlib.ScHname(0x1f44d644); +export const HFuncMember = new wasmlib.ScHname(0xc07da2cb); +export const HFuncSetOwner = new wasmlib.ScHname(0x2a15fe7b); export const HViewGetFactor = new wasmlib.ScHname(0x0ee668fe); -export const HViewGetOwner = new wasmlib.ScHname(0x137107a6); +export const HViewGetOwner = new wasmlib.ScHname(0x137107a6); diff --git a/contracts/wasm/dividend/ts/dividend/keys.ts b/contracts/wasm/dividend/ts/dividend/keys.ts index bc7de8907e..8f3a026043 100644 --- a/contracts/wasm/dividend/ts/dividend/keys.ts +++ b/contracts/wasm/dividend/ts/dividend/keys.ts @@ -9,13 +9,15 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export const IdxParamAddress = 0; -export const IdxParamFactor = 1; -export const IdxParamOwner = 2; +export const IdxParamFactor = 1; +export const IdxParamOwner = 2; + export const IdxResultFactor = 3; -export const IdxResultOwner = 4; -export const IdxStateMemberList = 5; -export const IdxStateMembers = 6; -export const IdxStateOwner = 7; +export const IdxResultOwner = 4; + +export const IdxStateMemberList = 5; +export const IdxStateMembers = 6; +export const IdxStateOwner = 7; export const IdxStateTotalFactor = 8; export let keyMap: string[] = [ diff --git a/contracts/wasm/dividend/ts/dividend/lib.ts b/contracts/wasm/dividend/ts/dividend/lib.ts index 9154b0fe44..d991a42845 100644 --- a/contracts/wasm/dividend/ts/dividend/lib.ts +++ b/contracts/wasm/dividend/ts/dividend/lib.ts @@ -14,12 +14,12 @@ export function on_call(index: i32): void { export function on_load(): void { let exports = new wasmlib.ScExports(); - exports.addFunc(sc.FuncDivide, funcDivideThunk); - exports.addFunc(sc.FuncInit, funcInitThunk); - exports.addFunc(sc.FuncMember, funcMemberThunk); - exports.addFunc(sc.FuncSetOwner, funcSetOwnerThunk); + exports.addFunc(sc.FuncDivide, funcDivideThunk); + exports.addFunc(sc.FuncInit, funcInitThunk); + exports.addFunc(sc.FuncMember, funcMemberThunk); + exports.addFunc(sc.FuncSetOwner, funcSetOwnerThunk); exports.addView(sc.ViewGetFactor, viewGetFactorThunk); - exports.addView(sc.ViewGetOwner, viewGetOwnerThunk); + exports.addView(sc.ViewGetOwner, viewGetOwnerThunk); for (let i = 0; i < sc.keyMap.length; i++) { sc.idxMap[i] = wasmlib.Key32.fromString(sc.keyMap[i]); diff --git a/contracts/wasm/donatewithfeedback/go/donatewithfeedback/consts.go b/contracts/wasm/donatewithfeedback/go/donatewithfeedback/consts.go index b0218abd72..d6c691a71e 100644 --- a/contracts/wasm/donatewithfeedback/go/donatewithfeedback/consts.go +++ b/contracts/wasm/donatewithfeedback/go/donatewithfeedback/consts.go @@ -16,26 +16,26 @@ const ( ) const ( - ParamAmount = wasmlib.Key("amount") - ParamFeedback = wasmlib.Key("feedback") - ParamNr = wasmlib.Key("nr") + ParamAmount = "amount" + ParamFeedback = "feedback" + ParamNr = "nr" ) const ( - ResultAmount = wasmlib.Key("amount") - ResultCount = wasmlib.Key("count") - ResultDonator = wasmlib.Key("donator") - ResultError = wasmlib.Key("error") - ResultFeedback = wasmlib.Key("feedback") - ResultMaxDonation = wasmlib.Key("maxDonation") - ResultTimestamp = wasmlib.Key("timestamp") - ResultTotalDonation = wasmlib.Key("totalDonation") + ResultAmount = "amount" + ResultCount = "count" + ResultDonator = "donator" + ResultError = "error" + ResultFeedback = "feedback" + ResultMaxDonation = "maxDonation" + ResultTimestamp = "timestamp" + ResultTotalDonation = "totalDonation" ) const ( - StateLog = wasmlib.Key("log") - StateMaxDonation = wasmlib.Key("maxDonation") - StateTotalDonation = wasmlib.Key("totalDonation") + StateLog = "log" + StateMaxDonation = "maxDonation" + StateTotalDonation = "totalDonation" ) const ( diff --git a/contracts/wasm/donatewithfeedback/go/donatewithfeedback/keys.go b/contracts/wasm/donatewithfeedback/go/donatewithfeedback/keys.go index 3d99eb879e..a6939d46b7 100644 --- a/contracts/wasm/donatewithfeedback/go/donatewithfeedback/keys.go +++ b/contracts/wasm/donatewithfeedback/go/donatewithfeedback/keys.go @@ -10,9 +10,10 @@ package donatewithfeedback import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" const ( - IdxParamAmount = 0 - IdxParamFeedback = 1 - IdxParamNr = 2 + IdxParamAmount = 0 + IdxParamFeedback = 1 + IdxParamNr = 2 + IdxResultAmount = 3 IdxResultCount = 4 IdxResultDonator = 5 @@ -21,9 +22,10 @@ const ( IdxResultMaxDonation = 8 IdxResultTimestamp = 9 IdxResultTotalDonation = 10 - IdxStateLog = 11 - IdxStateMaxDonation = 12 - IdxStateTotalDonation = 13 + + IdxStateLog = 11 + IdxStateMaxDonation = 12 + IdxStateTotalDonation = 13 ) const keyMapLen = 14 diff --git a/contracts/wasm/donatewithfeedback/src/consts.rs b/contracts/wasm/donatewithfeedback/src/consts.rs index 8b7d938ce0..1088c26437 100644 --- a/contracts/wasm/donatewithfeedback/src/consts.rs +++ b/contracts/wasm/donatewithfeedback/src/consts.rs @@ -9,33 +9,33 @@ use wasmlib::*; -pub const SC_NAME: &str = "donatewithfeedback"; -pub const SC_DESCRIPTION: &str = ""; -pub const HSC_NAME: ScHname = ScHname(0x696d7f66); - -pub const PARAM_AMOUNT: &str = "amount"; -pub const PARAM_FEEDBACK: &str = "feedback"; -pub const PARAM_NR: &str = "nr"; - -pub const RESULT_AMOUNT: &str = "amount"; -pub const RESULT_COUNT: &str = "count"; -pub const RESULT_DONATOR: &str = "donator"; -pub const RESULT_ERROR: &str = "error"; -pub const RESULT_FEEDBACK: &str = "feedback"; -pub const RESULT_MAX_DONATION: &str = "maxDonation"; -pub const RESULT_TIMESTAMP: &str = "timestamp"; -pub const RESULT_TOTAL_DONATION: &str = "totalDonation"; - -pub const STATE_LOG: &str = "log"; -pub const STATE_MAX_DONATION: &str = "maxDonation"; -pub const STATE_TOTAL_DONATION: &str = "totalDonation"; - -pub const FUNC_DONATE: &str = "donate"; -pub const FUNC_WITHDRAW: &str = "withdraw"; -pub const VIEW_DONATION: &str = "donation"; -pub const VIEW_DONATION_INFO: &str = "donationInfo"; - -pub const HFUNC_DONATE: ScHname = ScHname(0xdc9b133a); -pub const HFUNC_WITHDRAW: ScHname = ScHname(0x9dcc0f41); -pub const HVIEW_DONATION: ScHname = ScHname(0xbdb245ba); -pub const HVIEW_DONATION_INFO: ScHname = ScHname(0xc8f7c726); +pub const SC_NAME : &str = "donatewithfeedback"; +pub const SC_DESCRIPTION : &str = ""; +pub const HSC_NAME : ScHname = ScHname(0x696d7f66); + +pub const PARAM_AMOUNT : &str = "amount"; +pub const PARAM_FEEDBACK : &str = "feedback"; +pub const PARAM_NR : &str = "nr"; + +pub const RESULT_AMOUNT : &str = "amount"; +pub const RESULT_COUNT : &str = "count"; +pub const RESULT_DONATOR : &str = "donator"; +pub const RESULT_ERROR : &str = "error"; +pub const RESULT_FEEDBACK : &str = "feedback"; +pub const RESULT_MAX_DONATION : &str = "maxDonation"; +pub const RESULT_TIMESTAMP : &str = "timestamp"; +pub const RESULT_TOTAL_DONATION : &str = "totalDonation"; + +pub const STATE_LOG : &str = "log"; +pub const STATE_MAX_DONATION : &str = "maxDonation"; +pub const STATE_TOTAL_DONATION : &str = "totalDonation"; + +pub const FUNC_DONATE : &str = "donate"; +pub const FUNC_WITHDRAW : &str = "withdraw"; +pub const VIEW_DONATION : &str = "donation"; +pub const VIEW_DONATION_INFO : &str = "donationInfo"; + +pub const HFUNC_DONATE : ScHname = ScHname(0xdc9b133a); +pub const HFUNC_WITHDRAW : ScHname = ScHname(0x9dcc0f41); +pub const HVIEW_DONATION : ScHname = ScHname(0xbdb245ba); +pub const HVIEW_DONATION_INFO : ScHname = ScHname(0xc8f7c726); diff --git a/contracts/wasm/donatewithfeedback/src/keys.rs b/contracts/wasm/donatewithfeedback/src/keys.rs index 176049a9c5..15946701bc 100644 --- a/contracts/wasm/donatewithfeedback/src/keys.rs +++ b/contracts/wasm/donatewithfeedback/src/keys.rs @@ -11,20 +11,22 @@ use wasmlib::*; use crate::*; -pub(crate) const IDX_PARAM_AMOUNT: usize = 0; -pub(crate) const IDX_PARAM_FEEDBACK: usize = 1; -pub(crate) const IDX_PARAM_NR: usize = 2; -pub(crate) const IDX_RESULT_AMOUNT: usize = 3; -pub(crate) const IDX_RESULT_COUNT: usize = 4; -pub(crate) const IDX_RESULT_DONATOR: usize = 5; -pub(crate) const IDX_RESULT_ERROR: usize = 6; -pub(crate) const IDX_RESULT_FEEDBACK: usize = 7; -pub(crate) const IDX_RESULT_MAX_DONATION: usize = 8; -pub(crate) const IDX_RESULT_TIMESTAMP: usize = 9; -pub(crate) const IDX_RESULT_TOTAL_DONATION: usize = 10; -pub(crate) const IDX_STATE_LOG: usize = 11; -pub(crate) const IDX_STATE_MAX_DONATION: usize = 12; -pub(crate) const IDX_STATE_TOTAL_DONATION: usize = 13; +pub(crate) const IDX_PARAM_AMOUNT : usize = 0; +pub(crate) const IDX_PARAM_FEEDBACK : usize = 1; +pub(crate) const IDX_PARAM_NR : usize = 2; + +pub(crate) const IDX_RESULT_AMOUNT : usize = 3; +pub(crate) const IDX_RESULT_COUNT : usize = 4; +pub(crate) const IDX_RESULT_DONATOR : usize = 5; +pub(crate) const IDX_RESULT_ERROR : usize = 6; +pub(crate) const IDX_RESULT_FEEDBACK : usize = 7; +pub(crate) const IDX_RESULT_MAX_DONATION : usize = 8; +pub(crate) const IDX_RESULT_TIMESTAMP : usize = 9; +pub(crate) const IDX_RESULT_TOTAL_DONATION : usize = 10; + +pub(crate) const IDX_STATE_LOG : usize = 11; +pub(crate) const IDX_STATE_MAX_DONATION : usize = 12; +pub(crate) const IDX_STATE_TOTAL_DONATION : usize = 13; pub const KEY_MAP_LEN: usize = 14; diff --git a/contracts/wasm/donatewithfeedback/src/lib.rs b/contracts/wasm/donatewithfeedback/src/lib.rs index 0504a54d03..fa9f1e7fd3 100644 --- a/contracts/wasm/donatewithfeedback/src/lib.rs +++ b/contracts/wasm/donatewithfeedback/src/lib.rs @@ -30,9 +30,9 @@ mod donatewithfeedback; #[no_mangle] fn on_load() { let exports = ScExports::new(); - exports.add_func(FUNC_DONATE, func_donate_thunk); - exports.add_func(FUNC_WITHDRAW, func_withdraw_thunk); - exports.add_view(VIEW_DONATION, view_donation_thunk); + exports.add_func(FUNC_DONATE, func_donate_thunk); + exports.add_func(FUNC_WITHDRAW, func_withdraw_thunk); + exports.add_view(VIEW_DONATION, view_donation_thunk); exports.add_view(VIEW_DONATION_INFO, view_donation_info_thunk); unsafe { diff --git a/contracts/wasm/donatewithfeedback/src/structs.rs b/contracts/wasm/donatewithfeedback/src/structs.rs index 392284bd3a..6a90fa7752 100644 --- a/contracts/wasm/donatewithfeedback/src/structs.rs +++ b/contracts/wasm/donatewithfeedback/src/structs.rs @@ -11,22 +11,22 @@ use wasmlib::*; use wasmlib::host::*; pub struct Donation { - pub amount: i64, // amount donated - pub donator: ScAgentID, // who donated - pub error: String, // error to be reported to donator if anything goes wrong - pub feedback: String, // the feedback for the person donated to - pub timestamp: i64, // when the donation took place + pub amount : i64, // amount donated + pub donator : ScAgentID, // who donated + pub error : String, // error to be reported to donator if anything goes wrong + pub feedback : String, // the feedback for the person donated to + pub timestamp : i64, // when the donation took place } impl Donation { pub fn from_bytes(bytes: &[u8]) -> Donation { let mut decode = BytesDecoder::new(bytes); Donation { - amount: decode.int64(), - donator: decode.agent_id(), - error: decode.string(), - feedback: decode.string(), - timestamp: decode.int64(), + amount : decode.int64(), + donator : decode.agent_id(), + error : decode.string(), + feedback : decode.string(), + timestamp : decode.int64(), } } diff --git a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/consts.ts b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/consts.ts index 01512e0646..c95c4a93f6 100644 --- a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/consts.ts +++ b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/consts.ts @@ -11,29 +11,29 @@ export const ScName = "donatewithfeedback"; export const ScDescription = ""; export const HScName = new wasmlib.ScHname(0x696d7f66); -export const ParamAmount = "amount"; +export const ParamAmount = "amount"; export const ParamFeedback = "feedback"; -export const ParamNr = "nr"; - -export const ResultAmount = "amount"; -export const ResultCount = "count"; -export const ResultDonator = "donator"; -export const ResultError = "error"; -export const ResultFeedback = "feedback"; -export const ResultMaxDonation = "maxDonation"; -export const ResultTimestamp = "timestamp"; +export const ParamNr = "nr"; + +export const ResultAmount = "amount"; +export const ResultCount = "count"; +export const ResultDonator = "donator"; +export const ResultError = "error"; +export const ResultFeedback = "feedback"; +export const ResultMaxDonation = "maxDonation"; +export const ResultTimestamp = "timestamp"; export const ResultTotalDonation = "totalDonation"; -export const StateLog = "log"; -export const StateMaxDonation = "maxDonation"; +export const StateLog = "log"; +export const StateMaxDonation = "maxDonation"; export const StateTotalDonation = "totalDonation"; -export const FuncDonate = "donate"; -export const FuncWithdraw = "withdraw"; -export const ViewDonation = "donation"; +export const FuncDonate = "donate"; +export const FuncWithdraw = "withdraw"; +export const ViewDonation = "donation"; export const ViewDonationInfo = "donationInfo"; -export const HFuncDonate = new wasmlib.ScHname(0xdc9b133a); -export const HFuncWithdraw = new wasmlib.ScHname(0x9dcc0f41); -export const HViewDonation = new wasmlib.ScHname(0xbdb245ba); +export const HFuncDonate = new wasmlib.ScHname(0xdc9b133a); +export const HFuncWithdraw = new wasmlib.ScHname(0x9dcc0f41); +export const HViewDonation = new wasmlib.ScHname(0xbdb245ba); export const HViewDonationInfo = new wasmlib.ScHname(0xc8f7c726); diff --git a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/keys.ts b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/keys.ts index 52ff7fd98b..16ce9ceed1 100644 --- a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/keys.ts +++ b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/keys.ts @@ -8,19 +8,21 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; -export const IdxParamAmount = 0; +export const IdxParamAmount = 0; export const IdxParamFeedback = 1; -export const IdxParamNr = 2; -export const IdxResultAmount = 3; -export const IdxResultCount = 4; -export const IdxResultDonator = 5; -export const IdxResultError = 6; -export const IdxResultFeedback = 7; -export const IdxResultMaxDonation = 8; -export const IdxResultTimestamp = 9; +export const IdxParamNr = 2; + +export const IdxResultAmount = 3; +export const IdxResultCount = 4; +export const IdxResultDonator = 5; +export const IdxResultError = 6; +export const IdxResultFeedback = 7; +export const IdxResultMaxDonation = 8; +export const IdxResultTimestamp = 9; export const IdxResultTotalDonation = 10; -export const IdxStateLog = 11; -export const IdxStateMaxDonation = 12; + +export const IdxStateLog = 11; +export const IdxStateMaxDonation = 12; export const IdxStateTotalDonation = 13; export let keyMap: string[] = [ diff --git a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/lib.ts b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/lib.ts index 089f434c78..cc2b77b552 100644 --- a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/lib.ts +++ b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/lib.ts @@ -14,9 +14,9 @@ export function on_call(index: i32): void { export function on_load(): void { let exports = new wasmlib.ScExports(); - exports.addFunc(sc.FuncDonate, funcDonateThunk); - exports.addFunc(sc.FuncWithdraw, funcWithdrawThunk); - exports.addView(sc.ViewDonation, viewDonationThunk); + exports.addFunc(sc.FuncDonate, funcDonateThunk); + exports.addFunc(sc.FuncWithdraw, funcWithdrawThunk); + exports.addView(sc.ViewDonation, viewDonationThunk); exports.addView(sc.ViewDonationInfo, viewDonationInfoThunk); for (let i = 0; i < sc.keyMap.length; i++) { diff --git a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/structs.ts b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/structs.ts index e704102f20..595c11292f 100644 --- a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/structs.ts +++ b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/structs.ts @@ -8,19 +8,19 @@ import * as wasmlib from "wasmlib"; export class Donation { - amount: i64 = 0; // amount donated - donator: wasmlib.ScAgentID = new wasmlib.ScAgentID(); // who donated - error: string = ""; // error to be reported to donator if anything goes wrong - feedback: string = ""; // the feedback for the person donated to - timestamp: i64 = 0; // when the donation took place + amount : i64 = 0; // amount donated + donator : wasmlib.ScAgentID = new wasmlib.ScAgentID(); // who donated + error : string = ""; // error to be reported to donator if anything goes wrong + feedback : string = ""; // the feedback for the person donated to + timestamp : i64 = 0; // when the donation took place static fromBytes(bytes: u8[]): Donation { let decode = new wasmlib.BytesDecoder(bytes); let data = new Donation(); - data.amount = decode.int64(); - data.donator = decode.agentID(); - data.error = decode.string(); - data.feedback = decode.string(); + data.amount = decode.int64(); + data.donator = decode.agentID(); + data.error = decode.string(); + data.feedback = decode.string(); data.timestamp = decode.int64(); decode.close(); return data; diff --git a/contracts/wasm/erc20/go/erc20/consts.go b/contracts/wasm/erc20/go/erc20/consts.go index 21ffa48e92..b958c9f6e4 100644 --- a/contracts/wasm/erc20/go/erc20/consts.go +++ b/contracts/wasm/erc20/go/erc20/consts.go @@ -16,23 +16,23 @@ const ( ) const ( - ParamAccount = wasmlib.Key("ac") - ParamAmount = wasmlib.Key("am") - ParamCreator = wasmlib.Key("c") - ParamDelegation = wasmlib.Key("d") - ParamRecipient = wasmlib.Key("r") - ParamSupply = wasmlib.Key("s") + ParamAccount = "ac" + ParamAmount = "am" + ParamCreator = "c" + ParamDelegation = "d" + ParamRecipient = "r" + ParamSupply = "s" ) const ( - ResultAmount = wasmlib.Key("am") - ResultSupply = wasmlib.Key("s") + ResultAmount = "am" + ResultSupply = "s" ) const ( - StateAllAllowances = wasmlib.Key("a") - StateBalances = wasmlib.Key("b") - StateSupply = wasmlib.Key("s") + StateAllAllowances = "a" + StateBalances = "b" + StateSupply = "s" ) const ( diff --git a/contracts/wasm/erc20/go/erc20/keys.go b/contracts/wasm/erc20/go/erc20/keys.go index 5ab67393c5..d23df24110 100644 --- a/contracts/wasm/erc20/go/erc20/keys.go +++ b/contracts/wasm/erc20/go/erc20/keys.go @@ -10,14 +10,16 @@ package erc20 import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" const ( - IdxParamAccount = 0 - IdxParamAmount = 1 - IdxParamCreator = 2 - IdxParamDelegation = 3 - IdxParamRecipient = 4 - IdxParamSupply = 5 - IdxResultAmount = 6 - IdxResultSupply = 7 + IdxParamAccount = 0 + IdxParamAmount = 1 + IdxParamCreator = 2 + IdxParamDelegation = 3 + IdxParamRecipient = 4 + IdxParamSupply = 5 + + IdxResultAmount = 6 + IdxResultSupply = 7 + IdxStateAllAllowances = 8 IdxStateBalances = 9 IdxStateSupply = 10 diff --git a/contracts/wasm/erc20/src/consts.rs b/contracts/wasm/erc20/src/consts.rs index a872c77ce2..3c644e36a4 100644 --- a/contracts/wasm/erc20/src/consts.rs +++ b/contracts/wasm/erc20/src/consts.rs @@ -9,36 +9,36 @@ use wasmlib::*; -pub const SC_NAME: &str = "erc20"; -pub const SC_DESCRIPTION: &str = "ERC-20 PoC for IOTA Smart Contracts"; -pub const HSC_NAME: ScHname = ScHname(0x200e3733); - -pub const PARAM_ACCOUNT: &str = "ac"; -pub const PARAM_AMOUNT: &str = "am"; -pub const PARAM_CREATOR: &str = "c"; -pub const PARAM_DELEGATION: &str = "d"; -pub const PARAM_RECIPIENT: &str = "r"; -pub const PARAM_SUPPLY: &str = "s"; - -pub const RESULT_AMOUNT: &str = "am"; -pub const RESULT_SUPPLY: &str = "s"; - -pub const STATE_ALL_ALLOWANCES: &str = "a"; -pub const STATE_BALANCES: &str = "b"; -pub const STATE_SUPPLY: &str = "s"; - -pub const FUNC_APPROVE: &str = "approve"; -pub const FUNC_INIT: &str = "init"; -pub const FUNC_TRANSFER: &str = "transfer"; -pub const FUNC_TRANSFER_FROM: &str = "transferFrom"; -pub const VIEW_ALLOWANCE: &str = "allowance"; -pub const VIEW_BALANCE_OF: &str = "balanceOf"; -pub const VIEW_TOTAL_SUPPLY: &str = "totalSupply"; - -pub const HFUNC_APPROVE: ScHname = ScHname(0xa0661268); -pub const HFUNC_INIT: ScHname = ScHname(0x1f44d644); -pub const HFUNC_TRANSFER: ScHname = ScHname(0xa15da184); -pub const HFUNC_TRANSFER_FROM: ScHname = ScHname(0xd5e0a602); -pub const HVIEW_ALLOWANCE: ScHname = ScHname(0x5e16006a); -pub const HVIEW_BALANCE_OF: ScHname = ScHname(0x67ef8df4); -pub const HVIEW_TOTAL_SUPPLY: ScHname = ScHname(0x9505e6ca); +pub const SC_NAME : &str = "erc20"; +pub const SC_DESCRIPTION : &str = "ERC-20 PoC for IOTA Smart Contracts"; +pub const HSC_NAME : ScHname = ScHname(0x200e3733); + +pub const PARAM_ACCOUNT : &str = "ac"; +pub const PARAM_AMOUNT : &str = "am"; +pub const PARAM_CREATOR : &str = "c"; +pub const PARAM_DELEGATION : &str = "d"; +pub const PARAM_RECIPIENT : &str = "r"; +pub const PARAM_SUPPLY : &str = "s"; + +pub const RESULT_AMOUNT : &str = "am"; +pub const RESULT_SUPPLY : &str = "s"; + +pub const STATE_ALL_ALLOWANCES : &str = "a"; +pub const STATE_BALANCES : &str = "b"; +pub const STATE_SUPPLY : &str = "s"; + +pub const FUNC_APPROVE : &str = "approve"; +pub const FUNC_INIT : &str = "init"; +pub const FUNC_TRANSFER : &str = "transfer"; +pub const FUNC_TRANSFER_FROM : &str = "transferFrom"; +pub const VIEW_ALLOWANCE : &str = "allowance"; +pub const VIEW_BALANCE_OF : &str = "balanceOf"; +pub const VIEW_TOTAL_SUPPLY : &str = "totalSupply"; + +pub const HFUNC_APPROVE : ScHname = ScHname(0xa0661268); +pub const HFUNC_INIT : ScHname = ScHname(0x1f44d644); +pub const HFUNC_TRANSFER : ScHname = ScHname(0xa15da184); +pub const HFUNC_TRANSFER_FROM : ScHname = ScHname(0xd5e0a602); +pub const HVIEW_ALLOWANCE : ScHname = ScHname(0x5e16006a); +pub const HVIEW_BALANCE_OF : ScHname = ScHname(0x67ef8df4); +pub const HVIEW_TOTAL_SUPPLY : ScHname = ScHname(0x9505e6ca); diff --git a/contracts/wasm/erc20/src/keys.rs b/contracts/wasm/erc20/src/keys.rs index b5cd843122..44095bd456 100644 --- a/contracts/wasm/erc20/src/keys.rs +++ b/contracts/wasm/erc20/src/keys.rs @@ -11,17 +11,19 @@ use wasmlib::*; use crate::*; -pub(crate) const IDX_PARAM_ACCOUNT: usize = 0; -pub(crate) const IDX_PARAM_AMOUNT: usize = 1; -pub(crate) const IDX_PARAM_CREATOR: usize = 2; -pub(crate) const IDX_PARAM_DELEGATION: usize = 3; -pub(crate) const IDX_PARAM_RECIPIENT: usize = 4; -pub(crate) const IDX_PARAM_SUPPLY: usize = 5; -pub(crate) const IDX_RESULT_AMOUNT: usize = 6; -pub(crate) const IDX_RESULT_SUPPLY: usize = 7; -pub(crate) const IDX_STATE_ALL_ALLOWANCES: usize = 8; -pub(crate) const IDX_STATE_BALANCES: usize = 9; -pub(crate) const IDX_STATE_SUPPLY: usize = 10; +pub(crate) const IDX_PARAM_ACCOUNT : usize = 0; +pub(crate) const IDX_PARAM_AMOUNT : usize = 1; +pub(crate) const IDX_PARAM_CREATOR : usize = 2; +pub(crate) const IDX_PARAM_DELEGATION : usize = 3; +pub(crate) const IDX_PARAM_RECIPIENT : usize = 4; +pub(crate) const IDX_PARAM_SUPPLY : usize = 5; + +pub(crate) const IDX_RESULT_AMOUNT : usize = 6; +pub(crate) const IDX_RESULT_SUPPLY : usize = 7; + +pub(crate) const IDX_STATE_ALL_ALLOWANCES : usize = 8; +pub(crate) const IDX_STATE_BALANCES : usize = 9; +pub(crate) const IDX_STATE_SUPPLY : usize = 10; pub const KEY_MAP_LEN: usize = 11; diff --git a/contracts/wasm/erc20/src/lib.rs b/contracts/wasm/erc20/src/lib.rs index 5d821aecdb..2dc5059e2a 100644 --- a/contracts/wasm/erc20/src/lib.rs +++ b/contracts/wasm/erc20/src/lib.rs @@ -30,13 +30,13 @@ mod erc20; #[no_mangle] fn on_load() { let exports = ScExports::new(); - exports.add_func(FUNC_APPROVE, func_approve_thunk); - exports.add_func(FUNC_INIT, func_init_thunk); - exports.add_func(FUNC_TRANSFER, func_transfer_thunk); + exports.add_func(FUNC_APPROVE, func_approve_thunk); + exports.add_func(FUNC_INIT, func_init_thunk); + exports.add_func(FUNC_TRANSFER, func_transfer_thunk); exports.add_func(FUNC_TRANSFER_FROM, func_transfer_from_thunk); - exports.add_view(VIEW_ALLOWANCE, view_allowance_thunk); - exports.add_view(VIEW_BALANCE_OF, view_balance_of_thunk); - exports.add_view(VIEW_TOTAL_SUPPLY, view_total_supply_thunk); + exports.add_view(VIEW_ALLOWANCE, view_allowance_thunk); + exports.add_view(VIEW_BALANCE_OF, view_balance_of_thunk); + exports.add_view(VIEW_TOTAL_SUPPLY, view_total_supply_thunk); unsafe { for i in 0..KEY_MAP_LEN { diff --git a/contracts/wasm/erc20/ts/erc20/consts.ts b/contracts/wasm/erc20/ts/erc20/consts.ts index 9020011f56..6912a924b5 100644 --- a/contracts/wasm/erc20/ts/erc20/consts.ts +++ b/contracts/wasm/erc20/ts/erc20/consts.ts @@ -11,32 +11,32 @@ export const ScName = "erc20"; export const ScDescription = "ERC-20 PoC for IOTA Smart Contracts"; export const HScName = new wasmlib.ScHname(0x200e3733); -export const ParamAccount = "ac"; -export const ParamAmount = "am"; -export const ParamCreator = "c"; +export const ParamAccount = "ac"; +export const ParamAmount = "am"; +export const ParamCreator = "c"; export const ParamDelegation = "d"; -export const ParamRecipient = "r"; -export const ParamSupply = "s"; +export const ParamRecipient = "r"; +export const ParamSupply = "s"; export const ResultAmount = "am"; export const ResultSupply = "s"; export const StateAllAllowances = "a"; -export const StateBalances = "b"; -export const StateSupply = "s"; +export const StateBalances = "b"; +export const StateSupply = "s"; -export const FuncApprove = "approve"; -export const FuncInit = "init"; -export const FuncTransfer = "transfer"; +export const FuncApprove = "approve"; +export const FuncInit = "init"; +export const FuncTransfer = "transfer"; export const FuncTransferFrom = "transferFrom"; -export const ViewAllowance = "allowance"; -export const ViewBalanceOf = "balanceOf"; -export const ViewTotalSupply = "totalSupply"; +export const ViewAllowance = "allowance"; +export const ViewBalanceOf = "balanceOf"; +export const ViewTotalSupply = "totalSupply"; -export const HFuncApprove = new wasmlib.ScHname(0xa0661268); -export const HFuncInit = new wasmlib.ScHname(0x1f44d644); -export const HFuncTransfer = new wasmlib.ScHname(0xa15da184); +export const HFuncApprove = new wasmlib.ScHname(0xa0661268); +export const HFuncInit = new wasmlib.ScHname(0x1f44d644); +export const HFuncTransfer = new wasmlib.ScHname(0xa15da184); export const HFuncTransferFrom = new wasmlib.ScHname(0xd5e0a602); -export const HViewAllowance = new wasmlib.ScHname(0x5e16006a); -export const HViewBalanceOf = new wasmlib.ScHname(0x67ef8df4); -export const HViewTotalSupply = new wasmlib.ScHname(0x9505e6ca); +export const HViewAllowance = new wasmlib.ScHname(0x5e16006a); +export const HViewBalanceOf = new wasmlib.ScHname(0x67ef8df4); +export const HViewTotalSupply = new wasmlib.ScHname(0x9505e6ca); diff --git a/contracts/wasm/erc20/ts/erc20/keys.ts b/contracts/wasm/erc20/ts/erc20/keys.ts index adaea8b088..217222f5ce 100644 --- a/contracts/wasm/erc20/ts/erc20/keys.ts +++ b/contracts/wasm/erc20/ts/erc20/keys.ts @@ -8,17 +8,19 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; -export const IdxParamAccount = 0; -export const IdxParamAmount = 1; -export const IdxParamCreator = 2; +export const IdxParamAccount = 0; +export const IdxParamAmount = 1; +export const IdxParamCreator = 2; export const IdxParamDelegation = 3; -export const IdxParamRecipient = 4; -export const IdxParamSupply = 5; +export const IdxParamRecipient = 4; +export const IdxParamSupply = 5; + export const IdxResultAmount = 6; export const IdxResultSupply = 7; + export const IdxStateAllAllowances = 8; -export const IdxStateBalances = 9; -export const IdxStateSupply = 10; +export const IdxStateBalances = 9; +export const IdxStateSupply = 10; export let keyMap: string[] = [ sc.ParamAccount, diff --git a/contracts/wasm/erc20/ts/erc20/lib.ts b/contracts/wasm/erc20/ts/erc20/lib.ts index 48e144845b..7b15f7fde9 100644 --- a/contracts/wasm/erc20/ts/erc20/lib.ts +++ b/contracts/wasm/erc20/ts/erc20/lib.ts @@ -14,13 +14,13 @@ export function on_call(index: i32): void { export function on_load(): void { let exports = new wasmlib.ScExports(); - exports.addFunc(sc.FuncApprove, funcApproveThunk); - exports.addFunc(sc.FuncInit, funcInitThunk); - exports.addFunc(sc.FuncTransfer, funcTransferThunk); + exports.addFunc(sc.FuncApprove, funcApproveThunk); + exports.addFunc(sc.FuncInit, funcInitThunk); + exports.addFunc(sc.FuncTransfer, funcTransferThunk); exports.addFunc(sc.FuncTransferFrom, funcTransferFromThunk); - exports.addView(sc.ViewAllowance, viewAllowanceThunk); - exports.addView(sc.ViewBalanceOf, viewBalanceOfThunk); - exports.addView(sc.ViewTotalSupply, viewTotalSupplyThunk); + exports.addView(sc.ViewAllowance, viewAllowanceThunk); + exports.addView(sc.ViewBalanceOf, viewBalanceOfThunk); + exports.addView(sc.ViewTotalSupply, viewTotalSupplyThunk); for (let i = 0; i < sc.keyMap.length; i++) { sc.idxMap[i] = wasmlib.Key32.fromString(sc.keyMap[i]); diff --git a/contracts/wasm/fairauction/go/fairauction/consts.go b/contracts/wasm/fairauction/go/fairauction/consts.go index 225392daec..a64184d793 100644 --- a/contracts/wasm/fairauction/go/fairauction/consts.go +++ b/contracts/wasm/fairauction/go/fairauction/consts.go @@ -16,33 +16,33 @@ const ( ) const ( - ParamColor = wasmlib.Key("color") - ParamDescription = wasmlib.Key("description") - ParamDuration = wasmlib.Key("duration") - ParamMinimumBid = wasmlib.Key("minimumBid") - ParamOwnerMargin = wasmlib.Key("ownerMargin") + ParamColor = "color" + ParamDescription = "description" + ParamDuration = "duration" + ParamMinimumBid = "minimumBid" + ParamOwnerMargin = "ownerMargin" ) const ( - ResultBidders = wasmlib.Key("bidders") - ResultColor = wasmlib.Key("color") - ResultCreator = wasmlib.Key("creator") - ResultDeposit = wasmlib.Key("deposit") - ResultDescription = wasmlib.Key("description") - ResultDuration = wasmlib.Key("duration") - ResultHighestBid = wasmlib.Key("highestBid") - ResultHighestBidder = wasmlib.Key("highestBidder") - ResultMinimumBid = wasmlib.Key("minimumBid") - ResultNumTokens = wasmlib.Key("numTokens") - ResultOwnerMargin = wasmlib.Key("ownerMargin") - ResultWhenStarted = wasmlib.Key("whenStarted") + ResultBidders = "bidders" + ResultColor = "color" + ResultCreator = "creator" + ResultDeposit = "deposit" + ResultDescription = "description" + ResultDuration = "duration" + ResultHighestBid = "highestBid" + ResultHighestBidder = "highestBidder" + ResultMinimumBid = "minimumBid" + ResultNumTokens = "numTokens" + ResultOwnerMargin = "ownerMargin" + ResultWhenStarted = "whenStarted" ) const ( - StateAuctions = wasmlib.Key("auctions") - StateBidderList = wasmlib.Key("bidderList") - StateBids = wasmlib.Key("bids") - StateOwnerMargin = wasmlib.Key("ownerMargin") + StateAuctions = "auctions" + StateBidderList = "bidderList" + StateBids = "bids" + StateOwnerMargin = "ownerMargin" ) const ( diff --git a/contracts/wasm/fairauction/go/fairauction/keys.go b/contracts/wasm/fairauction/go/fairauction/keys.go index 24584b37df..c66bce5659 100644 --- a/contracts/wasm/fairauction/go/fairauction/keys.go +++ b/contracts/wasm/fairauction/go/fairauction/keys.go @@ -10,11 +10,12 @@ package fairauction import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" const ( - IdxParamColor = 0 - IdxParamDescription = 1 - IdxParamDuration = 2 - IdxParamMinimumBid = 3 - IdxParamOwnerMargin = 4 + IdxParamColor = 0 + IdxParamDescription = 1 + IdxParamDuration = 2 + IdxParamMinimumBid = 3 + IdxParamOwnerMargin = 4 + IdxResultBidders = 5 IdxResultColor = 6 IdxResultCreator = 7 @@ -27,10 +28,11 @@ const ( IdxResultNumTokens = 14 IdxResultOwnerMargin = 15 IdxResultWhenStarted = 16 - IdxStateAuctions = 17 - IdxStateBidderList = 18 - IdxStateBids = 19 - IdxStateOwnerMargin = 20 + + IdxStateAuctions = 17 + IdxStateBidderList = 18 + IdxStateBids = 19 + IdxStateOwnerMargin = 20 ) const keyMapLen = 21 diff --git a/contracts/wasm/fairauction/src/consts.rs b/contracts/wasm/fairauction/src/consts.rs index 9933066149..4d64eee75b 100644 --- a/contracts/wasm/fairauction/src/consts.rs +++ b/contracts/wasm/fairauction/src/consts.rs @@ -9,42 +9,42 @@ use wasmlib::*; -pub const SC_NAME: &str = "fairauction"; -pub const SC_DESCRIPTION: &str = "Decentralized auction to securely sell tokens to the highest bidder"; -pub const HSC_NAME: ScHname = ScHname(0x1b5c43b1); - -pub const PARAM_COLOR: &str = "color"; -pub const PARAM_DESCRIPTION: &str = "description"; -pub const PARAM_DURATION: &str = "duration"; -pub const PARAM_MINIMUM_BID: &str = "minimumBid"; -pub const PARAM_OWNER_MARGIN: &str = "ownerMargin"; - -pub const RESULT_BIDDERS: &str = "bidders"; -pub const RESULT_COLOR: &str = "color"; -pub const RESULT_CREATOR: &str = "creator"; -pub const RESULT_DEPOSIT: &str = "deposit"; -pub const RESULT_DESCRIPTION: &str = "description"; -pub const RESULT_DURATION: &str = "duration"; -pub const RESULT_HIGHEST_BID: &str = "highestBid"; -pub const RESULT_HIGHEST_BIDDER: &str = "highestBidder"; -pub const RESULT_MINIMUM_BID: &str = "minimumBid"; -pub const RESULT_NUM_TOKENS: &str = "numTokens"; -pub const RESULT_OWNER_MARGIN: &str = "ownerMargin"; -pub const RESULT_WHEN_STARTED: &str = "whenStarted"; - -pub const STATE_AUCTIONS: &str = "auctions"; -pub const STATE_BIDDER_LIST: &str = "bidderList"; -pub const STATE_BIDS: &str = "bids"; -pub const STATE_OWNER_MARGIN: &str = "ownerMargin"; - -pub const FUNC_FINALIZE_AUCTION: &str = "finalizeAuction"; -pub const FUNC_PLACE_BID: &str = "placeBid"; -pub const FUNC_SET_OWNER_MARGIN: &str = "setOwnerMargin"; -pub const FUNC_START_AUCTION: &str = "startAuction"; -pub const VIEW_GET_INFO: &str = "getInfo"; - -pub const HFUNC_FINALIZE_AUCTION: ScHname = ScHname(0x8d534ddc); -pub const HFUNC_PLACE_BID: ScHname = ScHname(0x9bd72fa9); -pub const HFUNC_SET_OWNER_MARGIN: ScHname = ScHname(0x1774461a); -pub const HFUNC_START_AUCTION: ScHname = ScHname(0xd5b7bacb); -pub const HVIEW_GET_INFO: ScHname = ScHname(0xcfedba5f); +pub const SC_NAME : &str = "fairauction"; +pub const SC_DESCRIPTION : &str = "Decentralized auction to securely sell tokens to the highest bidder"; +pub const HSC_NAME : ScHname = ScHname(0x1b5c43b1); + +pub const PARAM_COLOR : &str = "color"; +pub const PARAM_DESCRIPTION : &str = "description"; +pub const PARAM_DURATION : &str = "duration"; +pub const PARAM_MINIMUM_BID : &str = "minimumBid"; +pub const PARAM_OWNER_MARGIN : &str = "ownerMargin"; + +pub const RESULT_BIDDERS : &str = "bidders"; +pub const RESULT_COLOR : &str = "color"; +pub const RESULT_CREATOR : &str = "creator"; +pub const RESULT_DEPOSIT : &str = "deposit"; +pub const RESULT_DESCRIPTION : &str = "description"; +pub const RESULT_DURATION : &str = "duration"; +pub const RESULT_HIGHEST_BID : &str = "highestBid"; +pub const RESULT_HIGHEST_BIDDER : &str = "highestBidder"; +pub const RESULT_MINIMUM_BID : &str = "minimumBid"; +pub const RESULT_NUM_TOKENS : &str = "numTokens"; +pub const RESULT_OWNER_MARGIN : &str = "ownerMargin"; +pub const RESULT_WHEN_STARTED : &str = "whenStarted"; + +pub const STATE_AUCTIONS : &str = "auctions"; +pub const STATE_BIDDER_LIST : &str = "bidderList"; +pub const STATE_BIDS : &str = "bids"; +pub const STATE_OWNER_MARGIN : &str = "ownerMargin"; + +pub const FUNC_FINALIZE_AUCTION : &str = "finalizeAuction"; +pub const FUNC_PLACE_BID : &str = "placeBid"; +pub const FUNC_SET_OWNER_MARGIN : &str = "setOwnerMargin"; +pub const FUNC_START_AUCTION : &str = "startAuction"; +pub const VIEW_GET_INFO : &str = "getInfo"; + +pub const HFUNC_FINALIZE_AUCTION : ScHname = ScHname(0x8d534ddc); +pub const HFUNC_PLACE_BID : ScHname = ScHname(0x9bd72fa9); +pub const HFUNC_SET_OWNER_MARGIN : ScHname = ScHname(0x1774461a); +pub const HFUNC_START_AUCTION : ScHname = ScHname(0xd5b7bacb); +pub const HVIEW_GET_INFO : ScHname = ScHname(0xcfedba5f); diff --git a/contracts/wasm/fairauction/src/keys.rs b/contracts/wasm/fairauction/src/keys.rs index 5b93458202..843e56e642 100644 --- a/contracts/wasm/fairauction/src/keys.rs +++ b/contracts/wasm/fairauction/src/keys.rs @@ -11,27 +11,29 @@ use wasmlib::*; use crate::*; -pub(crate) const IDX_PARAM_COLOR: usize = 0; -pub(crate) const IDX_PARAM_DESCRIPTION: usize = 1; -pub(crate) const IDX_PARAM_DURATION: usize = 2; -pub(crate) const IDX_PARAM_MINIMUM_BID: usize = 3; -pub(crate) const IDX_PARAM_OWNER_MARGIN: usize = 4; -pub(crate) const IDX_RESULT_BIDDERS: usize = 5; -pub(crate) const IDX_RESULT_COLOR: usize = 6; -pub(crate) const IDX_RESULT_CREATOR: usize = 7; -pub(crate) const IDX_RESULT_DEPOSIT: usize = 8; -pub(crate) const IDX_RESULT_DESCRIPTION: usize = 9; -pub(crate) const IDX_RESULT_DURATION: usize = 10; -pub(crate) const IDX_RESULT_HIGHEST_BID: usize = 11; -pub(crate) const IDX_RESULT_HIGHEST_BIDDER: usize = 12; -pub(crate) const IDX_RESULT_MINIMUM_BID: usize = 13; -pub(crate) const IDX_RESULT_NUM_TOKENS: usize = 14; -pub(crate) const IDX_RESULT_OWNER_MARGIN: usize = 15; -pub(crate) const IDX_RESULT_WHEN_STARTED: usize = 16; -pub(crate) const IDX_STATE_AUCTIONS: usize = 17; -pub(crate) const IDX_STATE_BIDDER_LIST: usize = 18; -pub(crate) const IDX_STATE_BIDS: usize = 19; -pub(crate) const IDX_STATE_OWNER_MARGIN: usize = 20; +pub(crate) const IDX_PARAM_COLOR : usize = 0; +pub(crate) const IDX_PARAM_DESCRIPTION : usize = 1; +pub(crate) const IDX_PARAM_DURATION : usize = 2; +pub(crate) const IDX_PARAM_MINIMUM_BID : usize = 3; +pub(crate) const IDX_PARAM_OWNER_MARGIN : usize = 4; + +pub(crate) const IDX_RESULT_BIDDERS : usize = 5; +pub(crate) const IDX_RESULT_COLOR : usize = 6; +pub(crate) const IDX_RESULT_CREATOR : usize = 7; +pub(crate) const IDX_RESULT_DEPOSIT : usize = 8; +pub(crate) const IDX_RESULT_DESCRIPTION : usize = 9; +pub(crate) const IDX_RESULT_DURATION : usize = 10; +pub(crate) const IDX_RESULT_HIGHEST_BID : usize = 11; +pub(crate) const IDX_RESULT_HIGHEST_BIDDER : usize = 12; +pub(crate) const IDX_RESULT_MINIMUM_BID : usize = 13; +pub(crate) const IDX_RESULT_NUM_TOKENS : usize = 14; +pub(crate) const IDX_RESULT_OWNER_MARGIN : usize = 15; +pub(crate) const IDX_RESULT_WHEN_STARTED : usize = 16; + +pub(crate) const IDX_STATE_AUCTIONS : usize = 17; +pub(crate) const IDX_STATE_BIDDER_LIST : usize = 18; +pub(crate) const IDX_STATE_BIDS : usize = 19; +pub(crate) const IDX_STATE_OWNER_MARGIN : usize = 20; pub const KEY_MAP_LEN: usize = 21; diff --git a/contracts/wasm/fairauction/src/lib.rs b/contracts/wasm/fairauction/src/lib.rs index 23c000e6b8..c06b616810 100644 --- a/contracts/wasm/fairauction/src/lib.rs +++ b/contracts/wasm/fairauction/src/lib.rs @@ -32,10 +32,10 @@ mod fairauction; fn on_load() { let exports = ScExports::new(); exports.add_func(FUNC_FINALIZE_AUCTION, func_finalize_auction_thunk); - exports.add_func(FUNC_PLACE_BID, func_place_bid_thunk); + exports.add_func(FUNC_PLACE_BID, func_place_bid_thunk); exports.add_func(FUNC_SET_OWNER_MARGIN, func_set_owner_margin_thunk); - exports.add_func(FUNC_START_AUCTION, func_start_auction_thunk); - exports.add_view(VIEW_GET_INFO, view_get_info_thunk); + exports.add_func(FUNC_START_AUCTION, func_start_auction_thunk); + exports.add_view(VIEW_GET_INFO, view_get_info_thunk); unsafe { for i in 0..KEY_MAP_LEN { diff --git a/contracts/wasm/fairauction/src/structs.rs b/contracts/wasm/fairauction/src/structs.rs index bbede307d0..2ca3e578f6 100644 --- a/contracts/wasm/fairauction/src/structs.rs +++ b/contracts/wasm/fairauction/src/structs.rs @@ -11,34 +11,34 @@ use wasmlib::*; use wasmlib::host::*; pub struct Auction { - pub color: ScColor, // color of tokens for sale - pub creator: ScAgentID, // issuer of start_auction transaction - pub deposit: i64, // deposit by auction owner to cover the SC fees - pub description: String, // auction description - pub duration: i32, // auction duration in minutes - pub highest_bid: i64, // the current highest bid amount - pub highest_bidder: ScAgentID, // the current highest bidder - pub minimum_bid: i64, // minimum bid amount - pub num_tokens: i64, // number of tokens for sale - pub owner_margin: i64, // auction owner's margin in promilles - pub when_started: i64, // timestamp when auction started + pub color : ScColor, // color of tokens for sale + pub creator : ScAgentID, // issuer of start_auction transaction + pub deposit : i64, // deposit by auction owner to cover the SC fees + pub description : String, // auction description + pub duration : i32, // auction duration in minutes + pub highest_bid : i64, // the current highest bid amount + pub highest_bidder : ScAgentID, // the current highest bidder + pub minimum_bid : i64, // minimum bid amount + pub num_tokens : i64, // number of tokens for sale + pub owner_margin : i64, // auction owner's margin in promilles + pub when_started : i64, // timestamp when auction started } impl Auction { pub fn from_bytes(bytes: &[u8]) -> Auction { let mut decode = BytesDecoder::new(bytes); Auction { - color: decode.color(), - creator: decode.agent_id(), - deposit: decode.int64(), - description: decode.string(), - duration: decode.int32(), - highest_bid: decode.int64(), - highest_bidder: decode.agent_id(), - minimum_bid: decode.int64(), - num_tokens: decode.int64(), - owner_margin: decode.int64(), - when_started: decode.int64(), + color : decode.color(), + creator : decode.agent_id(), + deposit : decode.int64(), + description : decode.string(), + duration : decode.int32(), + highest_bid : decode.int64(), + highest_bidder : decode.agent_id(), + minimum_bid : decode.int64(), + num_tokens : decode.int64(), + owner_margin : decode.int64(), + when_started : decode.int64(), } } @@ -94,18 +94,18 @@ impl MutableAuction { } pub struct Bid { - pub amount: i64, // cumulative amount of bids from same bidder - pub index: i32, // index of bidder in bidder list - pub timestamp: i64, // timestamp of most recent bid + pub amount : i64, // cumulative amount of bids from same bidder + pub index : i32, // index of bidder in bidder list + pub timestamp : i64, // timestamp of most recent bid } impl Bid { pub fn from_bytes(bytes: &[u8]) -> Bid { let mut decode = BytesDecoder::new(bytes); Bid { - amount: decode.int64(), - index: decode.int32(), - timestamp: decode.int64(), + amount : decode.int64(), + index : decode.int32(), + timestamp : decode.int64(), } } diff --git a/contracts/wasm/fairauction/ts/fairauction/consts.ts b/contracts/wasm/fairauction/ts/fairauction/consts.ts index c1b25c4ffe..e4b544c88d 100644 --- a/contracts/wasm/fairauction/ts/fairauction/consts.ts +++ b/contracts/wasm/fairauction/ts/fairauction/consts.ts @@ -11,38 +11,38 @@ export const ScName = "fairauction"; export const ScDescription = "Decentralized auction to securely sell tokens to the highest bidder"; export const HScName = new wasmlib.ScHname(0x1b5c43b1); -export const ParamColor = "color"; +export const ParamColor = "color"; export const ParamDescription = "description"; -export const ParamDuration = "duration"; -export const ParamMinimumBid = "minimumBid"; +export const ParamDuration = "duration"; +export const ParamMinimumBid = "minimumBid"; export const ParamOwnerMargin = "ownerMargin"; -export const ResultBidders = "bidders"; -export const ResultColor = "color"; -export const ResultCreator = "creator"; -export const ResultDeposit = "deposit"; -export const ResultDescription = "description"; -export const ResultDuration = "duration"; -export const ResultHighestBid = "highestBid"; +export const ResultBidders = "bidders"; +export const ResultColor = "color"; +export const ResultCreator = "creator"; +export const ResultDeposit = "deposit"; +export const ResultDescription = "description"; +export const ResultDuration = "duration"; +export const ResultHighestBid = "highestBid"; export const ResultHighestBidder = "highestBidder"; -export const ResultMinimumBid = "minimumBid"; -export const ResultNumTokens = "numTokens"; -export const ResultOwnerMargin = "ownerMargin"; -export const ResultWhenStarted = "whenStarted"; - -export const StateAuctions = "auctions"; -export const StateBidderList = "bidderList"; -export const StateBids = "bids"; +export const ResultMinimumBid = "minimumBid"; +export const ResultNumTokens = "numTokens"; +export const ResultOwnerMargin = "ownerMargin"; +export const ResultWhenStarted = "whenStarted"; + +export const StateAuctions = "auctions"; +export const StateBidderList = "bidderList"; +export const StateBids = "bids"; export const StateOwnerMargin = "ownerMargin"; export const FuncFinalizeAuction = "finalizeAuction"; -export const FuncPlaceBid = "placeBid"; -export const FuncSetOwnerMargin = "setOwnerMargin"; -export const FuncStartAuction = "startAuction"; -export const ViewGetInfo = "getInfo"; +export const FuncPlaceBid = "placeBid"; +export const FuncSetOwnerMargin = "setOwnerMargin"; +export const FuncStartAuction = "startAuction"; +export const ViewGetInfo = "getInfo"; export const HFuncFinalizeAuction = new wasmlib.ScHname(0x8d534ddc); -export const HFuncPlaceBid = new wasmlib.ScHname(0x9bd72fa9); -export const HFuncSetOwnerMargin = new wasmlib.ScHname(0x1774461a); -export const HFuncStartAuction = new wasmlib.ScHname(0xd5b7bacb); -export const HViewGetInfo = new wasmlib.ScHname(0xcfedba5f); +export const HFuncPlaceBid = new wasmlib.ScHname(0x9bd72fa9); +export const HFuncSetOwnerMargin = new wasmlib.ScHname(0x1774461a); +export const HFuncStartAuction = new wasmlib.ScHname(0xd5b7bacb); +export const HViewGetInfo = new wasmlib.ScHname(0xcfedba5f); diff --git a/contracts/wasm/fairauction/ts/fairauction/keys.ts b/contracts/wasm/fairauction/ts/fairauction/keys.ts index 2745fd5748..b4d09d3c3a 100644 --- a/contracts/wasm/fairauction/ts/fairauction/keys.ts +++ b/contracts/wasm/fairauction/ts/fairauction/keys.ts @@ -8,26 +8,28 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; -export const IdxParamColor = 0; +export const IdxParamColor = 0; export const IdxParamDescription = 1; -export const IdxParamDuration = 2; -export const IdxParamMinimumBid = 3; +export const IdxParamDuration = 2; +export const IdxParamMinimumBid = 3; export const IdxParamOwnerMargin = 4; -export const IdxResultBidders = 5; -export const IdxResultColor = 6; -export const IdxResultCreator = 7; -export const IdxResultDeposit = 8; -export const IdxResultDescription = 9; -export const IdxResultDuration = 10; -export const IdxResultHighestBid = 11; + +export const IdxResultBidders = 5; +export const IdxResultColor = 6; +export const IdxResultCreator = 7; +export const IdxResultDeposit = 8; +export const IdxResultDescription = 9; +export const IdxResultDuration = 10; +export const IdxResultHighestBid = 11; export const IdxResultHighestBidder = 12; -export const IdxResultMinimumBid = 13; -export const IdxResultNumTokens = 14; -export const IdxResultOwnerMargin = 15; -export const IdxResultWhenStarted = 16; -export const IdxStateAuctions = 17; -export const IdxStateBidderList = 18; -export const IdxStateBids = 19; +export const IdxResultMinimumBid = 13; +export const IdxResultNumTokens = 14; +export const IdxResultOwnerMargin = 15; +export const IdxResultWhenStarted = 16; + +export const IdxStateAuctions = 17; +export const IdxStateBidderList = 18; +export const IdxStateBids = 19; export const IdxStateOwnerMargin = 20; export let keyMap: string[] = [ diff --git a/contracts/wasm/fairauction/ts/fairauction/lib.ts b/contracts/wasm/fairauction/ts/fairauction/lib.ts index 677e7a0f1c..be55858d8b 100644 --- a/contracts/wasm/fairauction/ts/fairauction/lib.ts +++ b/contracts/wasm/fairauction/ts/fairauction/lib.ts @@ -15,10 +15,10 @@ export function on_call(index: i32): void { export function on_load(): void { let exports = new wasmlib.ScExports(); exports.addFunc(sc.FuncFinalizeAuction, funcFinalizeAuctionThunk); - exports.addFunc(sc.FuncPlaceBid, funcPlaceBidThunk); - exports.addFunc(sc.FuncSetOwnerMargin, funcSetOwnerMarginThunk); - exports.addFunc(sc.FuncStartAuction, funcStartAuctionThunk); - exports.addView(sc.ViewGetInfo, viewGetInfoThunk); + exports.addFunc(sc.FuncPlaceBid, funcPlaceBidThunk); + exports.addFunc(sc.FuncSetOwnerMargin, funcSetOwnerMarginThunk); + exports.addFunc(sc.FuncStartAuction, funcStartAuctionThunk); + exports.addView(sc.ViewGetInfo, viewGetInfoThunk); for (let i = 0; i < sc.keyMap.length; i++) { sc.idxMap[i] = wasmlib.Key32.fromString(sc.keyMap[i]); diff --git a/contracts/wasm/fairauction/ts/fairauction/structs.ts b/contracts/wasm/fairauction/ts/fairauction/structs.ts index dcb47fc152..2a9319e5e2 100644 --- a/contracts/wasm/fairauction/ts/fairauction/structs.ts +++ b/contracts/wasm/fairauction/ts/fairauction/structs.ts @@ -8,32 +8,32 @@ import * as wasmlib from "wasmlib"; export class Auction { - color: wasmlib.ScColor = new wasmlib.ScColor(0); // color of tokens for sale - creator: wasmlib.ScAgentID = new wasmlib.ScAgentID(); // issuer of start_auction transaction - deposit: i64 = 0; // deposit by auction owner to cover the SC fees - description: string = ""; // auction description - duration: i32 = 0; // auction duration in minutes - highestBid: i64 = 0; // the current highest bid amount - highestBidder: wasmlib.ScAgentID = new wasmlib.ScAgentID(); // the current highest bidder - minimumBid: i64 = 0; // minimum bid amount - numTokens: i64 = 0; // number of tokens for sale - ownerMargin: i64 = 0; // auction owner's margin in promilles - whenStarted: i64 = 0; // timestamp when auction started + color : wasmlib.ScColor = new wasmlib.ScColor(0); // color of tokens for sale + creator : wasmlib.ScAgentID = new wasmlib.ScAgentID(); // issuer of start_auction transaction + deposit : i64 = 0; // deposit by auction owner to cover the SC fees + description : string = ""; // auction description + duration : i32 = 0; // auction duration in minutes + highestBid : i64 = 0; // the current highest bid amount + highestBidder : wasmlib.ScAgentID = new wasmlib.ScAgentID(); // the current highest bidder + minimumBid : i64 = 0; // minimum bid amount + numTokens : i64 = 0; // number of tokens for sale + ownerMargin : i64 = 0; // auction owner's margin in promilles + whenStarted : i64 = 0; // timestamp when auction started static fromBytes(bytes: u8[]): Auction { let decode = new wasmlib.BytesDecoder(bytes); let data = new Auction(); - data.color = decode.color(); - data.creator = decode.agentID(); - data.deposit = decode.int64(); - data.description = decode.string(); - data.duration = decode.int32(); - data.highestBid = decode.int64(); + data.color = decode.color(); + data.creator = decode.agentID(); + data.deposit = decode.int64(); + data.description = decode.string(); + data.duration = decode.int32(); + data.highestBid = decode.int64(); data.highestBidder = decode.agentID(); - data.minimumBid = decode.int64(); - data.numTokens = decode.int64(); - data.ownerMargin = decode.int64(); - data.whenStarted = decode.int64(); + data.minimumBid = decode.int64(); + data.numTokens = decode.int64(); + data.ownerMargin = decode.int64(); + data.whenStarted = decode.int64(); decode.close(); return data; } @@ -96,15 +96,15 @@ export class MutableAuction { } export class Bid { - amount: i64 = 0; // cumulative amount of bids from same bidder - index: i32 = 0; // index of bidder in bidder list - timestamp: i64 = 0; // timestamp of most recent bid + amount : i64 = 0; // cumulative amount of bids from same bidder + index : i32 = 0; // index of bidder in bidder list + timestamp : i64 = 0; // timestamp of most recent bid static fromBytes(bytes: u8[]): Bid { let decode = new wasmlib.BytesDecoder(bytes); let data = new Bid(); - data.amount = decode.int64(); - data.index = decode.int32(); + data.amount = decode.int64(); + data.index = decode.int32(); data.timestamp = decode.int64(); decode.close(); return data; diff --git a/contracts/wasm/fairroulette/go/fairroulette/consts.go b/contracts/wasm/fairroulette/go/fairroulette/consts.go index 350e9d21a8..69bdc218e0 100644 --- a/contracts/wasm/fairroulette/go/fairroulette/consts.go +++ b/contracts/wasm/fairroulette/go/fairroulette/consts.go @@ -16,24 +16,24 @@ const ( ) const ( - ParamNumber = wasmlib.Key("number") - ParamPlayPeriod = wasmlib.Key("playPeriod") + ParamNumber = "number" + ParamPlayPeriod = "playPeriod" ) const ( - ResultLastWinningNumber = wasmlib.Key("lastWinningNumber") - ResultRoundNumber = wasmlib.Key("roundNumber") - ResultRoundStartedAt = wasmlib.Key("roundStartedAt") - ResultRoundStatus = wasmlib.Key("roundStatus") + ResultLastWinningNumber = "lastWinningNumber" + ResultRoundNumber = "roundNumber" + ResultRoundStartedAt = "roundStartedAt" + ResultRoundStatus = "roundStatus" ) const ( - StateBets = wasmlib.Key("bets") - StateLastWinningNumber = wasmlib.Key("lastWinningNumber") - StatePlayPeriod = wasmlib.Key("playPeriod") - StateRoundNumber = wasmlib.Key("roundNumber") - StateRoundStartedAt = wasmlib.Key("roundStartedAt") - StateRoundStatus = wasmlib.Key("roundStatus") + StateBets = "bets" + StateLastWinningNumber = "lastWinningNumber" + StatePlayPeriod = "playPeriod" + StateRoundNumber = "roundNumber" + StateRoundStartedAt = "roundStartedAt" + StateRoundStatus = "roundStatus" ) const ( diff --git a/contracts/wasm/fairroulette/go/fairroulette/keys.go b/contracts/wasm/fairroulette/go/fairroulette/keys.go index 2837c356f4..3f95a7a418 100644 --- a/contracts/wasm/fairroulette/go/fairroulette/keys.go +++ b/contracts/wasm/fairroulette/go/fairroulette/keys.go @@ -10,18 +10,20 @@ package fairroulette import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" const ( - IdxParamNumber = 0 - IdxParamPlayPeriod = 1 + IdxParamNumber = 0 + IdxParamPlayPeriod = 1 + IdxResultLastWinningNumber = 2 IdxResultRoundNumber = 3 IdxResultRoundStartedAt = 4 IdxResultRoundStatus = 5 - IdxStateBets = 6 - IdxStateLastWinningNumber = 7 - IdxStatePlayPeriod = 8 - IdxStateRoundNumber = 9 - IdxStateRoundStartedAt = 10 - IdxStateRoundStatus = 11 + + IdxStateBets = 6 + IdxStateLastWinningNumber = 7 + IdxStatePlayPeriod = 8 + IdxStateRoundNumber = 9 + IdxStateRoundStartedAt = 10 + IdxStateRoundStatus = 11 ) const keyMapLen = 12 diff --git a/contracts/wasm/fairroulette/src/consts.rs b/contracts/wasm/fairroulette/src/consts.rs index 825e7da869..fd808c56f5 100644 --- a/contracts/wasm/fairroulette/src/consts.rs +++ b/contracts/wasm/fairroulette/src/consts.rs @@ -9,41 +9,41 @@ use wasmlib::*; -pub const SC_NAME: &str = "fairroulette"; -pub const SC_DESCRIPTION: &str = ""; -pub const HSC_NAME: ScHname = ScHname(0xdf79d138); - -pub const PARAM_NUMBER: &str = "number"; -pub const PARAM_PLAY_PERIOD: &str = "playPeriod"; - -pub const RESULT_LAST_WINNING_NUMBER: &str = "lastWinningNumber"; -pub const RESULT_ROUND_NUMBER: &str = "roundNumber"; -pub const RESULT_ROUND_STARTED_AT: &str = "roundStartedAt"; -pub const RESULT_ROUND_STATUS: &str = "roundStatus"; - -pub const STATE_BETS: &str = "bets"; -pub const STATE_LAST_WINNING_NUMBER: &str = "lastWinningNumber"; -pub const STATE_PLAY_PERIOD: &str = "playPeriod"; -pub const STATE_ROUND_NUMBER: &str = "roundNumber"; -pub const STATE_ROUND_STARTED_AT: &str = "roundStartedAt"; -pub const STATE_ROUND_STATUS: &str = "roundStatus"; - -pub const FUNC_FORCE_PAYOUT: &str = "forcePayout"; -pub const FUNC_FORCE_RESET: &str = "forceReset"; -pub const FUNC_PAY_WINNERS: &str = "payWinners"; -pub const FUNC_PLACE_BET: &str = "placeBet"; -pub const FUNC_PLAY_PERIOD: &str = "playPeriod"; -pub const VIEW_LAST_WINNING_NUMBER: &str = "lastWinningNumber"; -pub const VIEW_ROUND_NUMBER: &str = "roundNumber"; -pub const VIEW_ROUND_STARTED_AT: &str = "roundStartedAt"; -pub const VIEW_ROUND_STATUS: &str = "roundStatus"; - -pub const HFUNC_FORCE_PAYOUT: ScHname = ScHname(0x555a4c4f); -pub const HFUNC_FORCE_RESET: ScHname = ScHname(0xa331951e); -pub const HFUNC_PAY_WINNERS: ScHname = ScHname(0xfb2b0144); -pub const HFUNC_PLACE_BET: ScHname = ScHname(0xdfba7d1b); -pub const HFUNC_PLAY_PERIOD: ScHname = ScHname(0xcb94b293); -pub const HVIEW_LAST_WINNING_NUMBER: ScHname = ScHname(0x2f5f09fe); -pub const HVIEW_ROUND_NUMBER: ScHname = ScHname(0x0dcfe520); -pub const HVIEW_ROUND_STARTED_AT: ScHname = ScHname(0x725de8b4); -pub const HVIEW_ROUND_STATUS: ScHname = ScHname(0x145053b5); +pub const SC_NAME : &str = "fairroulette"; +pub const SC_DESCRIPTION : &str = ""; +pub const HSC_NAME : ScHname = ScHname(0xdf79d138); + +pub const PARAM_NUMBER : &str = "number"; +pub const PARAM_PLAY_PERIOD : &str = "playPeriod"; + +pub const RESULT_LAST_WINNING_NUMBER : &str = "lastWinningNumber"; +pub const RESULT_ROUND_NUMBER : &str = "roundNumber"; +pub const RESULT_ROUND_STARTED_AT : &str = "roundStartedAt"; +pub const RESULT_ROUND_STATUS : &str = "roundStatus"; + +pub const STATE_BETS : &str = "bets"; +pub const STATE_LAST_WINNING_NUMBER : &str = "lastWinningNumber"; +pub const STATE_PLAY_PERIOD : &str = "playPeriod"; +pub const STATE_ROUND_NUMBER : &str = "roundNumber"; +pub const STATE_ROUND_STARTED_AT : &str = "roundStartedAt"; +pub const STATE_ROUND_STATUS : &str = "roundStatus"; + +pub const FUNC_FORCE_PAYOUT : &str = "forcePayout"; +pub const FUNC_FORCE_RESET : &str = "forceReset"; +pub const FUNC_PAY_WINNERS : &str = "payWinners"; +pub const FUNC_PLACE_BET : &str = "placeBet"; +pub const FUNC_PLAY_PERIOD : &str = "playPeriod"; +pub const VIEW_LAST_WINNING_NUMBER : &str = "lastWinningNumber"; +pub const VIEW_ROUND_NUMBER : &str = "roundNumber"; +pub const VIEW_ROUND_STARTED_AT : &str = "roundStartedAt"; +pub const VIEW_ROUND_STATUS : &str = "roundStatus"; + +pub const HFUNC_FORCE_PAYOUT : ScHname = ScHname(0x555a4c4f); +pub const HFUNC_FORCE_RESET : ScHname = ScHname(0xa331951e); +pub const HFUNC_PAY_WINNERS : ScHname = ScHname(0xfb2b0144); +pub const HFUNC_PLACE_BET : ScHname = ScHname(0xdfba7d1b); +pub const HFUNC_PLAY_PERIOD : ScHname = ScHname(0xcb94b293); +pub const HVIEW_LAST_WINNING_NUMBER : ScHname = ScHname(0x2f5f09fe); +pub const HVIEW_ROUND_NUMBER : ScHname = ScHname(0x0dcfe520); +pub const HVIEW_ROUND_STARTED_AT : ScHname = ScHname(0x725de8b4); +pub const HVIEW_ROUND_STATUS : ScHname = ScHname(0x145053b5); diff --git a/contracts/wasm/fairroulette/src/keys.rs b/contracts/wasm/fairroulette/src/keys.rs index fe64401049..e487249b10 100644 --- a/contracts/wasm/fairroulette/src/keys.rs +++ b/contracts/wasm/fairroulette/src/keys.rs @@ -11,18 +11,20 @@ use wasmlib::*; use crate::*; -pub(crate) const IDX_PARAM_NUMBER: usize = 0; -pub(crate) const IDX_PARAM_PLAY_PERIOD: usize = 1; -pub(crate) const IDX_RESULT_LAST_WINNING_NUMBER: usize = 2; -pub(crate) const IDX_RESULT_ROUND_NUMBER: usize = 3; -pub(crate) const IDX_RESULT_ROUND_STARTED_AT: usize = 4; -pub(crate) const IDX_RESULT_ROUND_STATUS: usize = 5; -pub(crate) const IDX_STATE_BETS: usize = 6; -pub(crate) const IDX_STATE_LAST_WINNING_NUMBER: usize = 7; -pub(crate) const IDX_STATE_PLAY_PERIOD: usize = 8; -pub(crate) const IDX_STATE_ROUND_NUMBER: usize = 9; -pub(crate) const IDX_STATE_ROUND_STARTED_AT: usize = 10; -pub(crate) const IDX_STATE_ROUND_STATUS: usize = 11; +pub(crate) const IDX_PARAM_NUMBER : usize = 0; +pub(crate) const IDX_PARAM_PLAY_PERIOD : usize = 1; + +pub(crate) const IDX_RESULT_LAST_WINNING_NUMBER : usize = 2; +pub(crate) const IDX_RESULT_ROUND_NUMBER : usize = 3; +pub(crate) const IDX_RESULT_ROUND_STARTED_AT : usize = 4; +pub(crate) const IDX_RESULT_ROUND_STATUS : usize = 5; + +pub(crate) const IDX_STATE_BETS : usize = 6; +pub(crate) const IDX_STATE_LAST_WINNING_NUMBER : usize = 7; +pub(crate) const IDX_STATE_PLAY_PERIOD : usize = 8; +pub(crate) const IDX_STATE_ROUND_NUMBER : usize = 9; +pub(crate) const IDX_STATE_ROUND_STARTED_AT : usize = 10; +pub(crate) const IDX_STATE_ROUND_STATUS : usize = 11; pub const KEY_MAP_LEN: usize = 12; diff --git a/contracts/wasm/fairroulette/src/lib.rs b/contracts/wasm/fairroulette/src/lib.rs index dee9ebffc8..e253cdac6f 100644 --- a/contracts/wasm/fairroulette/src/lib.rs +++ b/contracts/wasm/fairroulette/src/lib.rs @@ -30,15 +30,15 @@ mod fairroulette; #[no_mangle] fn on_load() { let exports = ScExports::new(); - exports.add_func(FUNC_FORCE_PAYOUT, func_force_payout_thunk); - exports.add_func(FUNC_FORCE_RESET, func_force_reset_thunk); - exports.add_func(FUNC_PAY_WINNERS, func_pay_winners_thunk); - exports.add_func(FUNC_PLACE_BET, func_place_bet_thunk); - exports.add_func(FUNC_PLAY_PERIOD, func_play_period_thunk); + exports.add_func(FUNC_FORCE_PAYOUT, func_force_payout_thunk); + exports.add_func(FUNC_FORCE_RESET, func_force_reset_thunk); + exports.add_func(FUNC_PAY_WINNERS, func_pay_winners_thunk); + exports.add_func(FUNC_PLACE_BET, func_place_bet_thunk); + exports.add_func(FUNC_PLAY_PERIOD, func_play_period_thunk); exports.add_view(VIEW_LAST_WINNING_NUMBER, view_last_winning_number_thunk); - exports.add_view(VIEW_ROUND_NUMBER, view_round_number_thunk); - exports.add_view(VIEW_ROUND_STARTED_AT, view_round_started_at_thunk); - exports.add_view(VIEW_ROUND_STATUS, view_round_status_thunk); + exports.add_view(VIEW_ROUND_NUMBER, view_round_number_thunk); + exports.add_view(VIEW_ROUND_STARTED_AT, view_round_started_at_thunk); + exports.add_view(VIEW_ROUND_STATUS, view_round_status_thunk); unsafe { for i in 0..KEY_MAP_LEN { diff --git a/contracts/wasm/fairroulette/src/structs.rs b/contracts/wasm/fairroulette/src/structs.rs index fda6a8429e..6452db1ea1 100644 --- a/contracts/wasm/fairroulette/src/structs.rs +++ b/contracts/wasm/fairroulette/src/structs.rs @@ -11,18 +11,18 @@ use wasmlib::*; use wasmlib::host::*; pub struct Bet { - pub amount: i64, - pub better: ScAgentID, - pub number: i64, + pub amount : i64, + pub better : ScAgentID, + pub number : i64, } impl Bet { pub fn from_bytes(bytes: &[u8]) -> Bet { let mut decode = BytesDecoder::new(bytes); Bet { - amount: decode.int64(), - better: decode.agent_id(), - number: decode.int64(), + amount : decode.int64(), + better : decode.agent_id(), + number : decode.int64(), } } diff --git a/contracts/wasm/fairroulette/ts/fairroulette/consts.ts b/contracts/wasm/fairroulette/ts/fairroulette/consts.ts index 210f50c191..d930b586af 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/consts.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/consts.ts @@ -11,37 +11,37 @@ export const ScName = "fairroulette"; export const ScDescription = ""; export const HScName = new wasmlib.ScHname(0xdf79d138); -export const ParamNumber = "number"; +export const ParamNumber = "number"; export const ParamPlayPeriod = "playPeriod"; export const ResultLastWinningNumber = "lastWinningNumber"; -export const ResultRoundNumber = "roundNumber"; -export const ResultRoundStartedAt = "roundStartedAt"; -export const ResultRoundStatus = "roundStatus"; +export const ResultRoundNumber = "roundNumber"; +export const ResultRoundStartedAt = "roundStartedAt"; +export const ResultRoundStatus = "roundStatus"; -export const StateBets = "bets"; +export const StateBets = "bets"; export const StateLastWinningNumber = "lastWinningNumber"; -export const StatePlayPeriod = "playPeriod"; -export const StateRoundNumber = "roundNumber"; -export const StateRoundStartedAt = "roundStartedAt"; -export const StateRoundStatus = "roundStatus"; - -export const FuncForcePayout = "forcePayout"; -export const FuncForceReset = "forceReset"; -export const FuncPayWinners = "payWinners"; -export const FuncPlaceBet = "placeBet"; -export const FuncPlayPeriod = "playPeriod"; +export const StatePlayPeriod = "playPeriod"; +export const StateRoundNumber = "roundNumber"; +export const StateRoundStartedAt = "roundStartedAt"; +export const StateRoundStatus = "roundStatus"; + +export const FuncForcePayout = "forcePayout"; +export const FuncForceReset = "forceReset"; +export const FuncPayWinners = "payWinners"; +export const FuncPlaceBet = "placeBet"; +export const FuncPlayPeriod = "playPeriod"; export const ViewLastWinningNumber = "lastWinningNumber"; -export const ViewRoundNumber = "roundNumber"; -export const ViewRoundStartedAt = "roundStartedAt"; -export const ViewRoundStatus = "roundStatus"; - -export const HFuncForcePayout = new wasmlib.ScHname(0x555a4c4f); -export const HFuncForceReset = new wasmlib.ScHname(0xa331951e); -export const HFuncPayWinners = new wasmlib.ScHname(0xfb2b0144); -export const HFuncPlaceBet = new wasmlib.ScHname(0xdfba7d1b); -export const HFuncPlayPeriod = new wasmlib.ScHname(0xcb94b293); +export const ViewRoundNumber = "roundNumber"; +export const ViewRoundStartedAt = "roundStartedAt"; +export const ViewRoundStatus = "roundStatus"; + +export const HFuncForcePayout = new wasmlib.ScHname(0x555a4c4f); +export const HFuncForceReset = new wasmlib.ScHname(0xa331951e); +export const HFuncPayWinners = new wasmlib.ScHname(0xfb2b0144); +export const HFuncPlaceBet = new wasmlib.ScHname(0xdfba7d1b); +export const HFuncPlayPeriod = new wasmlib.ScHname(0xcb94b293); export const HViewLastWinningNumber = new wasmlib.ScHname(0x2f5f09fe); -export const HViewRoundNumber = new wasmlib.ScHname(0x0dcfe520); -export const HViewRoundStartedAt = new wasmlib.ScHname(0x725de8b4); -export const HViewRoundStatus = new wasmlib.ScHname(0x145053b5); +export const HViewRoundNumber = new wasmlib.ScHname(0x0dcfe520); +export const HViewRoundStartedAt = new wasmlib.ScHname(0x725de8b4); +export const HViewRoundStatus = new wasmlib.ScHname(0x145053b5); diff --git a/contracts/wasm/fairroulette/ts/fairroulette/keys.ts b/contracts/wasm/fairroulette/ts/fairroulette/keys.ts index 6db1cdf8af..46895b797f 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/keys.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/keys.ts @@ -8,18 +8,20 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; -export const IdxParamNumber = 0; +export const IdxParamNumber = 0; export const IdxParamPlayPeriod = 1; + export const IdxResultLastWinningNumber = 2; -export const IdxResultRoundNumber = 3; -export const IdxResultRoundStartedAt = 4; -export const IdxResultRoundStatus = 5; -export const IdxStateBets = 6; +export const IdxResultRoundNumber = 3; +export const IdxResultRoundStartedAt = 4; +export const IdxResultRoundStatus = 5; + +export const IdxStateBets = 6; export const IdxStateLastWinningNumber = 7; -export const IdxStatePlayPeriod = 8; -export const IdxStateRoundNumber = 9; -export const IdxStateRoundStartedAt = 10; -export const IdxStateRoundStatus = 11; +export const IdxStatePlayPeriod = 8; +export const IdxStateRoundNumber = 9; +export const IdxStateRoundStartedAt = 10; +export const IdxStateRoundStatus = 11; export let keyMap: string[] = [ sc.ParamNumber, diff --git a/contracts/wasm/fairroulette/ts/fairroulette/lib.ts b/contracts/wasm/fairroulette/ts/fairroulette/lib.ts index 493aa6e664..dedabdd800 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/lib.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/lib.ts @@ -14,15 +14,15 @@ export function on_call(index: i32): void { export function on_load(): void { let exports = new wasmlib.ScExports(); - exports.addFunc(sc.FuncForcePayout, funcForcePayoutThunk); - exports.addFunc(sc.FuncForceReset, funcForceResetThunk); - exports.addFunc(sc.FuncPayWinners, funcPayWinnersThunk); - exports.addFunc(sc.FuncPlaceBet, funcPlaceBetThunk); - exports.addFunc(sc.FuncPlayPeriod, funcPlayPeriodThunk); + exports.addFunc(sc.FuncForcePayout, funcForcePayoutThunk); + exports.addFunc(sc.FuncForceReset, funcForceResetThunk); + exports.addFunc(sc.FuncPayWinners, funcPayWinnersThunk); + exports.addFunc(sc.FuncPlaceBet, funcPlaceBetThunk); + exports.addFunc(sc.FuncPlayPeriod, funcPlayPeriodThunk); exports.addView(sc.ViewLastWinningNumber, viewLastWinningNumberThunk); - exports.addView(sc.ViewRoundNumber, viewRoundNumberThunk); - exports.addView(sc.ViewRoundStartedAt, viewRoundStartedAtThunk); - exports.addView(sc.ViewRoundStatus, viewRoundStatusThunk); + exports.addView(sc.ViewRoundNumber, viewRoundNumberThunk); + exports.addView(sc.ViewRoundStartedAt, viewRoundStartedAtThunk); + exports.addView(sc.ViewRoundStatus, viewRoundStatusThunk); for (let i = 0; i < sc.keyMap.length; i++) { sc.idxMap[i] = wasmlib.Key32.fromString(sc.keyMap[i]); diff --git a/contracts/wasm/fairroulette/ts/fairroulette/structs.ts b/contracts/wasm/fairroulette/ts/fairroulette/structs.ts index 14a72bb759..a871d08ff9 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/structs.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/structs.ts @@ -8,9 +8,9 @@ import * as wasmlib from "wasmlib"; export class Bet { - amount: i64 = 0; - better: wasmlib.ScAgentID = new wasmlib.ScAgentID(); - number: i64 = 0; + amount : i64 = 0; + better : wasmlib.ScAgentID = new wasmlib.ScAgentID(); + number : i64 = 0; static fromBytes(bytes: u8[]): Bet { let decode = new wasmlib.BytesDecoder(bytes); diff --git a/contracts/wasm/helloworld/go/helloworld/consts.go b/contracts/wasm/helloworld/go/helloworld/consts.go index c40715e769..bb14625014 100644 --- a/contracts/wasm/helloworld/go/helloworld/consts.go +++ b/contracts/wasm/helloworld/go/helloworld/consts.go @@ -16,7 +16,7 @@ const ( ) const ( - ResultHelloWorld = wasmlib.Key("helloWorld") + ResultHelloWorld = "helloWorld" ) const ( diff --git a/contracts/wasm/helloworld/src/consts.rs b/contracts/wasm/helloworld/src/consts.rs index c6c0be16f7..e875648233 100644 --- a/contracts/wasm/helloworld/src/consts.rs +++ b/contracts/wasm/helloworld/src/consts.rs @@ -9,14 +9,14 @@ use wasmlib::*; -pub const SC_NAME: &str = "helloworld"; -pub const SC_DESCRIPTION: &str = "The ubiquitous hello world demo"; -pub const HSC_NAME: ScHname = ScHname(0x0683223c); +pub const SC_NAME : &str = "helloworld"; +pub const SC_DESCRIPTION : &str = "The ubiquitous hello world demo"; +pub const HSC_NAME : ScHname = ScHname(0x0683223c); -pub const RESULT_HELLO_WORLD: &str = "helloWorld"; +pub const RESULT_HELLO_WORLD : &str = "helloWorld"; -pub const FUNC_HELLO_WORLD: &str = "helloWorld"; -pub const VIEW_GET_HELLO_WORLD: &str = "getHelloWorld"; +pub const FUNC_HELLO_WORLD : &str = "helloWorld"; +pub const VIEW_GET_HELLO_WORLD : &str = "getHelloWorld"; -pub const HFUNC_HELLO_WORLD: ScHname = ScHname(0x9d042e65); -pub const HVIEW_GET_HELLO_WORLD: ScHname = ScHname(0x210439ce); +pub const HFUNC_HELLO_WORLD : ScHname = ScHname(0x9d042e65); +pub const HVIEW_GET_HELLO_WORLD : ScHname = ScHname(0x210439ce); diff --git a/contracts/wasm/helloworld/src/keys.rs b/contracts/wasm/helloworld/src/keys.rs index 16a1c5a808..468a469a19 100644 --- a/contracts/wasm/helloworld/src/keys.rs +++ b/contracts/wasm/helloworld/src/keys.rs @@ -11,7 +11,9 @@ use wasmlib::*; use crate::*; -pub(crate) const IDX_RESULT_HELLO_WORLD: usize = 0; + +pub(crate) const IDX_RESULT_HELLO_WORLD : usize = 0; + pub const KEY_MAP_LEN: usize = 1; diff --git a/contracts/wasm/helloworld/src/lib.rs b/contracts/wasm/helloworld/src/lib.rs index ccc2b092df..80bb927a85 100644 --- a/contracts/wasm/helloworld/src/lib.rs +++ b/contracts/wasm/helloworld/src/lib.rs @@ -27,7 +27,7 @@ mod helloworld; #[no_mangle] fn on_load() { let exports = ScExports::new(); - exports.add_func(FUNC_HELLO_WORLD, func_hello_world_thunk); + exports.add_func(FUNC_HELLO_WORLD, func_hello_world_thunk); exports.add_view(VIEW_GET_HELLO_WORLD, view_get_hello_world_thunk); unsafe { diff --git a/contracts/wasm/helloworld/ts/helloworld/consts.ts b/contracts/wasm/helloworld/ts/helloworld/consts.ts index 686b23b6ea..d52c7a618a 100644 --- a/contracts/wasm/helloworld/ts/helloworld/consts.ts +++ b/contracts/wasm/helloworld/ts/helloworld/consts.ts @@ -13,8 +13,8 @@ export const HScName = new wasmlib.ScHname(0x0683223c); export const ResultHelloWorld = "helloWorld"; -export const FuncHelloWorld = "helloWorld"; +export const FuncHelloWorld = "helloWorld"; export const ViewGetHelloWorld = "getHelloWorld"; -export const HFuncHelloWorld = new wasmlib.ScHname(0x9d042e65); +export const HFuncHelloWorld = new wasmlib.ScHname(0x9d042e65); export const HViewGetHelloWorld = new wasmlib.ScHname(0x210439ce); diff --git a/contracts/wasm/helloworld/ts/helloworld/keys.ts b/contracts/wasm/helloworld/ts/helloworld/keys.ts index ea4a8f8442..7fb73b33ec 100644 --- a/contracts/wasm/helloworld/ts/helloworld/keys.ts +++ b/contracts/wasm/helloworld/ts/helloworld/keys.ts @@ -8,8 +8,10 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; + export const IdxResultHelloWorld = 0; + export let keyMap: string[] = [ sc.ResultHelloWorld, ]; diff --git a/contracts/wasm/helloworld/ts/helloworld/lib.ts b/contracts/wasm/helloworld/ts/helloworld/lib.ts index a4af6920e6..c70f64e037 100644 --- a/contracts/wasm/helloworld/ts/helloworld/lib.ts +++ b/contracts/wasm/helloworld/ts/helloworld/lib.ts @@ -14,7 +14,7 @@ export function on_call(index: i32): void { export function on_load(): void { let exports = new wasmlib.ScExports(); - exports.addFunc(sc.FuncHelloWorld, funcHelloWorldThunk); + exports.addFunc(sc.FuncHelloWorld, funcHelloWorldThunk); exports.addView(sc.ViewGetHelloWorld, viewGetHelloWorldThunk); for (let i = 0; i < sc.keyMap.length; i++) { diff --git a/contracts/wasm/inccounter/go/inccounter/consts.go b/contracts/wasm/inccounter/go/inccounter/consts.go index 113e24aa6b..86b738973e 100644 --- a/contracts/wasm/inccounter/go/inccounter/consts.go +++ b/contracts/wasm/inccounter/go/inccounter/consts.go @@ -16,19 +16,19 @@ const ( ) const ( - ParamCounter = wasmlib.Key("counter") - ParamDelay = wasmlib.Key("delay") - ParamDummy = wasmlib.Key("dummy") - ParamNumRepeats = wasmlib.Key("numRepeats") + ParamCounter = "counter" + ParamDelay = "delay" + ParamDummy = "dummy" + ParamNumRepeats = "numRepeats" ) const ( - ResultCounter = wasmlib.Key("counter") + ResultCounter = "counter" ) const ( - StateCounter = wasmlib.Key("counter") - StateNumRepeats = wasmlib.Key("numRepeats") + StateCounter = "counter" + StateNumRepeats = "numRepeats" ) const ( diff --git a/contracts/wasm/inccounter/go/inccounter/keys.go b/contracts/wasm/inccounter/go/inccounter/keys.go index 47800369d6..1741cdd8f9 100644 --- a/contracts/wasm/inccounter/go/inccounter/keys.go +++ b/contracts/wasm/inccounter/go/inccounter/keys.go @@ -14,7 +14,9 @@ const ( IdxParamDelay = 1 IdxParamDummy = 2 IdxParamNumRepeats = 3 - IdxResultCounter = 4 + + IdxResultCounter = 4 + IdxStateCounter = 5 IdxStateNumRepeats = 6 ) diff --git a/contracts/wasm/inccounter/src/consts.rs b/contracts/wasm/inccounter/src/consts.rs index f0476eaa86..e1590fc5ba 100644 --- a/contracts/wasm/inccounter/src/consts.rs +++ b/contracts/wasm/inccounter/src/consts.rs @@ -9,46 +9,46 @@ use wasmlib::*; -pub const SC_NAME: &str = "inccounter"; -pub const SC_DESCRIPTION: &str = ""; -pub const HSC_NAME: ScHname = ScHname(0xaf2438e9); - -pub const PARAM_COUNTER: &str = "counter"; -pub const PARAM_DELAY: &str = "delay"; -pub const PARAM_DUMMY: &str = "dummy"; -pub const PARAM_NUM_REPEATS: &str = "numRepeats"; - -pub const RESULT_COUNTER: &str = "counter"; - -pub const STATE_COUNTER: &str = "counter"; -pub const STATE_NUM_REPEATS: &str = "numRepeats"; - -pub const FUNC_CALL_INCREMENT: &str = "callIncrement"; -pub const FUNC_CALL_INCREMENT_RECURSE5X: &str = "callIncrementRecurse5x"; -pub const FUNC_ENDLESS_LOOP: &str = "endlessLoop"; -pub const FUNC_INCREMENT: &str = "increment"; -pub const FUNC_INCREMENT_WITH_DELAY: &str = "incrementWithDelay"; -pub const FUNC_INIT: &str = "init"; -pub const FUNC_LOCAL_STATE_INTERNAL_CALL: &str = "localStateInternalCall"; -pub const FUNC_LOCAL_STATE_POST: &str = "localStatePost"; -pub const FUNC_LOCAL_STATE_SANDBOX_CALL: &str = "localStateSandboxCall"; -pub const FUNC_POST_INCREMENT: &str = "postIncrement"; -pub const FUNC_REPEAT_MANY: &str = "repeatMany"; -pub const FUNC_TEST_LEB128: &str = "testLeb128"; -pub const FUNC_WHEN_MUST_INCREMENT: &str = "whenMustIncrement"; -pub const VIEW_GET_COUNTER: &str = "getCounter"; - -pub const HFUNC_CALL_INCREMENT: ScHname = ScHname(0xeb5dcacd); -pub const HFUNC_CALL_INCREMENT_RECURSE5X: ScHname = ScHname(0x8749fbff); -pub const HFUNC_ENDLESS_LOOP: ScHname = ScHname(0x365f0929); -pub const HFUNC_INCREMENT: ScHname = ScHname(0xd351bd12); -pub const HFUNC_INCREMENT_WITH_DELAY: ScHname = ScHname(0xa235bba7); -pub const HFUNC_INIT: ScHname = ScHname(0x1f44d644); -pub const HFUNC_LOCAL_STATE_INTERNAL_CALL: ScHname = ScHname(0xecfc5d33); -pub const HFUNC_LOCAL_STATE_POST: ScHname = ScHname(0x3fd54d13); -pub const HFUNC_LOCAL_STATE_SANDBOX_CALL: ScHname = ScHname(0x7bd22c53); -pub const HFUNC_POST_INCREMENT: ScHname = ScHname(0x81c772f5); -pub const HFUNC_REPEAT_MANY: ScHname = ScHname(0x4ff450d3); -pub const HFUNC_TEST_LEB128: ScHname = ScHname(0xd8364cb9); -pub const HFUNC_WHEN_MUST_INCREMENT: ScHname = ScHname(0xb4c3e7a6); -pub const HVIEW_GET_COUNTER: ScHname = ScHname(0xb423e607); +pub const SC_NAME : &str = "inccounter"; +pub const SC_DESCRIPTION : &str = ""; +pub const HSC_NAME : ScHname = ScHname(0xaf2438e9); + +pub const PARAM_COUNTER : &str = "counter"; +pub const PARAM_DELAY : &str = "delay"; +pub const PARAM_DUMMY : &str = "dummy"; +pub const PARAM_NUM_REPEATS : &str = "numRepeats"; + +pub const RESULT_COUNTER : &str = "counter"; + +pub const STATE_COUNTER : &str = "counter"; +pub const STATE_NUM_REPEATS : &str = "numRepeats"; + +pub const FUNC_CALL_INCREMENT : &str = "callIncrement"; +pub const FUNC_CALL_INCREMENT_RECURSE5X : &str = "callIncrementRecurse5x"; +pub const FUNC_ENDLESS_LOOP : &str = "endlessLoop"; +pub const FUNC_INCREMENT : &str = "increment"; +pub const FUNC_INCREMENT_WITH_DELAY : &str = "incrementWithDelay"; +pub const FUNC_INIT : &str = "init"; +pub const FUNC_LOCAL_STATE_INTERNAL_CALL : &str = "localStateInternalCall"; +pub const FUNC_LOCAL_STATE_POST : &str = "localStatePost"; +pub const FUNC_LOCAL_STATE_SANDBOX_CALL : &str = "localStateSandboxCall"; +pub const FUNC_POST_INCREMENT : &str = "postIncrement"; +pub const FUNC_REPEAT_MANY : &str = "repeatMany"; +pub const FUNC_TEST_LEB128 : &str = "testLeb128"; +pub const FUNC_WHEN_MUST_INCREMENT : &str = "whenMustIncrement"; +pub const VIEW_GET_COUNTER : &str = "getCounter"; + +pub const HFUNC_CALL_INCREMENT : ScHname = ScHname(0xeb5dcacd); +pub const HFUNC_CALL_INCREMENT_RECURSE5X : ScHname = ScHname(0x8749fbff); +pub const HFUNC_ENDLESS_LOOP : ScHname = ScHname(0x365f0929); +pub const HFUNC_INCREMENT : ScHname = ScHname(0xd351bd12); +pub const HFUNC_INCREMENT_WITH_DELAY : ScHname = ScHname(0xa235bba7); +pub const HFUNC_INIT : ScHname = ScHname(0x1f44d644); +pub const HFUNC_LOCAL_STATE_INTERNAL_CALL : ScHname = ScHname(0xecfc5d33); +pub const HFUNC_LOCAL_STATE_POST : ScHname = ScHname(0x3fd54d13); +pub const HFUNC_LOCAL_STATE_SANDBOX_CALL : ScHname = ScHname(0x7bd22c53); +pub const HFUNC_POST_INCREMENT : ScHname = ScHname(0x81c772f5); +pub const HFUNC_REPEAT_MANY : ScHname = ScHname(0x4ff450d3); +pub const HFUNC_TEST_LEB128 : ScHname = ScHname(0xd8364cb9); +pub const HFUNC_WHEN_MUST_INCREMENT : ScHname = ScHname(0xb4c3e7a6); +pub const HVIEW_GET_COUNTER : ScHname = ScHname(0xb423e607); diff --git a/contracts/wasm/inccounter/src/keys.rs b/contracts/wasm/inccounter/src/keys.rs index ba196a423b..cdbc2c396b 100644 --- a/contracts/wasm/inccounter/src/keys.rs +++ b/contracts/wasm/inccounter/src/keys.rs @@ -11,13 +11,15 @@ use wasmlib::*; use crate::*; -pub(crate) const IDX_PARAM_COUNTER: usize = 0; -pub(crate) const IDX_PARAM_DELAY: usize = 1; -pub(crate) const IDX_PARAM_DUMMY: usize = 2; -pub(crate) const IDX_PARAM_NUM_REPEATS: usize = 3; -pub(crate) const IDX_RESULT_COUNTER: usize = 4; -pub(crate) const IDX_STATE_COUNTER: usize = 5; -pub(crate) const IDX_STATE_NUM_REPEATS: usize = 6; +pub(crate) const IDX_PARAM_COUNTER : usize = 0; +pub(crate) const IDX_PARAM_DELAY : usize = 1; +pub(crate) const IDX_PARAM_DUMMY : usize = 2; +pub(crate) const IDX_PARAM_NUM_REPEATS : usize = 3; + +pub(crate) const IDX_RESULT_COUNTER : usize = 4; + +pub(crate) const IDX_STATE_COUNTER : usize = 5; +pub(crate) const IDX_STATE_NUM_REPEATS : usize = 6; pub const KEY_MAP_LEN: usize = 7; diff --git a/contracts/wasm/inccounter/src/lib.rs b/contracts/wasm/inccounter/src/lib.rs index 1c99d08755..e29777eda3 100644 --- a/contracts/wasm/inccounter/src/lib.rs +++ b/contracts/wasm/inccounter/src/lib.rs @@ -29,20 +29,20 @@ mod inccounter; #[no_mangle] fn on_load() { let exports = ScExports::new(); - exports.add_func(FUNC_CALL_INCREMENT, func_call_increment_thunk); - exports.add_func(FUNC_CALL_INCREMENT_RECURSE5X, func_call_increment_recurse5x_thunk); - exports.add_func(FUNC_ENDLESS_LOOP, func_endless_loop_thunk); - exports.add_func(FUNC_INCREMENT, func_increment_thunk); - exports.add_func(FUNC_INCREMENT_WITH_DELAY, func_increment_with_delay_thunk); - exports.add_func(FUNC_INIT, func_init_thunk); + exports.add_func(FUNC_CALL_INCREMENT, func_call_increment_thunk); + exports.add_func(FUNC_CALL_INCREMENT_RECURSE5X, func_call_increment_recurse5x_thunk); + exports.add_func(FUNC_ENDLESS_LOOP, func_endless_loop_thunk); + exports.add_func(FUNC_INCREMENT, func_increment_thunk); + exports.add_func(FUNC_INCREMENT_WITH_DELAY, func_increment_with_delay_thunk); + exports.add_func(FUNC_INIT, func_init_thunk); exports.add_func(FUNC_LOCAL_STATE_INTERNAL_CALL, func_local_state_internal_call_thunk); - exports.add_func(FUNC_LOCAL_STATE_POST, func_local_state_post_thunk); - exports.add_func(FUNC_LOCAL_STATE_SANDBOX_CALL, func_local_state_sandbox_call_thunk); - exports.add_func(FUNC_POST_INCREMENT, func_post_increment_thunk); - exports.add_func(FUNC_REPEAT_MANY, func_repeat_many_thunk); - exports.add_func(FUNC_TEST_LEB128, func_test_leb128_thunk); - exports.add_func(FUNC_WHEN_MUST_INCREMENT, func_when_must_increment_thunk); - exports.add_view(VIEW_GET_COUNTER, view_get_counter_thunk); + exports.add_func(FUNC_LOCAL_STATE_POST, func_local_state_post_thunk); + exports.add_func(FUNC_LOCAL_STATE_SANDBOX_CALL, func_local_state_sandbox_call_thunk); + exports.add_func(FUNC_POST_INCREMENT, func_post_increment_thunk); + exports.add_func(FUNC_REPEAT_MANY, func_repeat_many_thunk); + exports.add_func(FUNC_TEST_LEB128, func_test_leb128_thunk); + exports.add_func(FUNC_WHEN_MUST_INCREMENT, func_when_must_increment_thunk); + exports.add_view(VIEW_GET_COUNTER, view_get_counter_thunk); unsafe { for i in 0..KEY_MAP_LEN { diff --git a/contracts/wasm/inccounter/ts/inccounter/consts.ts b/contracts/wasm/inccounter/ts/inccounter/consts.ts index fd6d4303c8..ca522a8a58 100644 --- a/contracts/wasm/inccounter/ts/inccounter/consts.ts +++ b/contracts/wasm/inccounter/ts/inccounter/consts.ts @@ -11,42 +11,42 @@ export const ScName = "inccounter"; export const ScDescription = ""; export const HScName = new wasmlib.ScHname(0xaf2438e9); -export const ParamCounter = "counter"; -export const ParamDelay = "delay"; -export const ParamDummy = "dummy"; +export const ParamCounter = "counter"; +export const ParamDelay = "delay"; +export const ParamDummy = "dummy"; export const ParamNumRepeats = "numRepeats"; export const ResultCounter = "counter"; -export const StateCounter = "counter"; +export const StateCounter = "counter"; export const StateNumRepeats = "numRepeats"; -export const FuncCallIncrement = "callIncrement"; +export const FuncCallIncrement = "callIncrement"; export const FuncCallIncrementRecurse5x = "callIncrementRecurse5x"; -export const FuncEndlessLoop = "endlessLoop"; -export const FuncIncrement = "increment"; -export const FuncIncrementWithDelay = "incrementWithDelay"; -export const FuncInit = "init"; +export const FuncEndlessLoop = "endlessLoop"; +export const FuncIncrement = "increment"; +export const FuncIncrementWithDelay = "incrementWithDelay"; +export const FuncInit = "init"; export const FuncLocalStateInternalCall = "localStateInternalCall"; -export const FuncLocalStatePost = "localStatePost"; -export const FuncLocalStateSandboxCall = "localStateSandboxCall"; -export const FuncPostIncrement = "postIncrement"; -export const FuncRepeatMany = "repeatMany"; -export const FuncTestLeb128 = "testLeb128"; -export const FuncWhenMustIncrement = "whenMustIncrement"; -export const ViewGetCounter = "getCounter"; - -export const HFuncCallIncrement = new wasmlib.ScHname(0xeb5dcacd); +export const FuncLocalStatePost = "localStatePost"; +export const FuncLocalStateSandboxCall = "localStateSandboxCall"; +export const FuncPostIncrement = "postIncrement"; +export const FuncRepeatMany = "repeatMany"; +export const FuncTestLeb128 = "testLeb128"; +export const FuncWhenMustIncrement = "whenMustIncrement"; +export const ViewGetCounter = "getCounter"; + +export const HFuncCallIncrement = new wasmlib.ScHname(0xeb5dcacd); export const HFuncCallIncrementRecurse5x = new wasmlib.ScHname(0x8749fbff); -export const HFuncEndlessLoop = new wasmlib.ScHname(0x365f0929); -export const HFuncIncrement = new wasmlib.ScHname(0xd351bd12); -export const HFuncIncrementWithDelay = new wasmlib.ScHname(0xa235bba7); -export const HFuncInit = new wasmlib.ScHname(0x1f44d644); +export const HFuncEndlessLoop = new wasmlib.ScHname(0x365f0929); +export const HFuncIncrement = new wasmlib.ScHname(0xd351bd12); +export const HFuncIncrementWithDelay = new wasmlib.ScHname(0xa235bba7); +export const HFuncInit = new wasmlib.ScHname(0x1f44d644); export const HFuncLocalStateInternalCall = new wasmlib.ScHname(0xecfc5d33); -export const HFuncLocalStatePost = new wasmlib.ScHname(0x3fd54d13); -export const HFuncLocalStateSandboxCall = new wasmlib.ScHname(0x7bd22c53); -export const HFuncPostIncrement = new wasmlib.ScHname(0x81c772f5); -export const HFuncRepeatMany = new wasmlib.ScHname(0x4ff450d3); -export const HFuncTestLeb128 = new wasmlib.ScHname(0xd8364cb9); -export const HFuncWhenMustIncrement = new wasmlib.ScHname(0xb4c3e7a6); -export const HViewGetCounter = new wasmlib.ScHname(0xb423e607); +export const HFuncLocalStatePost = new wasmlib.ScHname(0x3fd54d13); +export const HFuncLocalStateSandboxCall = new wasmlib.ScHname(0x7bd22c53); +export const HFuncPostIncrement = new wasmlib.ScHname(0x81c772f5); +export const HFuncRepeatMany = new wasmlib.ScHname(0x4ff450d3); +export const HFuncTestLeb128 = new wasmlib.ScHname(0xd8364cb9); +export const HFuncWhenMustIncrement = new wasmlib.ScHname(0xb4c3e7a6); +export const HViewGetCounter = new wasmlib.ScHname(0xb423e607); diff --git a/contracts/wasm/inccounter/ts/inccounter/keys.ts b/contracts/wasm/inccounter/ts/inccounter/keys.ts index 85d9eff219..94e03bd1c1 100644 --- a/contracts/wasm/inccounter/ts/inccounter/keys.ts +++ b/contracts/wasm/inccounter/ts/inccounter/keys.ts @@ -8,12 +8,14 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; -export const IdxParamCounter = 0; -export const IdxParamDelay = 1; -export const IdxParamDummy = 2; +export const IdxParamCounter = 0; +export const IdxParamDelay = 1; +export const IdxParamDummy = 2; export const IdxParamNumRepeats = 3; + export const IdxResultCounter = 4; -export const IdxStateCounter = 5; + +export const IdxStateCounter = 5; export const IdxStateNumRepeats = 6; export let keyMap: string[] = [ diff --git a/contracts/wasm/inccounter/ts/inccounter/lib.ts b/contracts/wasm/inccounter/ts/inccounter/lib.ts index 760f34d2c2..59d72dbea3 100644 --- a/contracts/wasm/inccounter/ts/inccounter/lib.ts +++ b/contracts/wasm/inccounter/ts/inccounter/lib.ts @@ -14,20 +14,20 @@ export function on_call(index: i32): void { export function on_load(): void { let exports = new wasmlib.ScExports(); - exports.addFunc(sc.FuncCallIncrement, funcCallIncrementThunk); + exports.addFunc(sc.FuncCallIncrement, funcCallIncrementThunk); exports.addFunc(sc.FuncCallIncrementRecurse5x, funcCallIncrementRecurse5xThunk); - exports.addFunc(sc.FuncEndlessLoop, funcEndlessLoopThunk); - exports.addFunc(sc.FuncIncrement, funcIncrementThunk); - exports.addFunc(sc.FuncIncrementWithDelay, funcIncrementWithDelayThunk); - exports.addFunc(sc.FuncInit, funcInitThunk); + exports.addFunc(sc.FuncEndlessLoop, funcEndlessLoopThunk); + exports.addFunc(sc.FuncIncrement, funcIncrementThunk); + exports.addFunc(sc.FuncIncrementWithDelay, funcIncrementWithDelayThunk); + exports.addFunc(sc.FuncInit, funcInitThunk); exports.addFunc(sc.FuncLocalStateInternalCall, funcLocalStateInternalCallThunk); - exports.addFunc(sc.FuncLocalStatePost, funcLocalStatePostThunk); - exports.addFunc(sc.FuncLocalStateSandboxCall, funcLocalStateSandboxCallThunk); - exports.addFunc(sc.FuncPostIncrement, funcPostIncrementThunk); - exports.addFunc(sc.FuncRepeatMany, funcRepeatManyThunk); - exports.addFunc(sc.FuncTestLeb128, funcTestLeb128Thunk); - exports.addFunc(sc.FuncWhenMustIncrement, funcWhenMustIncrementThunk); - exports.addView(sc.ViewGetCounter, viewGetCounterThunk); + exports.addFunc(sc.FuncLocalStatePost, funcLocalStatePostThunk); + exports.addFunc(sc.FuncLocalStateSandboxCall, funcLocalStateSandboxCallThunk); + exports.addFunc(sc.FuncPostIncrement, funcPostIncrementThunk); + exports.addFunc(sc.FuncRepeatMany, funcRepeatManyThunk); + exports.addFunc(sc.FuncTestLeb128, funcTestLeb128Thunk); + exports.addFunc(sc.FuncWhenMustIncrement, funcWhenMustIncrementThunk); + exports.addView(sc.ViewGetCounter, viewGetCounterThunk); for (let i = 0; i < sc.keyMap.length; i++) { sc.idxMap[i] = wasmlib.Key32.fromString(sc.keyMap[i]); diff --git a/contracts/wasm/testcore/go/testcore/consts.go b/contracts/wasm/testcore/go/testcore/consts.go index 12caa9f4f3..d1e82b1b9c 100644 --- a/contracts/wasm/testcore/go/testcore/consts.go +++ b/contracts/wasm/testcore/go/testcore/consts.go @@ -16,47 +16,47 @@ const ( ) const ( - ParamAddress = wasmlib.Key("address") - ParamAgentID = wasmlib.Key("agentID") - ParamCaller = wasmlib.Key("caller") - ParamChainID = wasmlib.Key("chainID") - ParamChainOwnerID = wasmlib.Key("chainOwnerID") - ParamContractCreator = wasmlib.Key("contractCreator") - ParamContractID = wasmlib.Key("contractID") - ParamCounter = wasmlib.Key("counter") - ParamFail = wasmlib.Key("initFailParam") - ParamHash = wasmlib.Key("Hash") - ParamHname = wasmlib.Key("Hname") - ParamHnameContract = wasmlib.Key("hnameContract") - ParamHnameEP = wasmlib.Key("hnameEP") - ParamHnameZero = wasmlib.Key("Hname-0") - ParamInt64 = wasmlib.Key("int64") - ParamInt64Zero = wasmlib.Key("int64-0") - ParamIntValue = wasmlib.Key("intParamValue") - ParamName = wasmlib.Key("intParamName") - ParamProgHash = wasmlib.Key("progHash") - ParamString = wasmlib.Key("string") - ParamStringZero = wasmlib.Key("string-0") - ParamVarName = wasmlib.Key("varName") + ParamAddress = "address" + ParamAgentID = "agentID" + ParamCaller = "caller" + ParamChainID = "chainID" + ParamChainOwnerID = "chainOwnerID" + ParamContractCreator = "contractCreator" + ParamContractID = "contractID" + ParamCounter = "counter" + ParamFail = "initFailParam" + ParamHash = "Hash" + ParamHname = "Hname" + ParamHnameContract = "hnameContract" + ParamHnameEP = "hnameEP" + ParamHnameZero = "Hname-0" + ParamInt64 = "int64" + ParamInt64Zero = "int64-0" + ParamIntValue = "intParamValue" + ParamName = "intParamName" + ParamProgHash = "progHash" + ParamString = "string" + ParamStringZero = "string-0" + ParamVarName = "varName" ) const ( - ResultChainOwnerID = wasmlib.Key("chainOwnerID") - ResultCounter = wasmlib.Key("counter") - ResultIntValue = wasmlib.Key("intParamValue") - ResultMintedColor = wasmlib.Key("mintedColor") - ResultMintedSupply = wasmlib.Key("mintedSupply") - ResultSandboxCall = wasmlib.Key("sandboxCall") - ResultValues = wasmlib.Key("this") - ResultVars = wasmlib.Key("this") + ResultChainOwnerID = "chainOwnerID" + ResultCounter = "counter" + ResultIntValue = "intParamValue" + ResultMintedColor = "mintedColor" + ResultMintedSupply = "mintedSupply" + ResultSandboxCall = "sandboxCall" + ResultValues = "this" + ResultVars = "this" ) const ( - StateCounter = wasmlib.Key("counter") - StateHnameEP = wasmlib.Key("hnameEP") - StateInts = wasmlib.Key("ints") - StateMintedColor = wasmlib.Key("mintedColor") - StateMintedSupply = wasmlib.Key("mintedSupply") + StateCounter = "counter" + StateHnameEP = "hnameEP" + StateInts = "ints" + StateMintedColor = "mintedColor" + StateMintedSupply = "mintedSupply" ) const ( diff --git a/contracts/wasm/testcore/go/testcore/keys.go b/contracts/wasm/testcore/go/testcore/keys.go index 52a50f73b5..bf75b33824 100644 --- a/contracts/wasm/testcore/go/testcore/keys.go +++ b/contracts/wasm/testcore/go/testcore/keys.go @@ -32,19 +32,21 @@ const ( IdxParamString = 19 IdxParamStringZero = 20 IdxParamVarName = 21 - IdxResultChainOwnerID = 22 - IdxResultCounter = 23 - IdxResultIntValue = 24 - IdxResultMintedColor = 25 - IdxResultMintedSupply = 26 - IdxResultSandboxCall = 27 - IdxResultValues = 28 - IdxResultVars = 29 - IdxStateCounter = 30 - IdxStateHnameEP = 31 - IdxStateInts = 32 - IdxStateMintedColor = 33 - IdxStateMintedSupply = 34 + + IdxResultChainOwnerID = 22 + IdxResultCounter = 23 + IdxResultIntValue = 24 + IdxResultMintedColor = 25 + IdxResultMintedSupply = 26 + IdxResultSandboxCall = 27 + IdxResultValues = 28 + IdxResultVars = 29 + + IdxStateCounter = 30 + IdxStateHnameEP = 31 + IdxStateInts = 32 + IdxStateMintedColor = 33 + IdxStateMintedSupply = 34 ) const keyMapLen = 35 diff --git a/contracts/wasm/testcore/go/testcore/testcore.go b/contracts/wasm/testcore/go/testcore/testcore.go index 7d83b31df4..9537c6374a 100644 --- a/contracts/wasm/testcore/go/testcore/testcore.go +++ b/contracts/wasm/testcore/go/testcore/testcore.go @@ -40,9 +40,9 @@ func funcCallOnChain(ctx wasmlib.ScFuncContext, f *CallOnChainContext) { counter.SetValue(counter.Value() + 1) params := wasmlib.NewScMutableMap() - params.GetInt64(ParamIntValue).SetValue(paramIn) + params.GetInt64(wasmlib.Key(ParamIntValue)).SetValue(paramIn) ret := ctx.Call(hnameContract, hnameEP, params, nil) - retVal := ret.GetInt64(ResultIntValue).Value() + retVal := ret.GetInt64(wasmlib.Key(ResultIntValue)).Value() f.Results.IntValue().SetValue(retVal) } diff --git a/contracts/wasm/testcore/src/consts.rs b/contracts/wasm/testcore/src/consts.rs index 9707d7b550..efff63eec3 100644 --- a/contracts/wasm/testcore/src/consts.rs +++ b/contracts/wasm/testcore/src/consts.rs @@ -9,110 +9,110 @@ use wasmlib::*; -pub const SC_NAME: &str = "testcore"; -pub const SC_DESCRIPTION: &str = "Core test for ISCP wasmlib Rust/Wasm library"; -pub const HSC_NAME: ScHname = ScHname(0x370d33ad); +pub const SC_NAME : &str = "testcore"; +pub const SC_DESCRIPTION : &str = "Core test for ISCP wasmlib Rust/Wasm library"; +pub const HSC_NAME : ScHname = ScHname(0x370d33ad); -pub const PARAM_ADDRESS: &str = "address"; -pub const PARAM_AGENT_ID: &str = "agentID"; -pub const PARAM_CALLER: &str = "caller"; -pub const PARAM_CHAIN_ID: &str = "chainID"; -pub const PARAM_CHAIN_OWNER_ID: &str = "chainOwnerID"; -pub const PARAM_CONTRACT_CREATOR: &str = "contractCreator"; -pub const PARAM_CONTRACT_ID: &str = "contractID"; -pub const PARAM_COUNTER: &str = "counter"; -pub const PARAM_FAIL: &str = "initFailParam"; -pub const PARAM_HASH: &str = "Hash"; -pub const PARAM_HNAME: &str = "Hname"; -pub const PARAM_HNAME_CONTRACT: &str = "hnameContract"; -pub const PARAM_HNAME_EP: &str = "hnameEP"; -pub const PARAM_HNAME_ZERO: &str = "Hname-0"; -pub const PARAM_INT64: &str = "int64"; -pub const PARAM_INT64_ZERO: &str = "int64-0"; -pub const PARAM_INT_VALUE: &str = "intParamValue"; -pub const PARAM_NAME: &str = "intParamName"; -pub const PARAM_PROG_HASH: &str = "progHash"; -pub const PARAM_STRING: &str = "string"; -pub const PARAM_STRING_ZERO: &str = "string-0"; -pub const PARAM_VAR_NAME: &str = "varName"; +pub const PARAM_ADDRESS : &str = "address"; +pub const PARAM_AGENT_ID : &str = "agentID"; +pub const PARAM_CALLER : &str = "caller"; +pub const PARAM_CHAIN_ID : &str = "chainID"; +pub const PARAM_CHAIN_OWNER_ID : &str = "chainOwnerID"; +pub const PARAM_CONTRACT_CREATOR : &str = "contractCreator"; +pub const PARAM_CONTRACT_ID : &str = "contractID"; +pub const PARAM_COUNTER : &str = "counter"; +pub const PARAM_FAIL : &str = "initFailParam"; +pub const PARAM_HASH : &str = "Hash"; +pub const PARAM_HNAME : &str = "Hname"; +pub const PARAM_HNAME_CONTRACT : &str = "hnameContract"; +pub const PARAM_HNAME_EP : &str = "hnameEP"; +pub const PARAM_HNAME_ZERO : &str = "Hname-0"; +pub const PARAM_INT64 : &str = "int64"; +pub const PARAM_INT64_ZERO : &str = "int64-0"; +pub const PARAM_INT_VALUE : &str = "intParamValue"; +pub const PARAM_NAME : &str = "intParamName"; +pub const PARAM_PROG_HASH : &str = "progHash"; +pub const PARAM_STRING : &str = "string"; +pub const PARAM_STRING_ZERO : &str = "string-0"; +pub const PARAM_VAR_NAME : &str = "varName"; -pub const RESULT_CHAIN_OWNER_ID: &str = "chainOwnerID"; -pub const RESULT_COUNTER: &str = "counter"; -pub const RESULT_INT_VALUE: &str = "intParamValue"; -pub const RESULT_MINTED_COLOR: &str = "mintedColor"; -pub const RESULT_MINTED_SUPPLY: &str = "mintedSupply"; -pub const RESULT_SANDBOX_CALL: &str = "sandboxCall"; -pub const RESULT_VALUES: &str = "this"; -pub const RESULT_VARS: &str = "this"; +pub const RESULT_CHAIN_OWNER_ID : &str = "chainOwnerID"; +pub const RESULT_COUNTER : &str = "counter"; +pub const RESULT_INT_VALUE : &str = "intParamValue"; +pub const RESULT_MINTED_COLOR : &str = "mintedColor"; +pub const RESULT_MINTED_SUPPLY : &str = "mintedSupply"; +pub const RESULT_SANDBOX_CALL : &str = "sandboxCall"; +pub const RESULT_VALUES : &str = "this"; +pub const RESULT_VARS : &str = "this"; -pub const STATE_COUNTER: &str = "counter"; -pub const STATE_HNAME_EP: &str = "hnameEP"; -pub const STATE_INTS: &str = "ints"; -pub const STATE_MINTED_COLOR: &str = "mintedColor"; -pub const STATE_MINTED_SUPPLY: &str = "mintedSupply"; +pub const STATE_COUNTER : &str = "counter"; +pub const STATE_HNAME_EP : &str = "hnameEP"; +pub const STATE_INTS : &str = "ints"; +pub const STATE_MINTED_COLOR : &str = "mintedColor"; +pub const STATE_MINTED_SUPPLY : &str = "mintedSupply"; -pub const FUNC_CALL_ON_CHAIN: &str = "callOnChain"; -pub const FUNC_CHECK_CONTEXT_FROM_FULL_EP: &str = "checkContextFromFullEP"; -pub const FUNC_DO_NOTHING: &str = "doNothing"; -pub const FUNC_GET_MINTED_SUPPLY: &str = "getMintedSupply"; -pub const FUNC_INC_COUNTER: &str = "incCounter"; -pub const FUNC_INIT: &str = "init"; -pub const FUNC_PASS_TYPES_FULL: &str = "passTypesFull"; -pub const FUNC_RUN_RECURSION: &str = "runRecursion"; -pub const FUNC_SEND_TO_ADDRESS: &str = "sendToAddress"; -pub const FUNC_SET_INT: &str = "setInt"; -pub const FUNC_SPAWN: &str = "spawn"; -pub const FUNC_TEST_BLOCK_CONTEXT1: &str = "testBlockContext1"; -pub const FUNC_TEST_BLOCK_CONTEXT2: &str = "testBlockContext2"; -pub const FUNC_TEST_CALL_PANIC_FULL_EP: &str = "testCallPanicFullEP"; -pub const FUNC_TEST_CALL_PANIC_VIEW_EP_FROM_FULL: &str = "testCallPanicViewEPFromFull"; -pub const FUNC_TEST_CHAIN_OWNER_ID_FULL: &str = "testChainOwnerIDFull"; -pub const FUNC_TEST_EVENT_LOG_DEPLOY: &str = "testEventLogDeploy"; -pub const FUNC_TEST_EVENT_LOG_EVENT_DATA: &str = "testEventLogEventData"; -pub const FUNC_TEST_EVENT_LOG_GENERIC_DATA: &str = "testEventLogGenericData"; -pub const FUNC_TEST_PANIC_FULL_EP: &str = "testPanicFullEP"; -pub const FUNC_WITHDRAW_TO_CHAIN: &str = "withdrawToChain"; -pub const VIEW_CHECK_CONTEXT_FROM_VIEW_EP: &str = "checkContextFromViewEP"; -pub const VIEW_FIBONACCI: &str = "fibonacci"; -pub const VIEW_GET_COUNTER: &str = "getCounter"; -pub const VIEW_GET_INT: &str = "getInt"; -pub const VIEW_GET_STRING_VALUE: &str = "getStringValue"; -pub const VIEW_JUST_VIEW: &str = "justView"; -pub const VIEW_PASS_TYPES_VIEW: &str = "passTypesView"; -pub const VIEW_TEST_CALL_PANIC_VIEW_EP_FROM_VIEW: &str = "testCallPanicViewEPFromView"; -pub const VIEW_TEST_CHAIN_OWNER_ID_VIEW: &str = "testChainOwnerIDView"; -pub const VIEW_TEST_PANIC_VIEW_EP: &str = "testPanicViewEP"; -pub const VIEW_TEST_SANDBOX_CALL: &str = "testSandboxCall"; +pub const FUNC_CALL_ON_CHAIN : &str = "callOnChain"; +pub const FUNC_CHECK_CONTEXT_FROM_FULL_EP : &str = "checkContextFromFullEP"; +pub const FUNC_DO_NOTHING : &str = "doNothing"; +pub const FUNC_GET_MINTED_SUPPLY : &str = "getMintedSupply"; +pub const FUNC_INC_COUNTER : &str = "incCounter"; +pub const FUNC_INIT : &str = "init"; +pub const FUNC_PASS_TYPES_FULL : &str = "passTypesFull"; +pub const FUNC_RUN_RECURSION : &str = "runRecursion"; +pub const FUNC_SEND_TO_ADDRESS : &str = "sendToAddress"; +pub const FUNC_SET_INT : &str = "setInt"; +pub const FUNC_SPAWN : &str = "spawn"; +pub const FUNC_TEST_BLOCK_CONTEXT1 : &str = "testBlockContext1"; +pub const FUNC_TEST_BLOCK_CONTEXT2 : &str = "testBlockContext2"; +pub const FUNC_TEST_CALL_PANIC_FULL_EP : &str = "testCallPanicFullEP"; +pub const FUNC_TEST_CALL_PANIC_VIEW_EP_FROM_FULL : &str = "testCallPanicViewEPFromFull"; +pub const FUNC_TEST_CHAIN_OWNER_ID_FULL : &str = "testChainOwnerIDFull"; +pub const FUNC_TEST_EVENT_LOG_DEPLOY : &str = "testEventLogDeploy"; +pub const FUNC_TEST_EVENT_LOG_EVENT_DATA : &str = "testEventLogEventData"; +pub const FUNC_TEST_EVENT_LOG_GENERIC_DATA : &str = "testEventLogGenericData"; +pub const FUNC_TEST_PANIC_FULL_EP : &str = "testPanicFullEP"; +pub const FUNC_WITHDRAW_TO_CHAIN : &str = "withdrawToChain"; +pub const VIEW_CHECK_CONTEXT_FROM_VIEW_EP : &str = "checkContextFromViewEP"; +pub const VIEW_FIBONACCI : &str = "fibonacci"; +pub const VIEW_GET_COUNTER : &str = "getCounter"; +pub const VIEW_GET_INT : &str = "getInt"; +pub const VIEW_GET_STRING_VALUE : &str = "getStringValue"; +pub const VIEW_JUST_VIEW : &str = "justView"; +pub const VIEW_PASS_TYPES_VIEW : &str = "passTypesView"; +pub const VIEW_TEST_CALL_PANIC_VIEW_EP_FROM_VIEW : &str = "testCallPanicViewEPFromView"; +pub const VIEW_TEST_CHAIN_OWNER_ID_VIEW : &str = "testChainOwnerIDView"; +pub const VIEW_TEST_PANIC_VIEW_EP : &str = "testPanicViewEP"; +pub const VIEW_TEST_SANDBOX_CALL : &str = "testSandboxCall"; -pub const HFUNC_CALL_ON_CHAIN: ScHname = ScHname(0x95a3d123); -pub const HFUNC_CHECK_CONTEXT_FROM_FULL_EP: ScHname = ScHname(0xa56c24ba); -pub const HFUNC_DO_NOTHING: ScHname = ScHname(0xdda4a6de); -pub const HFUNC_GET_MINTED_SUPPLY: ScHname = ScHname(0x0c2d113c); -pub const HFUNC_INC_COUNTER: ScHname = ScHname(0x7b287419); -pub const HFUNC_INIT: ScHname = ScHname(0x1f44d644); -pub const HFUNC_PASS_TYPES_FULL: ScHname = ScHname(0x733ea0ea); -pub const HFUNC_RUN_RECURSION: ScHname = ScHname(0x833425fd); -pub const HFUNC_SEND_TO_ADDRESS: ScHname = ScHname(0x63ce4634); -pub const HFUNC_SET_INT: ScHname = ScHname(0x62056f74); -pub const HFUNC_SPAWN: ScHname = ScHname(0xec929d12); -pub const HFUNC_TEST_BLOCK_CONTEXT1: ScHname = ScHname(0x796d4136); -pub const HFUNC_TEST_BLOCK_CONTEXT2: ScHname = ScHname(0x758b0452); -pub const HFUNC_TEST_CALL_PANIC_FULL_EP: ScHname = ScHname(0x4c878834); -pub const HFUNC_TEST_CALL_PANIC_VIEW_EP_FROM_FULL: ScHname = ScHname(0xfd7e8c1d); -pub const HFUNC_TEST_CHAIN_OWNER_ID_FULL: ScHname = ScHname(0x2aff1167); -pub const HFUNC_TEST_EVENT_LOG_DEPLOY: ScHname = ScHname(0x96ff760a); -pub const HFUNC_TEST_EVENT_LOG_EVENT_DATA: ScHname = ScHname(0x0efcf939); -pub const HFUNC_TEST_EVENT_LOG_GENERIC_DATA: ScHname = ScHname(0x6a16629d); -pub const HFUNC_TEST_PANIC_FULL_EP: ScHname = ScHname(0x24fdef07); -pub const HFUNC_WITHDRAW_TO_CHAIN: ScHname = ScHname(0x437bc026); -pub const HVIEW_CHECK_CONTEXT_FROM_VIEW_EP: ScHname = ScHname(0x88ff0167); -pub const HVIEW_FIBONACCI: ScHname = ScHname(0x7940873c); -pub const HVIEW_GET_COUNTER: ScHname = ScHname(0xb423e607); -pub const HVIEW_GET_INT: ScHname = ScHname(0x1887e5ef); -pub const HVIEW_GET_STRING_VALUE: ScHname = ScHname(0xcf0a4d32); -pub const HVIEW_JUST_VIEW: ScHname = ScHname(0x33b8972e); -pub const HVIEW_PASS_TYPES_VIEW: ScHname = ScHname(0x1a5b87ea); -pub const HVIEW_TEST_CALL_PANIC_VIEW_EP_FROM_VIEW: ScHname = ScHname(0x91b10c99); -pub const HVIEW_TEST_CHAIN_OWNER_ID_VIEW: ScHname = ScHname(0x26586c33); -pub const HVIEW_TEST_PANIC_VIEW_EP: ScHname = ScHname(0x22bc4d72); -pub const HVIEW_TEST_SANDBOX_CALL: ScHname = ScHname(0x42d72b63); +pub const HFUNC_CALL_ON_CHAIN : ScHname = ScHname(0x95a3d123); +pub const HFUNC_CHECK_CONTEXT_FROM_FULL_EP : ScHname = ScHname(0xa56c24ba); +pub const HFUNC_DO_NOTHING : ScHname = ScHname(0xdda4a6de); +pub const HFUNC_GET_MINTED_SUPPLY : ScHname = ScHname(0x0c2d113c); +pub const HFUNC_INC_COUNTER : ScHname = ScHname(0x7b287419); +pub const HFUNC_INIT : ScHname = ScHname(0x1f44d644); +pub const HFUNC_PASS_TYPES_FULL : ScHname = ScHname(0x733ea0ea); +pub const HFUNC_RUN_RECURSION : ScHname = ScHname(0x833425fd); +pub const HFUNC_SEND_TO_ADDRESS : ScHname = ScHname(0x63ce4634); +pub const HFUNC_SET_INT : ScHname = ScHname(0x62056f74); +pub const HFUNC_SPAWN : ScHname = ScHname(0xec929d12); +pub const HFUNC_TEST_BLOCK_CONTEXT1 : ScHname = ScHname(0x796d4136); +pub const HFUNC_TEST_BLOCK_CONTEXT2 : ScHname = ScHname(0x758b0452); +pub const HFUNC_TEST_CALL_PANIC_FULL_EP : ScHname = ScHname(0x4c878834); +pub const HFUNC_TEST_CALL_PANIC_VIEW_EP_FROM_FULL : ScHname = ScHname(0xfd7e8c1d); +pub const HFUNC_TEST_CHAIN_OWNER_ID_FULL : ScHname = ScHname(0x2aff1167); +pub const HFUNC_TEST_EVENT_LOG_DEPLOY : ScHname = ScHname(0x96ff760a); +pub const HFUNC_TEST_EVENT_LOG_EVENT_DATA : ScHname = ScHname(0x0efcf939); +pub const HFUNC_TEST_EVENT_LOG_GENERIC_DATA : ScHname = ScHname(0x6a16629d); +pub const HFUNC_TEST_PANIC_FULL_EP : ScHname = ScHname(0x24fdef07); +pub const HFUNC_WITHDRAW_TO_CHAIN : ScHname = ScHname(0x437bc026); +pub const HVIEW_CHECK_CONTEXT_FROM_VIEW_EP : ScHname = ScHname(0x88ff0167); +pub const HVIEW_FIBONACCI : ScHname = ScHname(0x7940873c); +pub const HVIEW_GET_COUNTER : ScHname = ScHname(0xb423e607); +pub const HVIEW_GET_INT : ScHname = ScHname(0x1887e5ef); +pub const HVIEW_GET_STRING_VALUE : ScHname = ScHname(0xcf0a4d32); +pub const HVIEW_JUST_VIEW : ScHname = ScHname(0x33b8972e); +pub const HVIEW_PASS_TYPES_VIEW : ScHname = ScHname(0x1a5b87ea); +pub const HVIEW_TEST_CALL_PANIC_VIEW_EP_FROM_VIEW : ScHname = ScHname(0x91b10c99); +pub const HVIEW_TEST_CHAIN_OWNER_ID_VIEW : ScHname = ScHname(0x26586c33); +pub const HVIEW_TEST_PANIC_VIEW_EP : ScHname = ScHname(0x22bc4d72); +pub const HVIEW_TEST_SANDBOX_CALL : ScHname = ScHname(0x42d72b63); diff --git a/contracts/wasm/testcore/src/keys.rs b/contracts/wasm/testcore/src/keys.rs index 988b0ebe48..3144450f06 100644 --- a/contracts/wasm/testcore/src/keys.rs +++ b/contracts/wasm/testcore/src/keys.rs @@ -11,41 +11,43 @@ use wasmlib::*; use crate::*; -pub(crate) const IDX_PARAM_ADDRESS: usize = 0; -pub(crate) const IDX_PARAM_AGENT_ID: usize = 1; -pub(crate) const IDX_PARAM_CALLER: usize = 2; -pub(crate) const IDX_PARAM_CHAIN_ID: usize = 3; -pub(crate) const IDX_PARAM_CHAIN_OWNER_ID: usize = 4; -pub(crate) const IDX_PARAM_CONTRACT_CREATOR: usize = 5; -pub(crate) const IDX_PARAM_CONTRACT_ID: usize = 6; -pub(crate) const IDX_PARAM_COUNTER: usize = 7; -pub(crate) const IDX_PARAM_FAIL: usize = 8; -pub(crate) const IDX_PARAM_HASH: usize = 9; -pub(crate) const IDX_PARAM_HNAME: usize = 10; -pub(crate) const IDX_PARAM_HNAME_CONTRACT: usize = 11; -pub(crate) const IDX_PARAM_HNAME_EP: usize = 12; -pub(crate) const IDX_PARAM_HNAME_ZERO: usize = 13; -pub(crate) const IDX_PARAM_INT64: usize = 14; -pub(crate) const IDX_PARAM_INT64_ZERO: usize = 15; -pub(crate) const IDX_PARAM_INT_VALUE: usize = 16; -pub(crate) const IDX_PARAM_NAME: usize = 17; -pub(crate) const IDX_PARAM_PROG_HASH: usize = 18; -pub(crate) const IDX_PARAM_STRING: usize = 19; -pub(crate) const IDX_PARAM_STRING_ZERO: usize = 20; -pub(crate) const IDX_PARAM_VAR_NAME: usize = 21; -pub(crate) const IDX_RESULT_CHAIN_OWNER_ID: usize = 22; -pub(crate) const IDX_RESULT_COUNTER: usize = 23; -pub(crate) const IDX_RESULT_INT_VALUE: usize = 24; -pub(crate) const IDX_RESULT_MINTED_COLOR: usize = 25; -pub(crate) const IDX_RESULT_MINTED_SUPPLY: usize = 26; -pub(crate) const IDX_RESULT_SANDBOX_CALL: usize = 27; -pub(crate) const IDX_RESULT_VALUES: usize = 28; -pub(crate) const IDX_RESULT_VARS: usize = 29; -pub(crate) const IDX_STATE_COUNTER: usize = 30; -pub(crate) const IDX_STATE_HNAME_EP: usize = 31; -pub(crate) const IDX_STATE_INTS: usize = 32; -pub(crate) const IDX_STATE_MINTED_COLOR: usize = 33; -pub(crate) const IDX_STATE_MINTED_SUPPLY: usize = 34; +pub(crate) const IDX_PARAM_ADDRESS : usize = 0; +pub(crate) const IDX_PARAM_AGENT_ID : usize = 1; +pub(crate) const IDX_PARAM_CALLER : usize = 2; +pub(crate) const IDX_PARAM_CHAIN_ID : usize = 3; +pub(crate) const IDX_PARAM_CHAIN_OWNER_ID : usize = 4; +pub(crate) const IDX_PARAM_CONTRACT_CREATOR : usize = 5; +pub(crate) const IDX_PARAM_CONTRACT_ID : usize = 6; +pub(crate) const IDX_PARAM_COUNTER : usize = 7; +pub(crate) const IDX_PARAM_FAIL : usize = 8; +pub(crate) const IDX_PARAM_HASH : usize = 9; +pub(crate) const IDX_PARAM_HNAME : usize = 10; +pub(crate) const IDX_PARAM_HNAME_CONTRACT : usize = 11; +pub(crate) const IDX_PARAM_HNAME_EP : usize = 12; +pub(crate) const IDX_PARAM_HNAME_ZERO : usize = 13; +pub(crate) const IDX_PARAM_INT64 : usize = 14; +pub(crate) const IDX_PARAM_INT64_ZERO : usize = 15; +pub(crate) const IDX_PARAM_INT_VALUE : usize = 16; +pub(crate) const IDX_PARAM_NAME : usize = 17; +pub(crate) const IDX_PARAM_PROG_HASH : usize = 18; +pub(crate) const IDX_PARAM_STRING : usize = 19; +pub(crate) const IDX_PARAM_STRING_ZERO : usize = 20; +pub(crate) const IDX_PARAM_VAR_NAME : usize = 21; + +pub(crate) const IDX_RESULT_CHAIN_OWNER_ID : usize = 22; +pub(crate) const IDX_RESULT_COUNTER : usize = 23; +pub(crate) const IDX_RESULT_INT_VALUE : usize = 24; +pub(crate) const IDX_RESULT_MINTED_COLOR : usize = 25; +pub(crate) const IDX_RESULT_MINTED_SUPPLY : usize = 26; +pub(crate) const IDX_RESULT_SANDBOX_CALL : usize = 27; +pub(crate) const IDX_RESULT_VALUES : usize = 28; +pub(crate) const IDX_RESULT_VARS : usize = 29; + +pub(crate) const IDX_STATE_COUNTER : usize = 30; +pub(crate) const IDX_STATE_HNAME_EP : usize = 31; +pub(crate) const IDX_STATE_INTS : usize = 32; +pub(crate) const IDX_STATE_MINTED_COLOR : usize = 33; +pub(crate) const IDX_STATE_MINTED_SUPPLY : usize = 34; pub const KEY_MAP_LEN: usize = 35; diff --git a/contracts/wasm/testcore/src/lib.rs b/contracts/wasm/testcore/src/lib.rs index 81777168b5..2d4b0e9e7b 100644 --- a/contracts/wasm/testcore/src/lib.rs +++ b/contracts/wasm/testcore/src/lib.rs @@ -29,38 +29,38 @@ mod testcore; #[no_mangle] fn on_load() { let exports = ScExports::new(); - exports.add_func(FUNC_CALL_ON_CHAIN, func_call_on_chain_thunk); - exports.add_func(FUNC_CHECK_CONTEXT_FROM_FULL_EP, func_check_context_from_full_ep_thunk); - exports.add_func(FUNC_DO_NOTHING, func_do_nothing_thunk); - exports.add_func(FUNC_GET_MINTED_SUPPLY, func_get_minted_supply_thunk); - exports.add_func(FUNC_INC_COUNTER, func_inc_counter_thunk); - exports.add_func(FUNC_INIT, func_init_thunk); - exports.add_func(FUNC_PASS_TYPES_FULL, func_pass_types_full_thunk); - exports.add_func(FUNC_RUN_RECURSION, func_run_recursion_thunk); - exports.add_func(FUNC_SEND_TO_ADDRESS, func_send_to_address_thunk); - exports.add_func(FUNC_SET_INT, func_set_int_thunk); - exports.add_func(FUNC_SPAWN, func_spawn_thunk); - exports.add_func(FUNC_TEST_BLOCK_CONTEXT1, func_test_block_context1_thunk); - exports.add_func(FUNC_TEST_BLOCK_CONTEXT2, func_test_block_context2_thunk); - exports.add_func(FUNC_TEST_CALL_PANIC_FULL_EP, func_test_call_panic_full_ep_thunk); + exports.add_func(FUNC_CALL_ON_CHAIN, func_call_on_chain_thunk); + exports.add_func(FUNC_CHECK_CONTEXT_FROM_FULL_EP, func_check_context_from_full_ep_thunk); + exports.add_func(FUNC_DO_NOTHING, func_do_nothing_thunk); + exports.add_func(FUNC_GET_MINTED_SUPPLY, func_get_minted_supply_thunk); + exports.add_func(FUNC_INC_COUNTER, func_inc_counter_thunk); + exports.add_func(FUNC_INIT, func_init_thunk); + exports.add_func(FUNC_PASS_TYPES_FULL, func_pass_types_full_thunk); + exports.add_func(FUNC_RUN_RECURSION, func_run_recursion_thunk); + exports.add_func(FUNC_SEND_TO_ADDRESS, func_send_to_address_thunk); + exports.add_func(FUNC_SET_INT, func_set_int_thunk); + exports.add_func(FUNC_SPAWN, func_spawn_thunk); + exports.add_func(FUNC_TEST_BLOCK_CONTEXT1, func_test_block_context1_thunk); + exports.add_func(FUNC_TEST_BLOCK_CONTEXT2, func_test_block_context2_thunk); + exports.add_func(FUNC_TEST_CALL_PANIC_FULL_EP, func_test_call_panic_full_ep_thunk); exports.add_func(FUNC_TEST_CALL_PANIC_VIEW_EP_FROM_FULL, func_test_call_panic_view_ep_from_full_thunk); - exports.add_func(FUNC_TEST_CHAIN_OWNER_ID_FULL, func_test_chain_owner_id_full_thunk); - exports.add_func(FUNC_TEST_EVENT_LOG_DEPLOY, func_test_event_log_deploy_thunk); - exports.add_func(FUNC_TEST_EVENT_LOG_EVENT_DATA, func_test_event_log_event_data_thunk); - exports.add_func(FUNC_TEST_EVENT_LOG_GENERIC_DATA, func_test_event_log_generic_data_thunk); - exports.add_func(FUNC_TEST_PANIC_FULL_EP, func_test_panic_full_ep_thunk); - exports.add_func(FUNC_WITHDRAW_TO_CHAIN, func_withdraw_to_chain_thunk); - exports.add_view(VIEW_CHECK_CONTEXT_FROM_VIEW_EP, view_check_context_from_view_ep_thunk); - exports.add_view(VIEW_FIBONACCI, view_fibonacci_thunk); - exports.add_view(VIEW_GET_COUNTER, view_get_counter_thunk); - exports.add_view(VIEW_GET_INT, view_get_int_thunk); - exports.add_view(VIEW_GET_STRING_VALUE, view_get_string_value_thunk); - exports.add_view(VIEW_JUST_VIEW, view_just_view_thunk); - exports.add_view(VIEW_PASS_TYPES_VIEW, view_pass_types_view_thunk); + exports.add_func(FUNC_TEST_CHAIN_OWNER_ID_FULL, func_test_chain_owner_id_full_thunk); + exports.add_func(FUNC_TEST_EVENT_LOG_DEPLOY, func_test_event_log_deploy_thunk); + exports.add_func(FUNC_TEST_EVENT_LOG_EVENT_DATA, func_test_event_log_event_data_thunk); + exports.add_func(FUNC_TEST_EVENT_LOG_GENERIC_DATA, func_test_event_log_generic_data_thunk); + exports.add_func(FUNC_TEST_PANIC_FULL_EP, func_test_panic_full_ep_thunk); + exports.add_func(FUNC_WITHDRAW_TO_CHAIN, func_withdraw_to_chain_thunk); + exports.add_view(VIEW_CHECK_CONTEXT_FROM_VIEW_EP, view_check_context_from_view_ep_thunk); + exports.add_view(VIEW_FIBONACCI, view_fibonacci_thunk); + exports.add_view(VIEW_GET_COUNTER, view_get_counter_thunk); + exports.add_view(VIEW_GET_INT, view_get_int_thunk); + exports.add_view(VIEW_GET_STRING_VALUE, view_get_string_value_thunk); + exports.add_view(VIEW_JUST_VIEW, view_just_view_thunk); + exports.add_view(VIEW_PASS_TYPES_VIEW, view_pass_types_view_thunk); exports.add_view(VIEW_TEST_CALL_PANIC_VIEW_EP_FROM_VIEW, view_test_call_panic_view_ep_from_view_thunk); - exports.add_view(VIEW_TEST_CHAIN_OWNER_ID_VIEW, view_test_chain_owner_id_view_thunk); - exports.add_view(VIEW_TEST_PANIC_VIEW_EP, view_test_panic_view_ep_thunk); - exports.add_view(VIEW_TEST_SANDBOX_CALL, view_test_sandbox_call_thunk); + exports.add_view(VIEW_TEST_CHAIN_OWNER_ID_VIEW, view_test_chain_owner_id_view_thunk); + exports.add_view(VIEW_TEST_PANIC_VIEW_EP, view_test_panic_view_ep_thunk); + exports.add_view(VIEW_TEST_SANDBOX_CALL, view_test_sandbox_call_thunk); unsafe { for i in 0..KEY_MAP_LEN { diff --git a/contracts/wasm/testcore/ts/testcore/consts.ts b/contracts/wasm/testcore/ts/testcore/consts.ts index ba03a0916c..9800e419f1 100644 --- a/contracts/wasm/testcore/ts/testcore/consts.ts +++ b/contracts/wasm/testcore/ts/testcore/consts.ts @@ -11,106 +11,106 @@ export const ScName = "testcore"; export const ScDescription = "Core test for ISCP wasmlib Rust/Wasm library"; export const HScName = new wasmlib.ScHname(0x370d33ad); -export const ParamAddress = "address"; -export const ParamAgentID = "agentID"; -export const ParamCaller = "caller"; -export const ParamChainID = "chainID"; -export const ParamChainOwnerID = "chainOwnerID"; +export const ParamAddress = "address"; +export const ParamAgentID = "agentID"; +export const ParamCaller = "caller"; +export const ParamChainID = "chainID"; +export const ParamChainOwnerID = "chainOwnerID"; export const ParamContractCreator = "contractCreator"; -export const ParamContractID = "contractID"; -export const ParamCounter = "counter"; -export const ParamFail = "initFailParam"; -export const ParamHash = "Hash"; -export const ParamHname = "Hname"; -export const ParamHnameContract = "hnameContract"; -export const ParamHnameEP = "hnameEP"; -export const ParamHnameZero = "Hname-0"; -export const ParamInt64 = "int64"; -export const ParamInt64Zero = "int64-0"; -export const ParamIntValue = "intParamValue"; -export const ParamName = "intParamName"; -export const ParamProgHash = "progHash"; -export const ParamString = "string"; -export const ParamStringZero = "string-0"; -export const ParamVarName = "varName"; +export const ParamContractID = "contractID"; +export const ParamCounter = "counter"; +export const ParamFail = "initFailParam"; +export const ParamHash = "Hash"; +export const ParamHname = "Hname"; +export const ParamHnameContract = "hnameContract"; +export const ParamHnameEP = "hnameEP"; +export const ParamHnameZero = "Hname-0"; +export const ParamInt64 = "int64"; +export const ParamInt64Zero = "int64-0"; +export const ParamIntValue = "intParamValue"; +export const ParamName = "intParamName"; +export const ParamProgHash = "progHash"; +export const ParamString = "string"; +export const ParamStringZero = "string-0"; +export const ParamVarName = "varName"; export const ResultChainOwnerID = "chainOwnerID"; -export const ResultCounter = "counter"; -export const ResultIntValue = "intParamValue"; -export const ResultMintedColor = "mintedColor"; +export const ResultCounter = "counter"; +export const ResultIntValue = "intParamValue"; +export const ResultMintedColor = "mintedColor"; export const ResultMintedSupply = "mintedSupply"; -export const ResultSandboxCall = "sandboxCall"; -export const ResultValues = "this"; -export const ResultVars = "this"; +export const ResultSandboxCall = "sandboxCall"; +export const ResultValues = "this"; +export const ResultVars = "this"; -export const StateCounter = "counter"; -export const StateHnameEP = "hnameEP"; -export const StateInts = "ints"; -export const StateMintedColor = "mintedColor"; +export const StateCounter = "counter"; +export const StateHnameEP = "hnameEP"; +export const StateInts = "ints"; +export const StateMintedColor = "mintedColor"; export const StateMintedSupply = "mintedSupply"; -export const FuncCallOnChain = "callOnChain"; -export const FuncCheckContextFromFullEP = "checkContextFromFullEP"; -export const FuncDoNothing = "doNothing"; -export const FuncGetMintedSupply = "getMintedSupply"; -export const FuncIncCounter = "incCounter"; -export const FuncInit = "init"; -export const FuncPassTypesFull = "passTypesFull"; -export const FuncRunRecursion = "runRecursion"; -export const FuncSendToAddress = "sendToAddress"; -export const FuncSetInt = "setInt"; -export const FuncSpawn = "spawn"; -export const FuncTestBlockContext1 = "testBlockContext1"; -export const FuncTestBlockContext2 = "testBlockContext2"; -export const FuncTestCallPanicFullEP = "testCallPanicFullEP"; +export const FuncCallOnChain = "callOnChain"; +export const FuncCheckContextFromFullEP = "checkContextFromFullEP"; +export const FuncDoNothing = "doNothing"; +export const FuncGetMintedSupply = "getMintedSupply"; +export const FuncIncCounter = "incCounter"; +export const FuncInit = "init"; +export const FuncPassTypesFull = "passTypesFull"; +export const FuncRunRecursion = "runRecursion"; +export const FuncSendToAddress = "sendToAddress"; +export const FuncSetInt = "setInt"; +export const FuncSpawn = "spawn"; +export const FuncTestBlockContext1 = "testBlockContext1"; +export const FuncTestBlockContext2 = "testBlockContext2"; +export const FuncTestCallPanicFullEP = "testCallPanicFullEP"; export const FuncTestCallPanicViewEPFromFull = "testCallPanicViewEPFromFull"; -export const FuncTestChainOwnerIDFull = "testChainOwnerIDFull"; -export const FuncTestEventLogDeploy = "testEventLogDeploy"; -export const FuncTestEventLogEventData = "testEventLogEventData"; -export const FuncTestEventLogGenericData = "testEventLogGenericData"; -export const FuncTestPanicFullEP = "testPanicFullEP"; -export const FuncWithdrawToChain = "withdrawToChain"; -export const ViewCheckContextFromViewEP = "checkContextFromViewEP"; -export const ViewFibonacci = "fibonacci"; -export const ViewGetCounter = "getCounter"; -export const ViewGetInt = "getInt"; -export const ViewGetStringValue = "getStringValue"; -export const ViewJustView = "justView"; -export const ViewPassTypesView = "passTypesView"; +export const FuncTestChainOwnerIDFull = "testChainOwnerIDFull"; +export const FuncTestEventLogDeploy = "testEventLogDeploy"; +export const FuncTestEventLogEventData = "testEventLogEventData"; +export const FuncTestEventLogGenericData = "testEventLogGenericData"; +export const FuncTestPanicFullEP = "testPanicFullEP"; +export const FuncWithdrawToChain = "withdrawToChain"; +export const ViewCheckContextFromViewEP = "checkContextFromViewEP"; +export const ViewFibonacci = "fibonacci"; +export const ViewGetCounter = "getCounter"; +export const ViewGetInt = "getInt"; +export const ViewGetStringValue = "getStringValue"; +export const ViewJustView = "justView"; +export const ViewPassTypesView = "passTypesView"; export const ViewTestCallPanicViewEPFromView = "testCallPanicViewEPFromView"; -export const ViewTestChainOwnerIDView = "testChainOwnerIDView"; -export const ViewTestPanicViewEP = "testPanicViewEP"; -export const ViewTestSandboxCall = "testSandboxCall"; +export const ViewTestChainOwnerIDView = "testChainOwnerIDView"; +export const ViewTestPanicViewEP = "testPanicViewEP"; +export const ViewTestSandboxCall = "testSandboxCall"; -export const HFuncCallOnChain = new wasmlib.ScHname(0x95a3d123); -export const HFuncCheckContextFromFullEP = new wasmlib.ScHname(0xa56c24ba); -export const HFuncDoNothing = new wasmlib.ScHname(0xdda4a6de); -export const HFuncGetMintedSupply = new wasmlib.ScHname(0x0c2d113c); -export const HFuncIncCounter = new wasmlib.ScHname(0x7b287419); -export const HFuncInit = new wasmlib.ScHname(0x1f44d644); -export const HFuncPassTypesFull = new wasmlib.ScHname(0x733ea0ea); -export const HFuncRunRecursion = new wasmlib.ScHname(0x833425fd); -export const HFuncSendToAddress = new wasmlib.ScHname(0x63ce4634); -export const HFuncSetInt = new wasmlib.ScHname(0x62056f74); -export const HFuncSpawn = new wasmlib.ScHname(0xec929d12); -export const HFuncTestBlockContext1 = new wasmlib.ScHname(0x796d4136); -export const HFuncTestBlockContext2 = new wasmlib.ScHname(0x758b0452); -export const HFuncTestCallPanicFullEP = new wasmlib.ScHname(0x4c878834); +export const HFuncCallOnChain = new wasmlib.ScHname(0x95a3d123); +export const HFuncCheckContextFromFullEP = new wasmlib.ScHname(0xa56c24ba); +export const HFuncDoNothing = new wasmlib.ScHname(0xdda4a6de); +export const HFuncGetMintedSupply = new wasmlib.ScHname(0x0c2d113c); +export const HFuncIncCounter = new wasmlib.ScHname(0x7b287419); +export const HFuncInit = new wasmlib.ScHname(0x1f44d644); +export const HFuncPassTypesFull = new wasmlib.ScHname(0x733ea0ea); +export const HFuncRunRecursion = new wasmlib.ScHname(0x833425fd); +export const HFuncSendToAddress = new wasmlib.ScHname(0x63ce4634); +export const HFuncSetInt = new wasmlib.ScHname(0x62056f74); +export const HFuncSpawn = new wasmlib.ScHname(0xec929d12); +export const HFuncTestBlockContext1 = new wasmlib.ScHname(0x796d4136); +export const HFuncTestBlockContext2 = new wasmlib.ScHname(0x758b0452); +export const HFuncTestCallPanicFullEP = new wasmlib.ScHname(0x4c878834); export const HFuncTestCallPanicViewEPFromFull = new wasmlib.ScHname(0xfd7e8c1d); -export const HFuncTestChainOwnerIDFull = new wasmlib.ScHname(0x2aff1167); -export const HFuncTestEventLogDeploy = new wasmlib.ScHname(0x96ff760a); -export const HFuncTestEventLogEventData = new wasmlib.ScHname(0x0efcf939); -export const HFuncTestEventLogGenericData = new wasmlib.ScHname(0x6a16629d); -export const HFuncTestPanicFullEP = new wasmlib.ScHname(0x24fdef07); -export const HFuncWithdrawToChain = new wasmlib.ScHname(0x437bc026); -export const HViewCheckContextFromViewEP = new wasmlib.ScHname(0x88ff0167); -export const HViewFibonacci = new wasmlib.ScHname(0x7940873c); -export const HViewGetCounter = new wasmlib.ScHname(0xb423e607); -export const HViewGetInt = new wasmlib.ScHname(0x1887e5ef); -export const HViewGetStringValue = new wasmlib.ScHname(0xcf0a4d32); -export const HViewJustView = new wasmlib.ScHname(0x33b8972e); -export const HViewPassTypesView = new wasmlib.ScHname(0x1a5b87ea); +export const HFuncTestChainOwnerIDFull = new wasmlib.ScHname(0x2aff1167); +export const HFuncTestEventLogDeploy = new wasmlib.ScHname(0x96ff760a); +export const HFuncTestEventLogEventData = new wasmlib.ScHname(0x0efcf939); +export const HFuncTestEventLogGenericData = new wasmlib.ScHname(0x6a16629d); +export const HFuncTestPanicFullEP = new wasmlib.ScHname(0x24fdef07); +export const HFuncWithdrawToChain = new wasmlib.ScHname(0x437bc026); +export const HViewCheckContextFromViewEP = new wasmlib.ScHname(0x88ff0167); +export const HViewFibonacci = new wasmlib.ScHname(0x7940873c); +export const HViewGetCounter = new wasmlib.ScHname(0xb423e607); +export const HViewGetInt = new wasmlib.ScHname(0x1887e5ef); +export const HViewGetStringValue = new wasmlib.ScHname(0xcf0a4d32); +export const HViewJustView = new wasmlib.ScHname(0x33b8972e); +export const HViewPassTypesView = new wasmlib.ScHname(0x1a5b87ea); export const HViewTestCallPanicViewEPFromView = new wasmlib.ScHname(0x91b10c99); -export const HViewTestChainOwnerIDView = new wasmlib.ScHname(0x26586c33); -export const HViewTestPanicViewEP = new wasmlib.ScHname(0x22bc4d72); -export const HViewTestSandboxCall = new wasmlib.ScHname(0x42d72b63); +export const HViewTestChainOwnerIDView = new wasmlib.ScHname(0x26586c33); +export const HViewTestPanicViewEP = new wasmlib.ScHname(0x22bc4d72); +export const HViewTestSandboxCall = new wasmlib.ScHname(0x42d72b63); diff --git a/contracts/wasm/testcore/ts/testcore/keys.ts b/contracts/wasm/testcore/ts/testcore/keys.ts index 421e1546cd..f1fdbcb9fb 100644 --- a/contracts/wasm/testcore/ts/testcore/keys.ts +++ b/contracts/wasm/testcore/ts/testcore/keys.ts @@ -8,40 +8,42 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; -export const IdxParamAddress = 0; -export const IdxParamAgentID = 1; -export const IdxParamCaller = 2; -export const IdxParamChainID = 3; -export const IdxParamChainOwnerID = 4; +export const IdxParamAddress = 0; +export const IdxParamAgentID = 1; +export const IdxParamCaller = 2; +export const IdxParamChainID = 3; +export const IdxParamChainOwnerID = 4; export const IdxParamContractCreator = 5; -export const IdxParamContractID = 6; -export const IdxParamCounter = 7; -export const IdxParamFail = 8; -export const IdxParamHash = 9; -export const IdxParamHname = 10; -export const IdxParamHnameContract = 11; -export const IdxParamHnameEP = 12; -export const IdxParamHnameZero = 13; -export const IdxParamInt64 = 14; -export const IdxParamInt64Zero = 15; -export const IdxParamIntValue = 16; -export const IdxParamName = 17; -export const IdxParamProgHash = 18; -export const IdxParamString = 19; -export const IdxParamStringZero = 20; -export const IdxParamVarName = 21; +export const IdxParamContractID = 6; +export const IdxParamCounter = 7; +export const IdxParamFail = 8; +export const IdxParamHash = 9; +export const IdxParamHname = 10; +export const IdxParamHnameContract = 11; +export const IdxParamHnameEP = 12; +export const IdxParamHnameZero = 13; +export const IdxParamInt64 = 14; +export const IdxParamInt64Zero = 15; +export const IdxParamIntValue = 16; +export const IdxParamName = 17; +export const IdxParamProgHash = 18; +export const IdxParamString = 19; +export const IdxParamStringZero = 20; +export const IdxParamVarName = 21; + export const IdxResultChainOwnerID = 22; -export const IdxResultCounter = 23; -export const IdxResultIntValue = 24; -export const IdxResultMintedColor = 25; +export const IdxResultCounter = 23; +export const IdxResultIntValue = 24; +export const IdxResultMintedColor = 25; export const IdxResultMintedSupply = 26; -export const IdxResultSandboxCall = 27; -export const IdxResultValues = 28; -export const IdxResultVars = 29; -export const IdxStateCounter = 30; -export const IdxStateHnameEP = 31; -export const IdxStateInts = 32; -export const IdxStateMintedColor = 33; +export const IdxResultSandboxCall = 27; +export const IdxResultValues = 28; +export const IdxResultVars = 29; + +export const IdxStateCounter = 30; +export const IdxStateHnameEP = 31; +export const IdxStateInts = 32; +export const IdxStateMintedColor = 33; export const IdxStateMintedSupply = 34; export let keyMap: string[] = [ diff --git a/contracts/wasm/testcore/ts/testcore/lib.ts b/contracts/wasm/testcore/ts/testcore/lib.ts index 9e8b213587..2ff3e7d18e 100644 --- a/contracts/wasm/testcore/ts/testcore/lib.ts +++ b/contracts/wasm/testcore/ts/testcore/lib.ts @@ -14,38 +14,38 @@ export function on_call(index: i32): void { export function on_load(): void { let exports = new wasmlib.ScExports(); - exports.addFunc(sc.FuncCallOnChain, funcCallOnChainThunk); - exports.addFunc(sc.FuncCheckContextFromFullEP, funcCheckContextFromFullEPThunk); - exports.addFunc(sc.FuncDoNothing, funcDoNothingThunk); - exports.addFunc(sc.FuncGetMintedSupply, funcGetMintedSupplyThunk); - exports.addFunc(sc.FuncIncCounter, funcIncCounterThunk); - exports.addFunc(sc.FuncInit, funcInitThunk); - exports.addFunc(sc.FuncPassTypesFull, funcPassTypesFullThunk); - exports.addFunc(sc.FuncRunRecursion, funcRunRecursionThunk); - exports.addFunc(sc.FuncSendToAddress, funcSendToAddressThunk); - exports.addFunc(sc.FuncSetInt, funcSetIntThunk); - exports.addFunc(sc.FuncSpawn, funcSpawnThunk); - exports.addFunc(sc.FuncTestBlockContext1, funcTestBlockContext1Thunk); - exports.addFunc(sc.FuncTestBlockContext2, funcTestBlockContext2Thunk); - exports.addFunc(sc.FuncTestCallPanicFullEP, funcTestCallPanicFullEPThunk); + exports.addFunc(sc.FuncCallOnChain, funcCallOnChainThunk); + exports.addFunc(sc.FuncCheckContextFromFullEP, funcCheckContextFromFullEPThunk); + exports.addFunc(sc.FuncDoNothing, funcDoNothingThunk); + exports.addFunc(sc.FuncGetMintedSupply, funcGetMintedSupplyThunk); + exports.addFunc(sc.FuncIncCounter, funcIncCounterThunk); + exports.addFunc(sc.FuncInit, funcInitThunk); + exports.addFunc(sc.FuncPassTypesFull, funcPassTypesFullThunk); + exports.addFunc(sc.FuncRunRecursion, funcRunRecursionThunk); + exports.addFunc(sc.FuncSendToAddress, funcSendToAddressThunk); + exports.addFunc(sc.FuncSetInt, funcSetIntThunk); + exports.addFunc(sc.FuncSpawn, funcSpawnThunk); + exports.addFunc(sc.FuncTestBlockContext1, funcTestBlockContext1Thunk); + exports.addFunc(sc.FuncTestBlockContext2, funcTestBlockContext2Thunk); + exports.addFunc(sc.FuncTestCallPanicFullEP, funcTestCallPanicFullEPThunk); exports.addFunc(sc.FuncTestCallPanicViewEPFromFull, funcTestCallPanicViewEPFromFullThunk); - exports.addFunc(sc.FuncTestChainOwnerIDFull, funcTestChainOwnerIDFullThunk); - exports.addFunc(sc.FuncTestEventLogDeploy, funcTestEventLogDeployThunk); - exports.addFunc(sc.FuncTestEventLogEventData, funcTestEventLogEventDataThunk); - exports.addFunc(sc.FuncTestEventLogGenericData, funcTestEventLogGenericDataThunk); - exports.addFunc(sc.FuncTestPanicFullEP, funcTestPanicFullEPThunk); - exports.addFunc(sc.FuncWithdrawToChain, funcWithdrawToChainThunk); - exports.addView(sc.ViewCheckContextFromViewEP, viewCheckContextFromViewEPThunk); - exports.addView(sc.ViewFibonacci, viewFibonacciThunk); - exports.addView(sc.ViewGetCounter, viewGetCounterThunk); - exports.addView(sc.ViewGetInt, viewGetIntThunk); - exports.addView(sc.ViewGetStringValue, viewGetStringValueThunk); - exports.addView(sc.ViewJustView, viewJustViewThunk); - exports.addView(sc.ViewPassTypesView, viewPassTypesViewThunk); + exports.addFunc(sc.FuncTestChainOwnerIDFull, funcTestChainOwnerIDFullThunk); + exports.addFunc(sc.FuncTestEventLogDeploy, funcTestEventLogDeployThunk); + exports.addFunc(sc.FuncTestEventLogEventData, funcTestEventLogEventDataThunk); + exports.addFunc(sc.FuncTestEventLogGenericData, funcTestEventLogGenericDataThunk); + exports.addFunc(sc.FuncTestPanicFullEP, funcTestPanicFullEPThunk); + exports.addFunc(sc.FuncWithdrawToChain, funcWithdrawToChainThunk); + exports.addView(sc.ViewCheckContextFromViewEP, viewCheckContextFromViewEPThunk); + exports.addView(sc.ViewFibonacci, viewFibonacciThunk); + exports.addView(sc.ViewGetCounter, viewGetCounterThunk); + exports.addView(sc.ViewGetInt, viewGetIntThunk); + exports.addView(sc.ViewGetStringValue, viewGetStringValueThunk); + exports.addView(sc.ViewJustView, viewJustViewThunk); + exports.addView(sc.ViewPassTypesView, viewPassTypesViewThunk); exports.addView(sc.ViewTestCallPanicViewEPFromView, viewTestCallPanicViewEPFromViewThunk); - exports.addView(sc.ViewTestChainOwnerIDView, viewTestChainOwnerIDViewThunk); - exports.addView(sc.ViewTestPanicViewEP, viewTestPanicViewEPThunk); - exports.addView(sc.ViewTestSandboxCall, viewTestSandboxCallThunk); + exports.addView(sc.ViewTestChainOwnerIDView, viewTestChainOwnerIDViewThunk); + exports.addView(sc.ViewTestPanicViewEP, viewTestPanicViewEPThunk); + exports.addView(sc.ViewTestSandboxCall, viewTestSandboxCallThunk); for (let i = 0; i < sc.keyMap.length; i++) { sc.idxMap[i] = wasmlib.Key32.fromString(sc.keyMap[i]); diff --git a/contracts/wasm/testwasmlib/go/testwasmlib/consts.go b/contracts/wasm/testwasmlib/go/testwasmlib/consts.go index 9daa6b1e88..05dc5882fa 100644 --- a/contracts/wasm/testwasmlib/go/testwasmlib/consts.go +++ b/contracts/wasm/testwasmlib/go/testwasmlib/consts.go @@ -16,38 +16,38 @@ const ( ) const ( - ParamAddress = wasmlib.Key("address") - ParamAgentID = wasmlib.Key("agentID") - ParamBlockIndex = wasmlib.Key("blockIndex") - ParamBytes = wasmlib.Key("bytes") - ParamChainID = wasmlib.Key("chainID") - ParamColor = wasmlib.Key("color") - ParamHash = wasmlib.Key("hash") - ParamHname = wasmlib.Key("hname") - ParamIndex = wasmlib.Key("index") - ParamInt16 = wasmlib.Key("int16") - ParamInt32 = wasmlib.Key("int32") - ParamInt64 = wasmlib.Key("int64") - ParamName = wasmlib.Key("name") - ParamParam = wasmlib.Key("this") - ParamRecordIndex = wasmlib.Key("recordIndex") - ParamRequestID = wasmlib.Key("requestID") - ParamString = wasmlib.Key("string") - ParamValue = wasmlib.Key("value") + ParamAddress = "address" + ParamAgentID = "agentID" + ParamBlockIndex = "blockIndex" + ParamBytes = "bytes" + ParamChainID = "chainID" + ParamColor = "color" + ParamHash = "hash" + ParamHname = "hname" + ParamIndex = "index" + ParamInt16 = "int16" + ParamInt32 = "int32" + ParamInt64 = "int64" + ParamName = "name" + ParamParam = "this" + ParamRecordIndex = "recordIndex" + ParamRequestID = "requestID" + ParamString = "string" + ParamValue = "value" ) const ( - ResultCount = wasmlib.Key("count") - ResultIotas = wasmlib.Key("iotas") - ResultLength = wasmlib.Key("length") - ResultRandom = wasmlib.Key("random") - ResultRecord = wasmlib.Key("record") - ResultValue = wasmlib.Key("value") + ResultCount = "count" + ResultIotas = "iotas" + ResultLength = "length" + ResultRandom = "random" + ResultRecord = "record" + ResultValue = "value" ) const ( - StateArrays = wasmlib.Key("arrays") - StateRandom = wasmlib.Key("random") + StateArrays = "arrays" + StateRandom = "random" ) const ( diff --git a/contracts/wasm/testwasmlib/go/testwasmlib/keys.go b/contracts/wasm/testwasmlib/go/testwasmlib/keys.go index c69cf0cc72..bd0abd63c1 100644 --- a/contracts/wasm/testwasmlib/go/testwasmlib/keys.go +++ b/contracts/wasm/testwasmlib/go/testwasmlib/keys.go @@ -28,14 +28,16 @@ const ( IdxParamRequestID = 15 IdxParamString = 16 IdxParamValue = 17 - IdxResultCount = 18 - IdxResultIotas = 19 - IdxResultLength = 20 - IdxResultRandom = 21 - IdxResultRecord = 22 - IdxResultValue = 23 - IdxStateArrays = 24 - IdxStateRandom = 25 + + IdxResultCount = 18 + IdxResultIotas = 19 + IdxResultLength = 20 + IdxResultRandom = 21 + IdxResultRecord = 22 + IdxResultValue = 23 + + IdxStateArrays = 24 + IdxStateRandom = 25 ) const keyMapLen = 26 diff --git a/contracts/wasm/testwasmlib/src/consts.rs b/contracts/wasm/testwasmlib/src/consts.rs index 8a1e0bb47f..648228f143 100644 --- a/contracts/wasm/testwasmlib/src/consts.rs +++ b/contracts/wasm/testwasmlib/src/consts.rs @@ -9,59 +9,59 @@ use wasmlib::*; -pub const SC_NAME: &str = "testwasmlib"; -pub const SC_DESCRIPTION: &str = "Exercise all aspects of WasmLib"; -pub const HSC_NAME: ScHname = ScHname(0x89703a45); +pub const SC_NAME : &str = "testwasmlib"; +pub const SC_DESCRIPTION : &str = "Exercise all aspects of WasmLib"; +pub const HSC_NAME : ScHname = ScHname(0x89703a45); -pub const PARAM_ADDRESS: &str = "address"; -pub const PARAM_AGENT_ID: &str = "agentID"; -pub const PARAM_BLOCK_INDEX: &str = "blockIndex"; -pub const PARAM_BYTES: &str = "bytes"; -pub const PARAM_CHAIN_ID: &str = "chainID"; -pub const PARAM_COLOR: &str = "color"; -pub const PARAM_HASH: &str = "hash"; -pub const PARAM_HNAME: &str = "hname"; -pub const PARAM_INDEX: &str = "index"; -pub const PARAM_INT16: &str = "int16"; -pub const PARAM_INT32: &str = "int32"; -pub const PARAM_INT64: &str = "int64"; -pub const PARAM_NAME: &str = "name"; -pub const PARAM_PARAM: &str = "this"; -pub const PARAM_RECORD_INDEX: &str = "recordIndex"; -pub const PARAM_REQUEST_ID: &str = "requestID"; -pub const PARAM_STRING: &str = "string"; -pub const PARAM_VALUE: &str = "value"; +pub const PARAM_ADDRESS : &str = "address"; +pub const PARAM_AGENT_ID : &str = "agentID"; +pub const PARAM_BLOCK_INDEX : &str = "blockIndex"; +pub const PARAM_BYTES : &str = "bytes"; +pub const PARAM_CHAIN_ID : &str = "chainID"; +pub const PARAM_COLOR : &str = "color"; +pub const PARAM_HASH : &str = "hash"; +pub const PARAM_HNAME : &str = "hname"; +pub const PARAM_INDEX : &str = "index"; +pub const PARAM_INT16 : &str = "int16"; +pub const PARAM_INT32 : &str = "int32"; +pub const PARAM_INT64 : &str = "int64"; +pub const PARAM_NAME : &str = "name"; +pub const PARAM_PARAM : &str = "this"; +pub const PARAM_RECORD_INDEX : &str = "recordIndex"; +pub const PARAM_REQUEST_ID : &str = "requestID"; +pub const PARAM_STRING : &str = "string"; +pub const PARAM_VALUE : &str = "value"; -pub const RESULT_COUNT: &str = "count"; -pub const RESULT_IOTAS: &str = "iotas"; -pub const RESULT_LENGTH: &str = "length"; -pub const RESULT_RANDOM: &str = "random"; -pub const RESULT_RECORD: &str = "record"; -pub const RESULT_VALUE: &str = "value"; +pub const RESULT_COUNT : &str = "count"; +pub const RESULT_IOTAS : &str = "iotas"; +pub const RESULT_LENGTH : &str = "length"; +pub const RESULT_RANDOM : &str = "random"; +pub const RESULT_RECORD : &str = "record"; +pub const RESULT_VALUE : &str = "value"; -pub const STATE_ARRAYS: &str = "arrays"; -pub const STATE_RANDOM: &str = "random"; +pub const STATE_ARRAYS : &str = "arrays"; +pub const STATE_RANDOM : &str = "random"; -pub const FUNC_ARRAY_CLEAR: &str = "arrayClear"; -pub const FUNC_ARRAY_CREATE: &str = "arrayCreate"; -pub const FUNC_ARRAY_SET: &str = "arraySet"; -pub const FUNC_PARAM_TYPES: &str = "paramTypes"; -pub const FUNC_RANDOM: &str = "random"; -pub const VIEW_ARRAY_LENGTH: &str = "arrayLength"; -pub const VIEW_ARRAY_VALUE: &str = "arrayValue"; -pub const VIEW_BLOCK_RECORD: &str = "blockRecord"; -pub const VIEW_BLOCK_RECORDS: &str = "blockRecords"; -pub const VIEW_GET_RANDOM: &str = "getRandom"; -pub const VIEW_IOTA_BALANCE: &str = "iotaBalance"; +pub const FUNC_ARRAY_CLEAR : &str = "arrayClear"; +pub const FUNC_ARRAY_CREATE : &str = "arrayCreate"; +pub const FUNC_ARRAY_SET : &str = "arraySet"; +pub const FUNC_PARAM_TYPES : &str = "paramTypes"; +pub const FUNC_RANDOM : &str = "random"; +pub const VIEW_ARRAY_LENGTH : &str = "arrayLength"; +pub const VIEW_ARRAY_VALUE : &str = "arrayValue"; +pub const VIEW_BLOCK_RECORD : &str = "blockRecord"; +pub const VIEW_BLOCK_RECORDS : &str = "blockRecords"; +pub const VIEW_GET_RANDOM : &str = "getRandom"; +pub const VIEW_IOTA_BALANCE : &str = "iotaBalance"; -pub const HFUNC_ARRAY_CLEAR: ScHname = ScHname(0x88021821); -pub const HFUNC_ARRAY_CREATE: ScHname = ScHname(0x1ed5b23b); -pub const HFUNC_ARRAY_SET: ScHname = ScHname(0x2c4150b3); -pub const HFUNC_PARAM_TYPES: ScHname = ScHname(0x6921c4cd); -pub const HFUNC_RANDOM: ScHname = ScHname(0xe86c97ca); -pub const HVIEW_ARRAY_LENGTH: ScHname = ScHname(0x3a831021); -pub const HVIEW_ARRAY_VALUE: ScHname = ScHname(0x662dbd81); -pub const HVIEW_BLOCK_RECORD: ScHname = ScHname(0xad13b2f8); -pub const HVIEW_BLOCK_RECORDS: ScHname = ScHname(0x16e249ea); -pub const HVIEW_GET_RANDOM: ScHname = ScHname(0x46263045); -pub const HVIEW_IOTA_BALANCE: ScHname = ScHname(0x9d3920bd); +pub const HFUNC_ARRAY_CLEAR : ScHname = ScHname(0x88021821); +pub const HFUNC_ARRAY_CREATE : ScHname = ScHname(0x1ed5b23b); +pub const HFUNC_ARRAY_SET : ScHname = ScHname(0x2c4150b3); +pub const HFUNC_PARAM_TYPES : ScHname = ScHname(0x6921c4cd); +pub const HFUNC_RANDOM : ScHname = ScHname(0xe86c97ca); +pub const HVIEW_ARRAY_LENGTH : ScHname = ScHname(0x3a831021); +pub const HVIEW_ARRAY_VALUE : ScHname = ScHname(0x662dbd81); +pub const HVIEW_BLOCK_RECORD : ScHname = ScHname(0xad13b2f8); +pub const HVIEW_BLOCK_RECORDS : ScHname = ScHname(0x16e249ea); +pub const HVIEW_GET_RANDOM : ScHname = ScHname(0x46263045); +pub const HVIEW_IOTA_BALANCE : ScHname = ScHname(0x9d3920bd); diff --git a/contracts/wasm/testwasmlib/src/keys.rs b/contracts/wasm/testwasmlib/src/keys.rs index 4b5a96df37..f59ef13b3d 100644 --- a/contracts/wasm/testwasmlib/src/keys.rs +++ b/contracts/wasm/testwasmlib/src/keys.rs @@ -11,32 +11,34 @@ use wasmlib::*; use crate::*; -pub(crate) const IDX_PARAM_ADDRESS: usize = 0; -pub(crate) const IDX_PARAM_AGENT_ID: usize = 1; -pub(crate) const IDX_PARAM_BLOCK_INDEX: usize = 2; -pub(crate) const IDX_PARAM_BYTES: usize = 3; -pub(crate) const IDX_PARAM_CHAIN_ID: usize = 4; -pub(crate) const IDX_PARAM_COLOR: usize = 5; -pub(crate) const IDX_PARAM_HASH: usize = 6; -pub(crate) const IDX_PARAM_HNAME: usize = 7; -pub(crate) const IDX_PARAM_INDEX: usize = 8; -pub(crate) const IDX_PARAM_INT16: usize = 9; -pub(crate) const IDX_PARAM_INT32: usize = 10; -pub(crate) const IDX_PARAM_INT64: usize = 11; -pub(crate) const IDX_PARAM_NAME: usize = 12; -pub(crate) const IDX_PARAM_PARAM: usize = 13; -pub(crate) const IDX_PARAM_RECORD_INDEX: usize = 14; -pub(crate) const IDX_PARAM_REQUEST_ID: usize = 15; -pub(crate) const IDX_PARAM_STRING: usize = 16; -pub(crate) const IDX_PARAM_VALUE: usize = 17; -pub(crate) const IDX_RESULT_COUNT: usize = 18; -pub(crate) const IDX_RESULT_IOTAS: usize = 19; -pub(crate) const IDX_RESULT_LENGTH: usize = 20; -pub(crate) const IDX_RESULT_RANDOM: usize = 21; -pub(crate) const IDX_RESULT_RECORD: usize = 22; -pub(crate) const IDX_RESULT_VALUE: usize = 23; -pub(crate) const IDX_STATE_ARRAYS: usize = 24; -pub(crate) const IDX_STATE_RANDOM: usize = 25; +pub(crate) const IDX_PARAM_ADDRESS : usize = 0; +pub(crate) const IDX_PARAM_AGENT_ID : usize = 1; +pub(crate) const IDX_PARAM_BLOCK_INDEX : usize = 2; +pub(crate) const IDX_PARAM_BYTES : usize = 3; +pub(crate) const IDX_PARAM_CHAIN_ID : usize = 4; +pub(crate) const IDX_PARAM_COLOR : usize = 5; +pub(crate) const IDX_PARAM_HASH : usize = 6; +pub(crate) const IDX_PARAM_HNAME : usize = 7; +pub(crate) const IDX_PARAM_INDEX : usize = 8; +pub(crate) const IDX_PARAM_INT16 : usize = 9; +pub(crate) const IDX_PARAM_INT32 : usize = 10; +pub(crate) const IDX_PARAM_INT64 : usize = 11; +pub(crate) const IDX_PARAM_NAME : usize = 12; +pub(crate) const IDX_PARAM_PARAM : usize = 13; +pub(crate) const IDX_PARAM_RECORD_INDEX : usize = 14; +pub(crate) const IDX_PARAM_REQUEST_ID : usize = 15; +pub(crate) const IDX_PARAM_STRING : usize = 16; +pub(crate) const IDX_PARAM_VALUE : usize = 17; + +pub(crate) const IDX_RESULT_COUNT : usize = 18; +pub(crate) const IDX_RESULT_IOTAS : usize = 19; +pub(crate) const IDX_RESULT_LENGTH : usize = 20; +pub(crate) const IDX_RESULT_RANDOM : usize = 21; +pub(crate) const IDX_RESULT_RECORD : usize = 22; +pub(crate) const IDX_RESULT_VALUE : usize = 23; + +pub(crate) const IDX_STATE_ARRAYS : usize = 24; +pub(crate) const IDX_STATE_RANDOM : usize = 25; pub const KEY_MAP_LEN: usize = 26; diff --git a/contracts/wasm/testwasmlib/src/lib.rs b/contracts/wasm/testwasmlib/src/lib.rs index 9dc7e7fe78..f064f1deb6 100644 --- a/contracts/wasm/testwasmlib/src/lib.rs +++ b/contracts/wasm/testwasmlib/src/lib.rs @@ -30,17 +30,17 @@ mod testwasmlib; #[no_mangle] fn on_load() { let exports = ScExports::new(); - exports.add_func(FUNC_ARRAY_CLEAR, func_array_clear_thunk); - exports.add_func(FUNC_ARRAY_CREATE, func_array_create_thunk); - exports.add_func(FUNC_ARRAY_SET, func_array_set_thunk); - exports.add_func(FUNC_PARAM_TYPES, func_param_types_thunk); - exports.add_func(FUNC_RANDOM, func_random_thunk); - exports.add_view(VIEW_ARRAY_LENGTH, view_array_length_thunk); - exports.add_view(VIEW_ARRAY_VALUE, view_array_value_thunk); - exports.add_view(VIEW_BLOCK_RECORD, view_block_record_thunk); + exports.add_func(FUNC_ARRAY_CLEAR, func_array_clear_thunk); + exports.add_func(FUNC_ARRAY_CREATE, func_array_create_thunk); + exports.add_func(FUNC_ARRAY_SET, func_array_set_thunk); + exports.add_func(FUNC_PARAM_TYPES, func_param_types_thunk); + exports.add_func(FUNC_RANDOM, func_random_thunk); + exports.add_view(VIEW_ARRAY_LENGTH, view_array_length_thunk); + exports.add_view(VIEW_ARRAY_VALUE, view_array_value_thunk); + exports.add_view(VIEW_BLOCK_RECORD, view_block_record_thunk); exports.add_view(VIEW_BLOCK_RECORDS, view_block_records_thunk); - exports.add_view(VIEW_GET_RANDOM, view_get_random_thunk); - exports.add_view(VIEW_IOTA_BALANCE, view_iota_balance_thunk); + exports.add_view(VIEW_GET_RANDOM, view_get_random_thunk); + exports.add_view(VIEW_IOTA_BALANCE, view_iota_balance_thunk); unsafe { for i in 0..KEY_MAP_LEN { diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/consts.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/consts.ts index 91b0386d25..452ab61090 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/consts.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/consts.ts @@ -11,55 +11,55 @@ export const ScName = "testwasmlib"; export const ScDescription = "Exercise all aspects of WasmLib"; export const HScName = new wasmlib.ScHname(0x89703a45); -export const ParamAddress = "address"; -export const ParamAgentID = "agentID"; -export const ParamBlockIndex = "blockIndex"; -export const ParamBytes = "bytes"; -export const ParamChainID = "chainID"; -export const ParamColor = "color"; -export const ParamHash = "hash"; -export const ParamHname = "hname"; -export const ParamIndex = "index"; -export const ParamInt16 = "int16"; -export const ParamInt32 = "int32"; -export const ParamInt64 = "int64"; -export const ParamName = "name"; -export const ParamParam = "this"; +export const ParamAddress = "address"; +export const ParamAgentID = "agentID"; +export const ParamBlockIndex = "blockIndex"; +export const ParamBytes = "bytes"; +export const ParamChainID = "chainID"; +export const ParamColor = "color"; +export const ParamHash = "hash"; +export const ParamHname = "hname"; +export const ParamIndex = "index"; +export const ParamInt16 = "int16"; +export const ParamInt32 = "int32"; +export const ParamInt64 = "int64"; +export const ParamName = "name"; +export const ParamParam = "this"; export const ParamRecordIndex = "recordIndex"; -export const ParamRequestID = "requestID"; -export const ParamString = "string"; -export const ParamValue = "value"; +export const ParamRequestID = "requestID"; +export const ParamString = "string"; +export const ParamValue = "value"; -export const ResultCount = "count"; -export const ResultIotas = "iotas"; +export const ResultCount = "count"; +export const ResultIotas = "iotas"; export const ResultLength = "length"; export const ResultRandom = "random"; export const ResultRecord = "record"; -export const ResultValue = "value"; +export const ResultValue = "value"; export const StateArrays = "arrays"; export const StateRandom = "random"; -export const FuncArrayClear = "arrayClear"; -export const FuncArrayCreate = "arrayCreate"; -export const FuncArraySet = "arraySet"; -export const FuncParamTypes = "paramTypes"; -export const FuncRandom = "random"; -export const ViewArrayLength = "arrayLength"; -export const ViewArrayValue = "arrayValue"; -export const ViewBlockRecord = "blockRecord"; +export const FuncArrayClear = "arrayClear"; +export const FuncArrayCreate = "arrayCreate"; +export const FuncArraySet = "arraySet"; +export const FuncParamTypes = "paramTypes"; +export const FuncRandom = "random"; +export const ViewArrayLength = "arrayLength"; +export const ViewArrayValue = "arrayValue"; +export const ViewBlockRecord = "blockRecord"; export const ViewBlockRecords = "blockRecords"; -export const ViewGetRandom = "getRandom"; -export const ViewIotaBalance = "iotaBalance"; +export const ViewGetRandom = "getRandom"; +export const ViewIotaBalance = "iotaBalance"; -export const HFuncArrayClear = new wasmlib.ScHname(0x88021821); -export const HFuncArrayCreate = new wasmlib.ScHname(0x1ed5b23b); -export const HFuncArraySet = new wasmlib.ScHname(0x2c4150b3); -export const HFuncParamTypes = new wasmlib.ScHname(0x6921c4cd); -export const HFuncRandom = new wasmlib.ScHname(0xe86c97ca); -export const HViewArrayLength = new wasmlib.ScHname(0x3a831021); -export const HViewArrayValue = new wasmlib.ScHname(0x662dbd81); -export const HViewBlockRecord = new wasmlib.ScHname(0xad13b2f8); +export const HFuncArrayClear = new wasmlib.ScHname(0x88021821); +export const HFuncArrayCreate = new wasmlib.ScHname(0x1ed5b23b); +export const HFuncArraySet = new wasmlib.ScHname(0x2c4150b3); +export const HFuncParamTypes = new wasmlib.ScHname(0x6921c4cd); +export const HFuncRandom = new wasmlib.ScHname(0xe86c97ca); +export const HViewArrayLength = new wasmlib.ScHname(0x3a831021); +export const HViewArrayValue = new wasmlib.ScHname(0x662dbd81); +export const HViewBlockRecord = new wasmlib.ScHname(0xad13b2f8); export const HViewBlockRecords = new wasmlib.ScHname(0x16e249ea); -export const HViewGetRandom = new wasmlib.ScHname(0x46263045); -export const HViewIotaBalance = new wasmlib.ScHname(0x9d3920bd); +export const HViewGetRandom = new wasmlib.ScHname(0x46263045); +export const HViewIotaBalance = new wasmlib.ScHname(0x9d3920bd); diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/keys.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/keys.ts index e4d3341df9..415ad2feea 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/keys.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/keys.ts @@ -8,30 +8,32 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; -export const IdxParamAddress = 0; -export const IdxParamAgentID = 1; -export const IdxParamBlockIndex = 2; -export const IdxParamBytes = 3; -export const IdxParamChainID = 4; -export const IdxParamColor = 5; -export const IdxParamHash = 6; -export const IdxParamHname = 7; -export const IdxParamIndex = 8; -export const IdxParamInt16 = 9; -export const IdxParamInt32 = 10; -export const IdxParamInt64 = 11; -export const IdxParamName = 12; -export const IdxParamParam = 13; +export const IdxParamAddress = 0; +export const IdxParamAgentID = 1; +export const IdxParamBlockIndex = 2; +export const IdxParamBytes = 3; +export const IdxParamChainID = 4; +export const IdxParamColor = 5; +export const IdxParamHash = 6; +export const IdxParamHname = 7; +export const IdxParamIndex = 8; +export const IdxParamInt16 = 9; +export const IdxParamInt32 = 10; +export const IdxParamInt64 = 11; +export const IdxParamName = 12; +export const IdxParamParam = 13; export const IdxParamRecordIndex = 14; -export const IdxParamRequestID = 15; -export const IdxParamString = 16; -export const IdxParamValue = 17; -export const IdxResultCount = 18; -export const IdxResultIotas = 19; +export const IdxParamRequestID = 15; +export const IdxParamString = 16; +export const IdxParamValue = 17; + +export const IdxResultCount = 18; +export const IdxResultIotas = 19; export const IdxResultLength = 20; export const IdxResultRandom = 21; export const IdxResultRecord = 22; -export const IdxResultValue = 23; +export const IdxResultValue = 23; + export const IdxStateArrays = 24; export const IdxStateRandom = 25; diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/lib.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/lib.ts index 46eeb4e5e0..6517abda64 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/lib.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/lib.ts @@ -14,17 +14,17 @@ export function on_call(index: i32): void { export function on_load(): void { let exports = new wasmlib.ScExports(); - exports.addFunc(sc.FuncArrayClear, funcArrayClearThunk); - exports.addFunc(sc.FuncArrayCreate, funcArrayCreateThunk); - exports.addFunc(sc.FuncArraySet, funcArraySetThunk); - exports.addFunc(sc.FuncParamTypes, funcParamTypesThunk); - exports.addFunc(sc.FuncRandom, funcRandomThunk); - exports.addView(sc.ViewArrayLength, viewArrayLengthThunk); - exports.addView(sc.ViewArrayValue, viewArrayValueThunk); - exports.addView(sc.ViewBlockRecord, viewBlockRecordThunk); + exports.addFunc(sc.FuncArrayClear, funcArrayClearThunk); + exports.addFunc(sc.FuncArrayCreate, funcArrayCreateThunk); + exports.addFunc(sc.FuncArraySet, funcArraySetThunk); + exports.addFunc(sc.FuncParamTypes, funcParamTypesThunk); + exports.addFunc(sc.FuncRandom, funcRandomThunk); + exports.addView(sc.ViewArrayLength, viewArrayLengthThunk); + exports.addView(sc.ViewArrayValue, viewArrayValueThunk); + exports.addView(sc.ViewBlockRecord, viewBlockRecordThunk); exports.addView(sc.ViewBlockRecords, viewBlockRecordsThunk); - exports.addView(sc.ViewGetRandom, viewGetRandomThunk); - exports.addView(sc.ViewIotaBalance, viewIotaBalanceThunk); + exports.addView(sc.ViewGetRandom, viewGetRandomThunk); + exports.addView(sc.ViewIotaBalance, viewIotaBalanceThunk); for (let i = 0; i < sc.keyMap.length; i++) { sc.idxMap[i] = wasmlib.Key32.fromString(sc.keyMap[i]); diff --git a/contracts/wasm/timestamp/go/timestamp/consts.go b/contracts/wasm/timestamp/go/timestamp/consts.go index 6a91e1580a..7e2f5135f8 100644 --- a/contracts/wasm/timestamp/go/timestamp/consts.go +++ b/contracts/wasm/timestamp/go/timestamp/consts.go @@ -16,11 +16,11 @@ const ( ) const ( - ResultTimestamp = wasmlib.Key("timestamp") + ResultTimestamp = "timestamp" ) const ( - StateTimestamp = wasmlib.Key("timestamp") + StateTimestamp = "timestamp" ) const ( diff --git a/contracts/wasm/timestamp/go/timestamp/keys.go b/contracts/wasm/timestamp/go/timestamp/keys.go index f386ce7bf5..9b658897b1 100644 --- a/contracts/wasm/timestamp/go/timestamp/keys.go +++ b/contracts/wasm/timestamp/go/timestamp/keys.go @@ -11,7 +11,8 @@ import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" const ( IdxResultTimestamp = 0 - IdxStateTimestamp = 1 + + IdxStateTimestamp = 1 ) const keyMapLen = 2 diff --git a/contracts/wasm/timestamp/src/consts.rs b/contracts/wasm/timestamp/src/consts.rs index 17e42c5599..31a77b2afd 100644 --- a/contracts/wasm/timestamp/src/consts.rs +++ b/contracts/wasm/timestamp/src/consts.rs @@ -9,16 +9,16 @@ use wasmlib::*; -pub const SC_NAME: &str = "timestamp"; -pub const SC_DESCRIPTION: &str = "Extremely simple timestamp server"; -pub const HSC_NAME: ScHname = ScHname(0x3988002e); +pub const SC_NAME : &str = "timestamp"; +pub const SC_DESCRIPTION : &str = "Extremely simple timestamp server"; +pub const HSC_NAME : ScHname = ScHname(0x3988002e); -pub const RESULT_TIMESTAMP: &str = "timestamp"; +pub const RESULT_TIMESTAMP : &str = "timestamp"; -pub const STATE_TIMESTAMP: &str = "timestamp"; +pub const STATE_TIMESTAMP : &str = "timestamp"; -pub const FUNC_NOW: &str = "now"; -pub const VIEW_GET_TIMESTAMP: &str = "getTimestamp"; +pub const FUNC_NOW : &str = "now"; +pub const VIEW_GET_TIMESTAMP : &str = "getTimestamp"; -pub const HFUNC_NOW: ScHname = ScHname(0xd73b7fc9); -pub const HVIEW_GET_TIMESTAMP: ScHname = ScHname(0x40c6376a); +pub const HFUNC_NOW : ScHname = ScHname(0xd73b7fc9); +pub const HVIEW_GET_TIMESTAMP : ScHname = ScHname(0x40c6376a); diff --git a/contracts/wasm/timestamp/src/keys.rs b/contracts/wasm/timestamp/src/keys.rs index cfcf92beb7..52cdcdbbb8 100644 --- a/contracts/wasm/timestamp/src/keys.rs +++ b/contracts/wasm/timestamp/src/keys.rs @@ -11,8 +11,10 @@ use wasmlib::*; use crate::*; -pub(crate) const IDX_RESULT_TIMESTAMP: usize = 0; -pub(crate) const IDX_STATE_TIMESTAMP: usize = 1; + +pub(crate) const IDX_RESULT_TIMESTAMP : usize = 0; + +pub(crate) const IDX_STATE_TIMESTAMP : usize = 1; pub const KEY_MAP_LEN: usize = 2; diff --git a/contracts/wasm/timestamp/src/lib.rs b/contracts/wasm/timestamp/src/lib.rs index 9234734fcf..e50f6ade0a 100644 --- a/contracts/wasm/timestamp/src/lib.rs +++ b/contracts/wasm/timestamp/src/lib.rs @@ -27,7 +27,7 @@ mod timestamp; #[no_mangle] fn on_load() { let exports = ScExports::new(); - exports.add_func(FUNC_NOW, func_now_thunk); + exports.add_func(FUNC_NOW, func_now_thunk); exports.add_view(VIEW_GET_TIMESTAMP, view_get_timestamp_thunk); unsafe { diff --git a/contracts/wasm/timestamp/ts/timestamp/consts.ts b/contracts/wasm/timestamp/ts/timestamp/consts.ts index c433c90691..62157f5505 100644 --- a/contracts/wasm/timestamp/ts/timestamp/consts.ts +++ b/contracts/wasm/timestamp/ts/timestamp/consts.ts @@ -15,8 +15,8 @@ export const ResultTimestamp = "timestamp"; export const StateTimestamp = "timestamp"; -export const FuncNow = "now"; +export const FuncNow = "now"; export const ViewGetTimestamp = "getTimestamp"; -export const HFuncNow = new wasmlib.ScHname(0xd73b7fc9); +export const HFuncNow = new wasmlib.ScHname(0xd73b7fc9); export const HViewGetTimestamp = new wasmlib.ScHname(0x40c6376a); diff --git a/contracts/wasm/timestamp/ts/timestamp/keys.ts b/contracts/wasm/timestamp/ts/timestamp/keys.ts index ccd306a472..3cfd4e84d0 100644 --- a/contracts/wasm/timestamp/ts/timestamp/keys.ts +++ b/contracts/wasm/timestamp/ts/timestamp/keys.ts @@ -8,7 +8,9 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; + export const IdxResultTimestamp = 0; + export const IdxStateTimestamp = 1; export let keyMap: string[] = [ diff --git a/contracts/wasm/timestamp/ts/timestamp/lib.ts b/contracts/wasm/timestamp/ts/timestamp/lib.ts index c76ef4a512..80e29210f7 100644 --- a/contracts/wasm/timestamp/ts/timestamp/lib.ts +++ b/contracts/wasm/timestamp/ts/timestamp/lib.ts @@ -14,7 +14,7 @@ export function on_call(index: i32): void { export function on_load(): void { let exports = new wasmlib.ScExports(); - exports.addFunc(sc.FuncNow, funcNowThunk); + exports.addFunc(sc.FuncNow, funcNowThunk); exports.addView(sc.ViewGetTimestamp, viewGetTimestampThunk); for (let i = 0; i < sc.keyMap.length; i++) { diff --git a/contracts/wasm/tokenregistry/go/tokenregistry/consts.go b/contracts/wasm/tokenregistry/go/tokenregistry/consts.go index 3d19dec000..03f53793bd 100644 --- a/contracts/wasm/tokenregistry/go/tokenregistry/consts.go +++ b/contracts/wasm/tokenregistry/go/tokenregistry/consts.go @@ -16,14 +16,14 @@ const ( ) const ( - ParamColor = wasmlib.Key("color") - ParamDescription = wasmlib.Key("description") - ParamUserDefined = wasmlib.Key("userDefined") + ParamColor = "color" + ParamDescription = "description" + ParamUserDefined = "userDefined" ) const ( - StateColorList = wasmlib.Key("colorList") - StateRegistry = wasmlib.Key("registry") + StateColorList = "colorList" + StateRegistry = "registry" ) const ( diff --git a/contracts/wasm/tokenregistry/go/tokenregistry/keys.go b/contracts/wasm/tokenregistry/go/tokenregistry/keys.go index fc2b5ee642..ec80cb792f 100644 --- a/contracts/wasm/tokenregistry/go/tokenregistry/keys.go +++ b/contracts/wasm/tokenregistry/go/tokenregistry/keys.go @@ -13,8 +13,9 @@ const ( IdxParamColor = 0 IdxParamDescription = 1 IdxParamUserDefined = 2 - IdxStateColorList = 3 - IdxStateRegistry = 4 + + IdxStateColorList = 3 + IdxStateRegistry = 4 ) const keyMapLen = 5 diff --git a/contracts/wasm/tokenregistry/src/consts.rs b/contracts/wasm/tokenregistry/src/consts.rs index 4248459bb6..e6cdc316d6 100644 --- a/contracts/wasm/tokenregistry/src/consts.rs +++ b/contracts/wasm/tokenregistry/src/consts.rs @@ -9,23 +9,23 @@ use wasmlib::*; -pub const SC_NAME: &str = "tokenregistry"; -pub const SC_DESCRIPTION: &str = ""; -pub const HSC_NAME: ScHname = ScHname(0xe1ba0c78); - -pub const PARAM_COLOR: &str = "color"; -pub const PARAM_DESCRIPTION: &str = "description"; -pub const PARAM_USER_DEFINED: &str = "userDefined"; - -pub const STATE_COLOR_LIST: &str = "colorList"; -pub const STATE_REGISTRY: &str = "registry"; - -pub const FUNC_MINT_SUPPLY: &str = "mintSupply"; -pub const FUNC_TRANSFER_OWNERSHIP: &str = "transferOwnership"; -pub const FUNC_UPDATE_METADATA: &str = "updateMetadata"; -pub const VIEW_GET_INFO: &str = "getInfo"; - -pub const HFUNC_MINT_SUPPLY: ScHname = ScHname(0x564349a7); -pub const HFUNC_TRANSFER_OWNERSHIP: ScHname = ScHname(0xbb9eb5af); -pub const HFUNC_UPDATE_METADATA: ScHname = ScHname(0xa26b23b6); -pub const HVIEW_GET_INFO: ScHname = ScHname(0xcfedba5f); +pub const SC_NAME : &str = "tokenregistry"; +pub const SC_DESCRIPTION : &str = ""; +pub const HSC_NAME : ScHname = ScHname(0xe1ba0c78); + +pub const PARAM_COLOR : &str = "color"; +pub const PARAM_DESCRIPTION : &str = "description"; +pub const PARAM_USER_DEFINED : &str = "userDefined"; + +pub const STATE_COLOR_LIST : &str = "colorList"; +pub const STATE_REGISTRY : &str = "registry"; + +pub const FUNC_MINT_SUPPLY : &str = "mintSupply"; +pub const FUNC_TRANSFER_OWNERSHIP : &str = "transferOwnership"; +pub const FUNC_UPDATE_METADATA : &str = "updateMetadata"; +pub const VIEW_GET_INFO : &str = "getInfo"; + +pub const HFUNC_MINT_SUPPLY : ScHname = ScHname(0x564349a7); +pub const HFUNC_TRANSFER_OWNERSHIP : ScHname = ScHname(0xbb9eb5af); +pub const HFUNC_UPDATE_METADATA : ScHname = ScHname(0xa26b23b6); +pub const HVIEW_GET_INFO : ScHname = ScHname(0xcfedba5f); diff --git a/contracts/wasm/tokenregistry/src/keys.rs b/contracts/wasm/tokenregistry/src/keys.rs index ec71db1211..4d155e37c3 100644 --- a/contracts/wasm/tokenregistry/src/keys.rs +++ b/contracts/wasm/tokenregistry/src/keys.rs @@ -11,11 +11,13 @@ use wasmlib::*; use crate::*; -pub(crate) const IDX_PARAM_COLOR: usize = 0; -pub(crate) const IDX_PARAM_DESCRIPTION: usize = 1; -pub(crate) const IDX_PARAM_USER_DEFINED: usize = 2; -pub(crate) const IDX_STATE_COLOR_LIST: usize = 3; -pub(crate) const IDX_STATE_REGISTRY: usize = 4; +pub(crate) const IDX_PARAM_COLOR : usize = 0; +pub(crate) const IDX_PARAM_DESCRIPTION : usize = 1; +pub(crate) const IDX_PARAM_USER_DEFINED : usize = 2; + + +pub(crate) const IDX_STATE_COLOR_LIST : usize = 3; +pub(crate) const IDX_STATE_REGISTRY : usize = 4; pub const KEY_MAP_LEN: usize = 5; diff --git a/contracts/wasm/tokenregistry/src/lib.rs b/contracts/wasm/tokenregistry/src/lib.rs index 6545bc0ca6..7ce4acf356 100644 --- a/contracts/wasm/tokenregistry/src/lib.rs +++ b/contracts/wasm/tokenregistry/src/lib.rs @@ -28,10 +28,10 @@ mod tokenregistry; #[no_mangle] fn on_load() { let exports = ScExports::new(); - exports.add_func(FUNC_MINT_SUPPLY, func_mint_supply_thunk); + exports.add_func(FUNC_MINT_SUPPLY, func_mint_supply_thunk); exports.add_func(FUNC_TRANSFER_OWNERSHIP, func_transfer_ownership_thunk); - exports.add_func(FUNC_UPDATE_METADATA, func_update_metadata_thunk); - exports.add_view(VIEW_GET_INFO, view_get_info_thunk); + exports.add_func(FUNC_UPDATE_METADATA, func_update_metadata_thunk); + exports.add_view(VIEW_GET_INFO, view_get_info_thunk); unsafe { for i in 0..KEY_MAP_LEN { diff --git a/contracts/wasm/tokenregistry/src/structs.rs b/contracts/wasm/tokenregistry/src/structs.rs index 0ca617fb06..bac94392cd 100644 --- a/contracts/wasm/tokenregistry/src/structs.rs +++ b/contracts/wasm/tokenregistry/src/structs.rs @@ -11,26 +11,26 @@ use wasmlib::*; use wasmlib::host::*; pub struct Token { - pub created: i64, // creation timestamp - pub description: String, // description what minted token represents - pub minted_by: ScAgentID, // original minter - pub owner: ScAgentID, // current owner - pub supply: i64, // amount of tokens originally minted - pub updated: i64, // last update timestamp - pub user_defined: String, // any user defined text + pub created : i64, // creation timestamp + pub description : String, // description what minted token represents + pub minted_by : ScAgentID, // original minter + pub owner : ScAgentID, // current owner + pub supply : i64, // amount of tokens originally minted + pub updated : i64, // last update timestamp + pub user_defined : String, // any user defined text } impl Token { pub fn from_bytes(bytes: &[u8]) -> Token { let mut decode = BytesDecoder::new(bytes); Token { - created: decode.int64(), - description: decode.string(), - minted_by: decode.agent_id(), - owner: decode.agent_id(), - supply: decode.int64(), - updated: decode.int64(), - user_defined: decode.string(), + created : decode.int64(), + description : decode.string(), + minted_by : decode.agent_id(), + owner : decode.agent_id(), + supply : decode.int64(), + updated : decode.int64(), + user_defined : decode.string(), } } diff --git a/contracts/wasm/tokenregistry/ts/tokenregistry/consts.ts b/contracts/wasm/tokenregistry/ts/tokenregistry/consts.ts index 21e028e2c3..fd519a0bf0 100644 --- a/contracts/wasm/tokenregistry/ts/tokenregistry/consts.ts +++ b/contracts/wasm/tokenregistry/ts/tokenregistry/consts.ts @@ -11,19 +11,19 @@ export const ScName = "tokenregistry"; export const ScDescription = ""; export const HScName = new wasmlib.ScHname(0xe1ba0c78); -export const ParamColor = "color"; +export const ParamColor = "color"; export const ParamDescription = "description"; export const ParamUserDefined = "userDefined"; export const StateColorList = "colorList"; -export const StateRegistry = "registry"; +export const StateRegistry = "registry"; -export const FuncMintSupply = "mintSupply"; +export const FuncMintSupply = "mintSupply"; export const FuncTransferOwnership = "transferOwnership"; -export const FuncUpdateMetadata = "updateMetadata"; -export const ViewGetInfo = "getInfo"; +export const FuncUpdateMetadata = "updateMetadata"; +export const ViewGetInfo = "getInfo"; -export const HFuncMintSupply = new wasmlib.ScHname(0x564349a7); +export const HFuncMintSupply = new wasmlib.ScHname(0x564349a7); export const HFuncTransferOwnership = new wasmlib.ScHname(0xbb9eb5af); -export const HFuncUpdateMetadata = new wasmlib.ScHname(0xa26b23b6); -export const HViewGetInfo = new wasmlib.ScHname(0xcfedba5f); +export const HFuncUpdateMetadata = new wasmlib.ScHname(0xa26b23b6); +export const HViewGetInfo = new wasmlib.ScHname(0xcfedba5f); diff --git a/contracts/wasm/tokenregistry/ts/tokenregistry/keys.ts b/contracts/wasm/tokenregistry/ts/tokenregistry/keys.ts index 743fc204b8..6e20801b3c 100644 --- a/contracts/wasm/tokenregistry/ts/tokenregistry/keys.ts +++ b/contracts/wasm/tokenregistry/ts/tokenregistry/keys.ts @@ -8,11 +8,13 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; -export const IdxParamColor = 0; +export const IdxParamColor = 0; export const IdxParamDescription = 1; export const IdxParamUserDefined = 2; + + export const IdxStateColorList = 3; -export const IdxStateRegistry = 4; +export const IdxStateRegistry = 4; export let keyMap: string[] = [ sc.ParamColor, diff --git a/contracts/wasm/tokenregistry/ts/tokenregistry/lib.ts b/contracts/wasm/tokenregistry/ts/tokenregistry/lib.ts index ec61666618..1bd8fb8120 100644 --- a/contracts/wasm/tokenregistry/ts/tokenregistry/lib.ts +++ b/contracts/wasm/tokenregistry/ts/tokenregistry/lib.ts @@ -14,10 +14,10 @@ export function on_call(index: i32): void { export function on_load(): void { let exports = new wasmlib.ScExports(); - exports.addFunc(sc.FuncMintSupply, funcMintSupplyThunk); + exports.addFunc(sc.FuncMintSupply, funcMintSupplyThunk); exports.addFunc(sc.FuncTransferOwnership, funcTransferOwnershipThunk); - exports.addFunc(sc.FuncUpdateMetadata, funcUpdateMetadataThunk); - exports.addView(sc.ViewGetInfo, viewGetInfoThunk); + exports.addFunc(sc.FuncUpdateMetadata, funcUpdateMetadataThunk); + exports.addView(sc.ViewGetInfo, viewGetInfoThunk); for (let i = 0; i < sc.keyMap.length; i++) { sc.idxMap[i] = wasmlib.Key32.fromString(sc.keyMap[i]); diff --git a/contracts/wasm/tokenregistry/ts/tokenregistry/structs.ts b/contracts/wasm/tokenregistry/ts/tokenregistry/structs.ts index 2e133d07e9..0a3c3af58c 100644 --- a/contracts/wasm/tokenregistry/ts/tokenregistry/structs.ts +++ b/contracts/wasm/tokenregistry/ts/tokenregistry/structs.ts @@ -8,23 +8,23 @@ import * as wasmlib from "wasmlib"; export class Token { - created: i64 = 0; // creation timestamp - description: string = ""; // description what minted token represents - mintedBy: wasmlib.ScAgentID = new wasmlib.ScAgentID(); // original minter - owner: wasmlib.ScAgentID = new wasmlib.ScAgentID(); // current owner - supply: i64 = 0; // amount of tokens originally minted - updated: i64 = 0; // last update timestamp - userDefined: string = ""; // any user defined text + created : i64 = 0; // creation timestamp + description : string = ""; // description what minted token represents + mintedBy : wasmlib.ScAgentID = new wasmlib.ScAgentID(); // original minter + owner : wasmlib.ScAgentID = new wasmlib.ScAgentID(); // current owner + supply : i64 = 0; // amount of tokens originally minted + updated : i64 = 0; // last update timestamp + userDefined : string = ""; // any user defined text static fromBytes(bytes: u8[]): Token { let decode = new wasmlib.BytesDecoder(bytes); let data = new Token(); - data.created = decode.int64(); + data.created = decode.int64(); data.description = decode.string(); - data.mintedBy = decode.agentID(); - data.owner = decode.agentID(); - data.supply = decode.int64(); - data.updated = decode.int64(); + data.mintedBy = decode.agentID(); + data.owner = decode.agentID(); + data.supply = decode.int64(); + data.updated = decode.int64(); data.userDefined = decode.string(); decode.close(); return data; diff --git a/packages/vm/wasmlib/go/wasmlib/coreaccounts/consts.go b/packages/vm/wasmlib/go/wasmlib/coreaccounts/consts.go index 47ab2e561c..08325d7f74 100644 --- a/packages/vm/wasmlib/go/wasmlib/coreaccounts/consts.go +++ b/packages/vm/wasmlib/go/wasmlib/coreaccounts/consts.go @@ -16,15 +16,15 @@ const ( ) const ( - ParamAgentID = wasmlib.Key("a") - ParamWithdrawAmount = wasmlib.Key("m") - ParamWithdrawColor = wasmlib.Key("c") + ParamAgentID = "a" + ParamWithdrawAmount = "m" + ParamWithdrawColor = "c" ) const ( - ResultAccountNonce = wasmlib.Key("n") - ResultAgents = wasmlib.Key("this") - ResultBalances = wasmlib.Key("this") + ResultAccountNonce = "n" + ResultAgents = "this" + ResultBalances = "this" ) const ( diff --git a/packages/vm/wasmlib/go/wasmlib/coreaccounts/params.go b/packages/vm/wasmlib/go/wasmlib/coreaccounts/params.go index 1ac40981d1..9c17692cec 100644 --- a/packages/vm/wasmlib/go/wasmlib/coreaccounts/params.go +++ b/packages/vm/wasmlib/go/wasmlib/coreaccounts/params.go @@ -14,7 +14,7 @@ type ImmutableDepositParams struct { } func (s ImmutableDepositParams) AgentID() wasmlib.ScImmutableAgentID { - return wasmlib.NewScImmutableAgentID(s.id, ParamAgentID.KeyID()) + return wasmlib.NewScImmutableAgentID(s.id, wasmlib.KeyID(ParamAgentID)) } type MutableDepositParams struct { @@ -22,7 +22,7 @@ type MutableDepositParams struct { } func (s MutableDepositParams) AgentID() wasmlib.ScMutableAgentID { - return wasmlib.NewScMutableAgentID(s.id, ParamAgentID.KeyID()) + return wasmlib.NewScMutableAgentID(s.id, wasmlib.KeyID(ParamAgentID)) } type ImmutableHarvestParams struct { @@ -30,11 +30,11 @@ type ImmutableHarvestParams struct { } func (s ImmutableHarvestParams) WithdrawAmount() wasmlib.ScImmutableInt64 { - return wasmlib.NewScImmutableInt64(s.id, ParamWithdrawAmount.KeyID()) + return wasmlib.NewScImmutableInt64(s.id, wasmlib.KeyID(ParamWithdrawAmount)) } func (s ImmutableHarvestParams) WithdrawColor() wasmlib.ScImmutableColor { - return wasmlib.NewScImmutableColor(s.id, ParamWithdrawColor.KeyID()) + return wasmlib.NewScImmutableColor(s.id, wasmlib.KeyID(ParamWithdrawColor)) } type MutableHarvestParams struct { @@ -42,11 +42,11 @@ type MutableHarvestParams struct { } func (s MutableHarvestParams) WithdrawAmount() wasmlib.ScMutableInt64 { - return wasmlib.NewScMutableInt64(s.id, ParamWithdrawAmount.KeyID()) + return wasmlib.NewScMutableInt64(s.id, wasmlib.KeyID(ParamWithdrawAmount)) } func (s MutableHarvestParams) WithdrawColor() wasmlib.ScMutableColor { - return wasmlib.NewScMutableColor(s.id, ParamWithdrawColor.KeyID()) + return wasmlib.NewScMutableColor(s.id, wasmlib.KeyID(ParamWithdrawColor)) } type ImmutableBalanceParams struct { @@ -54,7 +54,7 @@ type ImmutableBalanceParams struct { } func (s ImmutableBalanceParams) AgentID() wasmlib.ScImmutableAgentID { - return wasmlib.NewScImmutableAgentID(s.id, ParamAgentID.KeyID()) + return wasmlib.NewScImmutableAgentID(s.id, wasmlib.KeyID(ParamAgentID)) } type MutableBalanceParams struct { @@ -62,7 +62,7 @@ type MutableBalanceParams struct { } func (s MutableBalanceParams) AgentID() wasmlib.ScMutableAgentID { - return wasmlib.NewScMutableAgentID(s.id, ParamAgentID.KeyID()) + return wasmlib.NewScMutableAgentID(s.id, wasmlib.KeyID(ParamAgentID)) } type ImmutableGetAccountNonceParams struct { @@ -70,7 +70,7 @@ type ImmutableGetAccountNonceParams struct { } func (s ImmutableGetAccountNonceParams) AgentID() wasmlib.ScImmutableAgentID { - return wasmlib.NewScImmutableAgentID(s.id, ParamAgentID.KeyID()) + return wasmlib.NewScImmutableAgentID(s.id, wasmlib.KeyID(ParamAgentID)) } type MutableGetAccountNonceParams struct { @@ -78,5 +78,5 @@ type MutableGetAccountNonceParams struct { } func (s MutableGetAccountNonceParams) AgentID() wasmlib.ScMutableAgentID { - return wasmlib.NewScMutableAgentID(s.id, ParamAgentID.KeyID()) + return wasmlib.NewScMutableAgentID(s.id, wasmlib.KeyID(ParamAgentID)) } diff --git a/packages/vm/wasmlib/go/wasmlib/coreaccounts/results.go b/packages/vm/wasmlib/go/wasmlib/coreaccounts/results.go index 075f9e3409..2dd3a316ec 100644 --- a/packages/vm/wasmlib/go/wasmlib/coreaccounts/results.go +++ b/packages/vm/wasmlib/go/wasmlib/coreaccounts/results.go @@ -86,7 +86,7 @@ type ImmutableGetAccountNonceResults struct { } func (s ImmutableGetAccountNonceResults) AccountNonce() wasmlib.ScImmutableInt64 { - return wasmlib.NewScImmutableInt64(s.id, ResultAccountNonce.KeyID()) + return wasmlib.NewScImmutableInt64(s.id, wasmlib.KeyID(ResultAccountNonce)) } type MutableGetAccountNonceResults struct { @@ -94,7 +94,7 @@ type MutableGetAccountNonceResults struct { } func (s MutableGetAccountNonceResults) AccountNonce() wasmlib.ScMutableInt64 { - return wasmlib.NewScMutableInt64(s.id, ResultAccountNonce.KeyID()) + return wasmlib.NewScMutableInt64(s.id, wasmlib.KeyID(ResultAccountNonce)) } type ImmutableTotalAssetsResults struct { diff --git a/packages/vm/wasmlib/go/wasmlib/coreblob/consts.go b/packages/vm/wasmlib/go/wasmlib/coreblob/consts.go index 2ef5fdd70d..34e266cf68 100644 --- a/packages/vm/wasmlib/go/wasmlib/coreblob/consts.go +++ b/packages/vm/wasmlib/go/wasmlib/coreblob/consts.go @@ -16,15 +16,15 @@ const ( ) const ( - ParamBlobs = wasmlib.Key("this") - ParamField = wasmlib.Key("field") - ParamHash = wasmlib.Key("hash") + ParamBlobs = "this" + ParamField = "field" + ParamHash = "hash" ) const ( - ResultBlobSizes = wasmlib.Key("this") - ResultBytes = wasmlib.Key("bytes") - ResultHash = wasmlib.Key("hash") + ResultBlobSizes = "this" + ResultBytes = "bytes" + ResultHash = "hash" ) const ( diff --git a/packages/vm/wasmlib/go/wasmlib/coreblob/params.go b/packages/vm/wasmlib/go/wasmlib/coreblob/params.go index bda5540fe7..4a93f14cdb 100644 --- a/packages/vm/wasmlib/go/wasmlib/coreblob/params.go +++ b/packages/vm/wasmlib/go/wasmlib/coreblob/params.go @@ -50,11 +50,11 @@ type ImmutableGetBlobFieldParams struct { } func (s ImmutableGetBlobFieldParams) Field() wasmlib.ScImmutableString { - return wasmlib.NewScImmutableString(s.id, ParamField.KeyID()) + return wasmlib.NewScImmutableString(s.id, wasmlib.KeyID(ParamField)) } func (s ImmutableGetBlobFieldParams) Hash() wasmlib.ScImmutableHash { - return wasmlib.NewScImmutableHash(s.id, ParamHash.KeyID()) + return wasmlib.NewScImmutableHash(s.id, wasmlib.KeyID(ParamHash)) } type MutableGetBlobFieldParams struct { @@ -62,11 +62,11 @@ type MutableGetBlobFieldParams struct { } func (s MutableGetBlobFieldParams) Field() wasmlib.ScMutableString { - return wasmlib.NewScMutableString(s.id, ParamField.KeyID()) + return wasmlib.NewScMutableString(s.id, wasmlib.KeyID(ParamField)) } func (s MutableGetBlobFieldParams) Hash() wasmlib.ScMutableHash { - return wasmlib.NewScMutableHash(s.id, ParamHash.KeyID()) + return wasmlib.NewScMutableHash(s.id, wasmlib.KeyID(ParamHash)) } type ImmutableGetBlobInfoParams struct { @@ -74,7 +74,7 @@ type ImmutableGetBlobInfoParams struct { } func (s ImmutableGetBlobInfoParams) Hash() wasmlib.ScImmutableHash { - return wasmlib.NewScImmutableHash(s.id, ParamHash.KeyID()) + return wasmlib.NewScImmutableHash(s.id, wasmlib.KeyID(ParamHash)) } type MutableGetBlobInfoParams struct { @@ -82,5 +82,5 @@ type MutableGetBlobInfoParams struct { } func (s MutableGetBlobInfoParams) Hash() wasmlib.ScMutableHash { - return wasmlib.NewScMutableHash(s.id, ParamHash.KeyID()) + return wasmlib.NewScMutableHash(s.id, wasmlib.KeyID(ParamHash)) } diff --git a/packages/vm/wasmlib/go/wasmlib/coreblob/results.go b/packages/vm/wasmlib/go/wasmlib/coreblob/results.go index b9a5976423..8a24de4245 100644 --- a/packages/vm/wasmlib/go/wasmlib/coreblob/results.go +++ b/packages/vm/wasmlib/go/wasmlib/coreblob/results.go @@ -14,7 +14,7 @@ type ImmutableStoreBlobResults struct { } func (s ImmutableStoreBlobResults) Hash() wasmlib.ScImmutableHash { - return wasmlib.NewScImmutableHash(s.id, ResultHash.KeyID()) + return wasmlib.NewScImmutableHash(s.id, wasmlib.KeyID(ResultHash)) } type MutableStoreBlobResults struct { @@ -22,7 +22,7 @@ type MutableStoreBlobResults struct { } func (s MutableStoreBlobResults) Hash() wasmlib.ScMutableHash { - return wasmlib.NewScMutableHash(s.id, ResultHash.KeyID()) + return wasmlib.NewScMutableHash(s.id, wasmlib.KeyID(ResultHash)) } type ImmutableGetBlobFieldResults struct { @@ -30,7 +30,7 @@ type ImmutableGetBlobFieldResults struct { } func (s ImmutableGetBlobFieldResults) Bytes() wasmlib.ScImmutableBytes { - return wasmlib.NewScImmutableBytes(s.id, ResultBytes.KeyID()) + return wasmlib.NewScImmutableBytes(s.id, wasmlib.KeyID(ResultBytes)) } type MutableGetBlobFieldResults struct { @@ -38,7 +38,7 @@ type MutableGetBlobFieldResults struct { } func (s MutableGetBlobFieldResults) Bytes() wasmlib.ScMutableBytes { - return wasmlib.NewScMutableBytes(s.id, ResultBytes.KeyID()) + return wasmlib.NewScMutableBytes(s.id, wasmlib.KeyID(ResultBytes)) } type MapStringToImmutableInt32 struct { diff --git a/packages/vm/wasmlib/go/wasmlib/coreblocklog/consts.go b/packages/vm/wasmlib/go/wasmlib/coreblocklog/consts.go index f50b04564c..9b38d5f02d 100644 --- a/packages/vm/wasmlib/go/wasmlib/coreblocklog/consts.go +++ b/packages/vm/wasmlib/go/wasmlib/coreblocklog/consts.go @@ -16,23 +16,23 @@ const ( ) const ( - ParamBlockIndex = wasmlib.Key("n") - ParamContractHname = wasmlib.Key("h") - ParamFromBlock = wasmlib.Key("f") - ParamRequestID = wasmlib.Key("u") - ParamToBlock = wasmlib.Key("t") + ParamBlockIndex = "n" + ParamContractHname = "h" + ParamFromBlock = "f" + ParamRequestID = "u" + ParamToBlock = "t" ) const ( - ResultBlockIndex = wasmlib.Key("n") - ResultBlockInfo = wasmlib.Key("i") - ResultEvent = wasmlib.Key("e") - ResultGoverningAddress = wasmlib.Key("g") - ResultRequestID = wasmlib.Key("u") - ResultRequestIndex = wasmlib.Key("r") - ResultRequestProcessed = wasmlib.Key("p") - ResultRequestRecord = wasmlib.Key("d") - ResultStateControllerAddress = wasmlib.Key("s") + ResultBlockIndex = "n" + ResultBlockInfo = "i" + ResultEvent = "e" + ResultGoverningAddress = "g" + ResultRequestID = "u" + ResultRequestIndex = "r" + ResultRequestProcessed = "p" + ResultRequestRecord = "d" + ResultStateControllerAddress = "s" ) const ( diff --git a/packages/vm/wasmlib/go/wasmlib/coreblocklog/params.go b/packages/vm/wasmlib/go/wasmlib/coreblocklog/params.go index 08f7955b9c..b67570e3b1 100644 --- a/packages/vm/wasmlib/go/wasmlib/coreblocklog/params.go +++ b/packages/vm/wasmlib/go/wasmlib/coreblocklog/params.go @@ -14,7 +14,7 @@ type ImmutableGetBlockInfoParams struct { } func (s ImmutableGetBlockInfoParams) BlockIndex() wasmlib.ScImmutableInt32 { - return wasmlib.NewScImmutableInt32(s.id, ParamBlockIndex.KeyID()) + return wasmlib.NewScImmutableInt32(s.id, wasmlib.KeyID(ParamBlockIndex)) } type MutableGetBlockInfoParams struct { @@ -22,7 +22,7 @@ type MutableGetBlockInfoParams struct { } func (s MutableGetBlockInfoParams) BlockIndex() wasmlib.ScMutableInt32 { - return wasmlib.NewScMutableInt32(s.id, ParamBlockIndex.KeyID()) + return wasmlib.NewScMutableInt32(s.id, wasmlib.KeyID(ParamBlockIndex)) } type ImmutableGetEventsForBlockParams struct { @@ -30,7 +30,7 @@ type ImmutableGetEventsForBlockParams struct { } func (s ImmutableGetEventsForBlockParams) BlockIndex() wasmlib.ScImmutableInt32 { - return wasmlib.NewScImmutableInt32(s.id, ParamBlockIndex.KeyID()) + return wasmlib.NewScImmutableInt32(s.id, wasmlib.KeyID(ParamBlockIndex)) } type MutableGetEventsForBlockParams struct { @@ -38,7 +38,7 @@ type MutableGetEventsForBlockParams struct { } func (s MutableGetEventsForBlockParams) BlockIndex() wasmlib.ScMutableInt32 { - return wasmlib.NewScMutableInt32(s.id, ParamBlockIndex.KeyID()) + return wasmlib.NewScMutableInt32(s.id, wasmlib.KeyID(ParamBlockIndex)) } type ImmutableGetEventsForContractParams struct { @@ -46,15 +46,15 @@ type ImmutableGetEventsForContractParams struct { } func (s ImmutableGetEventsForContractParams) ContractHname() wasmlib.ScImmutableHname { - return wasmlib.NewScImmutableHname(s.id, ParamContractHname.KeyID()) + return wasmlib.NewScImmutableHname(s.id, wasmlib.KeyID(ParamContractHname)) } func (s ImmutableGetEventsForContractParams) FromBlock() wasmlib.ScImmutableInt32 { - return wasmlib.NewScImmutableInt32(s.id, ParamFromBlock.KeyID()) + return wasmlib.NewScImmutableInt32(s.id, wasmlib.KeyID(ParamFromBlock)) } func (s ImmutableGetEventsForContractParams) ToBlock() wasmlib.ScImmutableInt32 { - return wasmlib.NewScImmutableInt32(s.id, ParamToBlock.KeyID()) + return wasmlib.NewScImmutableInt32(s.id, wasmlib.KeyID(ParamToBlock)) } type MutableGetEventsForContractParams struct { @@ -62,15 +62,15 @@ type MutableGetEventsForContractParams struct { } func (s MutableGetEventsForContractParams) ContractHname() wasmlib.ScMutableHname { - return wasmlib.NewScMutableHname(s.id, ParamContractHname.KeyID()) + return wasmlib.NewScMutableHname(s.id, wasmlib.KeyID(ParamContractHname)) } func (s MutableGetEventsForContractParams) FromBlock() wasmlib.ScMutableInt32 { - return wasmlib.NewScMutableInt32(s.id, ParamFromBlock.KeyID()) + return wasmlib.NewScMutableInt32(s.id, wasmlib.KeyID(ParamFromBlock)) } func (s MutableGetEventsForContractParams) ToBlock() wasmlib.ScMutableInt32 { - return wasmlib.NewScMutableInt32(s.id, ParamToBlock.KeyID()) + return wasmlib.NewScMutableInt32(s.id, wasmlib.KeyID(ParamToBlock)) } type ImmutableGetEventsForRequestParams struct { @@ -78,7 +78,7 @@ type ImmutableGetEventsForRequestParams struct { } func (s ImmutableGetEventsForRequestParams) RequestID() wasmlib.ScImmutableRequestID { - return wasmlib.NewScImmutableRequestID(s.id, ParamRequestID.KeyID()) + return wasmlib.NewScImmutableRequestID(s.id, wasmlib.KeyID(ParamRequestID)) } type MutableGetEventsForRequestParams struct { @@ -86,7 +86,7 @@ type MutableGetEventsForRequestParams struct { } func (s MutableGetEventsForRequestParams) RequestID() wasmlib.ScMutableRequestID { - return wasmlib.NewScMutableRequestID(s.id, ParamRequestID.KeyID()) + return wasmlib.NewScMutableRequestID(s.id, wasmlib.KeyID(ParamRequestID)) } type ImmutableGetRequestIDsForBlockParams struct { @@ -94,7 +94,7 @@ type ImmutableGetRequestIDsForBlockParams struct { } func (s ImmutableGetRequestIDsForBlockParams) BlockIndex() wasmlib.ScImmutableInt32 { - return wasmlib.NewScImmutableInt32(s.id, ParamBlockIndex.KeyID()) + return wasmlib.NewScImmutableInt32(s.id, wasmlib.KeyID(ParamBlockIndex)) } type MutableGetRequestIDsForBlockParams struct { @@ -102,7 +102,7 @@ type MutableGetRequestIDsForBlockParams struct { } func (s MutableGetRequestIDsForBlockParams) BlockIndex() wasmlib.ScMutableInt32 { - return wasmlib.NewScMutableInt32(s.id, ParamBlockIndex.KeyID()) + return wasmlib.NewScMutableInt32(s.id, wasmlib.KeyID(ParamBlockIndex)) } type ImmutableGetRequestReceiptParams struct { @@ -110,7 +110,7 @@ type ImmutableGetRequestReceiptParams struct { } func (s ImmutableGetRequestReceiptParams) RequestID() wasmlib.ScImmutableRequestID { - return wasmlib.NewScImmutableRequestID(s.id, ParamRequestID.KeyID()) + return wasmlib.NewScImmutableRequestID(s.id, wasmlib.KeyID(ParamRequestID)) } type MutableGetRequestReceiptParams struct { @@ -118,7 +118,7 @@ type MutableGetRequestReceiptParams struct { } func (s MutableGetRequestReceiptParams) RequestID() wasmlib.ScMutableRequestID { - return wasmlib.NewScMutableRequestID(s.id, ParamRequestID.KeyID()) + return wasmlib.NewScMutableRequestID(s.id, wasmlib.KeyID(ParamRequestID)) } type ImmutableGetRequestReceiptsForBlockParams struct { @@ -126,7 +126,7 @@ type ImmutableGetRequestReceiptsForBlockParams struct { } func (s ImmutableGetRequestReceiptsForBlockParams) BlockIndex() wasmlib.ScImmutableInt32 { - return wasmlib.NewScImmutableInt32(s.id, ParamBlockIndex.KeyID()) + return wasmlib.NewScImmutableInt32(s.id, wasmlib.KeyID(ParamBlockIndex)) } type MutableGetRequestReceiptsForBlockParams struct { @@ -134,7 +134,7 @@ type MutableGetRequestReceiptsForBlockParams struct { } func (s MutableGetRequestReceiptsForBlockParams) BlockIndex() wasmlib.ScMutableInt32 { - return wasmlib.NewScMutableInt32(s.id, ParamBlockIndex.KeyID()) + return wasmlib.NewScMutableInt32(s.id, wasmlib.KeyID(ParamBlockIndex)) } type ImmutableIsRequestProcessedParams struct { @@ -142,7 +142,7 @@ type ImmutableIsRequestProcessedParams struct { } func (s ImmutableIsRequestProcessedParams) RequestID() wasmlib.ScImmutableRequestID { - return wasmlib.NewScImmutableRequestID(s.id, ParamRequestID.KeyID()) + return wasmlib.NewScImmutableRequestID(s.id, wasmlib.KeyID(ParamRequestID)) } type MutableIsRequestProcessedParams struct { @@ -150,5 +150,5 @@ type MutableIsRequestProcessedParams struct { } func (s MutableIsRequestProcessedParams) RequestID() wasmlib.ScMutableRequestID { - return wasmlib.NewScMutableRequestID(s.id, ParamRequestID.KeyID()) + return wasmlib.NewScMutableRequestID(s.id, wasmlib.KeyID(ParamRequestID)) } diff --git a/packages/vm/wasmlib/go/wasmlib/coreblocklog/results.go b/packages/vm/wasmlib/go/wasmlib/coreblocklog/results.go index 153ced4bae..6fee94382e 100644 --- a/packages/vm/wasmlib/go/wasmlib/coreblocklog/results.go +++ b/packages/vm/wasmlib/go/wasmlib/coreblocklog/results.go @@ -14,15 +14,15 @@ type ImmutableControlAddressesResults struct { } func (s ImmutableControlAddressesResults) BlockIndex() wasmlib.ScImmutableInt32 { - return wasmlib.NewScImmutableInt32(s.id, ResultBlockIndex.KeyID()) + return wasmlib.NewScImmutableInt32(s.id, wasmlib.KeyID(ResultBlockIndex)) } func (s ImmutableControlAddressesResults) GoverningAddress() wasmlib.ScImmutableAddress { - return wasmlib.NewScImmutableAddress(s.id, ResultGoverningAddress.KeyID()) + return wasmlib.NewScImmutableAddress(s.id, wasmlib.KeyID(ResultGoverningAddress)) } func (s ImmutableControlAddressesResults) StateControllerAddress() wasmlib.ScImmutableAddress { - return wasmlib.NewScImmutableAddress(s.id, ResultStateControllerAddress.KeyID()) + return wasmlib.NewScImmutableAddress(s.id, wasmlib.KeyID(ResultStateControllerAddress)) } type MutableControlAddressesResults struct { @@ -30,15 +30,15 @@ type MutableControlAddressesResults struct { } func (s MutableControlAddressesResults) BlockIndex() wasmlib.ScMutableInt32 { - return wasmlib.NewScMutableInt32(s.id, ResultBlockIndex.KeyID()) + return wasmlib.NewScMutableInt32(s.id, wasmlib.KeyID(ResultBlockIndex)) } func (s MutableControlAddressesResults) GoverningAddress() wasmlib.ScMutableAddress { - return wasmlib.NewScMutableAddress(s.id, ResultGoverningAddress.KeyID()) + return wasmlib.NewScMutableAddress(s.id, wasmlib.KeyID(ResultGoverningAddress)) } func (s MutableControlAddressesResults) StateControllerAddress() wasmlib.ScMutableAddress { - return wasmlib.NewScMutableAddress(s.id, ResultStateControllerAddress.KeyID()) + return wasmlib.NewScMutableAddress(s.id, wasmlib.KeyID(ResultStateControllerAddress)) } type ImmutableGetBlockInfoResults struct { @@ -46,7 +46,7 @@ type ImmutableGetBlockInfoResults struct { } func (s ImmutableGetBlockInfoResults) BlockInfo() wasmlib.ScImmutableBytes { - return wasmlib.NewScImmutableBytes(s.id, ResultBlockInfo.KeyID()) + return wasmlib.NewScImmutableBytes(s.id, wasmlib.KeyID(ResultBlockInfo)) } type MutableGetBlockInfoResults struct { @@ -54,7 +54,7 @@ type MutableGetBlockInfoResults struct { } func (s MutableGetBlockInfoResults) BlockInfo() wasmlib.ScMutableBytes { - return wasmlib.NewScMutableBytes(s.id, ResultBlockInfo.KeyID()) + return wasmlib.NewScMutableBytes(s.id, wasmlib.KeyID(ResultBlockInfo)) } type ArrayOfImmutableBytes struct { @@ -74,7 +74,7 @@ type ImmutableGetEventsForBlockResults struct { } func (s ImmutableGetEventsForBlockResults) Event() ArrayOfImmutableBytes { - arrID := wasmlib.GetObjectID(s.id, ResultEvent.KeyID(), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES) + arrID := wasmlib.GetObjectID(s.id, wasmlib.KeyID(ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES) return ArrayOfImmutableBytes{objID: arrID} } @@ -99,7 +99,7 @@ type MutableGetEventsForBlockResults struct { } func (s MutableGetEventsForBlockResults) Event() ArrayOfMutableBytes { - arrID := wasmlib.GetObjectID(s.id, ResultEvent.KeyID(), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES) + arrID := wasmlib.GetObjectID(s.id, wasmlib.KeyID(ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES) return ArrayOfMutableBytes{objID: arrID} } @@ -108,7 +108,7 @@ type ImmutableGetEventsForContractResults struct { } func (s ImmutableGetEventsForContractResults) Event() ArrayOfImmutableBytes { - arrID := wasmlib.GetObjectID(s.id, ResultEvent.KeyID(), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES) + arrID := wasmlib.GetObjectID(s.id, wasmlib.KeyID(ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES) return ArrayOfImmutableBytes{objID: arrID} } @@ -117,7 +117,7 @@ type MutableGetEventsForContractResults struct { } func (s MutableGetEventsForContractResults) Event() ArrayOfMutableBytes { - arrID := wasmlib.GetObjectID(s.id, ResultEvent.KeyID(), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES) + arrID := wasmlib.GetObjectID(s.id, wasmlib.KeyID(ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES) return ArrayOfMutableBytes{objID: arrID} } @@ -126,7 +126,7 @@ type ImmutableGetEventsForRequestResults struct { } func (s ImmutableGetEventsForRequestResults) Event() ArrayOfImmutableBytes { - arrID := wasmlib.GetObjectID(s.id, ResultEvent.KeyID(), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES) + arrID := wasmlib.GetObjectID(s.id, wasmlib.KeyID(ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES) return ArrayOfImmutableBytes{objID: arrID} } @@ -135,7 +135,7 @@ type MutableGetEventsForRequestResults struct { } func (s MutableGetEventsForRequestResults) Event() ArrayOfMutableBytes { - arrID := wasmlib.GetObjectID(s.id, ResultEvent.KeyID(), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES) + arrID := wasmlib.GetObjectID(s.id, wasmlib.KeyID(ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES) return ArrayOfMutableBytes{objID: arrID} } @@ -144,11 +144,11 @@ type ImmutableGetLatestBlockInfoResults struct { } func (s ImmutableGetLatestBlockInfoResults) BlockIndex() wasmlib.ScImmutableInt32 { - return wasmlib.NewScImmutableInt32(s.id, ResultBlockIndex.KeyID()) + return wasmlib.NewScImmutableInt32(s.id, wasmlib.KeyID(ResultBlockIndex)) } func (s ImmutableGetLatestBlockInfoResults) BlockInfo() wasmlib.ScImmutableBytes { - return wasmlib.NewScImmutableBytes(s.id, ResultBlockInfo.KeyID()) + return wasmlib.NewScImmutableBytes(s.id, wasmlib.KeyID(ResultBlockInfo)) } type MutableGetLatestBlockInfoResults struct { @@ -156,11 +156,11 @@ type MutableGetLatestBlockInfoResults struct { } func (s MutableGetLatestBlockInfoResults) BlockIndex() wasmlib.ScMutableInt32 { - return wasmlib.NewScMutableInt32(s.id, ResultBlockIndex.KeyID()) + return wasmlib.NewScMutableInt32(s.id, wasmlib.KeyID(ResultBlockIndex)) } func (s MutableGetLatestBlockInfoResults) BlockInfo() wasmlib.ScMutableBytes { - return wasmlib.NewScMutableBytes(s.id, ResultBlockInfo.KeyID()) + return wasmlib.NewScMutableBytes(s.id, wasmlib.KeyID(ResultBlockInfo)) } type ArrayOfImmutableRequestID struct { @@ -180,7 +180,7 @@ type ImmutableGetRequestIDsForBlockResults struct { } func (s ImmutableGetRequestIDsForBlockResults) RequestID() ArrayOfImmutableRequestID { - arrID := wasmlib.GetObjectID(s.id, ResultRequestID.KeyID(), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_REQUEST_ID) + arrID := wasmlib.GetObjectID(s.id, wasmlib.KeyID(ResultRequestID), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_REQUEST_ID) return ArrayOfImmutableRequestID{objID: arrID} } @@ -205,7 +205,7 @@ type MutableGetRequestIDsForBlockResults struct { } func (s MutableGetRequestIDsForBlockResults) RequestID() ArrayOfMutableRequestID { - arrID := wasmlib.GetObjectID(s.id, ResultRequestID.KeyID(), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_REQUEST_ID) + arrID := wasmlib.GetObjectID(s.id, wasmlib.KeyID(ResultRequestID), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_REQUEST_ID) return ArrayOfMutableRequestID{objID: arrID} } @@ -214,15 +214,15 @@ type ImmutableGetRequestReceiptResults struct { } func (s ImmutableGetRequestReceiptResults) BlockIndex() wasmlib.ScImmutableInt32 { - return wasmlib.NewScImmutableInt32(s.id, ResultBlockIndex.KeyID()) + return wasmlib.NewScImmutableInt32(s.id, wasmlib.KeyID(ResultBlockIndex)) } func (s ImmutableGetRequestReceiptResults) RequestIndex() wasmlib.ScImmutableInt16 { - return wasmlib.NewScImmutableInt16(s.id, ResultRequestIndex.KeyID()) + return wasmlib.NewScImmutableInt16(s.id, wasmlib.KeyID(ResultRequestIndex)) } func (s ImmutableGetRequestReceiptResults) RequestRecord() wasmlib.ScImmutableBytes { - return wasmlib.NewScImmutableBytes(s.id, ResultRequestRecord.KeyID()) + return wasmlib.NewScImmutableBytes(s.id, wasmlib.KeyID(ResultRequestRecord)) } type MutableGetRequestReceiptResults struct { @@ -230,15 +230,15 @@ type MutableGetRequestReceiptResults struct { } func (s MutableGetRequestReceiptResults) BlockIndex() wasmlib.ScMutableInt32 { - return wasmlib.NewScMutableInt32(s.id, ResultBlockIndex.KeyID()) + return wasmlib.NewScMutableInt32(s.id, wasmlib.KeyID(ResultBlockIndex)) } func (s MutableGetRequestReceiptResults) RequestIndex() wasmlib.ScMutableInt16 { - return wasmlib.NewScMutableInt16(s.id, ResultRequestIndex.KeyID()) + return wasmlib.NewScMutableInt16(s.id, wasmlib.KeyID(ResultRequestIndex)) } func (s MutableGetRequestReceiptResults) RequestRecord() wasmlib.ScMutableBytes { - return wasmlib.NewScMutableBytes(s.id, ResultRequestRecord.KeyID()) + return wasmlib.NewScMutableBytes(s.id, wasmlib.KeyID(ResultRequestRecord)) } type ImmutableGetRequestReceiptsForBlockResults struct { @@ -246,7 +246,7 @@ type ImmutableGetRequestReceiptsForBlockResults struct { } func (s ImmutableGetRequestReceiptsForBlockResults) RequestRecord() ArrayOfImmutableBytes { - arrID := wasmlib.GetObjectID(s.id, ResultRequestRecord.KeyID(), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES) + arrID := wasmlib.GetObjectID(s.id, wasmlib.KeyID(ResultRequestRecord), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES) return ArrayOfImmutableBytes{objID: arrID} } @@ -255,7 +255,7 @@ type MutableGetRequestReceiptsForBlockResults struct { } func (s MutableGetRequestReceiptsForBlockResults) RequestRecord() ArrayOfMutableBytes { - arrID := wasmlib.GetObjectID(s.id, ResultRequestRecord.KeyID(), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES) + arrID := wasmlib.GetObjectID(s.id, wasmlib.KeyID(ResultRequestRecord), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES) return ArrayOfMutableBytes{objID: arrID} } @@ -264,7 +264,7 @@ type ImmutableIsRequestProcessedResults struct { } func (s ImmutableIsRequestProcessedResults) RequestProcessed() wasmlib.ScImmutableString { - return wasmlib.NewScImmutableString(s.id, ResultRequestProcessed.KeyID()) + return wasmlib.NewScImmutableString(s.id, wasmlib.KeyID(ResultRequestProcessed)) } type MutableIsRequestProcessedResults struct { @@ -272,5 +272,5 @@ type MutableIsRequestProcessedResults struct { } func (s MutableIsRequestProcessedResults) RequestProcessed() wasmlib.ScMutableString { - return wasmlib.NewScMutableString(s.id, ResultRequestProcessed.KeyID()) + return wasmlib.NewScMutableString(s.id, wasmlib.KeyID(ResultRequestProcessed)) } diff --git a/packages/vm/wasmlib/go/wasmlib/coregovernance/consts.go b/packages/vm/wasmlib/go/wasmlib/coregovernance/consts.go index aec160544d..98cb3accc7 100644 --- a/packages/vm/wasmlib/go/wasmlib/coregovernance/consts.go +++ b/packages/vm/wasmlib/go/wasmlib/coregovernance/consts.go @@ -16,30 +16,30 @@ const ( ) const ( - ParamChainOwner = wasmlib.Key("oi") - ParamFeeColor = wasmlib.Key("fc") - ParamHname = wasmlib.Key("hn") - ParamMaxBlobSize = wasmlib.Key("bs") - ParamMaxEventSize = wasmlib.Key("es") - ParamMaxEventsPerReq = wasmlib.Key("ne") - ParamOwnerFee = wasmlib.Key("of") - ParamStateControllerAddress = wasmlib.Key("S") - ParamValidatorFee = wasmlib.Key("vf") + ParamChainOwner = "oi" + ParamFeeColor = "fc" + ParamHname = "hn" + ParamMaxBlobSize = "bs" + ParamMaxEventSize = "es" + ParamMaxEventsPerReq = "ne" + ParamOwnerFee = "of" + ParamStateControllerAddress = "S" + ParamValidatorFee = "vf" ) const ( - ResultAllowedStateControllerAddresses = wasmlib.Key("a") - ResultChainID = wasmlib.Key("c") - ResultChainOwnerID = wasmlib.Key("o") - ResultDefaultOwnerFee = wasmlib.Key("do") - ResultDefaultValidatorFee = wasmlib.Key("dv") - ResultDescription = wasmlib.Key("d") - ResultFeeColor = wasmlib.Key("f") - ResultMaxBlobSize = wasmlib.Key("mb") - ResultMaxEventSize = wasmlib.Key("me") - ResultMaxEventsPerReq = wasmlib.Key("mr") - ResultOwnerFee = wasmlib.Key("of") - ResultValidatorFee = wasmlib.Key("vf") + ResultAllowedStateControllerAddresses = "a" + ResultChainID = "c" + ResultChainOwnerID = "o" + ResultDefaultOwnerFee = "do" + ResultDefaultValidatorFee = "dv" + ResultDescription = "d" + ResultFeeColor = "f" + ResultMaxBlobSize = "mb" + ResultMaxEventSize = "me" + ResultMaxEventsPerReq = "mr" + ResultOwnerFee = "of" + ResultValidatorFee = "vf" ) const ( diff --git a/packages/vm/wasmlib/go/wasmlib/coregovernance/params.go b/packages/vm/wasmlib/go/wasmlib/coregovernance/params.go index 0ae22c402d..41e3e62ea2 100644 --- a/packages/vm/wasmlib/go/wasmlib/coregovernance/params.go +++ b/packages/vm/wasmlib/go/wasmlib/coregovernance/params.go @@ -14,15 +14,15 @@ type ImmutableAddAllowedStateControllerAddressParams struct { } func (s ImmutableAddAllowedStateControllerAddressParams) ChainOwner() wasmlib.ScImmutableAgentID { - return wasmlib.NewScImmutableAgentID(s.id, ParamChainOwner.KeyID()) + return wasmlib.NewScImmutableAgentID(s.id, wasmlib.KeyID(ParamChainOwner)) } func (s ImmutableAddAllowedStateControllerAddressParams) FeeColor() wasmlib.ScImmutableColor { - return wasmlib.NewScImmutableColor(s.id, ParamFeeColor.KeyID()) + return wasmlib.NewScImmutableColor(s.id, wasmlib.KeyID(ParamFeeColor)) } func (s ImmutableAddAllowedStateControllerAddressParams) StateControllerAddress() wasmlib.ScImmutableAddress { - return wasmlib.NewScImmutableAddress(s.id, ParamStateControllerAddress.KeyID()) + return wasmlib.NewScImmutableAddress(s.id, wasmlib.KeyID(ParamStateControllerAddress)) } type MutableAddAllowedStateControllerAddressParams struct { @@ -30,15 +30,15 @@ type MutableAddAllowedStateControllerAddressParams struct { } func (s MutableAddAllowedStateControllerAddressParams) ChainOwner() wasmlib.ScMutableAgentID { - return wasmlib.NewScMutableAgentID(s.id, ParamChainOwner.KeyID()) + return wasmlib.NewScMutableAgentID(s.id, wasmlib.KeyID(ParamChainOwner)) } func (s MutableAddAllowedStateControllerAddressParams) FeeColor() wasmlib.ScMutableColor { - return wasmlib.NewScMutableColor(s.id, ParamFeeColor.KeyID()) + return wasmlib.NewScMutableColor(s.id, wasmlib.KeyID(ParamFeeColor)) } func (s MutableAddAllowedStateControllerAddressParams) StateControllerAddress() wasmlib.ScMutableAddress { - return wasmlib.NewScMutableAddress(s.id, ParamStateControllerAddress.KeyID()) + return wasmlib.NewScMutableAddress(s.id, wasmlib.KeyID(ParamStateControllerAddress)) } type ImmutableDelegateChainOwnershipParams struct { @@ -46,7 +46,7 @@ type ImmutableDelegateChainOwnershipParams struct { } func (s ImmutableDelegateChainOwnershipParams) ChainOwner() wasmlib.ScImmutableAgentID { - return wasmlib.NewScImmutableAgentID(s.id, ParamChainOwner.KeyID()) + return wasmlib.NewScImmutableAgentID(s.id, wasmlib.KeyID(ParamChainOwner)) } type MutableDelegateChainOwnershipParams struct { @@ -54,7 +54,7 @@ type MutableDelegateChainOwnershipParams struct { } func (s MutableDelegateChainOwnershipParams) ChainOwner() wasmlib.ScMutableAgentID { - return wasmlib.NewScMutableAgentID(s.id, ParamChainOwner.KeyID()) + return wasmlib.NewScMutableAgentID(s.id, wasmlib.KeyID(ParamChainOwner)) } type ImmutableRemoveAllowedStateControllerAddressParams struct { @@ -62,7 +62,7 @@ type ImmutableRemoveAllowedStateControllerAddressParams struct { } func (s ImmutableRemoveAllowedStateControllerAddressParams) StateControllerAddress() wasmlib.ScImmutableAddress { - return wasmlib.NewScImmutableAddress(s.id, ParamStateControllerAddress.KeyID()) + return wasmlib.NewScImmutableAddress(s.id, wasmlib.KeyID(ParamStateControllerAddress)) } type MutableRemoveAllowedStateControllerAddressParams struct { @@ -70,7 +70,7 @@ type MutableRemoveAllowedStateControllerAddressParams struct { } func (s MutableRemoveAllowedStateControllerAddressParams) StateControllerAddress() wasmlib.ScMutableAddress { - return wasmlib.NewScMutableAddress(s.id, ParamStateControllerAddress.KeyID()) + return wasmlib.NewScMutableAddress(s.id, wasmlib.KeyID(ParamStateControllerAddress)) } type ImmutableRotateStateControllerParams struct { @@ -78,7 +78,7 @@ type ImmutableRotateStateControllerParams struct { } func (s ImmutableRotateStateControllerParams) StateControllerAddress() wasmlib.ScImmutableAddress { - return wasmlib.NewScImmutableAddress(s.id, ParamStateControllerAddress.KeyID()) + return wasmlib.NewScImmutableAddress(s.id, wasmlib.KeyID(ParamStateControllerAddress)) } type MutableRotateStateControllerParams struct { @@ -86,7 +86,7 @@ type MutableRotateStateControllerParams struct { } func (s MutableRotateStateControllerParams) StateControllerAddress() wasmlib.ScMutableAddress { - return wasmlib.NewScMutableAddress(s.id, ParamStateControllerAddress.KeyID()) + return wasmlib.NewScMutableAddress(s.id, wasmlib.KeyID(ParamStateControllerAddress)) } type ImmutableSetChainInfoParams struct { @@ -94,23 +94,23 @@ type ImmutableSetChainInfoParams struct { } func (s ImmutableSetChainInfoParams) MaxBlobSize() wasmlib.ScImmutableInt32 { - return wasmlib.NewScImmutableInt32(s.id, ParamMaxBlobSize.KeyID()) + return wasmlib.NewScImmutableInt32(s.id, wasmlib.KeyID(ParamMaxBlobSize)) } func (s ImmutableSetChainInfoParams) MaxEventSize() wasmlib.ScImmutableInt16 { - return wasmlib.NewScImmutableInt16(s.id, ParamMaxEventSize.KeyID()) + return wasmlib.NewScImmutableInt16(s.id, wasmlib.KeyID(ParamMaxEventSize)) } func (s ImmutableSetChainInfoParams) MaxEventsPerReq() wasmlib.ScImmutableInt16 { - return wasmlib.NewScImmutableInt16(s.id, ParamMaxEventsPerReq.KeyID()) + return wasmlib.NewScImmutableInt16(s.id, wasmlib.KeyID(ParamMaxEventsPerReq)) } func (s ImmutableSetChainInfoParams) OwnerFee() wasmlib.ScImmutableInt64 { - return wasmlib.NewScImmutableInt64(s.id, ParamOwnerFee.KeyID()) + return wasmlib.NewScImmutableInt64(s.id, wasmlib.KeyID(ParamOwnerFee)) } func (s ImmutableSetChainInfoParams) ValidatorFee() wasmlib.ScImmutableInt64 { - return wasmlib.NewScImmutableInt64(s.id, ParamValidatorFee.KeyID()) + return wasmlib.NewScImmutableInt64(s.id, wasmlib.KeyID(ParamValidatorFee)) } type MutableSetChainInfoParams struct { @@ -118,23 +118,23 @@ type MutableSetChainInfoParams struct { } func (s MutableSetChainInfoParams) MaxBlobSize() wasmlib.ScMutableInt32 { - return wasmlib.NewScMutableInt32(s.id, ParamMaxBlobSize.KeyID()) + return wasmlib.NewScMutableInt32(s.id, wasmlib.KeyID(ParamMaxBlobSize)) } func (s MutableSetChainInfoParams) MaxEventSize() wasmlib.ScMutableInt16 { - return wasmlib.NewScMutableInt16(s.id, ParamMaxEventSize.KeyID()) + return wasmlib.NewScMutableInt16(s.id, wasmlib.KeyID(ParamMaxEventSize)) } func (s MutableSetChainInfoParams) MaxEventsPerReq() wasmlib.ScMutableInt16 { - return wasmlib.NewScMutableInt16(s.id, ParamMaxEventsPerReq.KeyID()) + return wasmlib.NewScMutableInt16(s.id, wasmlib.KeyID(ParamMaxEventsPerReq)) } func (s MutableSetChainInfoParams) OwnerFee() wasmlib.ScMutableInt64 { - return wasmlib.NewScMutableInt64(s.id, ParamOwnerFee.KeyID()) + return wasmlib.NewScMutableInt64(s.id, wasmlib.KeyID(ParamOwnerFee)) } func (s MutableSetChainInfoParams) ValidatorFee() wasmlib.ScMutableInt64 { - return wasmlib.NewScMutableInt64(s.id, ParamValidatorFee.KeyID()) + return wasmlib.NewScMutableInt64(s.id, wasmlib.KeyID(ParamValidatorFee)) } type ImmutableSetContractFeeParams struct { @@ -142,15 +142,15 @@ type ImmutableSetContractFeeParams struct { } func (s ImmutableSetContractFeeParams) Hname() wasmlib.ScImmutableHname { - return wasmlib.NewScImmutableHname(s.id, ParamHname.KeyID()) + return wasmlib.NewScImmutableHname(s.id, wasmlib.KeyID(ParamHname)) } func (s ImmutableSetContractFeeParams) OwnerFee() wasmlib.ScImmutableInt64 { - return wasmlib.NewScImmutableInt64(s.id, ParamOwnerFee.KeyID()) + return wasmlib.NewScImmutableInt64(s.id, wasmlib.KeyID(ParamOwnerFee)) } func (s ImmutableSetContractFeeParams) ValidatorFee() wasmlib.ScImmutableInt64 { - return wasmlib.NewScImmutableInt64(s.id, ParamValidatorFee.KeyID()) + return wasmlib.NewScImmutableInt64(s.id, wasmlib.KeyID(ParamValidatorFee)) } type MutableSetContractFeeParams struct { @@ -158,15 +158,15 @@ type MutableSetContractFeeParams struct { } func (s MutableSetContractFeeParams) Hname() wasmlib.ScMutableHname { - return wasmlib.NewScMutableHname(s.id, ParamHname.KeyID()) + return wasmlib.NewScMutableHname(s.id, wasmlib.KeyID(ParamHname)) } func (s MutableSetContractFeeParams) OwnerFee() wasmlib.ScMutableInt64 { - return wasmlib.NewScMutableInt64(s.id, ParamOwnerFee.KeyID()) + return wasmlib.NewScMutableInt64(s.id, wasmlib.KeyID(ParamOwnerFee)) } func (s MutableSetContractFeeParams) ValidatorFee() wasmlib.ScMutableInt64 { - return wasmlib.NewScMutableInt64(s.id, ParamValidatorFee.KeyID()) + return wasmlib.NewScMutableInt64(s.id, wasmlib.KeyID(ParamValidatorFee)) } type ImmutableSetDefaultFeeParams struct { @@ -174,11 +174,11 @@ type ImmutableSetDefaultFeeParams struct { } func (s ImmutableSetDefaultFeeParams) OwnerFee() wasmlib.ScImmutableInt64 { - return wasmlib.NewScImmutableInt64(s.id, ParamOwnerFee.KeyID()) + return wasmlib.NewScImmutableInt64(s.id, wasmlib.KeyID(ParamOwnerFee)) } func (s ImmutableSetDefaultFeeParams) ValidatorFee() wasmlib.ScImmutableInt64 { - return wasmlib.NewScImmutableInt64(s.id, ParamValidatorFee.KeyID()) + return wasmlib.NewScImmutableInt64(s.id, wasmlib.KeyID(ParamValidatorFee)) } type MutableSetDefaultFeeParams struct { @@ -186,11 +186,11 @@ type MutableSetDefaultFeeParams struct { } func (s MutableSetDefaultFeeParams) OwnerFee() wasmlib.ScMutableInt64 { - return wasmlib.NewScMutableInt64(s.id, ParamOwnerFee.KeyID()) + return wasmlib.NewScMutableInt64(s.id, wasmlib.KeyID(ParamOwnerFee)) } func (s MutableSetDefaultFeeParams) ValidatorFee() wasmlib.ScMutableInt64 { - return wasmlib.NewScMutableInt64(s.id, ParamValidatorFee.KeyID()) + return wasmlib.NewScMutableInt64(s.id, wasmlib.KeyID(ParamValidatorFee)) } type ImmutableGetFeeInfoParams struct { @@ -198,7 +198,7 @@ type ImmutableGetFeeInfoParams struct { } func (s ImmutableGetFeeInfoParams) Hname() wasmlib.ScImmutableHname { - return wasmlib.NewScImmutableHname(s.id, ParamHname.KeyID()) + return wasmlib.NewScImmutableHname(s.id, wasmlib.KeyID(ParamHname)) } type MutableGetFeeInfoParams struct { @@ -206,5 +206,5 @@ type MutableGetFeeInfoParams struct { } func (s MutableGetFeeInfoParams) Hname() wasmlib.ScMutableHname { - return wasmlib.NewScMutableHname(s.id, ParamHname.KeyID()) + return wasmlib.NewScMutableHname(s.id, wasmlib.KeyID(ParamHname)) } diff --git a/packages/vm/wasmlib/go/wasmlib/coregovernance/results.go b/packages/vm/wasmlib/go/wasmlib/coregovernance/results.go index 0b2c92f4c5..c322210258 100644 --- a/packages/vm/wasmlib/go/wasmlib/coregovernance/results.go +++ b/packages/vm/wasmlib/go/wasmlib/coregovernance/results.go @@ -26,7 +26,7 @@ type ImmutableGetAllowedStateControllerAddressesResults struct { } func (s ImmutableGetAllowedStateControllerAddressesResults) AllowedStateControllerAddresses() ArrayOfImmutableBytes { - arrID := wasmlib.GetObjectID(s.id, ResultAllowedStateControllerAddresses.KeyID(), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES) + arrID := wasmlib.GetObjectID(s.id, wasmlib.KeyID(ResultAllowedStateControllerAddresses), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES) return ArrayOfImmutableBytes{objID: arrID} } @@ -51,7 +51,7 @@ type MutableGetAllowedStateControllerAddressesResults struct { } func (s MutableGetAllowedStateControllerAddressesResults) AllowedStateControllerAddresses() ArrayOfMutableBytes { - arrID := wasmlib.GetObjectID(s.id, ResultAllowedStateControllerAddresses.KeyID(), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES) + arrID := wasmlib.GetObjectID(s.id, wasmlib.KeyID(ResultAllowedStateControllerAddresses), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES) return ArrayOfMutableBytes{objID: arrID} } @@ -60,39 +60,39 @@ type ImmutableGetChainInfoResults struct { } func (s ImmutableGetChainInfoResults) ChainID() wasmlib.ScImmutableChainID { - return wasmlib.NewScImmutableChainID(s.id, ResultChainID.KeyID()) + return wasmlib.NewScImmutableChainID(s.id, wasmlib.KeyID(ResultChainID)) } func (s ImmutableGetChainInfoResults) ChainOwnerID() wasmlib.ScImmutableAgentID { - return wasmlib.NewScImmutableAgentID(s.id, ResultChainOwnerID.KeyID()) + return wasmlib.NewScImmutableAgentID(s.id, wasmlib.KeyID(ResultChainOwnerID)) } func (s ImmutableGetChainInfoResults) DefaultOwnerFee() wasmlib.ScImmutableInt64 { - return wasmlib.NewScImmutableInt64(s.id, ResultDefaultOwnerFee.KeyID()) + return wasmlib.NewScImmutableInt64(s.id, wasmlib.KeyID(ResultDefaultOwnerFee)) } func (s ImmutableGetChainInfoResults) DefaultValidatorFee() wasmlib.ScImmutableInt64 { - return wasmlib.NewScImmutableInt64(s.id, ResultDefaultValidatorFee.KeyID()) + return wasmlib.NewScImmutableInt64(s.id, wasmlib.KeyID(ResultDefaultValidatorFee)) } func (s ImmutableGetChainInfoResults) Description() wasmlib.ScImmutableString { - return wasmlib.NewScImmutableString(s.id, ResultDescription.KeyID()) + return wasmlib.NewScImmutableString(s.id, wasmlib.KeyID(ResultDescription)) } func (s ImmutableGetChainInfoResults) FeeColor() wasmlib.ScImmutableColor { - return wasmlib.NewScImmutableColor(s.id, ResultFeeColor.KeyID()) + return wasmlib.NewScImmutableColor(s.id, wasmlib.KeyID(ResultFeeColor)) } func (s ImmutableGetChainInfoResults) MaxBlobSize() wasmlib.ScImmutableInt32 { - return wasmlib.NewScImmutableInt32(s.id, ResultMaxBlobSize.KeyID()) + return wasmlib.NewScImmutableInt32(s.id, wasmlib.KeyID(ResultMaxBlobSize)) } func (s ImmutableGetChainInfoResults) MaxEventSize() wasmlib.ScImmutableInt16 { - return wasmlib.NewScImmutableInt16(s.id, ResultMaxEventSize.KeyID()) + return wasmlib.NewScImmutableInt16(s.id, wasmlib.KeyID(ResultMaxEventSize)) } func (s ImmutableGetChainInfoResults) MaxEventsPerReq() wasmlib.ScImmutableInt16 { - return wasmlib.NewScImmutableInt16(s.id, ResultMaxEventsPerReq.KeyID()) + return wasmlib.NewScImmutableInt16(s.id, wasmlib.KeyID(ResultMaxEventsPerReq)) } type MutableGetChainInfoResults struct { @@ -100,39 +100,39 @@ type MutableGetChainInfoResults struct { } func (s MutableGetChainInfoResults) ChainID() wasmlib.ScMutableChainID { - return wasmlib.NewScMutableChainID(s.id, ResultChainID.KeyID()) + return wasmlib.NewScMutableChainID(s.id, wasmlib.KeyID(ResultChainID)) } func (s MutableGetChainInfoResults) ChainOwnerID() wasmlib.ScMutableAgentID { - return wasmlib.NewScMutableAgentID(s.id, ResultChainOwnerID.KeyID()) + return wasmlib.NewScMutableAgentID(s.id, wasmlib.KeyID(ResultChainOwnerID)) } func (s MutableGetChainInfoResults) DefaultOwnerFee() wasmlib.ScMutableInt64 { - return wasmlib.NewScMutableInt64(s.id, ResultDefaultOwnerFee.KeyID()) + return wasmlib.NewScMutableInt64(s.id, wasmlib.KeyID(ResultDefaultOwnerFee)) } func (s MutableGetChainInfoResults) DefaultValidatorFee() wasmlib.ScMutableInt64 { - return wasmlib.NewScMutableInt64(s.id, ResultDefaultValidatorFee.KeyID()) + return wasmlib.NewScMutableInt64(s.id, wasmlib.KeyID(ResultDefaultValidatorFee)) } func (s MutableGetChainInfoResults) Description() wasmlib.ScMutableString { - return wasmlib.NewScMutableString(s.id, ResultDescription.KeyID()) + return wasmlib.NewScMutableString(s.id, wasmlib.KeyID(ResultDescription)) } func (s MutableGetChainInfoResults) FeeColor() wasmlib.ScMutableColor { - return wasmlib.NewScMutableColor(s.id, ResultFeeColor.KeyID()) + return wasmlib.NewScMutableColor(s.id, wasmlib.KeyID(ResultFeeColor)) } func (s MutableGetChainInfoResults) MaxBlobSize() wasmlib.ScMutableInt32 { - return wasmlib.NewScMutableInt32(s.id, ResultMaxBlobSize.KeyID()) + return wasmlib.NewScMutableInt32(s.id, wasmlib.KeyID(ResultMaxBlobSize)) } func (s MutableGetChainInfoResults) MaxEventSize() wasmlib.ScMutableInt16 { - return wasmlib.NewScMutableInt16(s.id, ResultMaxEventSize.KeyID()) + return wasmlib.NewScMutableInt16(s.id, wasmlib.KeyID(ResultMaxEventSize)) } func (s MutableGetChainInfoResults) MaxEventsPerReq() wasmlib.ScMutableInt16 { - return wasmlib.NewScMutableInt16(s.id, ResultMaxEventsPerReq.KeyID()) + return wasmlib.NewScMutableInt16(s.id, wasmlib.KeyID(ResultMaxEventsPerReq)) } type ImmutableGetFeeInfoResults struct { @@ -140,15 +140,15 @@ type ImmutableGetFeeInfoResults struct { } func (s ImmutableGetFeeInfoResults) FeeColor() wasmlib.ScImmutableColor { - return wasmlib.NewScImmutableColor(s.id, ResultFeeColor.KeyID()) + return wasmlib.NewScImmutableColor(s.id, wasmlib.KeyID(ResultFeeColor)) } func (s ImmutableGetFeeInfoResults) OwnerFee() wasmlib.ScImmutableInt64 { - return wasmlib.NewScImmutableInt64(s.id, ResultOwnerFee.KeyID()) + return wasmlib.NewScImmutableInt64(s.id, wasmlib.KeyID(ResultOwnerFee)) } func (s ImmutableGetFeeInfoResults) ValidatorFee() wasmlib.ScImmutableInt64 { - return wasmlib.NewScImmutableInt64(s.id, ResultValidatorFee.KeyID()) + return wasmlib.NewScImmutableInt64(s.id, wasmlib.KeyID(ResultValidatorFee)) } type MutableGetFeeInfoResults struct { @@ -156,15 +156,15 @@ type MutableGetFeeInfoResults struct { } func (s MutableGetFeeInfoResults) FeeColor() wasmlib.ScMutableColor { - return wasmlib.NewScMutableColor(s.id, ResultFeeColor.KeyID()) + return wasmlib.NewScMutableColor(s.id, wasmlib.KeyID(ResultFeeColor)) } func (s MutableGetFeeInfoResults) OwnerFee() wasmlib.ScMutableInt64 { - return wasmlib.NewScMutableInt64(s.id, ResultOwnerFee.KeyID()) + return wasmlib.NewScMutableInt64(s.id, wasmlib.KeyID(ResultOwnerFee)) } func (s MutableGetFeeInfoResults) ValidatorFee() wasmlib.ScMutableInt64 { - return wasmlib.NewScMutableInt64(s.id, ResultValidatorFee.KeyID()) + return wasmlib.NewScMutableInt64(s.id, wasmlib.KeyID(ResultValidatorFee)) } type ImmutableGetMaxBlobSizeResults struct { @@ -172,7 +172,7 @@ type ImmutableGetMaxBlobSizeResults struct { } func (s ImmutableGetMaxBlobSizeResults) MaxBlobSize() wasmlib.ScImmutableInt32 { - return wasmlib.NewScImmutableInt32(s.id, ResultMaxBlobSize.KeyID()) + return wasmlib.NewScImmutableInt32(s.id, wasmlib.KeyID(ResultMaxBlobSize)) } type MutableGetMaxBlobSizeResults struct { @@ -180,5 +180,5 @@ type MutableGetMaxBlobSizeResults struct { } func (s MutableGetMaxBlobSizeResults) MaxBlobSize() wasmlib.ScMutableInt32 { - return wasmlib.NewScMutableInt32(s.id, ResultMaxBlobSize.KeyID()) + return wasmlib.NewScMutableInt32(s.id, wasmlib.KeyID(ResultMaxBlobSize)) } diff --git a/packages/vm/wasmlib/go/wasmlib/coreroot/consts.go b/packages/vm/wasmlib/go/wasmlib/coreroot/consts.go index c607e01f0b..b791ab59f4 100644 --- a/packages/vm/wasmlib/go/wasmlib/coreroot/consts.go +++ b/packages/vm/wasmlib/go/wasmlib/coreroot/consts.go @@ -16,17 +16,17 @@ const ( ) const ( - ParamDeployer = wasmlib.Key("dp") - ParamDescription = wasmlib.Key("ds") - ParamHname = wasmlib.Key("hn") - ParamName = wasmlib.Key("nm") - ParamProgramHash = wasmlib.Key("ph") + ParamDeployer = "dp" + ParamDescription = "ds" + ParamHname = "hn" + ParamName = "nm" + ParamProgramHash = "ph" ) const ( - ResultContractFound = wasmlib.Key("cf") - ResultContractRecData = wasmlib.Key("dt") - ResultContractRegistry = wasmlib.Key("r") + ResultContractFound = "cf" + ResultContractRecData = "dt" + ResultContractRegistry = "r" ) const ( diff --git a/packages/vm/wasmlib/go/wasmlib/coreroot/params.go b/packages/vm/wasmlib/go/wasmlib/coreroot/params.go index 673849677e..f302c05d5c 100644 --- a/packages/vm/wasmlib/go/wasmlib/coreroot/params.go +++ b/packages/vm/wasmlib/go/wasmlib/coreroot/params.go @@ -14,15 +14,15 @@ type ImmutableDeployContractParams struct { } func (s ImmutableDeployContractParams) Description() wasmlib.ScImmutableString { - return wasmlib.NewScImmutableString(s.id, ParamDescription.KeyID()) + return wasmlib.NewScImmutableString(s.id, wasmlib.KeyID(ParamDescription)) } func (s ImmutableDeployContractParams) Name() wasmlib.ScImmutableString { - return wasmlib.NewScImmutableString(s.id, ParamName.KeyID()) + return wasmlib.NewScImmutableString(s.id, wasmlib.KeyID(ParamName)) } func (s ImmutableDeployContractParams) ProgramHash() wasmlib.ScImmutableHash { - return wasmlib.NewScImmutableHash(s.id, ParamProgramHash.KeyID()) + return wasmlib.NewScImmutableHash(s.id, wasmlib.KeyID(ParamProgramHash)) } type MutableDeployContractParams struct { @@ -30,15 +30,15 @@ type MutableDeployContractParams struct { } func (s MutableDeployContractParams) Description() wasmlib.ScMutableString { - return wasmlib.NewScMutableString(s.id, ParamDescription.KeyID()) + return wasmlib.NewScMutableString(s.id, wasmlib.KeyID(ParamDescription)) } func (s MutableDeployContractParams) Name() wasmlib.ScMutableString { - return wasmlib.NewScMutableString(s.id, ParamName.KeyID()) + return wasmlib.NewScMutableString(s.id, wasmlib.KeyID(ParamName)) } func (s MutableDeployContractParams) ProgramHash() wasmlib.ScMutableHash { - return wasmlib.NewScMutableHash(s.id, ParamProgramHash.KeyID()) + return wasmlib.NewScMutableHash(s.id, wasmlib.KeyID(ParamProgramHash)) } type ImmutableGrantDeployPermissionParams struct { @@ -46,7 +46,7 @@ type ImmutableGrantDeployPermissionParams struct { } func (s ImmutableGrantDeployPermissionParams) Deployer() wasmlib.ScImmutableAgentID { - return wasmlib.NewScImmutableAgentID(s.id, ParamDeployer.KeyID()) + return wasmlib.NewScImmutableAgentID(s.id, wasmlib.KeyID(ParamDeployer)) } type MutableGrantDeployPermissionParams struct { @@ -54,7 +54,7 @@ type MutableGrantDeployPermissionParams struct { } func (s MutableGrantDeployPermissionParams) Deployer() wasmlib.ScMutableAgentID { - return wasmlib.NewScMutableAgentID(s.id, ParamDeployer.KeyID()) + return wasmlib.NewScMutableAgentID(s.id, wasmlib.KeyID(ParamDeployer)) } type ImmutableRevokeDeployPermissionParams struct { @@ -62,7 +62,7 @@ type ImmutableRevokeDeployPermissionParams struct { } func (s ImmutableRevokeDeployPermissionParams) Deployer() wasmlib.ScImmutableAgentID { - return wasmlib.NewScImmutableAgentID(s.id, ParamDeployer.KeyID()) + return wasmlib.NewScImmutableAgentID(s.id, wasmlib.KeyID(ParamDeployer)) } type MutableRevokeDeployPermissionParams struct { @@ -70,7 +70,7 @@ type MutableRevokeDeployPermissionParams struct { } func (s MutableRevokeDeployPermissionParams) Deployer() wasmlib.ScMutableAgentID { - return wasmlib.NewScMutableAgentID(s.id, ParamDeployer.KeyID()) + return wasmlib.NewScMutableAgentID(s.id, wasmlib.KeyID(ParamDeployer)) } type ImmutableFindContractParams struct { @@ -78,7 +78,7 @@ type ImmutableFindContractParams struct { } func (s ImmutableFindContractParams) Hname() wasmlib.ScImmutableHname { - return wasmlib.NewScImmutableHname(s.id, ParamHname.KeyID()) + return wasmlib.NewScImmutableHname(s.id, wasmlib.KeyID(ParamHname)) } type MutableFindContractParams struct { @@ -86,5 +86,5 @@ type MutableFindContractParams struct { } func (s MutableFindContractParams) Hname() wasmlib.ScMutableHname { - return wasmlib.NewScMutableHname(s.id, ParamHname.KeyID()) + return wasmlib.NewScMutableHname(s.id, wasmlib.KeyID(ParamHname)) } diff --git a/packages/vm/wasmlib/go/wasmlib/coreroot/results.go b/packages/vm/wasmlib/go/wasmlib/coreroot/results.go index 3ade4f3e44..7108487a19 100644 --- a/packages/vm/wasmlib/go/wasmlib/coreroot/results.go +++ b/packages/vm/wasmlib/go/wasmlib/coreroot/results.go @@ -14,11 +14,11 @@ type ImmutableFindContractResults struct { } func (s ImmutableFindContractResults) ContractFound() wasmlib.ScImmutableBytes { - return wasmlib.NewScImmutableBytes(s.id, ResultContractFound.KeyID()) + return wasmlib.NewScImmutableBytes(s.id, wasmlib.KeyID(ResultContractFound)) } func (s ImmutableFindContractResults) ContractRecData() wasmlib.ScImmutableBytes { - return wasmlib.NewScImmutableBytes(s.id, ResultContractRecData.KeyID()) + return wasmlib.NewScImmutableBytes(s.id, wasmlib.KeyID(ResultContractRecData)) } type MutableFindContractResults struct { @@ -26,11 +26,11 @@ type MutableFindContractResults struct { } func (s MutableFindContractResults) ContractFound() wasmlib.ScMutableBytes { - return wasmlib.NewScMutableBytes(s.id, ResultContractFound.KeyID()) + return wasmlib.NewScMutableBytes(s.id, wasmlib.KeyID(ResultContractFound)) } func (s MutableFindContractResults) ContractRecData() wasmlib.ScMutableBytes { - return wasmlib.NewScMutableBytes(s.id, ResultContractRecData.KeyID()) + return wasmlib.NewScMutableBytes(s.id, wasmlib.KeyID(ResultContractRecData)) } type MapHnameToImmutableBytes struct { @@ -46,7 +46,7 @@ type ImmutableGetContractRecordsResults struct { } func (s ImmutableGetContractRecordsResults) ContractRegistry() MapHnameToImmutableBytes { - mapID := wasmlib.GetObjectID(s.id, ResultContractRegistry.KeyID(), wasmlib.TYPE_MAP) + mapID := wasmlib.GetObjectID(s.id, wasmlib.KeyID(ResultContractRegistry), wasmlib.TYPE_MAP) return MapHnameToImmutableBytes{objID: mapID} } @@ -67,6 +67,6 @@ type MutableGetContractRecordsResults struct { } func (s MutableGetContractRecordsResults) ContractRegistry() MapHnameToMutableBytes { - mapID := wasmlib.GetObjectID(s.id, ResultContractRegistry.KeyID(), wasmlib.TYPE_MAP) + mapID := wasmlib.GetObjectID(s.id, wasmlib.KeyID(ResultContractRegistry), wasmlib.TYPE_MAP) return MapHnameToMutableBytes{objID: mapID} } diff --git a/packages/vm/wasmlib/go/wasmlib/keys.go b/packages/vm/wasmlib/go/wasmlib/keys.go index 7015419481..62c5ccbba0 100644 --- a/packages/vm/wasmlib/go/wasmlib/keys.go +++ b/packages/vm/wasmlib/go/wasmlib/keys.go @@ -13,6 +13,10 @@ func (key Key) KeyID() Key32 { return GetKeyIDFromString(string(key)) } +func KeyID(key string) Key32 { + return Key(key).KeyID() +} + type Key32 int32 func (key Key32) KeyID() Key32 { diff --git a/packages/vm/wasmlib/src/coreaccounts/consts.rs b/packages/vm/wasmlib/src/coreaccounts/consts.rs index 969a653e7c..08e1dd53ce 100644 --- a/packages/vm/wasmlib/src/coreaccounts/consts.rs +++ b/packages/vm/wasmlib/src/coreaccounts/consts.rs @@ -9,30 +9,30 @@ use crate::*; -pub const SC_NAME: &str = "accounts"; -pub const SC_DESCRIPTION: &str = "Core chain account ledger contract"; -pub const HSC_NAME: ScHname = ScHname(0x3c4b5e02); - -pub(crate) const PARAM_AGENT_ID: &str = "a"; -pub(crate) const PARAM_WITHDRAW_AMOUNT: &str = "m"; -pub(crate) const PARAM_WITHDRAW_COLOR: &str = "c"; - -pub(crate) const RESULT_ACCOUNT_NONCE: &str = "n"; -pub(crate) const RESULT_AGENTS: &str = "this"; -pub(crate) const RESULT_BALANCES: &str = "this"; - -pub(crate) const FUNC_DEPOSIT: &str = "deposit"; -pub(crate) const FUNC_HARVEST: &str = "harvest"; -pub(crate) const FUNC_WITHDRAW: &str = "withdraw"; -pub(crate) const VIEW_ACCOUNTS: &str = "accounts"; -pub(crate) const VIEW_BALANCE: &str = "balance"; -pub(crate) const VIEW_GET_ACCOUNT_NONCE: &str = "getAccountNonce"; -pub(crate) const VIEW_TOTAL_ASSETS: &str = "totalAssets"; - -pub(crate) const HFUNC_DEPOSIT: ScHname = ScHname(0xbdc9102d); -pub(crate) const HFUNC_HARVEST: ScHname = ScHname(0x7b40efbd); -pub(crate) const HFUNC_WITHDRAW: ScHname = ScHname(0x9dcc0f41); -pub(crate) const HVIEW_ACCOUNTS: ScHname = ScHname(0x3c4b5e02); -pub(crate) const HVIEW_BALANCE: ScHname = ScHname(0x84168cb4); -pub(crate) const HVIEW_GET_ACCOUNT_NONCE: ScHname = ScHname(0x529d7df9); -pub(crate) const HVIEW_TOTAL_ASSETS: ScHname = ScHname(0xfab0f8d2); +pub const SC_NAME : &str = "accounts"; +pub const SC_DESCRIPTION : &str = "Core chain account ledger contract"; +pub const HSC_NAME : ScHname = ScHname(0x3c4b5e02); + +pub(crate) const PARAM_AGENT_ID : &str = "a"; +pub(crate) const PARAM_WITHDRAW_AMOUNT : &str = "m"; +pub(crate) const PARAM_WITHDRAW_COLOR : &str = "c"; + +pub(crate) const RESULT_ACCOUNT_NONCE : &str = "n"; +pub(crate) const RESULT_AGENTS : &str = "this"; +pub(crate) const RESULT_BALANCES : &str = "this"; + +pub(crate) const FUNC_DEPOSIT : &str = "deposit"; +pub(crate) const FUNC_HARVEST : &str = "harvest"; +pub(crate) const FUNC_WITHDRAW : &str = "withdraw"; +pub(crate) const VIEW_ACCOUNTS : &str = "accounts"; +pub(crate) const VIEW_BALANCE : &str = "balance"; +pub(crate) const VIEW_GET_ACCOUNT_NONCE : &str = "getAccountNonce"; +pub(crate) const VIEW_TOTAL_ASSETS : &str = "totalAssets"; + +pub(crate) const HFUNC_DEPOSIT : ScHname = ScHname(0xbdc9102d); +pub(crate) const HFUNC_HARVEST : ScHname = ScHname(0x7b40efbd); +pub(crate) const HFUNC_WITHDRAW : ScHname = ScHname(0x9dcc0f41); +pub(crate) const HVIEW_ACCOUNTS : ScHname = ScHname(0x3c4b5e02); +pub(crate) const HVIEW_BALANCE : ScHname = ScHname(0x84168cb4); +pub(crate) const HVIEW_GET_ACCOUNT_NONCE : ScHname = ScHname(0x529d7df9); +pub(crate) const HVIEW_TOTAL_ASSETS : ScHname = ScHname(0xfab0f8d2); diff --git a/packages/vm/wasmlib/src/coreblob/consts.rs b/packages/vm/wasmlib/src/coreblob/consts.rs index b8f53f6cd9..83221ab5df 100644 --- a/packages/vm/wasmlib/src/coreblob/consts.rs +++ b/packages/vm/wasmlib/src/coreblob/consts.rs @@ -9,24 +9,24 @@ use crate::*; -pub const SC_NAME: &str = "blob"; -pub const SC_DESCRIPTION: &str = "Core blob contract"; -pub const HSC_NAME: ScHname = ScHname(0xfd91bc63); - -pub(crate) const PARAM_BLOBS: &str = "this"; -pub(crate) const PARAM_FIELD: &str = "field"; -pub(crate) const PARAM_HASH: &str = "hash"; - -pub(crate) const RESULT_BLOB_SIZES: &str = "this"; -pub(crate) const RESULT_BYTES: &str = "bytes"; -pub(crate) const RESULT_HASH: &str = "hash"; - -pub(crate) const FUNC_STORE_BLOB: &str = "storeBlob"; -pub(crate) const VIEW_GET_BLOB_FIELD: &str = "getBlobField"; -pub(crate) const VIEW_GET_BLOB_INFO: &str = "getBlobInfo"; -pub(crate) const VIEW_LIST_BLOBS: &str = "listBlobs"; - -pub(crate) const HFUNC_STORE_BLOB: ScHname = ScHname(0xddd4c281); -pub(crate) const HVIEW_GET_BLOB_FIELD: ScHname = ScHname(0x1f448130); -pub(crate) const HVIEW_GET_BLOB_INFO: ScHname = ScHname(0xfde4ab46); -pub(crate) const HVIEW_LIST_BLOBS: ScHname = ScHname(0x62ca7990); +pub const SC_NAME : &str = "blob"; +pub const SC_DESCRIPTION : &str = "Core blob contract"; +pub const HSC_NAME : ScHname = ScHname(0xfd91bc63); + +pub(crate) const PARAM_BLOBS : &str = "this"; +pub(crate) const PARAM_FIELD : &str = "field"; +pub(crate) const PARAM_HASH : &str = "hash"; + +pub(crate) const RESULT_BLOB_SIZES : &str = "this"; +pub(crate) const RESULT_BYTES : &str = "bytes"; +pub(crate) const RESULT_HASH : &str = "hash"; + +pub(crate) const FUNC_STORE_BLOB : &str = "storeBlob"; +pub(crate) const VIEW_GET_BLOB_FIELD : &str = "getBlobField"; +pub(crate) const VIEW_GET_BLOB_INFO : &str = "getBlobInfo"; +pub(crate) const VIEW_LIST_BLOBS : &str = "listBlobs"; + +pub(crate) const HFUNC_STORE_BLOB : ScHname = ScHname(0xddd4c281); +pub(crate) const HVIEW_GET_BLOB_FIELD : ScHname = ScHname(0x1f448130); +pub(crate) const HVIEW_GET_BLOB_INFO : ScHname = ScHname(0xfde4ab46); +pub(crate) const HVIEW_LIST_BLOBS : ScHname = ScHname(0x62ca7990); diff --git a/packages/vm/wasmlib/src/coreblocklog/consts.rs b/packages/vm/wasmlib/src/coreblocklog/consts.rs index 03eb5efc34..11051412bb 100644 --- a/packages/vm/wasmlib/src/coreblocklog/consts.rs +++ b/packages/vm/wasmlib/src/coreblocklog/consts.rs @@ -9,44 +9,44 @@ use crate::*; -pub const SC_NAME: &str = "blocklog"; -pub const SC_DESCRIPTION: &str = "Core block log contract"; -pub const HSC_NAME: ScHname = ScHname(0xf538ef2b); - -pub(crate) const PARAM_BLOCK_INDEX: &str = "n"; -pub(crate) const PARAM_CONTRACT_HNAME: &str = "h"; -pub(crate) const PARAM_FROM_BLOCK: &str = "f"; -pub(crate) const PARAM_REQUEST_ID: &str = "u"; -pub(crate) const PARAM_TO_BLOCK: &str = "t"; - -pub(crate) const RESULT_BLOCK_INDEX: &str = "n"; -pub(crate) const RESULT_BLOCK_INFO: &str = "i"; -pub(crate) const RESULT_EVENT: &str = "e"; -pub(crate) const RESULT_GOVERNING_ADDRESS: &str = "g"; -pub(crate) const RESULT_REQUEST_ID: &str = "u"; -pub(crate) const RESULT_REQUEST_INDEX: &str = "r"; -pub(crate) const RESULT_REQUEST_PROCESSED: &str = "p"; -pub(crate) const RESULT_REQUEST_RECORD: &str = "d"; -pub(crate) const RESULT_STATE_CONTROLLER_ADDRESS: &str = "s"; - -pub(crate) const VIEW_CONTROL_ADDRESSES: &str = "controlAddresses"; -pub(crate) const VIEW_GET_BLOCK_INFO: &str = "getBlockInfo"; -pub(crate) const VIEW_GET_EVENTS_FOR_BLOCK: &str = "getEventsForBlock"; -pub(crate) const VIEW_GET_EVENTS_FOR_CONTRACT: &str = "getEventsForContract"; -pub(crate) const VIEW_GET_EVENTS_FOR_REQUEST: &str = "getEventsForRequest"; -pub(crate) const VIEW_GET_LATEST_BLOCK_INFO: &str = "getLatestBlockInfo"; -pub(crate) const VIEW_GET_REQUEST_I_DS_FOR_BLOCK: &str = "getRequestIDsForBlock"; -pub(crate) const VIEW_GET_REQUEST_RECEIPT: &str = "getRequestReceipt"; -pub(crate) const VIEW_GET_REQUEST_RECEIPTS_FOR_BLOCK: &str = "getRequestReceiptsForBlock"; -pub(crate) const VIEW_IS_REQUEST_PROCESSED: &str = "isRequestProcessed"; - -pub(crate) const HVIEW_CONTROL_ADDRESSES: ScHname = ScHname(0x796bd223); -pub(crate) const HVIEW_GET_BLOCK_INFO: ScHname = ScHname(0xbe89f9b3); -pub(crate) const HVIEW_GET_EVENTS_FOR_BLOCK: ScHname = ScHname(0x36232798); -pub(crate) const HVIEW_GET_EVENTS_FOR_CONTRACT: ScHname = ScHname(0x682a1922); -pub(crate) const HVIEW_GET_EVENTS_FOR_REQUEST: ScHname = ScHname(0x4f8d68e4); -pub(crate) const HVIEW_GET_LATEST_BLOCK_INFO: ScHname = ScHname(0x084a1760); -pub(crate) const HVIEW_GET_REQUEST_I_DS_FOR_BLOCK: ScHname = ScHname(0x5a20327a); -pub(crate) const HVIEW_GET_REQUEST_RECEIPT: ScHname = ScHname(0xb7f9534f); -pub(crate) const HVIEW_GET_REQUEST_RECEIPTS_FOR_BLOCK: ScHname = ScHname(0x77e3beef); -pub(crate) const HVIEW_IS_REQUEST_PROCESSED: ScHname = ScHname(0xd57d50a9); +pub const SC_NAME : &str = "blocklog"; +pub const SC_DESCRIPTION : &str = "Core block log contract"; +pub const HSC_NAME : ScHname = ScHname(0xf538ef2b); + +pub(crate) const PARAM_BLOCK_INDEX : &str = "n"; +pub(crate) const PARAM_CONTRACT_HNAME : &str = "h"; +pub(crate) const PARAM_FROM_BLOCK : &str = "f"; +pub(crate) const PARAM_REQUEST_ID : &str = "u"; +pub(crate) const PARAM_TO_BLOCK : &str = "t"; + +pub(crate) const RESULT_BLOCK_INDEX : &str = "n"; +pub(crate) const RESULT_BLOCK_INFO : &str = "i"; +pub(crate) const RESULT_EVENT : &str = "e"; +pub(crate) const RESULT_GOVERNING_ADDRESS : &str = "g"; +pub(crate) const RESULT_REQUEST_ID : &str = "u"; +pub(crate) const RESULT_REQUEST_INDEX : &str = "r"; +pub(crate) const RESULT_REQUEST_PROCESSED : &str = "p"; +pub(crate) const RESULT_REQUEST_RECORD : &str = "d"; +pub(crate) const RESULT_STATE_CONTROLLER_ADDRESS : &str = "s"; + +pub(crate) const VIEW_CONTROL_ADDRESSES : &str = "controlAddresses"; +pub(crate) const VIEW_GET_BLOCK_INFO : &str = "getBlockInfo"; +pub(crate) const VIEW_GET_EVENTS_FOR_BLOCK : &str = "getEventsForBlock"; +pub(crate) const VIEW_GET_EVENTS_FOR_CONTRACT : &str = "getEventsForContract"; +pub(crate) const VIEW_GET_EVENTS_FOR_REQUEST : &str = "getEventsForRequest"; +pub(crate) const VIEW_GET_LATEST_BLOCK_INFO : &str = "getLatestBlockInfo"; +pub(crate) const VIEW_GET_REQUEST_I_DS_FOR_BLOCK : &str = "getRequestIDsForBlock"; +pub(crate) const VIEW_GET_REQUEST_RECEIPT : &str = "getRequestReceipt"; +pub(crate) const VIEW_GET_REQUEST_RECEIPTS_FOR_BLOCK : &str = "getRequestReceiptsForBlock"; +pub(crate) const VIEW_IS_REQUEST_PROCESSED : &str = "isRequestProcessed"; + +pub(crate) const HVIEW_CONTROL_ADDRESSES : ScHname = ScHname(0x796bd223); +pub(crate) const HVIEW_GET_BLOCK_INFO : ScHname = ScHname(0xbe89f9b3); +pub(crate) const HVIEW_GET_EVENTS_FOR_BLOCK : ScHname = ScHname(0x36232798); +pub(crate) const HVIEW_GET_EVENTS_FOR_CONTRACT : ScHname = ScHname(0x682a1922); +pub(crate) const HVIEW_GET_EVENTS_FOR_REQUEST : ScHname = ScHname(0x4f8d68e4); +pub(crate) const HVIEW_GET_LATEST_BLOCK_INFO : ScHname = ScHname(0x084a1760); +pub(crate) const HVIEW_GET_REQUEST_I_DS_FOR_BLOCK : ScHname = ScHname(0x5a20327a); +pub(crate) const HVIEW_GET_REQUEST_RECEIPT : ScHname = ScHname(0xb7f9534f); +pub(crate) const HVIEW_GET_REQUEST_RECEIPTS_FOR_BLOCK : ScHname = ScHname(0x77e3beef); +pub(crate) const HVIEW_IS_REQUEST_PROCESSED : ScHname = ScHname(0xd57d50a9); diff --git a/packages/vm/wasmlib/src/coregovernance/consts.rs b/packages/vm/wasmlib/src/coregovernance/consts.rs index cf3f96194a..69059554b2 100644 --- a/packages/vm/wasmlib/src/coregovernance/consts.rs +++ b/packages/vm/wasmlib/src/coregovernance/consts.rs @@ -9,55 +9,55 @@ use crate::*; -pub const SC_NAME: &str = "governance"; -pub const SC_DESCRIPTION: &str = "Core governance contract"; -pub const HSC_NAME: ScHname = ScHname(0x17cf909f); - -pub(crate) const PARAM_CHAIN_OWNER: &str = "oi"; -pub(crate) const PARAM_FEE_COLOR: &str = "fc"; -pub(crate) const PARAM_HNAME: &str = "hn"; -pub(crate) const PARAM_MAX_BLOB_SIZE: &str = "bs"; -pub(crate) const PARAM_MAX_EVENT_SIZE: &str = "es"; -pub(crate) const PARAM_MAX_EVENTS_PER_REQ: &str = "ne"; -pub(crate) const PARAM_OWNER_FEE: &str = "of"; -pub(crate) const PARAM_STATE_CONTROLLER_ADDRESS: &str = "S"; -pub(crate) const PARAM_VALIDATOR_FEE: &str = "vf"; - -pub(crate) const RESULT_ALLOWED_STATE_CONTROLLER_ADDRESSES: &str = "a"; -pub(crate) const RESULT_CHAIN_ID: &str = "c"; -pub(crate) const RESULT_CHAIN_OWNER_ID: &str = "o"; -pub(crate) const RESULT_DEFAULT_OWNER_FEE: &str = "do"; -pub(crate) const RESULT_DEFAULT_VALIDATOR_FEE: &str = "dv"; -pub(crate) const RESULT_DESCRIPTION: &str = "d"; -pub(crate) const RESULT_FEE_COLOR: &str = "f"; -pub(crate) const RESULT_MAX_BLOB_SIZE: &str = "mb"; -pub(crate) const RESULT_MAX_EVENT_SIZE: &str = "me"; -pub(crate) const RESULT_MAX_EVENTS_PER_REQ: &str = "mr"; -pub(crate) const RESULT_OWNER_FEE: &str = "of"; -pub(crate) const RESULT_VALIDATOR_FEE: &str = "vf"; - -pub(crate) const FUNC_ADD_ALLOWED_STATE_CONTROLLER_ADDRESS: &str = "addAllowedStateControllerAddress"; -pub(crate) const FUNC_CLAIM_CHAIN_OWNERSHIP: &str = "claimChainOwnership"; -pub(crate) const FUNC_DELEGATE_CHAIN_OWNERSHIP: &str = "delegateChainOwnership"; -pub(crate) const FUNC_REMOVE_ALLOWED_STATE_CONTROLLER_ADDRESS: &str = "removeAllowedStateControllerAddress"; -pub(crate) const FUNC_ROTATE_STATE_CONTROLLER: &str = "rotateStateController"; -pub(crate) const FUNC_SET_CHAIN_INFO: &str = "setChainInfo"; -pub(crate) const FUNC_SET_CONTRACT_FEE: &str = "setContractFee"; -pub(crate) const FUNC_SET_DEFAULT_FEE: &str = "setDefaultFee"; -pub(crate) const VIEW_GET_ALLOWED_STATE_CONTROLLER_ADDRESSES: &str = "getAllowedStateControllerAddresses"; -pub(crate) const VIEW_GET_CHAIN_INFO: &str = "getChainInfo"; -pub(crate) const VIEW_GET_FEE_INFO: &str = "getFeeInfo"; -pub(crate) const VIEW_GET_MAX_BLOB_SIZE: &str = "getMaxBlobSize"; - -pub(crate) const HFUNC_ADD_ALLOWED_STATE_CONTROLLER_ADDRESS: ScHname = ScHname(0x9469d567); -pub(crate) const HFUNC_CLAIM_CHAIN_OWNERSHIP: ScHname = ScHname(0x03ff0fc0); -pub(crate) const HFUNC_DELEGATE_CHAIN_OWNERSHIP: ScHname = ScHname(0x93ecb6ad); -pub(crate) const HFUNC_REMOVE_ALLOWED_STATE_CONTROLLER_ADDRESS: ScHname = ScHname(0x31f69447); -pub(crate) const HFUNC_ROTATE_STATE_CONTROLLER: ScHname = ScHname(0x244d1038); -pub(crate) const HFUNC_SET_CHAIN_INFO: ScHname = ScHname(0x702f5d2b); -pub(crate) const HFUNC_SET_CONTRACT_FEE: ScHname = ScHname(0x8421a42b); -pub(crate) const HFUNC_SET_DEFAULT_FEE: ScHname = ScHname(0x3310ecd0); -pub(crate) const HVIEW_GET_ALLOWED_STATE_CONTROLLER_ADDRESSES: ScHname = ScHname(0xf3505183); -pub(crate) const HVIEW_GET_CHAIN_INFO: ScHname = ScHname(0x434477e2); -pub(crate) const HVIEW_GET_FEE_INFO: ScHname = ScHname(0x9fe54b48); -pub(crate) const HVIEW_GET_MAX_BLOB_SIZE: ScHname = ScHname(0xe1db3d28); +pub const SC_NAME : &str = "governance"; +pub const SC_DESCRIPTION : &str = "Core governance contract"; +pub const HSC_NAME : ScHname = ScHname(0x17cf909f); + +pub(crate) const PARAM_CHAIN_OWNER : &str = "oi"; +pub(crate) const PARAM_FEE_COLOR : &str = "fc"; +pub(crate) const PARAM_HNAME : &str = "hn"; +pub(crate) const PARAM_MAX_BLOB_SIZE : &str = "bs"; +pub(crate) const PARAM_MAX_EVENT_SIZE : &str = "es"; +pub(crate) const PARAM_MAX_EVENTS_PER_REQ : &str = "ne"; +pub(crate) const PARAM_OWNER_FEE : &str = "of"; +pub(crate) const PARAM_STATE_CONTROLLER_ADDRESS : &str = "S"; +pub(crate) const PARAM_VALIDATOR_FEE : &str = "vf"; + +pub(crate) const RESULT_ALLOWED_STATE_CONTROLLER_ADDRESSES : &str = "a"; +pub(crate) const RESULT_CHAIN_ID : &str = "c"; +pub(crate) const RESULT_CHAIN_OWNER_ID : &str = "o"; +pub(crate) const RESULT_DEFAULT_OWNER_FEE : &str = "do"; +pub(crate) const RESULT_DEFAULT_VALIDATOR_FEE : &str = "dv"; +pub(crate) const RESULT_DESCRIPTION : &str = "d"; +pub(crate) const RESULT_FEE_COLOR : &str = "f"; +pub(crate) const RESULT_MAX_BLOB_SIZE : &str = "mb"; +pub(crate) const RESULT_MAX_EVENT_SIZE : &str = "me"; +pub(crate) const RESULT_MAX_EVENTS_PER_REQ : &str = "mr"; +pub(crate) const RESULT_OWNER_FEE : &str = "of"; +pub(crate) const RESULT_VALIDATOR_FEE : &str = "vf"; + +pub(crate) const FUNC_ADD_ALLOWED_STATE_CONTROLLER_ADDRESS : &str = "addAllowedStateControllerAddress"; +pub(crate) const FUNC_CLAIM_CHAIN_OWNERSHIP : &str = "claimChainOwnership"; +pub(crate) const FUNC_DELEGATE_CHAIN_OWNERSHIP : &str = "delegateChainOwnership"; +pub(crate) const FUNC_REMOVE_ALLOWED_STATE_CONTROLLER_ADDRESS : &str = "removeAllowedStateControllerAddress"; +pub(crate) const FUNC_ROTATE_STATE_CONTROLLER : &str = "rotateStateController"; +pub(crate) const FUNC_SET_CHAIN_INFO : &str = "setChainInfo"; +pub(crate) const FUNC_SET_CONTRACT_FEE : &str = "setContractFee"; +pub(crate) const FUNC_SET_DEFAULT_FEE : &str = "setDefaultFee"; +pub(crate) const VIEW_GET_ALLOWED_STATE_CONTROLLER_ADDRESSES : &str = "getAllowedStateControllerAddresses"; +pub(crate) const VIEW_GET_CHAIN_INFO : &str = "getChainInfo"; +pub(crate) const VIEW_GET_FEE_INFO : &str = "getFeeInfo"; +pub(crate) const VIEW_GET_MAX_BLOB_SIZE : &str = "getMaxBlobSize"; + +pub(crate) const HFUNC_ADD_ALLOWED_STATE_CONTROLLER_ADDRESS : ScHname = ScHname(0x9469d567); +pub(crate) const HFUNC_CLAIM_CHAIN_OWNERSHIP : ScHname = ScHname(0x03ff0fc0); +pub(crate) const HFUNC_DELEGATE_CHAIN_OWNERSHIP : ScHname = ScHname(0x93ecb6ad); +pub(crate) const HFUNC_REMOVE_ALLOWED_STATE_CONTROLLER_ADDRESS : ScHname = ScHname(0x31f69447); +pub(crate) const HFUNC_ROTATE_STATE_CONTROLLER : ScHname = ScHname(0x244d1038); +pub(crate) const HFUNC_SET_CHAIN_INFO : ScHname = ScHname(0x702f5d2b); +pub(crate) const HFUNC_SET_CONTRACT_FEE : ScHname = ScHname(0x8421a42b); +pub(crate) const HFUNC_SET_DEFAULT_FEE : ScHname = ScHname(0x3310ecd0); +pub(crate) const HVIEW_GET_ALLOWED_STATE_CONTROLLER_ADDRESSES : ScHname = ScHname(0xf3505183); +pub(crate) const HVIEW_GET_CHAIN_INFO : ScHname = ScHname(0x434477e2); +pub(crate) const HVIEW_GET_FEE_INFO : ScHname = ScHname(0x9fe54b48); +pub(crate) const HVIEW_GET_MAX_BLOB_SIZE : ScHname = ScHname(0xe1db3d28); diff --git a/packages/vm/wasmlib/src/coreroot/consts.rs b/packages/vm/wasmlib/src/coreroot/consts.rs index 14f6bc2be2..6644fc38a1 100644 --- a/packages/vm/wasmlib/src/coreroot/consts.rs +++ b/packages/vm/wasmlib/src/coreroot/consts.rs @@ -9,28 +9,28 @@ use crate::*; -pub const SC_NAME: &str = "root"; -pub const SC_DESCRIPTION: &str = "Core root contract"; -pub const HSC_NAME: ScHname = ScHname(0xcebf5908); - -pub(crate) const PARAM_DEPLOYER: &str = "dp"; -pub(crate) const PARAM_DESCRIPTION: &str = "ds"; -pub(crate) const PARAM_HNAME: &str = "hn"; -pub(crate) const PARAM_NAME: &str = "nm"; -pub(crate) const PARAM_PROGRAM_HASH: &str = "ph"; - -pub(crate) const RESULT_CONTRACT_FOUND: &str = "cf"; -pub(crate) const RESULT_CONTRACT_REC_DATA: &str = "dt"; -pub(crate) const RESULT_CONTRACT_REGISTRY: &str = "r"; - -pub(crate) const FUNC_DEPLOY_CONTRACT: &str = "deployContract"; -pub(crate) const FUNC_GRANT_DEPLOY_PERMISSION: &str = "grantDeployPermission"; -pub(crate) const FUNC_REVOKE_DEPLOY_PERMISSION: &str = "revokeDeployPermission"; -pub(crate) const VIEW_FIND_CONTRACT: &str = "findContract"; -pub(crate) const VIEW_GET_CONTRACT_RECORDS: &str = "getContractRecords"; - -pub(crate) const HFUNC_DEPLOY_CONTRACT: ScHname = ScHname(0x28232c27); -pub(crate) const HFUNC_GRANT_DEPLOY_PERMISSION: ScHname = ScHname(0xf440263a); -pub(crate) const HFUNC_REVOKE_DEPLOY_PERMISSION: ScHname = ScHname(0x850744f1); -pub(crate) const HVIEW_FIND_CONTRACT: ScHname = ScHname(0xc145ca00); -pub(crate) const HVIEW_GET_CONTRACT_RECORDS: ScHname = ScHname(0x078b3ef3); +pub const SC_NAME : &str = "root"; +pub const SC_DESCRIPTION : &str = "Core root contract"; +pub const HSC_NAME : ScHname = ScHname(0xcebf5908); + +pub(crate) const PARAM_DEPLOYER : &str = "dp"; +pub(crate) const PARAM_DESCRIPTION : &str = "ds"; +pub(crate) const PARAM_HNAME : &str = "hn"; +pub(crate) const PARAM_NAME : &str = "nm"; +pub(crate) const PARAM_PROGRAM_HASH : &str = "ph"; + +pub(crate) const RESULT_CONTRACT_FOUND : &str = "cf"; +pub(crate) const RESULT_CONTRACT_REC_DATA : &str = "dt"; +pub(crate) const RESULT_CONTRACT_REGISTRY : &str = "r"; + +pub(crate) const FUNC_DEPLOY_CONTRACT : &str = "deployContract"; +pub(crate) const FUNC_GRANT_DEPLOY_PERMISSION : &str = "grantDeployPermission"; +pub(crate) const FUNC_REVOKE_DEPLOY_PERMISSION : &str = "revokeDeployPermission"; +pub(crate) const VIEW_FIND_CONTRACT : &str = "findContract"; +pub(crate) const VIEW_GET_CONTRACT_RECORDS : &str = "getContractRecords"; + +pub(crate) const HFUNC_DEPLOY_CONTRACT : ScHname = ScHname(0x28232c27); +pub(crate) const HFUNC_GRANT_DEPLOY_PERMISSION : ScHname = ScHname(0xf440263a); +pub(crate) const HFUNC_REVOKE_DEPLOY_PERMISSION : ScHname = ScHname(0x850744f1); +pub(crate) const HVIEW_FIND_CONTRACT : ScHname = ScHname(0xc145ca00); +pub(crate) const HVIEW_GET_CONTRACT_RECORDS : ScHname = ScHname(0x078b3ef3); diff --git a/packages/vm/wasmlib/ts/wasmlib/coreaccounts/consts.ts b/packages/vm/wasmlib/ts/wasmlib/coreaccounts/consts.ts index 6b62c38dbd..967aa43c5f 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreaccounts/consts.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreaccounts/consts.ts @@ -11,26 +11,26 @@ export const ScName = "accounts"; export const ScDescription = "Core chain account ledger contract"; export const HScName = new wasmlib.ScHname(0x3c4b5e02); -export const ParamAgentID = "a"; +export const ParamAgentID = "a"; export const ParamWithdrawAmount = "m"; -export const ParamWithdrawColor = "c"; +export const ParamWithdrawColor = "c"; export const ResultAccountNonce = "n"; -export const ResultAgents = "this"; -export const ResultBalances = "this"; +export const ResultAgents = "this"; +export const ResultBalances = "this"; -export const FuncDeposit = "deposit"; -export const FuncHarvest = "harvest"; -export const FuncWithdraw = "withdraw"; -export const ViewAccounts = "accounts"; -export const ViewBalance = "balance"; +export const FuncDeposit = "deposit"; +export const FuncHarvest = "harvest"; +export const FuncWithdraw = "withdraw"; +export const ViewAccounts = "accounts"; +export const ViewBalance = "balance"; export const ViewGetAccountNonce = "getAccountNonce"; -export const ViewTotalAssets = "totalAssets"; +export const ViewTotalAssets = "totalAssets"; -export const HFuncDeposit = new wasmlib.ScHname(0xbdc9102d); -export const HFuncHarvest = new wasmlib.ScHname(0x7b40efbd); -export const HFuncWithdraw = new wasmlib.ScHname(0x9dcc0f41); -export const HViewAccounts = new wasmlib.ScHname(0x3c4b5e02); -export const HViewBalance = new wasmlib.ScHname(0x84168cb4); +export const HFuncDeposit = new wasmlib.ScHname(0xbdc9102d); +export const HFuncHarvest = new wasmlib.ScHname(0x7b40efbd); +export const HFuncWithdraw = new wasmlib.ScHname(0x9dcc0f41); +export const HViewAccounts = new wasmlib.ScHname(0x3c4b5e02); +export const HViewBalance = new wasmlib.ScHname(0x84168cb4); export const HViewGetAccountNonce = new wasmlib.ScHname(0x529d7df9); -export const HViewTotalAssets = new wasmlib.ScHname(0xfab0f8d2); +export const HViewTotalAssets = new wasmlib.ScHname(0xfab0f8d2); diff --git a/packages/vm/wasmlib/ts/wasmlib/coreblob/consts.ts b/packages/vm/wasmlib/ts/wasmlib/coreblob/consts.ts index d9b309478b..9293fa2b4f 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreblob/consts.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreblob/consts.ts @@ -13,18 +13,18 @@ export const HScName = new wasmlib.ScHname(0xfd91bc63); export const ParamBlobs = "this"; export const ParamField = "field"; -export const ParamHash = "hash"; +export const ParamHash = "hash"; export const ResultBlobSizes = "this"; -export const ResultBytes = "bytes"; -export const ResultHash = "hash"; +export const ResultBytes = "bytes"; +export const ResultHash = "hash"; -export const FuncStoreBlob = "storeBlob"; +export const FuncStoreBlob = "storeBlob"; export const ViewGetBlobField = "getBlobField"; -export const ViewGetBlobInfo = "getBlobInfo"; -export const ViewListBlobs = "listBlobs"; +export const ViewGetBlobInfo = "getBlobInfo"; +export const ViewListBlobs = "listBlobs"; -export const HFuncStoreBlob = new wasmlib.ScHname(0xddd4c281); +export const HFuncStoreBlob = new wasmlib.ScHname(0xddd4c281); export const HViewGetBlobField = new wasmlib.ScHname(0x1f448130); -export const HViewGetBlobInfo = new wasmlib.ScHname(0xfde4ab46); -export const HViewListBlobs = new wasmlib.ScHname(0x62ca7990); +export const HViewGetBlobInfo = new wasmlib.ScHname(0xfde4ab46); +export const HViewListBlobs = new wasmlib.ScHname(0x62ca7990); diff --git a/packages/vm/wasmlib/ts/wasmlib/coreblocklog/consts.ts b/packages/vm/wasmlib/ts/wasmlib/coreblocklog/consts.ts index 1b8b4b8884..8525d71f43 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreblocklog/consts.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreblocklog/consts.ts @@ -11,40 +11,40 @@ export const ScName = "blocklog"; export const ScDescription = "Core block log contract"; export const HScName = new wasmlib.ScHname(0xf538ef2b); -export const ParamBlockIndex = "n"; +export const ParamBlockIndex = "n"; export const ParamContractHname = "h"; -export const ParamFromBlock = "f"; -export const ParamRequestID = "u"; -export const ParamToBlock = "t"; +export const ParamFromBlock = "f"; +export const ParamRequestID = "u"; +export const ParamToBlock = "t"; -export const ResultBlockIndex = "n"; -export const ResultBlockInfo = "i"; -export const ResultEvent = "e"; -export const ResultGoverningAddress = "g"; -export const ResultRequestID = "u"; -export const ResultRequestIndex = "r"; -export const ResultRequestProcessed = "p"; -export const ResultRequestRecord = "d"; +export const ResultBlockIndex = "n"; +export const ResultBlockInfo = "i"; +export const ResultEvent = "e"; +export const ResultGoverningAddress = "g"; +export const ResultRequestID = "u"; +export const ResultRequestIndex = "r"; +export const ResultRequestProcessed = "p"; +export const ResultRequestRecord = "d"; export const ResultStateControllerAddress = "s"; -export const ViewControlAddresses = "controlAddresses"; -export const ViewGetBlockInfo = "getBlockInfo"; -export const ViewGetEventsForBlock = "getEventsForBlock"; -export const ViewGetEventsForContract = "getEventsForContract"; -export const ViewGetEventsForRequest = "getEventsForRequest"; -export const ViewGetLatestBlockInfo = "getLatestBlockInfo"; -export const ViewGetRequestIDsForBlock = "getRequestIDsForBlock"; -export const ViewGetRequestReceipt = "getRequestReceipt"; +export const ViewControlAddresses = "controlAddresses"; +export const ViewGetBlockInfo = "getBlockInfo"; +export const ViewGetEventsForBlock = "getEventsForBlock"; +export const ViewGetEventsForContract = "getEventsForContract"; +export const ViewGetEventsForRequest = "getEventsForRequest"; +export const ViewGetLatestBlockInfo = "getLatestBlockInfo"; +export const ViewGetRequestIDsForBlock = "getRequestIDsForBlock"; +export const ViewGetRequestReceipt = "getRequestReceipt"; export const ViewGetRequestReceiptsForBlock = "getRequestReceiptsForBlock"; -export const ViewIsRequestProcessed = "isRequestProcessed"; +export const ViewIsRequestProcessed = "isRequestProcessed"; -export const HViewControlAddresses = new wasmlib.ScHname(0x796bd223); -export const HViewGetBlockInfo = new wasmlib.ScHname(0xbe89f9b3); -export const HViewGetEventsForBlock = new wasmlib.ScHname(0x36232798); -export const HViewGetEventsForContract = new wasmlib.ScHname(0x682a1922); -export const HViewGetEventsForRequest = new wasmlib.ScHname(0x4f8d68e4); -export const HViewGetLatestBlockInfo = new wasmlib.ScHname(0x084a1760); -export const HViewGetRequestIDsForBlock = new wasmlib.ScHname(0x5a20327a); -export const HViewGetRequestReceipt = new wasmlib.ScHname(0xb7f9534f); +export const HViewControlAddresses = new wasmlib.ScHname(0x796bd223); +export const HViewGetBlockInfo = new wasmlib.ScHname(0xbe89f9b3); +export const HViewGetEventsForBlock = new wasmlib.ScHname(0x36232798); +export const HViewGetEventsForContract = new wasmlib.ScHname(0x682a1922); +export const HViewGetEventsForRequest = new wasmlib.ScHname(0x4f8d68e4); +export const HViewGetLatestBlockInfo = new wasmlib.ScHname(0x084a1760); +export const HViewGetRequestIDsForBlock = new wasmlib.ScHname(0x5a20327a); +export const HViewGetRequestReceipt = new wasmlib.ScHname(0xb7f9534f); export const HViewGetRequestReceiptsForBlock = new wasmlib.ScHname(0x77e3beef); -export const HViewIsRequestProcessed = new wasmlib.ScHname(0xd57d50a9); +export const HViewIsRequestProcessed = new wasmlib.ScHname(0xd57d50a9); diff --git a/packages/vm/wasmlib/ts/wasmlib/coregovernance/consts.ts b/packages/vm/wasmlib/ts/wasmlib/coregovernance/consts.ts index 96ebdc9e74..bc538fbb2b 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coregovernance/consts.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coregovernance/consts.ts @@ -11,51 +11,51 @@ export const ScName = "governance"; export const ScDescription = "Core governance contract"; export const HScName = new wasmlib.ScHname(0x17cf909f); -export const ParamChainOwner = "oi"; -export const ParamFeeColor = "fc"; -export const ParamHname = "hn"; -export const ParamMaxBlobSize = "bs"; -export const ParamMaxEventSize = "es"; -export const ParamMaxEventsPerReq = "ne"; -export const ParamOwnerFee = "of"; +export const ParamChainOwner = "oi"; +export const ParamFeeColor = "fc"; +export const ParamHname = "hn"; +export const ParamMaxBlobSize = "bs"; +export const ParamMaxEventSize = "es"; +export const ParamMaxEventsPerReq = "ne"; +export const ParamOwnerFee = "of"; export const ParamStateControllerAddress = "S"; -export const ParamValidatorFee = "vf"; +export const ParamValidatorFee = "vf"; export const ResultAllowedStateControllerAddresses = "a"; -export const ResultChainID = "c"; -export const ResultChainOwnerID = "o"; -export const ResultDefaultOwnerFee = "do"; -export const ResultDefaultValidatorFee = "dv"; -export const ResultDescription = "d"; -export const ResultFeeColor = "f"; -export const ResultMaxBlobSize = "mb"; -export const ResultMaxEventSize = "me"; -export const ResultMaxEventsPerReq = "mr"; -export const ResultOwnerFee = "of"; -export const ResultValidatorFee = "vf"; +export const ResultChainID = "c"; +export const ResultChainOwnerID = "o"; +export const ResultDefaultOwnerFee = "do"; +export const ResultDefaultValidatorFee = "dv"; +export const ResultDescription = "d"; +export const ResultFeeColor = "f"; +export const ResultMaxBlobSize = "mb"; +export const ResultMaxEventSize = "me"; +export const ResultMaxEventsPerReq = "mr"; +export const ResultOwnerFee = "of"; +export const ResultValidatorFee = "vf"; -export const FuncAddAllowedStateControllerAddress = "addAllowedStateControllerAddress"; -export const FuncClaimChainOwnership = "claimChainOwnership"; -export const FuncDelegateChainOwnership = "delegateChainOwnership"; +export const FuncAddAllowedStateControllerAddress = "addAllowedStateControllerAddress"; +export const FuncClaimChainOwnership = "claimChainOwnership"; +export const FuncDelegateChainOwnership = "delegateChainOwnership"; export const FuncRemoveAllowedStateControllerAddress = "removeAllowedStateControllerAddress"; -export const FuncRotateStateController = "rotateStateController"; -export const FuncSetChainInfo = "setChainInfo"; -export const FuncSetContractFee = "setContractFee"; -export const FuncSetDefaultFee = "setDefaultFee"; -export const ViewGetAllowedStateControllerAddresses = "getAllowedStateControllerAddresses"; -export const ViewGetChainInfo = "getChainInfo"; -export const ViewGetFeeInfo = "getFeeInfo"; -export const ViewGetMaxBlobSize = "getMaxBlobSize"; +export const FuncRotateStateController = "rotateStateController"; +export const FuncSetChainInfo = "setChainInfo"; +export const FuncSetContractFee = "setContractFee"; +export const FuncSetDefaultFee = "setDefaultFee"; +export const ViewGetAllowedStateControllerAddresses = "getAllowedStateControllerAddresses"; +export const ViewGetChainInfo = "getChainInfo"; +export const ViewGetFeeInfo = "getFeeInfo"; +export const ViewGetMaxBlobSize = "getMaxBlobSize"; -export const HFuncAddAllowedStateControllerAddress = new wasmlib.ScHname(0x9469d567); -export const HFuncClaimChainOwnership = new wasmlib.ScHname(0x03ff0fc0); -export const HFuncDelegateChainOwnership = new wasmlib.ScHname(0x93ecb6ad); +export const HFuncAddAllowedStateControllerAddress = new wasmlib.ScHname(0x9469d567); +export const HFuncClaimChainOwnership = new wasmlib.ScHname(0x03ff0fc0); +export const HFuncDelegateChainOwnership = new wasmlib.ScHname(0x93ecb6ad); export const HFuncRemoveAllowedStateControllerAddress = new wasmlib.ScHname(0x31f69447); -export const HFuncRotateStateController = new wasmlib.ScHname(0x244d1038); -export const HFuncSetChainInfo = new wasmlib.ScHname(0x702f5d2b); -export const HFuncSetContractFee = new wasmlib.ScHname(0x8421a42b); -export const HFuncSetDefaultFee = new wasmlib.ScHname(0x3310ecd0); -export const HViewGetAllowedStateControllerAddresses = new wasmlib.ScHname(0xf3505183); -export const HViewGetChainInfo = new wasmlib.ScHname(0x434477e2); -export const HViewGetFeeInfo = new wasmlib.ScHname(0x9fe54b48); -export const HViewGetMaxBlobSize = new wasmlib.ScHname(0xe1db3d28); +export const HFuncRotateStateController = new wasmlib.ScHname(0x244d1038); +export const HFuncSetChainInfo = new wasmlib.ScHname(0x702f5d2b); +export const HFuncSetContractFee = new wasmlib.ScHname(0x8421a42b); +export const HFuncSetDefaultFee = new wasmlib.ScHname(0x3310ecd0); +export const HViewGetAllowedStateControllerAddresses = new wasmlib.ScHname(0xf3505183); +export const HViewGetChainInfo = new wasmlib.ScHname(0x434477e2); +export const HViewGetFeeInfo = new wasmlib.ScHname(0x9fe54b48); +export const HViewGetMaxBlobSize = new wasmlib.ScHname(0xe1db3d28); diff --git a/packages/vm/wasmlib/ts/wasmlib/coreroot/consts.ts b/packages/vm/wasmlib/ts/wasmlib/coreroot/consts.ts index 4701098e81..8d5626b329 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreroot/consts.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreroot/consts.ts @@ -11,24 +11,24 @@ export const ScName = "root"; export const ScDescription = "Core root contract"; export const HScName = new wasmlib.ScHname(0xcebf5908); -export const ParamDeployer = "dp"; +export const ParamDeployer = "dp"; export const ParamDescription = "ds"; -export const ParamHname = "hn"; -export const ParamName = "nm"; +export const ParamHname = "hn"; +export const ParamName = "nm"; export const ParamProgramHash = "ph"; -export const ResultContractFound = "cf"; -export const ResultContractRecData = "dt"; +export const ResultContractFound = "cf"; +export const ResultContractRecData = "dt"; export const ResultContractRegistry = "r"; -export const FuncDeployContract = "deployContract"; -export const FuncGrantDeployPermission = "grantDeployPermission"; +export const FuncDeployContract = "deployContract"; +export const FuncGrantDeployPermission = "grantDeployPermission"; export const FuncRevokeDeployPermission = "revokeDeployPermission"; -export const ViewFindContract = "findContract"; -export const ViewGetContractRecords = "getContractRecords"; +export const ViewFindContract = "findContract"; +export const ViewGetContractRecords = "getContractRecords"; -export const HFuncDeployContract = new wasmlib.ScHname(0x28232c27); -export const HFuncGrantDeployPermission = new wasmlib.ScHname(0xf440263a); +export const HFuncDeployContract = new wasmlib.ScHname(0x28232c27); +export const HFuncGrantDeployPermission = new wasmlib.ScHname(0xf440263a); export const HFuncRevokeDeployPermission = new wasmlib.ScHname(0x850744f1); -export const HViewFindContract = new wasmlib.ScHname(0xc145ca00); -export const HViewGetContractRecords = new wasmlib.ScHname(0x078b3ef3); +export const HViewFindContract = new wasmlib.ScHname(0xc145ca00); +export const HViewGetContractRecords = new wasmlib.ScHname(0x078b3ef3); diff --git a/tools/schema/generator/emitter.go b/tools/schema/generator/emitter.go index 504655558a..375c7ec0d1 100644 --- a/tools/schema/generator/emitter.go +++ b/tools/schema/generator/emitter.go @@ -89,45 +89,83 @@ func (g *GenBase) emitEach(key string) { template := parts[2] switch parts[1] { case KeyFunc: - for _, g.currentFunc = range g.s.Funcs { - g.gen.setFuncKeys() - g.emit(template) - } + g.emitEachFunc(g.s.Funcs, template) case KeyMandatory: - mandatory := make([]*Field, 0) - for _, g.currentField = range g.currentFunc.Params { - if !g.currentField.Optional { - mandatory = append(mandatory, g.currentField) - } - } - g.emitFields(mandatory, template) + g.emitEachMandatoryField(template) case KeyParam: - g.emitFields(g.currentFunc.Params, template) + g.emitEachField(g.currentFunc.Params, template) case KeyParams: - g.emitFields(g.s.Params, template) + g.emitEachField(g.s.Params, template) case KeyResult: - g.emitFields(g.currentFunc.Results, template) + g.emitEachField(g.currentFunc.Results, template) case KeyResults: - g.emitFields(g.s.Results, template) + g.emitEachField(g.s.Results, template) case KeyState: - g.emitFields(g.s.StateVars, template) + g.emitEachField(g.s.StateVars, template) case KeyStruct: - g.emitFields(g.currentStruct.Fields, template) + g.emitEachField(g.currentStruct.Fields, template) case KeyStructs: - for _, g.currentStruct = range g.s.Structs { - g.setMultiKeyValues("strName", g.currentStruct.Name) - g.emit(template) - } + g.emitEachStruct(g.s.Structs, template) case KeyTypeDef: - g.emitFields(g.s.Typedefs, template) + g.emitEachField(g.s.Typedefs, template) default: g.println("???:" + key) } } -func (g *GenBase) emitFields(fields []*Field, template string) { +func (g *GenBase) emitEachField(fields []*Field, template string) { + g.maxCamelFldLen = 0 + g.maxSnakeFldLen = 0 for _, g.currentField = range fields { - g.gen.setFieldKeys() + camelLen := len(g.currentField.Name) + if g.maxCamelFldLen < camelLen { + g.maxCamelFldLen = camelLen + } + snakeLen := len(snake(g.currentField.Name)) + if g.maxSnakeFldLen < snakeLen { + g.maxSnakeFldLen = snakeLen + } + } + + for _, g.currentField = range fields { + g.gen.setFieldKeys(true) + g.emit(template) + } +} + +func (g *GenBase) emitEachFunc(funcs []*Func, template string) { + g.maxCamelFuncLen = 0 + g.maxSnakeFuncLen = 0 + for _, g.currentFunc = range funcs { + camelLen := len(g.currentFunc.Name) + if g.maxCamelFuncLen < camelLen { + g.maxCamelFuncLen = camelLen + } + snakeLen := len(snake(g.currentFunc.Name)) + if g.maxSnakeFuncLen < snakeLen { + g.maxSnakeFuncLen = snakeLen + } + } + + for _, g.currentFunc = range funcs { + g.gen.setFuncKeys() + g.emit(template) + } +} + +func (g *GenBase) emitEachMandatoryField(template string) { + mandatoryFields := make([]*Field, 0) + for _, g.currentField = range g.currentFunc.Params { + if !g.currentField.Optional { + mandatoryFields = append(mandatoryFields, g.currentField) + } + } + g.emitEachField(mandatoryFields, template) +} + +func (g *GenBase) emitEachStruct(structs []*Struct, template string) { + for _, g.currentStruct = range structs { + g.setMultiKeyValues("strName", g.currentStruct.Name) g.emit(template) } } @@ -234,7 +272,7 @@ func (g *GenBase) fieldIsTypeDef() bool { for _, typeDef := range g.s.Typedefs { if typeDef.Name == g.currentField.Type { g.currentField = typeDef - g.gen.setFieldKeys() + g.gen.setFieldKeys(false) return true } } diff --git a/tools/schema/generator/generator.go b/tools/schema/generator/generator.go index f58f09a7a3..68a634ad5a 100644 --- a/tools/schema/generator/generator.go +++ b/tools/schema/generator/generator.go @@ -21,29 +21,35 @@ type Generator interface { init(s *Schema) funcName(f *Func) string generateLanguageSpecificFiles() error - setFieldKeys() + setFieldKeys(pad bool) setFuncKeys() } type GenBase struct { - currentField *Field - currentFunc *Func - currentStruct *Struct - emitters map[string]func(g *GenBase) - extension string - file *os.File - folder string - funcRegexp *regexp.Regexp - gen Generator - keys map[string]string - language string - newTypes map[string]bool - rootFolder string - s *Schema - skipWarning bool - templates map[string]string + currentField *Field + currentFunc *Func + currentStruct *Struct + emitters map[string]func(g *GenBase) + extension string + file *os.File + folder string + funcRegexp *regexp.Regexp + gen Generator + keys map[string]string + language string + maxCamelFuncLen int + maxSnakeFuncLen int + maxCamelFldLen int + maxSnakeFldLen int + newTypes map[string]bool + rootFolder string + s *Schema + skipWarning bool + templates map[string]string } +const spaces = " " + func (g *GenBase) init(s *Schema, templates []map[string]string) { g.s = s g.emitters = map[string]func(g *GenBase){} @@ -313,7 +319,7 @@ func (g *GenBase) setCommonKeys() { g.keys["maxIndex"] = strconv.Itoa(g.s.KeyID) } -func (g *GenBase) setFieldKeys() { +func (g *GenBase) setFieldKeys(pad bool) { g.setMultiKeyValues("fldName", g.currentField.Name) g.setMultiKeyValues("fldType", g.currentField.Type) @@ -321,6 +327,11 @@ func (g *GenBase) setFieldKeys() { g.keys["fldComment"] = g.currentField.Comment g.keys["fldMapKey"] = g.currentField.MapKey g.keys["fldIndex"] = strconv.Itoa(g.currentField.KeyID) + + if pad { + g.keys["fldPad"] = spaces[:g.maxCamelFldLen-len(g.keys["fldName"])] + g.keys["fld_pad"] = spaces[:g.maxSnakeFldLen-len(g.keys["fld_name"])] + } } func (g *GenBase) setFuncKeys() { @@ -336,6 +347,9 @@ func (g *GenBase) setFuncKeys() { } g.keys["funcAccess"] = grant g.keys["funcAccessComment"] = comment + + g.keys["funcPad"] = spaces[:g.maxCamelFuncLen-len(g.keys["funcName"])] + g.keys["func_pad"] = spaces[:g.maxSnakeFuncLen-len(g.keys["func_name"])] } func (g *GenBase) setMultiKeyValues(key, value string) { diff --git a/tools/schema/generator/generator_go.go b/tools/schema/generator/generator_go.go index 40c398b25d..10d83c29fa 100644 --- a/tools/schema/generator/generator_go.go +++ b/tools/schema/generator/generator_go.go @@ -76,8 +76,8 @@ func (g *GoGenerator) generateLanguageSpecificFiles() error { return g.createSourceFile("../main") } -func (g *GoGenerator) setFieldKeys() { - g.GenBase.setFieldKeys() +func (g *GoGenerator) setFieldKeys(pad bool) { + g.GenBase.setFieldKeys(pad) fldTypeID := goTypeIds[g.currentField.Type] if fldTypeID == "" { diff --git a/tools/schema/generator/generator_rust.go b/tools/schema/generator/generator_rust.go index 49a4beb72a..e38cd1457b 100644 --- a/tools/schema/generator/generator_rust.go +++ b/tools/schema/generator/generator_rust.go @@ -109,8 +109,8 @@ func (g *RustGenerator) generateLanguageSpecificFiles() error { return nil } -func (g *RustGenerator) setFieldKeys() { - g.GenBase.setFieldKeys() +func (g *RustGenerator) setFieldKeys(pad bool) { + g.GenBase.setFieldKeys(pad) field := g.currentField fldRef := "&" diff --git a/tools/schema/generator/generator_ts.go b/tools/schema/generator/generator_ts.go index 5eb83272ce..512d98c61c 100644 --- a/tools/schema/generator/generator_ts.go +++ b/tools/schema/generator/generator_ts.go @@ -106,8 +106,8 @@ func (g *TypeScriptGenerator) generateLanguageSpecificFiles() error { return nil } -func (g *TypeScriptGenerator) setFieldKeys() { - g.GenBase.setFieldKeys() +func (g *TypeScriptGenerator) setFieldKeys(pad bool) { + g.GenBase.setFieldKeys(pad) fldTypeID := tsTypeIds[g.currentField.Type] if fldTypeID == "" { diff --git a/tools/schema/generator/gotemplates/consts.go b/tools/schema/generator/gotemplates/consts.go index 957d537fbb..3ba03bca64 100644 --- a/tools/schema/generator/gotemplates/consts.go +++ b/tools/schema/generator/gotemplates/consts.go @@ -48,14 +48,14 @@ $#each state constField `, // ******************************* "constField": ` - $constPrefix$FldName = wasmlib.Key("$fldAlias") + $constPrefix$FldName$fldPad = "$fldAlias" `, // ******************************* "constFunc": ` - $Kind$FuncName = "$funcName" + $Kind$FuncName$funcPad = "$funcName" `, // ******************************* "constHFunc": ` - H$Kind$FuncName = wasmlib.ScHname(0x$funcHName) + H$Kind$FuncName$funcPad = wasmlib.ScHname(0x$funcHName) `, } diff --git a/tools/schema/generator/gotemplates/keys.go b/tools/schema/generator/gotemplates/keys.go index f448894864..e8528d83bc 100644 --- a/tools/schema/generator/gotemplates/keys.go +++ b/tools/schema/generator/gotemplates/keys.go @@ -8,8 +8,10 @@ $#emit goHeader const ( $#set constPrefix Param $#each params constFieldIdx + $#set constPrefix Result $#each results constFieldIdx + $#set constPrefix State $#each state constFieldIdx ) @@ -29,7 +31,7 @@ var idxMap [keyMapLen]wasmlib.Key32 `, // ******************************* "constFieldIdx": ` - Idx$constPrefix$FldName = $fldIndex + Idx$constPrefix$FldName$fldPad = $fldIndex `, // ******************************* "constFieldKey": ` diff --git a/tools/schema/generator/gotemplates/lib.go b/tools/schema/generator/gotemplates/lib.go index dc81f324f9..e76e06263b 100644 --- a/tools/schema/generator/gotemplates/lib.go +++ b/tools/schema/generator/gotemplates/lib.go @@ -18,7 +18,7 @@ $#each func libThunk `, // ******************************* "libExportFunc": ` - exports.Add$Kind($Kind$FuncName, $kind$FuncName$+Thunk) + exports.Add$Kind($Kind$FuncName,$funcPad $kind$FuncName$+Thunk) `, // ******************************* "libThunk": ` diff --git a/tools/schema/generator/gotemplates/proxy.go b/tools/schema/generator/gotemplates/proxy.go index 41a4461eb3..814a8abdf9 100644 --- a/tools/schema/generator/gotemplates/proxy.go +++ b/tools/schema/generator/gotemplates/proxy.go @@ -22,7 +22,7 @@ $#if basetype proxyBaseType proxyNewType `, // ******************************* "setCoreVarID": ` -$#set varID $Kind$FldName.KeyID() +$#set varID wasmlib.KeyID($Kind$FldName) `, // ******************************* "proxyArray": ` diff --git a/tools/schema/generator/gotemplates/structs.go b/tools/schema/generator/gotemplates/structs.go index 1d77a9f965..ab36a555bd 100644 --- a/tools/schema/generator/gotemplates/structs.go +++ b/tools/schema/generator/gotemplates/structs.go @@ -33,11 +33,11 @@ $#emit structMethods `, // ******************************* "structField": ` - $FldName $fldLangType $fldComment + $FldName$fldPad $fldLangType $fldComment `, // ******************************* "structDecode": ` - data.$FldName = decode.$FldType() + data.$FldName$fldPad = decode.$FldType() `, // ******************************* "structEncode": ` diff --git a/tools/schema/generator/rstemplates/consts.go b/tools/schema/generator/rstemplates/consts.go index fa605534aa..cc8dca8759 100644 --- a/tools/schema/generator/rstemplates/consts.go +++ b/tools/schema/generator/rstemplates/consts.go @@ -7,9 +7,9 @@ var constsRs = map[string]string{ $#if core useCrate useWasmLib -pub const SC_NAME: &str = "$scName"; -pub const SC_DESCRIPTION: &str = "$scDesc"; -pub const HSC_NAME: ScHname = ScHname(0x$hscName); +pub const SC_NAME : &str = "$scName"; +pub const SC_DESCRIPTION : &str = "$scDesc"; +pub const HSC_NAME : ScHname = ScHname(0x$hscName); $#if params constParams $#if results constResults $#if state constState @@ -38,14 +38,14 @@ $#each state constField `, // ******************************* "constField": ` -pub$crate const $constPrefix$FLD_NAME: &str = "$fldAlias"; +pub$crate const $constPrefix$FLD_NAME$fld_pad : &str = "$fldAlias"; `, // ******************************* "constFunc": ` -pub$crate const $KIND$+_$FUNC_NAME: &str = "$funcName"; +pub$crate const $KIND$+_$FUNC_NAME$func_pad : &str = "$funcName"; `, // ******************************* "constHFunc": ` -pub$crate const H$KIND$+_$FUNC_NAME: ScHname = ScHname(0x$funcHName); +pub$crate const H$KIND$+_$FUNC_NAME$func_pad : ScHname = ScHname(0x$funcHName); `, } diff --git a/tools/schema/generator/rstemplates/keys.go b/tools/schema/generator/rstemplates/keys.go index 581be4ff9f..6099c04e59 100644 --- a/tools/schema/generator/rstemplates/keys.go +++ b/tools/schema/generator/rstemplates/keys.go @@ -11,8 +11,10 @@ use crate::*; $#set constPrefix PARAM_ $#each params constFieldIdx + $#set constPrefix RESULT_ $#each results constFieldIdx + $#set constPrefix STATE_ $#each state constFieldIdx @@ -37,7 +39,7 @@ pub fn idx_map(idx: usize) -> Key32 { `, // ******************************* "constFieldIdx": ` -pub(crate) const IDX_$constPrefix$FLD_NAME: usize = $fldIndex; +pub(crate) const IDX_$constPrefix$FLD_NAME$fld_pad : usize = $fldIndex; `, // ******************************* "constFieldKey": ` diff --git a/tools/schema/generator/rstemplates/lib.go b/tools/schema/generator/rstemplates/lib.go index e3dcc72d03..f1257d73d0 100644 --- a/tools/schema/generator/rstemplates/lib.go +++ b/tools/schema/generator/rstemplates/lib.go @@ -41,7 +41,7 @@ $#each func libThunk `, // ******************************* "libExportFunc": ` - exports.add_$kind($KIND$+_$FUNC_NAME, $kind$+_$func_name$+_thunk); + exports.add_$kind($KIND$+_$FUNC_NAME,$func_pad $kind$+_$func_name$+_thunk); `, // ******************************* "libThunk": ` diff --git a/tools/schema/generator/rstemplates/structs.go b/tools/schema/generator/rstemplates/structs.go index 4481988513..99bae78f23 100644 --- a/tools/schema/generator/rstemplates/structs.go +++ b/tools/schema/generator/rstemplates/structs.go @@ -37,11 +37,11 @@ $#emit structMethods `, // ******************************* "structField": ` - pub $fld_name: $fldLangType, $fldComment + pub $fld_name$fld_pad : $fldLangType, $fldComment `, // ******************************* "structDecode": ` - $fld_name: decode.$fld_type(), + $fld_name$fld_pad : decode.$fld_type(), `, // ******************************* "structEncode": ` diff --git a/tools/schema/generator/tstemplates/consts.go b/tools/schema/generator/tstemplates/consts.go index 0094577b15..b50939ef77 100644 --- a/tools/schema/generator/tstemplates/consts.go +++ b/tools/schema/generator/tstemplates/consts.go @@ -36,14 +36,14 @@ $#each state constField `, // ******************************* "constField": ` -export const $constPrefix$FldName = "$fldAlias"; +export const $constPrefix$FldName$fldPad = "$fldAlias"; `, // ******************************* "constFunc": ` -export const $Kind$FuncName = "$funcName"; +export const $Kind$FuncName$funcPad = "$funcName"; `, // ******************************* "constHFunc": ` -export const H$Kind$FuncName = new wasmlib.ScHname(0x$funcHName); +export const H$Kind$FuncName$funcPad = new wasmlib.ScHname(0x$funcHName); `, } diff --git a/tools/schema/generator/tstemplates/keys.go b/tools/schema/generator/tstemplates/keys.go index 6111ffccb7..6aaa919ad5 100644 --- a/tools/schema/generator/tstemplates/keys.go +++ b/tools/schema/generator/tstemplates/keys.go @@ -7,8 +7,10 @@ $#emit tsImports $#set constPrefix Param $#each params constFieldIdx + $#set constPrefix Result $#each results constFieldIdx + $#set constPrefix State $#each state constFieldIdx @@ -25,7 +27,7 @@ export let idxMap: wasmlib.Key32[] = new Array(keyMap.length); `, // ******************************* "constFieldIdx": ` -export const Idx$constPrefix$FldName = $fldIndex; +export const Idx$constPrefix$FldName$fldPad = $fldIndex; `, // ******************************* "constFieldKey": ` diff --git a/tools/schema/generator/tstemplates/lib.go b/tools/schema/generator/tstemplates/lib.go index a4fe5d3e97..d0b3f5d1ae 100644 --- a/tools/schema/generator/tstemplates/lib.go +++ b/tools/schema/generator/tstemplates/lib.go @@ -21,7 +21,7 @@ $#each func libThunk `, // ******************************* "libExportFunc": ` - exports.add$Kind(sc.$Kind$FuncName, $kind$FuncName$+Thunk); + exports.add$Kind(sc.$Kind$FuncName,$funcPad $kind$FuncName$+Thunk); `, // ******************************* "libThunk": ` diff --git a/tools/schema/generator/tstemplates/structs.go b/tools/schema/generator/tstemplates/structs.go index 1a78ed8a6f..9cf18b8756 100644 --- a/tools/schema/generator/tstemplates/structs.go +++ b/tools/schema/generator/tstemplates/structs.go @@ -33,11 +33,11 @@ $#emit structMethods `, // ******************************* "structField": ` - $fldName: $fldLangType = $fldTypeInit; $fldComment + $fldName$fldPad : $fldLangType = $fldTypeInit; $fldComment `, // ******************************* "structDecode": ` - data.$fldName = decode.$fldType(); + data.$fldName$fldPad = decode.$fldType(); `, // ******************************* "structEncode": ` diff --git a/tools/schema/generator/utils.go b/tools/schema/generator/utils.go index 479d2e26b3..fea7e4b59b 100644 --- a/tools/schema/generator/utils.go +++ b/tools/schema/generator/utils.go @@ -74,14 +74,6 @@ func lower(name string) string { return strings.ToLower(name) } -// pad to specified size with spaces -func pad(name string, size int) string { - for i := len(name); i < size; i++ { - name += " " - } - return name -} - // convert camel case to lower case snake case func snake(name string) string { // insert underscores between [a-z0-9] followed by [A-Z] From 8232351f47bdc53a7ad9297b61d723d7a6e98fb1 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Sun, 7 Nov 2021 17:44:07 -0800 Subject: [PATCH 040/198] Simplified file processing --- tools/schema/generator/generator.go | 126 ++++++++++------------- tools/schema/generator/generator_rust.go | 17 +-- tools/schema/generator/generator_ts.go | 17 +-- 3 files changed, 60 insertions(+), 100 deletions(-) diff --git a/tools/schema/generator/generator.go b/tools/schema/generator/generator.go index 68a634ad5a..32d0f03245 100644 --- a/tools/schema/generator/generator.go +++ b/tools/schema/generator/generator.go @@ -44,7 +44,6 @@ type GenBase struct { newTypes map[string]bool rootFolder string s *Schema - skipWarning bool templates map[string]string } @@ -73,32 +72,26 @@ func (g *GenBase) close() { _ = g.file.Close() } -func (g *GenBase) create(path string) (err error) { +func (g *GenBase) createFile(path string, overwrite bool, generator func()) (err error) { + if !overwrite && g.exists(path) == nil { + return nil + } g.file, err = os.Create(path) - return err -} - -func (g *GenBase) createSourceFile(name string, generator ...func()) error { - err := g.create(g.folder + name + g.extension) if err != nil { return err } defer g.close() + generator() + return nil +} - // TODO take copyright from schema? - - // always add copyright to source file - g.emit("copyright") - if !g.skipWarning { +// TODO take copyright from schema? +func (g *GenBase) createSourceFile(name string) error { + return g.createFile(g.folder+name+g.extension, true, func() { + g.emit("copyright") g.emit("warning") - } - g.skipWarning = false - if len(generator) != 0 { - generator[0]() - return nil - } - g.emit(name + g.extension) - return nil + g.emit(name + g.extension) + }) } func (g *GenBase) exists(path string) (err error) { @@ -205,19 +198,20 @@ func (g *GenBase) generateCode() error { func (g *GenBase) generateFuncs() error { scFileName := g.folder + g.s.Name + g.extension - err := g.open(g.folder + g.s.Name + g.extension) - if err != nil { + if g.exists(scFileName) != nil { // generate initial SC function file - g.skipWarning = true - return g.createSourceFile(g.s.Name, func() { + return g.createFile(scFileName, false, func() { + g.emit("copyright") g.emit("funcs" + g.extension) }) } - // append missing function signatures to existing code file + // append missing SC functions to existing code file - // scan existing file for signatures - lines, existing, err := g.scanExistingCode() + // scan existing file for function names + existing := make(StringMap) + lines := make([]string, 0) + err := g.scanExistingCode(scFileName, &existing, &lines) if err != nil { return err } @@ -228,25 +222,24 @@ func (g *GenBase) generateFuncs() error { if err != nil { return err } - err = g.create(scFileName) - if err != nil { - return err - } - defer g.close() - // make copy of file - for _, line := range lines { - g.println(line) - } + err = g.createFile(scFileName, false, func() { + // make copy of original file + for _, line := range lines { + g.println(line) + } - // append any new funcs - for _, g.currentFunc = range g.s.Funcs { - if existing[g.gen.funcName(g.currentFunc)] == "" { - g.setFuncKeys() - g.emit("funcSignature") + // append any new funcs + for _, g.currentFunc = range g.s.Funcs { + if existing[g.gen.funcName(g.currentFunc)] == "" { + g.setFuncKeys() + g.emit("funcSignature") + } } + }) + if err != nil { + return err } - return os.Remove(scOriginal) } @@ -259,48 +252,37 @@ func (g *GenBase) generateTests() error { // do not overwrite existing file name := strings.ToLower(g.s.Name) filename := "test/" + name + "_test.go" - err = g.exists(filename) - if err == nil { - return nil - } + return g.createFile(filename, false, func() { + g.emit("test.go") + }) +} - err = g.create(filename) +func (g *GenBase) openFile(path string, processor func() error) (err error) { + g.file, err = os.Open(path) if err != nil { return err } defer g.close() - - g.emit("test.go") - return nil -} - -func (g *GenBase) open(path string) (err error) { - g.file, err = os.Open(path) - return err + return processor() } func (g *GenBase) println(a ...interface{}) { _, _ = fmt.Fprintln(g.file, a...) } -func (g *GenBase) scanExistingCode() ([]string, StringMap, error) { - defer g.close() - existing := make(StringMap) - lines := make([]string, 0) - scanner := bufio.NewScanner(g.file) - for scanner.Scan() { - line := scanner.Text() - matches := g.funcRegexp.FindStringSubmatch(line) - if matches != nil { - existing[matches[1]] = line +func (g *GenBase) scanExistingCode(path string, existing *StringMap, lines *[]string) error { + return g.openFile(path, func() error { + scanner := bufio.NewScanner(g.file) + for scanner.Scan() { + line := scanner.Text() + matches := g.funcRegexp.FindStringSubmatch(line) + if matches != nil { + (*existing)[matches[1]] = line + } + *lines = append(*lines, line) } - lines = append(lines, line) - } - err := scanner.Err() - if err != nil { - return nil, nil, err - } - return lines, existing, nil + return scanner.Err() + }) } func (g *GenBase) setCommonKeys() { diff --git a/tools/schema/generator/generator_rust.go b/tools/schema/generator/generator_rust.go index e38cd1457b..8452c488ce 100644 --- a/tools/schema/generator/generator_rust.go +++ b/tools/schema/generator/generator_rust.go @@ -93,20 +93,9 @@ func (g *RustGenerator) generateLanguageSpecificFiles() error { } cargoToml := "Cargo.toml" - err := g.exists(cargoToml) - if err == nil { - // already exists - return nil - } - - err = g.create(cargoToml) - if err != nil { - return err - } - defer g.close() - - g.emit(cargoToml) - return nil + return g.createFile(cargoToml, false, func() { + g.emit(cargoToml) + }) } func (g *RustGenerator) setFieldKeys(pad bool) { diff --git a/tools/schema/generator/generator_ts.go b/tools/schema/generator/generator_ts.go index 512d98c61c..c5e841ca42 100644 --- a/tools/schema/generator/generator_ts.go +++ b/tools/schema/generator/generator_ts.go @@ -90,20 +90,9 @@ func (g *TypeScriptGenerator) generateLanguageSpecificFiles() error { } tsconfig := "tsconfig.json" - err = g.exists(g.folder + tsconfig) - if err == nil { - // already exists - return nil - } - - err = g.create(g.folder + tsconfig) - if err != nil { - return err - } - defer g.close() - - g.emit(tsconfig) - return nil + return g.createFile(g.folder+tsconfig, false, func() { + g.emit(tsconfig) + }) } func (g *TypeScriptGenerator) setFieldKeys(pad bool) { From 22b0f5ae450fac1b965cbdec69f6727c71bc5616 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Sun, 7 Nov 2021 21:25:20 -0800 Subject: [PATCH 041/198] More cleanup and even some docs --- tools/schema/generator/emitter.go | 121 ++++++++++++----------- tools/schema/generator/generator.go | 70 +++++++------ tools/schema/generator/generator_go.go | 5 +- tools/schema/generator/generator_rust.go | 2 +- tools/schema/generator/generator_ts.go | 2 +- 5 files changed, 103 insertions(+), 97 deletions(-) diff --git a/tools/schema/generator/emitter.go b/tools/schema/generator/emitter.go index 375c7ec0d1..f4041c3d32 100644 --- a/tools/schema/generator/emitter.go +++ b/tools/schema/generator/emitter.go @@ -32,13 +32,16 @@ const ( var emitKeyRegExp = regexp.MustCompile(`\$[a-zA-Z_]+`) +// emit processes "$#emit template" +// It processes all lines in the named template +// If the template is non-existent nothing will happen +// Any line starting with a special "$#" directive will recursively be processed +// An unknown directive will result in an error func (g *GenBase) emit(template string) { lines := strings.Split(g.templates[template], "\n") for i := 1; i < len(lines)-1; i++ { - line := lines[i] - // replace any placeholder keys - line = emitKeyRegExp.ReplaceAllStringFunc(line, func(key string) string { + line := emitKeyRegExp.ReplaceAllStringFunc(lines[i], func(key string) string { text, ok := g.keys[key[1:]] if ok { return text @@ -49,40 +52,39 @@ func (g *GenBase) emit(template string) { // remove concatenation markers line = strings.ReplaceAll(line, "$+", "") - // now process special commands - if strings.HasPrefix(line, "$#") { - if strings.HasPrefix(line, "$#emit ") { - g.emit(strings.TrimSpace(line[7:])) - continue - } - if strings.HasPrefix(line, "$#each ") { - g.emitEach(line) - continue - } - if strings.HasPrefix(line, "$#func ") { - g.emitFunc(line) - continue - } - if strings.HasPrefix(line, "$#if ") { - g.emitIf(line) - continue - } - if strings.HasPrefix(line, "$#set ") { - g.emitSet(line) - continue - } - g.println("???:" + line) + // line contains special directive? + space := strings.Index(line, " ") + if space <= 2 || line[:2] != "$#" { + // no special directive, just emit line + g.println(line) continue } - g.println(line) + // now process special directive + switch line[2:space] { + case "emit": + g.emit(strings.TrimSpace(line[7:])) + case "each": + g.emitEach(line) + case "func": + g.emitFunc(line) + case "if": + g.emitIf(line) + case "set": + g.emitSet(line) + default: + g.error(line) + } } } -func (g *GenBase) emitEach(key string) { - parts := strings.Split(key, " ") +// emitEach processes "$#each array template" +// It processes the template for each item in the array +// Produces an error if the array key is unknown +func (g *GenBase) emitEach(line string) { + parts := strings.Split(line, " ") if len(parts) != 3 { - g.println("???:" + key) + g.error(line) return } @@ -109,7 +111,7 @@ func (g *GenBase) emitEach(key string) { case KeyTypeDef: g.emitEachField(g.s.Typedefs, template) default: - g.println("???:" + key) + g.error(line) } } @@ -170,10 +172,13 @@ func (g *GenBase) emitEachStruct(structs []*Struct, template string) { } } -func (g *GenBase) emitFunc(key string) { - parts := strings.Split(key, " ") +// emitFunc processes "$#func emitter" +// It can call back into go code to emit more complex stuff +// Produces an error if emitter is unknown +func (g *GenBase) emitFunc(line string) { + parts := strings.Split(line, " ") if len(parts) != 2 { - g.println("???:" + key) + g.error(line) return } @@ -182,43 +187,45 @@ func (g *GenBase) emitFunc(key string) { emitter(g) return } - g.println("???:" + key) + g.error(line) } +// emitIf processes "$#if condition template [elseTemplate]" +// It processes template when the named condition is true +// It processes the optional elseTemplate when the named condition is false +// Produces an error if named condition is unknown //nolint:funlen -func (g *GenBase) emitIf(key string) { - parts := strings.Split(key, " ") +func (g *GenBase) emitIf(line string) { + parts := strings.Split(line, " ") if len(parts) < 3 || len(parts) > 4 { - g.println("???:" + key) + g.error(line) return } - conditionKey := parts[1] - template := parts[2] - condition := false - switch conditionKey { + switch parts[1] { case KeyArray: condition = g.currentField.Array case KeyBaseType: condition = g.currentField.TypeID != 0 + case KeyCore: + condition = g.s.CoreContracts case KeyExist: - proxy := g.keys[KeyProxy] - condition = g.newTypes[proxy] + condition = g.newTypes[g.keys[KeyProxy]] + case KeyFunc: + condition = g.keys["kind"] == KeyFunc case KeyInit: condition = g.currentFunc.Name == KeyInit case KeyMap: condition = g.currentField.MapKey != "" case KeyMut: condition = g.keys[KeyMut] == "Mutable" - case KeyCore: - condition = g.s.CoreContracts - case KeyFunc, KeyView: - condition = g.keys["kind"] == conditionKey case KeyParam: condition = len(g.currentFunc.Params) != 0 case KeyParams: condition = len(g.s.Params) != 0 + case KeyPtrs: + condition = len(g.currentFunc.Params) != 0 || len(g.currentFunc.Results) != 0 case KeyResult: condition = len(g.currentFunc.Results) != 0 case KeyResults: @@ -233,29 +240,33 @@ func (g *GenBase) emitIf(key string) { condition = g.fieldIsTypeDef() case KeyTypeDefs: condition = len(g.s.Typedefs) != 0 - case KeyPtrs: - condition = len(g.currentFunc.Params) != 0 || len(g.currentFunc.Results) != 0 + case KeyView: + condition = g.keys["kind"] == KeyView default: - g.println("???:" + key) + g.error(line) return } if condition { - g.emit(template) + g.emit(parts[2]) return } // else branch? if len(parts) == 4 { - template = parts[3] - g.emit(template) + g.emit(parts[3]) } } +// emitSet processes "$#set key value" +// It sets the specified key to value, which can be anything +// Just make sure there is a space after the key name +// The special key "exist" is used to add a newly generated type +// It can be used to prevent duplicate types from being generated func (g *GenBase) emitSet(line string) { parts := strings.Split(line, " ") if len(parts) < 3 { - g.println("???:" + line) + g.error(line) return } diff --git a/tools/schema/generator/generator.go b/tools/schema/generator/generator.go index 32d0f03245..ae5803d8db 100644 --- a/tools/schema/generator/generator.go +++ b/tools/schema/generator/generator.go @@ -86,7 +86,10 @@ func (g *GenBase) createFile(path string, overwrite bool, generator func()) (err } // TODO take copyright from schema? -func (g *GenBase) createSourceFile(name string) error { +func (g *GenBase) createSourceFile(name string, condition bool) error { + if !condition { + return nil + } return g.createFile(g.folder+name+g.extension, true, func() { g.emit("copyright") g.emit("warning") @@ -94,6 +97,10 @@ func (g *GenBase) createSourceFile(name string) error { }) } +func (g *GenBase) error(what string) { + g.println("???:" + what) +} + func (g *GenBase) exists(path string) (err error) { _, err = os.Stat(path) return err @@ -141,52 +148,43 @@ func (g *GenBase) Generate(s *Schema) error { } func (g *GenBase) generateCode() error { - err := g.createSourceFile("consts") + err := g.createSourceFile("consts", true) if err != nil { return err } - if len(g.s.Structs) != 0 { - err = g.createSourceFile("structs") - if err != nil { - return err - } + err = g.createSourceFile("contract", true) + if err != nil { + return err } - if len(g.s.Typedefs) != 0 { - err = g.createSourceFile("typedefs") - if err != nil { - return err - } + err = g.createSourceFile("keys", !g.s.CoreContracts) + if err != nil { + return err } - if len(g.s.Params) != 0 { - err = g.createSourceFile("params") - if err != nil { - return err - } + err = g.createSourceFile("lib", !g.s.CoreContracts) + if err != nil { + return err } - if len(g.s.Results) != 0 { - err = g.createSourceFile("results") - if err != nil { - return err - } + err = g.createSourceFile("params", len(g.s.Params) != 0) + if err != nil { + return err } - err = g.createSourceFile("contract") + err = g.createSourceFile("results", len(g.s.Results) != 0) + if err != nil { + return err + } + err = g.createSourceFile("state", !g.s.CoreContracts) + if err != nil { + return err + } + err = g.createSourceFile("structs", len(g.s.Structs) != 0) + if err != nil { + return err + } + err = g.createSourceFile("typedefs", len(g.s.Typedefs) != 0) if err != nil { return err } - if !g.s.CoreContracts { - err = g.createSourceFile("keys") - if err != nil { - return err - } - err = g.createSourceFile("state") - if err != nil { - return err - } - err = g.createSourceFile("lib") - if err != nil { - return err - } err = g.generateFuncs() if err != nil { return err diff --git a/tools/schema/generator/generator_go.go b/tools/schema/generator/generator_go.go index 10d83c29fa..0822ed05c2 100644 --- a/tools/schema/generator/generator_go.go +++ b/tools/schema/generator/generator_go.go @@ -70,10 +70,7 @@ func (g *GoGenerator) init(s *Schema) { } func (g *GoGenerator) generateLanguageSpecificFiles() error { - if g.s.CoreContracts { - return nil - } - return g.createSourceFile("../main") + return g.createSourceFile("../main", !g.s.CoreContracts) } func (g *GoGenerator) setFieldKeys(pad bool) { diff --git a/tools/schema/generator/generator_rust.go b/tools/schema/generator/generator_rust.go index 8452c488ce..3db51f13c8 100644 --- a/tools/schema/generator/generator_rust.go +++ b/tools/schema/generator/generator_rust.go @@ -89,7 +89,7 @@ func (g *RustGenerator) funcName(f *Func) string { func (g *RustGenerator) generateLanguageSpecificFiles() error { if g.s.CoreContracts { - return g.createSourceFile("mod") + return g.createSourceFile("mod", true) } cargoToml := "Cargo.toml" diff --git a/tools/schema/generator/generator_ts.go b/tools/schema/generator/generator_ts.go index c5e841ca42..192f3ce4c1 100644 --- a/tools/schema/generator/generator_ts.go +++ b/tools/schema/generator/generator_ts.go @@ -84,7 +84,7 @@ func (g *TypeScriptGenerator) init(s *Schema) { } func (g *TypeScriptGenerator) generateLanguageSpecificFiles() error { - err := g.createSourceFile("index") + err := g.createSourceFile("index", true) if err != nil { return err } From c8939f7c332d005b25763e6f96e17dea6d6ff784 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Mon, 8 Nov 2021 12:50:31 +0200 Subject: [PATCH 042/198] Code style change in ApplyBlock --- packages/state/state.go | 27 +++++++++------------------ packages/state/state_test.go | 13 +++---------- 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/packages/state/state.go b/packages/state/state.go index 8822e90c19..c2467b9301 100644 --- a/packages/state/state.go +++ b/packages/state/state.go @@ -48,10 +48,12 @@ func newVirtualState(db kvstore.KVStore, chainID *iscp.ChainID) *virtualStateAcc func newZeroVirtualState(db kvstore.KVStore, chainID *iscp.ChainID) (VirtualStateAccess, Block) { ret := newVirtualState(db, chainID) - originBlock, err := ret.applyOriginBlock() - if err != nil { - panic(err) - } + originBlock := newOriginBlock() + + // Applying origin block to empty virtual state + ret.ApplyStateUpdates(originBlock.(*blockImpl).stateUpdate) + ret.appliedBlockHashes = []hashing.HashValue{hashing.HashData(originBlock.EssenceBytes())} + _, _ = ret.ExtractBlock() // clear the update log return ret, originBlock } @@ -129,24 +131,13 @@ func (vs *virtualStateAccess) PreviousStateHash() hashing.HashValue { } // ApplyBlock applies a block of state updates. Checks consistency of the block and previous state. Updates state hash +// It is not suitible for applying origin block to empty virtual state. This is done in `newZeroVirtualState` func (vs *virtualStateAccess) ApplyBlock(b Block) error { - return vs.applyAnyBlock(b, false) -} - -func (vs *virtualStateAccess) applyOriginBlock() (Block, error) { - originBlock := newOriginBlock() - return originBlock, vs.applyAnyBlock(originBlock, true) -} - -func (vs *virtualStateAccess) applyAnyBlock(b Block, empty bool) error { - if empty && b.BlockIndex() != 0 { - return xerrors.Errorf("ApplyBlock: b state index #%d can't be applied to the empty state", b.BlockIndex()) - } - if !empty && vs.BlockIndex()+1 != b.BlockIndex() { + if vs.BlockIndex()+1 != b.BlockIndex() { return xerrors.Errorf("ApplyBlock: b state index #%d can't be applied to the state with index #%d", b.BlockIndex(), vs.BlockIndex()) } - if !empty && vs.Timestamp().After(b.Timestamp()) { + if vs.Timestamp().After(b.Timestamp()) { return xerrors.New("ApplyBlock: inconsistent timestamps") } vs.ApplyStateUpdates(b.(*blockImpl).stateUpdate) diff --git a/packages/state/state_test.go b/packages/state/state_test.go index 88649b57d4..babbac2c35 100644 --- a/packages/state/state_test.go +++ b/packages/state/state_test.go @@ -52,18 +52,11 @@ func TestOriginHashes(t *testing.T) { require.True(t, origBlock.Timestamp().IsZero()) require.EqualValues(t, hashing.NilHash, origBlock.PreviousStateHash()) t.Logf("zero state hash = %s", z.StateCommitment().String()) + require.EqualValues(t, 0, z.BlockIndex()) + require.True(t, z.Timestamp().IsZero()) + require.EqualValues(t, hashing.NilHash, z.PreviousStateHash()) require.EqualValues(t, calcOriginStateHash(), z.StateCommitment()) }) - t.Run("origin state construct", func(t *testing.T) { - emptyState := newVirtualState(mapdb.NewMapDB(), nil) - origBlock, err := emptyState.applyOriginBlock() - require.EqualValues(t, 0, origBlock.BlockIndex()) - require.True(t, origBlock.Timestamp().IsZero()) - require.EqualValues(t, hashing.NilHash, origBlock.PreviousStateHash()) - require.NoError(t, err) - require.EqualValues(t, emptyState.StateCommitment(), calcOriginStateHash()) - require.EqualValues(t, hashing.NilHash, emptyState.PreviousStateHash()) - }) } func TestStateWithDB(t *testing.T) { From e966729260cc2669050b2d9dd87cb00415af4a35 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Mon, 8 Nov 2021 13:15:45 +0200 Subject: [PATCH 043/198] Some refactoring of chainimpl messages. Still work in progress. --- packages/chain/chain.go | 10 ++-- packages/chain/chainimpl/chainimpl.go | 18 +++++-- packages/chain/chainimpl/eventproc.go | 51 ++++++++++--------- packages/chain/chainimpl/interface.go | 14 +---- packages/chain/chainimpl/messages.go | 24 +++++++++ packages/chain/messages/offledger_req_msg.go | 12 ++--- .../chain/messages/offledger_req_msg_test.go | 4 +- packages/chain/messages/peermsg.go | 5 -- packages/chain/messages/req_ack_msg.go | 16 +++--- packages/webapi/request/request.go | 2 +- 10 files changed, 91 insertions(+), 65 deletions(-) create mode 100644 packages/chain/chainimpl/messages.go diff --git a/packages/chain/chain.go b/packages/chain/chain.go index a4548d9d0f..851c5e59ec 100644 --- a/packages/chain/chain.go +++ b/packages/chain/chain.go @@ -7,8 +7,6 @@ import ( "fmt" "time" - "github.com/iotaledger/wasp/packages/iscp/request" - "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/hive.go/events" "github.com/iotaledger/hive.go/logger" @@ -16,6 +14,7 @@ import ( "github.com/iotaledger/wasp/packages/hashing" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/coreutil" + "github.com/iotaledger/wasp/packages/iscp/request" "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/state" "github.com/iotaledger/wasp/packages/tcrypto" @@ -27,13 +26,17 @@ type ChainCore interface { ID() *iscp.ChainID GetCommitteeInfo() *CommitteeInfo AttachToPeerMessages(fun func(recv *peering.RecvEvent)) - EnqueueDismissChain(reason string) StateCandidateToStateManager(state.VirtualStateAccess, ledgerstate.OutputID) Events() ChainEvents Processors() *processors.Cache GlobalStateSync() coreutil.ChainStateSync GetStateReader() state.OptimisticStateReader Log() *logger.Logger + + // Most of these methods are made publick for mocking in tests + EnqueueDismissChain(reason string) // This one should really be public + EnqueueLedgerState(chainOutput *ledgerstate.AliasOutput, timestamp time.Time) + EnqueueOffLedgerRequestPeerMsg(req *request.OffLedger, senderNetID string) } // ChainEntry interface to access chain from the chain registry side @@ -42,7 +45,6 @@ type ChainEntry interface { ReceiveInclusionState(ledgerstate.TransactionID, ledgerstate.InclusionState) ReceiveState(stateOutput *ledgerstate.AliasOutput, timestamp time.Time) ReceiveOutput(output ledgerstate.Output) - ReceiveOffLedgerRequest(req *request.OffLedger, senderNetID string) Dismiss(reason string) IsDismissed() bool diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index 956e0e06b0..73c51e76e2 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -167,14 +167,24 @@ func (c *chainObj) receiveCommitteePeerMessages(event *peering.RecvEvent) { } func (c *chainObj) receiveChainPeerMessages(event *peering.RecvEvent) { - msg := event.Msg + peerMsg := event.Msg switch event.Msg.MsgType { case messages.MsgOffLedgerRequest: - c.enqueueOffLedgerRequestPeerMsg(msg) + msg, err := messages.OffLedgerRequestPeerMsgFromBytes(peerMsg.MsgData) + if err != nil { + c.log.Error(err) + return + } + c.EnqueueOffLedgerRequestPeerMsg(msg.Req, peerMsg.SenderNetID) case messages.MsgRequestAck: - c.enqueueRequestAckPeerMsg(msg) + msg, err := messages.RequestAckPeerMsgFromBytes(peerMsg.MsgData) + if err != nil { + c.log.Error(err) + return + } + c.enqueueRequestAckPeerMsg(msg.ReqID, peerMsg.SenderNetID) case messages.MsgMissingRequest: - c.enqueueMissingRequestPeerMsg(msg) + //c.enqueueMissingRequestPeerMsg(msg) default: } } diff --git a/packages/chain/chainimpl/eventproc.go b/packages/chain/chainimpl/eventproc.go index b27b7b65f9..e89d4b1cff 100644 --- a/packages/chain/chainimpl/eventproc.go +++ b/packages/chain/chainimpl/eventproc.go @@ -9,9 +9,10 @@ import ( "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/wasp/packages/chain/messages" "github.com/iotaledger/wasp/packages/hashing" + "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/iscp/request" "github.com/iotaledger/wasp/packages/peering" "golang.org/x/xerrors" - // "github.com/iotaledger/wasp/packages/iscp" // "github.com/iotaledger/wasp/packages/state" // "github.com/iotaledger/wasp/packages/util" ) @@ -28,7 +29,7 @@ func (c *chainObj) handleMessagesLoop() { select { case msg, ok := <-nDismissChainMsgChannel: if ok { - c.handleDismissChain(msg.(messages.DismissChainMsg)) + c.handleDismissChain(msg.(DismissChainMsg)) } else { nDismissChainMsgChannel = nil } @@ -40,13 +41,13 @@ func (c *chainObj) handleMessagesLoop() { } case msg, ok := <-nOffLedgerRequestPeerMsgChannel: if ok { - c.handleOffLedgerRequestPeerMsg(msg.(*peering.PeerMessage)) + c.handleOffLedgerRequestPeerMsg(msg.(OffLedgerRequestMsg)) } else { nOffLedgerRequestPeerMsgChannel = nil } case msg, ok := <-nRequestAckPeerMsgChannel: if ok { - c.handleRequestAckPeerMsg(msg.(*peering.PeerMessage)) + c.handleRequestAckPeerMsg(msg.(RequestAckMsg)) } else { nRequestAckPeerMsgChannel = nil } @@ -82,14 +83,14 @@ func (c *chainObj) handleMessagesLoop() { } func (c *chainObj) EnqueueDismissChain(reason string) { - c.dismissChainMsgChannel.In() <- messages.DismissChainMsg{Reason: reason} + c.dismissChainMsgChannel.In() <- DismissChainMsg{Reason: reason} } -func (c *chainObj) handleDismissChain(msg messages.DismissChainMsg) { +func (c *chainObj) handleDismissChain(msg DismissChainMsg) { c.Dismiss(msg.Reason) } -func (c *chainObj) enqueueLedgerState(chainOutput *ledgerstate.AliasOutput, timestamp time.Time) { +func (c *chainObj) EnqueueLedgerState(chainOutput *ledgerstate.AliasOutput, timestamp time.Time) { c.stateMsgChannel.In() <- &messages.StateMsg{ ChainOutput: chainOutput, Timestamp: timestamp, @@ -122,30 +123,34 @@ func (c *chainObj) handleLedgerState(msg *messages.StateMsg) { c.stateMgr.EventStateMsg(msg) } -func (c *chainObj) enqueueOffLedgerRequestPeerMsg(peerMsg *peering.PeerMessage) { - c.offLedgerRequestPeerMsgChannel.In() <- peerMsg +func (c *chainObj) EnqueueOffLedgerRequestPeerMsg(req *request.OffLedger, senderNetID string) { + c.offLedgerRequestPeerMsgChannel.In() <- OffLedgerRequestMsg{ + Req: req, + SenderNetID: senderNetID, + } } -func (c *chainObj) handleOffLedgerRequestPeerMsg(peerMsg *peering.PeerMessage) { - msg, err := messages.OffLedgerRequestMsgFromBytes(peerMsg.MsgData) - if err != nil { - c.log.Error(err) +func (c *chainObj) handleOffLedgerRequestPeerMsg(msg OffLedgerRequestMsg) { + req := msg.Req + senderNetID := msg.SenderNetID + c.log.Debugf("handleOffLedgerRequestPeerMsg: reqID: %s, peerID: %s", req.ID().Base58(), senderNetID) + c.sendRequestAcknowledgementMsg(req.ID(), senderNetID) + if !c.mempool.ReceiveRequest(req) { return } - c.ReceiveOffLedgerRequest(msg.Req, peerMsg.SenderNetID) + c.log.Debugf("handleOffLedgerRequestPeerMsg - added to mempool: reqID: %s, peerID: %s", req.ID().Base58(), senderNetID) + c.broadcastOffLedgerRequest(req) } -func (c *chainObj) enqueueRequestAckPeerMsg(peerMsg *peering.PeerMessage) { - c.requestAckPeerMsgChannel.In() <- peerMsg +func (c *chainObj) enqueueRequestAckPeerMsg(requestID *iscp.RequestID, senderNetID string) { + c.requestAckPeerMsgChannel.In() <- RequestAckMsg{ + ReqID: requestID, + SenderNetID: senderNetID, + } } -func (c *chainObj) handleRequestAckPeerMsg(peerMsg *peering.PeerMessage) { - msg, err := messages.RequestAckMsgFromBytes(peerMsg.MsgData) - if err != nil { - c.log.Error(err) - return - } - c.ReceiveRequestAckMessage(msg.ReqID, peerMsg.SenderNetID) +func (c *chainObj) handleRequestAckPeerMsg(msg RequestAckMsg) { + c.ReceiveRequestAckMessage(msg.ReqID, msg.SenderNetID) } func (c *chainObj) enqueueMissingRequestIDsPeerMsg(peerMsg *peering.PeerMessage) { diff --git a/packages/chain/chainimpl/interface.go b/packages/chain/chainimpl/interface.go index 229f2d6895..b6c089d314 100644 --- a/packages/chain/chainimpl/interface.go +++ b/packages/chain/chainimpl/interface.go @@ -119,7 +119,7 @@ func shouldSendToPeer(peerID string, ackPeers []string) bool { func (c *chainObj) broadcastOffLedgerRequest(req *request.OffLedger) { c.log.Debugf("broadcastOffLedgerRequest: toNPeers: %d, reqID: %s", c.offledgerBroadcastUpToNPeers, req.ID().Base58()) - msgData := messages.NewOffLedgerRequestMsg(c.chainID, req).Bytes() + msgData := messages.NewOffLedgerRequestPeerMsg(c.chainID, req).Bytes() committee := c.getCommittee() getPeerIDs := (*c.peers).GetRandomPeers @@ -165,16 +165,6 @@ func (c *chainObj) broadcastOffLedgerRequest(req *request.OffLedger) { }() } -func (c *chainObj) ReceiveOffLedgerRequest(req *request.OffLedger, senderNetID string) { - c.log.Debugf("ReceiveOffLedgerRequest: reqID: %s, peerID: %s", req.ID().Base58(), senderNetID) - c.sendRequestAcknowledgementMsg(req.ID(), senderNetID) - if !c.mempool.ReceiveRequest(req) { - return - } - c.log.Debugf("ReceiveOffLedgerRequest - added to mempool: reqID: %s, peerID: %s", req.ID().Base58(), senderNetID) - c.broadcastOffLedgerRequest(req) -} - func (c *chainObj) sendRequestAcknowledgementMsg(reqID iscp.RequestID, peerID string) { c.log.Debugf("sendRequestAcknowledgementMsg: reqID: %s, peerID: %s", reqID.Base58(), peerID) if peerID == "" { @@ -215,7 +205,7 @@ func (c *chainObj) ReceiveRequest(req iscp.Request) { func (c *chainObj) ReceiveState(stateOutput *ledgerstate.AliasOutput, timestamp time.Time) { c.log.Debugf("ReceiveState #%d: outputID: %s, stateAddr: %s", stateOutput.GetStateIndex(), iscp.OID(stateOutput.ID()), stateOutput.GetStateAddress().Base58()) - c.enqueueLedgerState(stateOutput, timestamp) + c.EnqueueLedgerState(stateOutput, timestamp) } func (c *chainObj) ReceiveInclusionState(txID ledgerstate.TransactionID, inclusionState ledgerstate.InclusionState) { diff --git a/packages/chain/chainimpl/messages.go b/packages/chain/chainimpl/messages.go new file mode 100644 index 0000000000..90e8ca5228 --- /dev/null +++ b/packages/chain/chainimpl/messages.go @@ -0,0 +1,24 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +package chainimpl + +import ( + "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/iscp/request" +) + +// DismissChainMsg sent by component to the chain core in case of major setback +type DismissChainMsg struct { + Reason string +} + +type OffLedgerRequestMsg struct { + Req *request.OffLedger + SenderNetID string +} + +type RequestAckMsg struct { + ReqID *iscp.RequestID + SenderNetID string +} diff --git a/packages/chain/messages/offledger_req_msg.go b/packages/chain/messages/offledger_req_msg.go index 95fac6208a..8bfd84c594 100644 --- a/packages/chain/messages/offledger_req_msg.go +++ b/packages/chain/messages/offledger_req_msg.go @@ -10,26 +10,26 @@ import ( "golang.org/x/xerrors" ) -type OffLedgerRequestMsg struct { +type OffLedgerRequestPeerMsg struct { ChainID *iscp.ChainID Req *request.OffLedger } -func NewOffLedgerRequestMsg(chainID *iscp.ChainID, req *request.OffLedger) *OffLedgerRequestMsg { - return &OffLedgerRequestMsg{ +func NewOffLedgerRequestPeerMsg(chainID *iscp.ChainID, req *request.OffLedger) *OffLedgerRequestPeerMsg { + return &OffLedgerRequestPeerMsg{ ChainID: chainID, Req: req, } } -func (msg *OffLedgerRequestMsg) Bytes() []byte { +func (msg *OffLedgerRequestPeerMsg) Bytes() []byte { return marshalutil.New(). Write(msg.ChainID). Write(msg.Req). Bytes() } -func OffLedgerRequestMsgFromBytes(data []byte) (*OffLedgerRequestMsg, error) { +func OffLedgerRequestPeerMsgFromBytes(data []byte) (*OffLedgerRequestPeerMsg, error) { mu := marshalutil.New(data) chainID, err := iscp.ChainIDFromMarshalUtil(mu) if err != nil { @@ -43,7 +43,7 @@ func OffLedgerRequestMsgFromBytes(data []byte) (*OffLedgerRequestMsg, error) { if !ok { return nil, xerrors.New("OffLedgerRequestMsgFromBytes: wrong type of request data") } - return &OffLedgerRequestMsg{ + return &OffLedgerRequestPeerMsg{ ChainID: chainID, Req: reqCasted, }, nil diff --git a/packages/chain/messages/offledger_req_msg_test.go b/packages/chain/messages/offledger_req_msg_test.go index 03dd3e4c87..cf59918018 100644 --- a/packages/chain/messages/offledger_req_msg_test.go +++ b/packages/chain/messages/offledger_req_msg_test.go @@ -24,7 +24,7 @@ func TestMarshalling(t *testing.T) { dict.Dict{foo: []byte("bar")}, ) - msg := NewOffLedgerRequestMsg( + msg := NewOffLedgerRequestPeerMsg( iscp.RandomChainID(), request.NewOffLedger(contract, entrypoint, args), ) @@ -33,7 +33,7 @@ func TestMarshalling(t *testing.T) { msgBytes := msg.Bytes() // unmashal the message from bytes and ensure everything checks out - unmarshalledMsg, err := OffLedgerRequestMsgFromBytes(msgBytes) + unmarshalledMsg, err := OffLedgerRequestPeerMsgFromBytes(msgBytes) require.NoError(t, err) require.True(t, unmarshalledMsg.ChainID.AliasAddress.Equals(msg.ChainID.AliasAddress)) diff --git a/packages/chain/messages/peermsg.go b/packages/chain/messages/peermsg.go index fcf816517d..803239ecc9 100644 --- a/packages/chain/messages/peermsg.go +++ b/packages/chain/messages/peermsg.go @@ -55,11 +55,6 @@ type BlockMsg struct { BlockBytes []byte } -// DismissChainMsg sent by component to the chain core in case of major setback -type DismissChainMsg struct { - Reason string -} - // StateTransitionMsg Notifies chain about changed state type StateTransitionMsg struct { // new variable state diff --git a/packages/chain/messages/req_ack_msg.go b/packages/chain/messages/req_ack_msg.go index 1c8f1a4f83..9ca76c4e3e 100644 --- a/packages/chain/messages/req_ack_msg.go +++ b/packages/chain/messages/req_ack_msg.go @@ -12,30 +12,30 @@ import ( "golang.org/x/xerrors" ) -type RequestAcKMsg struct { +type RequestAckPeerMsg struct { ReqID *iscp.RequestID } -func NewRequestAckMsg(reqID iscp.RequestID) *RequestAcKMsg { - return &RequestAcKMsg{ +func NewRequestAckMsg(reqID iscp.RequestID) *RequestAckPeerMsg { + return &RequestAckPeerMsg{ ReqID: &reqID, } } -func (msg *RequestAcKMsg) write(w io.Writer) error { +func (msg *RequestAckPeerMsg) write(w io.Writer) error { if _, err := w.Write(msg.ReqID.Bytes()); err != nil { return xerrors.Errorf("failed to write requestIDs: %w", err) } return nil } -func (msg *RequestAcKMsg) Bytes() []byte { +func (msg *RequestAckPeerMsg) Bytes() []byte { var buf bytes.Buffer _ = msg.write(&buf) return buf.Bytes() } -func (msg *RequestAcKMsg) read(r io.Reader) error { +func (msg *RequestAckPeerMsg) read(r io.Reader) error { b, err := ioutil.ReadAll(r) if err != nil { return xerrors.Errorf("failed to read requestIDs: %w", err) @@ -48,9 +48,9 @@ func (msg *RequestAcKMsg) read(r io.Reader) error { return nil } -func RequestAckMsgFromBytes(buf []byte) (RequestAcKMsg, error) { +func RequestAckPeerMsgFromBytes(buf []byte) (RequestAckPeerMsg, error) { r := bytes.NewReader(buf) - msg := RequestAcKMsg{} + msg := RequestAckPeerMsg{} err := msg.read(r) return msg, err } diff --git a/packages/webapi/request/request.go b/packages/webapi/request/request.go index 0538990689..8c8137303f 100644 --- a/packages/webapi/request/request.go +++ b/packages/webapi/request/request.go @@ -106,7 +106,7 @@ func (o *offLedgerReqAPI) handleNewRequest(c echo.Context) error { if len(balances) == 0 { return httperrors.BadRequest(fmt.Sprintf("No balance on account %s", offLedgerReq.SenderAccount().Base58())) } - ch.ReceiveOffLedgerRequest(offLedgerReq, "") + ch.EnqueueOffLedgerRequestPeerMsg(offLedgerReq, "") return c.NoContent(http.StatusAccepted) } From 535ada6c66ef952e84f819ce7f7d71c1cf011743 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Mon, 8 Nov 2021 13:22:36 +0200 Subject: [PATCH 044/198] Reintroducing 'applyBlockNoCheck' --- packages/state/state.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/state/state.go b/packages/state/state.go index c2467b9301..120a56cac7 100644 --- a/packages/state/state.go +++ b/packages/state/state.go @@ -49,11 +49,7 @@ func newVirtualState(db kvstore.KVStore, chainID *iscp.ChainID) *virtualStateAcc func newZeroVirtualState(db kvstore.KVStore, chainID *iscp.ChainID) (VirtualStateAccess, Block) { ret := newVirtualState(db, chainID) originBlock := newOriginBlock() - - // Applying origin block to empty virtual state - ret.ApplyStateUpdates(originBlock.(*blockImpl).stateUpdate) - ret.appliedBlockHashes = []hashing.HashValue{hashing.HashData(originBlock.EssenceBytes())} - + ret.applyBlockNoCheck(originBlock) _, _ = ret.ExtractBlock() // clear the update log return ret, originBlock } @@ -140,9 +136,13 @@ func (vs *virtualStateAccess) ApplyBlock(b Block) error { if vs.Timestamp().After(b.Timestamp()) { return xerrors.New("ApplyBlock: inconsistent timestamps") } + vs.applyBlockNoCheck(b) + return nil +} + +func (vs *virtualStateAccess) applyBlockNoCheck(b Block) { vs.ApplyStateUpdates(b.(*blockImpl).stateUpdate) vs.appliedBlockHashes = append(vs.appliedBlockHashes, hashing.HashData(b.EssenceBytes())) - return nil } // ApplyStateUpdates applies one state update. Doesn't change the state hash: it can be changed by Apply block From cef83a3a365d747b5d47b65a4d49fc7951ac8f18 Mon Sep 17 00:00:00 2001 From: lucastortora Date: Tue, 26 Oct 2021 10:18:31 +0200 Subject: [PATCH 045/198] Moved unused .md files from documentation/docs to documentation/temp. Updated links. Copied misc/docker to guide/running_a_node/docker Fixed links. Updated sidebar. --- .../chains_and_nodes}/docker.md | 2 +- .../docs/guide/chains_and_nodes/publisher.md | 34 ------------------- .../guide/chains_and_nodes/running-a-node.md | 2 +- .../off-ledger-requests.md | 2 +- documentation/sidebars.js | 2 +- documentation/{docs => temp}/misc/accounts.md | 0 .../{docs => temp}/misc/coretypes.md | 0 documentation/{docs => temp}/misc/deploy.md | 0 documentation/{docs => temp}/misc/install.md | 0 documentation/{docs => temp}/misc/invoking.md | 0 .../{docs => temp}/misc/publisher.md | 0 documentation/{docs => temp}/misc/runwasp.md | 0 documentation/{docs => temp}/misc/utxo.md | 0 documentation/{docs => temp}/profiling.md | 0 .../{docs => temp}/rfc/prevent-mev.md | 0 .../{docs => temp}/rfc/replay-off-ledger.md | 0 documentation/{docs => temp}/tutorial/01.md | 0 documentation/{docs => temp}/tutorial/02.md | 0 documentation/{docs => temp}/tutorial/03.md | 0 documentation/{docs => temp}/tutorial/04.md | 0 documentation/{docs => temp}/tutorial/05.md | 0 documentation/{docs => temp}/tutorial/06.md | 0 documentation/{docs => temp}/tutorial/07.md | 0 documentation/{docs => temp}/tutorial/08.md | 0 documentation/{docs => temp}/tutorial/09.md | 0 documentation/{docs => temp}/tutorial/10.md | 0 documentation/{docs => temp}/tutorial/11.md | 0 documentation/{docs => temp}/tutorial/12.md | 0 .../{docs => temp}/tutorial/readme.md | 0 documentation/{docs => temp}/welcome.md | 0 30 files changed, 4 insertions(+), 38 deletions(-) rename documentation/docs/{misc => guide/chains_and_nodes}/docker.md (93%) delete mode 100644 documentation/docs/guide/chains_and_nodes/publisher.md rename documentation/{docs => temp}/misc/accounts.md (100%) rename documentation/{docs => temp}/misc/coretypes.md (100%) rename documentation/{docs => temp}/misc/deploy.md (100%) rename documentation/{docs => temp}/misc/install.md (100%) rename documentation/{docs => temp}/misc/invoking.md (100%) rename documentation/{docs => temp}/misc/publisher.md (100%) rename documentation/{docs => temp}/misc/runwasp.md (100%) rename documentation/{docs => temp}/misc/utxo.md (100%) rename documentation/{docs => temp}/profiling.md (100%) rename documentation/{docs => temp}/rfc/prevent-mev.md (100%) rename documentation/{docs => temp}/rfc/replay-off-ledger.md (100%) rename documentation/{docs => temp}/tutorial/01.md (100%) rename documentation/{docs => temp}/tutorial/02.md (100%) rename documentation/{docs => temp}/tutorial/03.md (100%) rename documentation/{docs => temp}/tutorial/04.md (100%) rename documentation/{docs => temp}/tutorial/05.md (100%) rename documentation/{docs => temp}/tutorial/06.md (100%) rename documentation/{docs => temp}/tutorial/07.md (100%) rename documentation/{docs => temp}/tutorial/08.md (100%) rename documentation/{docs => temp}/tutorial/09.md (100%) rename documentation/{docs => temp}/tutorial/10.md (100%) rename documentation/{docs => temp}/tutorial/11.md (100%) rename documentation/{docs => temp}/tutorial/12.md (100%) rename documentation/{docs => temp}/tutorial/readme.md (100%) rename documentation/{docs => temp}/welcome.md (100%) diff --git a/documentation/docs/misc/docker.md b/documentation/docs/guide/chains_and_nodes/docker.md similarity index 93% rename from documentation/docs/misc/docker.md rename to documentation/docs/guide/chains_and_nodes/docker.md index c1304341fe..a1d9ca56c6 100644 --- a/documentation/docs/misc/docker.md +++ b/documentation/docs/guide/chains_and_nodes/docker.md @@ -13,7 +13,7 @@ keywords: --- # Docker -This page describes the configuration of the Wasp node in combination with Docker. If you followed the instructions in [Running a Node](../guide/chains_and_nodes/running-a-node.md), you can skip to [Configuring wasp-cli](../guide/chains_and_nodes/wasp-cli.md). +This page describes the configuration of the Wasp node in combination with Docker. If you followed the instructions in [Running a Node](running-a-node.md), you can skip to [Configuring wasp-cli](wasp-cli.md). ## Introduction diff --git a/documentation/docs/guide/chains_and_nodes/publisher.md b/documentation/docs/guide/chains_and_nodes/publisher.md deleted file mode 100644 index 527b3edb50..0000000000 --- a/documentation/docs/guide/chains_and_nodes/publisher.md +++ /dev/null @@ -1,34 +0,0 @@ ---- -keywords: -- ISCP -- Publisher -- Nanomsg -- Messages -description: Publishing important events via a Nanomsg message stream. Subscribing to a stream with a client. Message format description. -image: /img/logo/WASP_logo_dark.png ---- - -# Wasp Publisher - -Each Wasp node publishes important events via a [Nanomsg](https://nanomsg.org/) message stream -(just like ZMQ is used in IRI. Possibly in the future ZMQ and MQTT publishers will be supported too). - -Any Nanomsg client can subscribe to the message stream. In Go you can use the -`packages/subscribe` package provided in Wasp for this. - -The Publisher port can be configured in `config.json` with the `nanomsg.port` -setting. - -Message format is simply a string consisting of a space separated list of tokens; and the first token -is the message type. Below is a list of all message types published by Wasp. (You can search for -`publisher.Publish` in the code to see the exact places where each message is published.) - -|Message|Format| -|:--- |:--- | -|Chain record has been saved in the registry | `chainrec ` | -|Chain committee has been activated|`active_committee `| -|Chain committee dismissed|`dismissed_committee `| -|A new SC request reached the node|`request_in `| -|SC request has been processed (i.e. corresponding state update was confirmed)|`request_out `| -|State transition (new state has been committed to DB)| `state `| -|Event generated by a SC|`vmmsg ...`| diff --git a/documentation/docs/guide/chains_and_nodes/running-a-node.md b/documentation/docs/guide/chains_and_nodes/running-a-node.md index f8e8922df9..2847489581 100644 --- a/documentation/docs/guide/chains_and_nodes/running-a-node.md +++ b/documentation/docs/guide/chains_and_nodes/running-a-node.md @@ -17,7 +17,7 @@ keywords: # Running a Node In the following section, you can find information on how to use Wasp by cloning the repository and building the application. -If you prefer, you can also configure a node [using a docker image](../../misc/docker.md) (official images will be provided in the future). +If you prefer, you can also configure a node [using a docker image](docker.md) (official images will be provided in the future). ## Requirements diff --git a/documentation/docs/guide/core_concepts/smartcontract-interaction/off-ledger-requests.md b/documentation/docs/guide/core_concepts/smartcontract-interaction/off-ledger-requests.md index 32b2293aef..5922ea3909 100644 --- a/documentation/docs/guide/core_concepts/smartcontract-interaction/off-ledger-requests.md +++ b/documentation/docs/guide/core_concepts/smartcontract-interaction/off-ledger-requests.md @@ -17,7 +17,7 @@ You can send `off-ledger` requests by sending an API call to a WASP node, which ## Nonce -In order to [prevent replay attacks](../../../rfc/prevent-mev.md), off-ledger requests must include a special parameter, the `nonce`. +In order to prevent replay attacks, off-ledger requests must include a special parameter, the `nonce`. Nonces are account-bound; the current nonce for a given account can be obtained via the [`accounts`](../core_contracts/accounts.md) core contract `getAccountNonce` view. :::info Important diff --git a/documentation/sidebars.js b/documentation/sidebars.js index 61eb907815..e7f397147b 100644 --- a/documentation/sidebars.js +++ b/documentation/sidebars.js @@ -217,7 +217,7 @@ module.exports = { { type: 'doc', label: 'Using Docker', - id: 'misc/docker', + id: 'guide/chains_and_nodes/docker', }, { type: 'doc', diff --git a/documentation/docs/misc/accounts.md b/documentation/temp/misc/accounts.md similarity index 100% rename from documentation/docs/misc/accounts.md rename to documentation/temp/misc/accounts.md diff --git a/documentation/docs/misc/coretypes.md b/documentation/temp/misc/coretypes.md similarity index 100% rename from documentation/docs/misc/coretypes.md rename to documentation/temp/misc/coretypes.md diff --git a/documentation/docs/misc/deploy.md b/documentation/temp/misc/deploy.md similarity index 100% rename from documentation/docs/misc/deploy.md rename to documentation/temp/misc/deploy.md diff --git a/documentation/docs/misc/install.md b/documentation/temp/misc/install.md similarity index 100% rename from documentation/docs/misc/install.md rename to documentation/temp/misc/install.md diff --git a/documentation/docs/misc/invoking.md b/documentation/temp/misc/invoking.md similarity index 100% rename from documentation/docs/misc/invoking.md rename to documentation/temp/misc/invoking.md diff --git a/documentation/docs/misc/publisher.md b/documentation/temp/misc/publisher.md similarity index 100% rename from documentation/docs/misc/publisher.md rename to documentation/temp/misc/publisher.md diff --git a/documentation/docs/misc/runwasp.md b/documentation/temp/misc/runwasp.md similarity index 100% rename from documentation/docs/misc/runwasp.md rename to documentation/temp/misc/runwasp.md diff --git a/documentation/docs/misc/utxo.md b/documentation/temp/misc/utxo.md similarity index 100% rename from documentation/docs/misc/utxo.md rename to documentation/temp/misc/utxo.md diff --git a/documentation/docs/profiling.md b/documentation/temp/profiling.md similarity index 100% rename from documentation/docs/profiling.md rename to documentation/temp/profiling.md diff --git a/documentation/docs/rfc/prevent-mev.md b/documentation/temp/rfc/prevent-mev.md similarity index 100% rename from documentation/docs/rfc/prevent-mev.md rename to documentation/temp/rfc/prevent-mev.md diff --git a/documentation/docs/rfc/replay-off-ledger.md b/documentation/temp/rfc/replay-off-ledger.md similarity index 100% rename from documentation/docs/rfc/replay-off-ledger.md rename to documentation/temp/rfc/replay-off-ledger.md diff --git a/documentation/docs/tutorial/01.md b/documentation/temp/tutorial/01.md similarity index 100% rename from documentation/docs/tutorial/01.md rename to documentation/temp/tutorial/01.md diff --git a/documentation/docs/tutorial/02.md b/documentation/temp/tutorial/02.md similarity index 100% rename from documentation/docs/tutorial/02.md rename to documentation/temp/tutorial/02.md diff --git a/documentation/docs/tutorial/03.md b/documentation/temp/tutorial/03.md similarity index 100% rename from documentation/docs/tutorial/03.md rename to documentation/temp/tutorial/03.md diff --git a/documentation/docs/tutorial/04.md b/documentation/temp/tutorial/04.md similarity index 100% rename from documentation/docs/tutorial/04.md rename to documentation/temp/tutorial/04.md diff --git a/documentation/docs/tutorial/05.md b/documentation/temp/tutorial/05.md similarity index 100% rename from documentation/docs/tutorial/05.md rename to documentation/temp/tutorial/05.md diff --git a/documentation/docs/tutorial/06.md b/documentation/temp/tutorial/06.md similarity index 100% rename from documentation/docs/tutorial/06.md rename to documentation/temp/tutorial/06.md diff --git a/documentation/docs/tutorial/07.md b/documentation/temp/tutorial/07.md similarity index 100% rename from documentation/docs/tutorial/07.md rename to documentation/temp/tutorial/07.md diff --git a/documentation/docs/tutorial/08.md b/documentation/temp/tutorial/08.md similarity index 100% rename from documentation/docs/tutorial/08.md rename to documentation/temp/tutorial/08.md diff --git a/documentation/docs/tutorial/09.md b/documentation/temp/tutorial/09.md similarity index 100% rename from documentation/docs/tutorial/09.md rename to documentation/temp/tutorial/09.md diff --git a/documentation/docs/tutorial/10.md b/documentation/temp/tutorial/10.md similarity index 100% rename from documentation/docs/tutorial/10.md rename to documentation/temp/tutorial/10.md diff --git a/documentation/docs/tutorial/11.md b/documentation/temp/tutorial/11.md similarity index 100% rename from documentation/docs/tutorial/11.md rename to documentation/temp/tutorial/11.md diff --git a/documentation/docs/tutorial/12.md b/documentation/temp/tutorial/12.md similarity index 100% rename from documentation/docs/tutorial/12.md rename to documentation/temp/tutorial/12.md diff --git a/documentation/docs/tutorial/readme.md b/documentation/temp/tutorial/readme.md similarity index 100% rename from documentation/docs/tutorial/readme.md rename to documentation/temp/tutorial/readme.md diff --git a/documentation/docs/welcome.md b/documentation/temp/welcome.md similarity index 100% rename from documentation/docs/welcome.md rename to documentation/temp/welcome.md From 8185ecd4458a2e7cf8de6a87e44a2d54b7c63895 Mon Sep 17 00:00:00 2001 From: lucastortora Date: Tue, 26 Oct 2021 10:24:25 +0200 Subject: [PATCH 046/198] fixed spacing --- .../smartcontract-interaction/off-ledger-requests.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/docs/guide/core_concepts/smartcontract-interaction/off-ledger-requests.md b/documentation/docs/guide/core_concepts/smartcontract-interaction/off-ledger-requests.md index 5922ea3909..0f486031ed 100644 --- a/documentation/docs/guide/core_concepts/smartcontract-interaction/off-ledger-requests.md +++ b/documentation/docs/guide/core_concepts/smartcontract-interaction/off-ledger-requests.md @@ -17,7 +17,7 @@ You can send `off-ledger` requests by sending an API call to a WASP node, which ## Nonce -In order to prevent replay attacks, off-ledger requests must include a special parameter, the `nonce`. +In order to prevent replay attacks, off-ledger requests must include a special parameter, the `nonce`. Nonces are account-bound; the current nonce for a given account can be obtained via the [`accounts`](../core_contracts/accounts.md) core contract `getAccountNonce` view. :::info Important From 12077f7f3c28cc488e5c2b7e5b58e5bfef1e792f Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Mon, 8 Nov 2021 07:51:34 -0800 Subject: [PATCH 047/198] Added booleans --- contracts/wasm/dividend/go/dividend/lib.go | 2 + contracts/wasm/dividend/src/lib.rs | 6 +- contracts/wasm/dividend/ts/dividend/lib.ts | 6 +- .../go/donatewithfeedback/lib.go | 1 + contracts/wasm/donatewithfeedback/src/lib.rs | 5 +- .../ts/donatewithfeedback/lib.ts | 3 +- .../wasm/fairauction/go/fairauction/lib.go | 2 + contracts/wasm/fairauction/src/lib.rs | 8 ++- .../wasm/fairauction/ts/fairauction/lib.ts | 6 +- .../wasm/fairroulette/go/fairroulette/lib.go | 4 ++ contracts/wasm/fairroulette/src/lib.rs | 18 +++-- .../wasm/fairroulette/ts/fairroulette/lib.ts | 12 ++-- contracts/wasm/testcore/src/lib.rs | 2 +- .../tokenregistry/go/tokenregistry/lib.go | 2 + contracts/wasm/tokenregistry/src/lib.rs | 10 +-- .../tokenregistry/ts/tokenregistry/lib.ts | 6 +- contracts/wasm/update_hardcoded.cmd | 5 +- tools/schema/generator/emitter.go | 71 ++++++++++++++++++- tools/schema/generator/generator.go | 70 ++---------------- tools/schema/generator/gotemplates/lib.go | 17 +++-- tools/schema/generator/rstemplates/lib.go | 17 +++-- tools/schema/generator/tstemplates/lib.go | 17 +++-- 22 files changed, 180 insertions(+), 110 deletions(-) diff --git a/contracts/wasm/dividend/go/dividend/lib.go b/contracts/wasm/dividend/go/dividend/lib.go index 141fd7ad4c..ea83c8abb5 100644 --- a/contracts/wasm/dividend/go/dividend/lib.go +++ b/contracts/wasm/dividend/go/dividend/lib.go @@ -64,6 +64,7 @@ type MemberContext struct { func funcMemberThunk(ctx wasmlib.ScFuncContext) { ctx.Log("dividend.funcMember") + // only defined owner of contract can add members access := ctx.State().GetAgentID(wasmlib.Key("owner")) ctx.Require(access.Exists(), "access not set: owner") @@ -90,6 +91,7 @@ type SetOwnerContext struct { func funcSetOwnerThunk(ctx wasmlib.ScFuncContext) { ctx.Log("dividend.funcSetOwner") + // only defined owner of contract can change owner access := ctx.State().GetAgentID(wasmlib.Key("owner")) ctx.Require(access.Exists(), "access not set: owner") diff --git a/contracts/wasm/dividend/src/lib.rs b/contracts/wasm/dividend/src/lib.rs index 35abe5bb9d..58f053d384 100644 --- a/contracts/wasm/dividend/src/lib.rs +++ b/contracts/wasm/dividend/src/lib.rs @@ -84,7 +84,8 @@ pub struct MemberContext { fn func_member_thunk(ctx: &ScFuncContext) { ctx.log("dividend.funcMember"); - // only defined owner of contract can add members + + // only defined owner of contract can add members let access = ctx.state().get_agent_id("owner"); ctx.require(access.exists(), "access not set: owner"); ctx.require(ctx.caller() == access.value(), "no permission"); @@ -110,7 +111,8 @@ pub struct SetOwnerContext { fn func_set_owner_thunk(ctx: &ScFuncContext) { ctx.log("dividend.funcSetOwner"); - // only defined owner of contract can change owner + + // only defined owner of contract can change owner let access = ctx.state().get_agent_id("owner"); ctx.require(access.exists(), "access not set: owner"); ctx.require(ctx.caller() == access.value(), "no permission"); diff --git a/contracts/wasm/dividend/ts/dividend/lib.ts b/contracts/wasm/dividend/ts/dividend/lib.ts index d991a42845..6d2710649e 100644 --- a/contracts/wasm/dividend/ts/dividend/lib.ts +++ b/contracts/wasm/dividend/ts/dividend/lib.ts @@ -45,7 +45,8 @@ function funcInitThunk(ctx: wasmlib.ScFuncContext): void { function funcMemberThunk(ctx: wasmlib.ScFuncContext): void { ctx.log("dividend.funcMember"); - // only defined owner of contract can add members + + // only defined owner of contract can add members let access = ctx.state().getAgentID(wasmlib.Key32.fromString("owner")); ctx.require(access.exists(), "access not set: owner"); ctx.require(ctx.caller().equals(access.value()), "no permission"); @@ -61,7 +62,8 @@ function funcMemberThunk(ctx: wasmlib.ScFuncContext): void { function funcSetOwnerThunk(ctx: wasmlib.ScFuncContext): void { ctx.log("dividend.funcSetOwner"); - // only defined owner of contract can change owner + + // only defined owner of contract can change owner let access = ctx.state().getAgentID(wasmlib.Key32.fromString("owner")); ctx.require(access.exists(), "access not set: owner"); ctx.require(ctx.caller().equals(access.value()), "no permission"); diff --git a/contracts/wasm/donatewithfeedback/go/donatewithfeedback/lib.go b/contracts/wasm/donatewithfeedback/go/donatewithfeedback/lib.go index 1e9d2da3ce..e24d6693b9 100644 --- a/contracts/wasm/donatewithfeedback/go/donatewithfeedback/lib.go +++ b/contracts/wasm/donatewithfeedback/go/donatewithfeedback/lib.go @@ -47,6 +47,7 @@ type WithdrawContext struct { func funcWithdrawThunk(ctx wasmlib.ScFuncContext) { ctx.Log("donatewithfeedback.funcWithdraw") + // only SC creator can withdraw donated funds ctx.Require(ctx.Caller() == ctx.ContractCreator(), "no permission") diff --git a/contracts/wasm/donatewithfeedback/src/lib.rs b/contracts/wasm/donatewithfeedback/src/lib.rs index fa9f1e7fd3..feb50f1542 100644 --- a/contracts/wasm/donatewithfeedback/src/lib.rs +++ b/contracts/wasm/donatewithfeedback/src/lib.rs @@ -68,8 +68,9 @@ pub struct WithdrawContext { fn func_withdraw_thunk(ctx: &ScFuncContext) { ctx.log("donatewithfeedback.funcWithdraw"); - // only SC creator can withdraw donated funds - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + + // only SC creator can withdraw donated funds + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); let f = WithdrawContext { params: ImmutableWithdrawParams { diff --git a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/lib.ts b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/lib.ts index cc2b77b552..ea6080bb30 100644 --- a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/lib.ts +++ b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/lib.ts @@ -35,7 +35,8 @@ function funcDonateThunk(ctx: wasmlib.ScFuncContext): void { function funcWithdrawThunk(ctx: wasmlib.ScFuncContext): void { ctx.log("donatewithfeedback.funcWithdraw"); - // only SC creator can withdraw donated funds + + // only SC creator can withdraw donated funds ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); let f = new sc.WithdrawContext(); diff --git a/contracts/wasm/fairauction/go/fairauction/lib.go b/contracts/wasm/fairauction/go/fairauction/lib.go index c59c2a1b0a..7e27fcdd01 100644 --- a/contracts/wasm/fairauction/go/fairauction/lib.go +++ b/contracts/wasm/fairauction/go/fairauction/lib.go @@ -29,6 +29,7 @@ type FinalizeAuctionContext struct { func funcFinalizeAuctionThunk(ctx wasmlib.ScFuncContext) { ctx.Log("fairauction.funcFinalizeAuction") + // only SC itself can invoke this function ctx.Require(ctx.Caller() == ctx.AccountID(), "no permission") @@ -72,6 +73,7 @@ type SetOwnerMarginContext struct { func funcSetOwnerMarginThunk(ctx wasmlib.ScFuncContext) { ctx.Log("fairauction.funcSetOwnerMargin") + // only SC creator can set owner margin ctx.Require(ctx.Caller() == ctx.ContractCreator(), "no permission") diff --git a/contracts/wasm/fairauction/src/lib.rs b/contracts/wasm/fairauction/src/lib.rs index c06b616810..97dec4b38d 100644 --- a/contracts/wasm/fairauction/src/lib.rs +++ b/contracts/wasm/fairauction/src/lib.rs @@ -51,7 +51,8 @@ pub struct FinalizeAuctionContext { fn func_finalize_auction_thunk(ctx: &ScFuncContext) { ctx.log("fairauction.funcFinalizeAuction"); - // only SC itself can invoke this function + + // only SC itself can invoke this function ctx.require(ctx.caller() == ctx.account_id(), "no permission"); let f = FinalizeAuctionContext { @@ -94,8 +95,9 @@ pub struct SetOwnerMarginContext { fn func_set_owner_margin_thunk(ctx: &ScFuncContext) { ctx.log("fairauction.funcSetOwnerMargin"); - // only SC creator can set owner margin - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + + // only SC creator can set owner margin + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); let f = SetOwnerMarginContext { params: ImmutableSetOwnerMarginParams { diff --git a/contracts/wasm/fairauction/ts/fairauction/lib.ts b/contracts/wasm/fairauction/ts/fairauction/lib.ts index be55858d8b..2f7ea11525 100644 --- a/contracts/wasm/fairauction/ts/fairauction/lib.ts +++ b/contracts/wasm/fairauction/ts/fairauction/lib.ts @@ -27,7 +27,8 @@ export function on_load(): void { function funcFinalizeAuctionThunk(ctx: wasmlib.ScFuncContext): void { ctx.log("fairauction.funcFinalizeAuction"); - // only SC itself can invoke this function + + // only SC itself can invoke this function ctx.require(ctx.caller().equals(ctx.accountID()), "no permission"); let f = new sc.FinalizeAuctionContext(); @@ -50,7 +51,8 @@ function funcPlaceBidThunk(ctx: wasmlib.ScFuncContext): void { function funcSetOwnerMarginThunk(ctx: wasmlib.ScFuncContext): void { ctx.log("fairauction.funcSetOwnerMargin"); - // only SC creator can set owner margin + + // only SC creator can set owner margin ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); let f = new sc.SetOwnerMarginContext(); diff --git a/contracts/wasm/fairroulette/go/fairroulette/lib.go b/contracts/wasm/fairroulette/go/fairroulette/lib.go index a6b2d30b11..6a4da53cda 100644 --- a/contracts/wasm/fairroulette/go/fairroulette/lib.go +++ b/contracts/wasm/fairroulette/go/fairroulette/lib.go @@ -32,6 +32,7 @@ type ForcePayoutContext struct { func funcForcePayoutThunk(ctx wasmlib.ScFuncContext) { ctx.Log("fairroulette.funcForcePayout") + // only SC creator can restart the round forcefully ctx.Require(ctx.Caller() == ctx.ContractCreator(), "no permission") @@ -50,6 +51,7 @@ type ForceResetContext struct { func funcForceResetThunk(ctx wasmlib.ScFuncContext) { ctx.Log("fairroulette.funcForceReset") + // only SC creator can restart the round forcefully ctx.Require(ctx.Caller() == ctx.ContractCreator(), "no permission") @@ -68,6 +70,7 @@ type PayWinnersContext struct { func funcPayWinnersThunk(ctx wasmlib.ScFuncContext) { ctx.Log("fairroulette.funcPayWinners") + // only SC itself can invoke this function ctx.Require(ctx.Caller() == ctx.AccountID(), "no permission") @@ -107,6 +110,7 @@ type PlayPeriodContext struct { func funcPlayPeriodThunk(ctx wasmlib.ScFuncContext) { ctx.Log("fairroulette.funcPlayPeriod") + // only SC creator can update the play period ctx.Require(ctx.Caller() == ctx.ContractCreator(), "no permission") diff --git a/contracts/wasm/fairroulette/src/lib.rs b/contracts/wasm/fairroulette/src/lib.rs index e253cdac6f..89b5f0a67a 100644 --- a/contracts/wasm/fairroulette/src/lib.rs +++ b/contracts/wasm/fairroulette/src/lib.rs @@ -53,8 +53,9 @@ pub struct ForcePayoutContext { fn func_force_payout_thunk(ctx: &ScFuncContext) { ctx.log("fairroulette.funcForcePayout"); - // only SC creator can restart the round forcefully - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + + // only SC creator can restart the round forcefully + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); let f = ForcePayoutContext { state: MutableFairRouletteState { @@ -71,8 +72,9 @@ pub struct ForceResetContext { fn func_force_reset_thunk(ctx: &ScFuncContext) { ctx.log("fairroulette.funcForceReset"); - // only SC creator can restart the round forcefully - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + + // only SC creator can restart the round forcefully + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); let f = ForceResetContext { state: MutableFairRouletteState { @@ -89,7 +91,8 @@ pub struct PayWinnersContext { fn func_pay_winners_thunk(ctx: &ScFuncContext) { ctx.log("fairroulette.funcPayWinners"); - // only SC itself can invoke this function + + // only SC itself can invoke this function ctx.require(ctx.caller() == ctx.account_id(), "no permission"); let f = PayWinnersContext { @@ -128,8 +131,9 @@ pub struct PlayPeriodContext { fn func_play_period_thunk(ctx: &ScFuncContext) { ctx.log("fairroulette.funcPlayPeriod"); - // only SC creator can update the play period - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + + // only SC creator can update the play period + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); let f = PlayPeriodContext { params: ImmutablePlayPeriodParams { diff --git a/contracts/wasm/fairroulette/ts/fairroulette/lib.ts b/contracts/wasm/fairroulette/ts/fairroulette/lib.ts index dedabdd800..e19135eaba 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/lib.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/lib.ts @@ -31,7 +31,8 @@ export function on_load(): void { function funcForcePayoutThunk(ctx: wasmlib.ScFuncContext): void { ctx.log("fairroulette.funcForcePayout"); - // only SC creator can restart the round forcefully + + // only SC creator can restart the round forcefully ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); let f = new sc.ForcePayoutContext(); @@ -42,7 +43,8 @@ function funcForcePayoutThunk(ctx: wasmlib.ScFuncContext): void { function funcForceResetThunk(ctx: wasmlib.ScFuncContext): void { ctx.log("fairroulette.funcForceReset"); - // only SC creator can restart the round forcefully + + // only SC creator can restart the round forcefully ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); let f = new sc.ForceResetContext(); @@ -53,7 +55,8 @@ function funcForceResetThunk(ctx: wasmlib.ScFuncContext): void { function funcPayWinnersThunk(ctx: wasmlib.ScFuncContext): void { ctx.log("fairroulette.funcPayWinners"); - // only SC itself can invoke this function + + // only SC itself can invoke this function ctx.require(ctx.caller().equals(ctx.accountID()), "no permission"); let f = new sc.PayWinnersContext(); @@ -74,7 +77,8 @@ function funcPlaceBetThunk(ctx: wasmlib.ScFuncContext): void { function funcPlayPeriodThunk(ctx: wasmlib.ScFuncContext): void { ctx.log("fairroulette.funcPlayPeriod"); - // only SC creator can update the play period + + // only SC creator can update the play period ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); let f = new sc.PlayPeriodContext(); diff --git a/contracts/wasm/testcore/src/lib.rs b/contracts/wasm/testcore/src/lib.rs index 2d4b0e9e7b..d9e65ea0ae 100644 --- a/contracts/wasm/testcore/src/lib.rs +++ b/contracts/wasm/testcore/src/lib.rs @@ -246,7 +246,7 @@ pub struct SendToAddressContext { fn func_send_to_address_thunk(ctx: &ScFuncContext) { ctx.log("testcore.funcSendToAddress"); - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); let f = SendToAddressContext { params: ImmutableSendToAddressParams { diff --git a/contracts/wasm/tokenregistry/go/tokenregistry/lib.go b/contracts/wasm/tokenregistry/go/tokenregistry/lib.go index a8a1e20fd8..1d16acbac7 100644 --- a/contracts/wasm/tokenregistry/go/tokenregistry/lib.go +++ b/contracts/wasm/tokenregistry/go/tokenregistry/lib.go @@ -47,6 +47,7 @@ type TransferOwnershipContext struct { func funcTransferOwnershipThunk(ctx wasmlib.ScFuncContext) { ctx.Log("tokenregistry.funcTransferOwnership") + // TODO the one who can transfer token ownership ctx.Require(ctx.Caller() == ctx.ContractCreator(), "no permission") @@ -70,6 +71,7 @@ type UpdateMetadataContext struct { func funcUpdateMetadataThunk(ctx wasmlib.ScFuncContext) { ctx.Log("tokenregistry.funcUpdateMetadata") + // TODO the one who can change the token info ctx.Require(ctx.Caller() == ctx.ContractCreator(), "no permission") diff --git a/contracts/wasm/tokenregistry/src/lib.rs b/contracts/wasm/tokenregistry/src/lib.rs index 7ce4acf356..629e025911 100644 --- a/contracts/wasm/tokenregistry/src/lib.rs +++ b/contracts/wasm/tokenregistry/src/lib.rs @@ -66,8 +66,9 @@ pub struct TransferOwnershipContext { fn func_transfer_ownership_thunk(ctx: &ScFuncContext) { ctx.log("tokenregistry.funcTransferOwnership"); - // TODO the one who can transfer token ownership - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + + // TODO the one who can transfer token ownership + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); let f = TransferOwnershipContext { params: ImmutableTransferOwnershipParams { @@ -89,8 +90,9 @@ pub struct UpdateMetadataContext { fn func_update_metadata_thunk(ctx: &ScFuncContext) { ctx.log("tokenregistry.funcUpdateMetadata"); - // TODO the one who can change the token info - ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); + + // TODO the one who can change the token info + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); let f = UpdateMetadataContext { params: ImmutableUpdateMetadataParams { diff --git a/contracts/wasm/tokenregistry/ts/tokenregistry/lib.ts b/contracts/wasm/tokenregistry/ts/tokenregistry/lib.ts index 1bd8fb8120..48b2839424 100644 --- a/contracts/wasm/tokenregistry/ts/tokenregistry/lib.ts +++ b/contracts/wasm/tokenregistry/ts/tokenregistry/lib.ts @@ -35,7 +35,8 @@ function funcMintSupplyThunk(ctx: wasmlib.ScFuncContext): void { function funcTransferOwnershipThunk(ctx: wasmlib.ScFuncContext): void { ctx.log("tokenregistry.funcTransferOwnership"); - // TODO the one who can transfer token ownership + + // TODO the one who can transfer token ownership ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); let f = new sc.TransferOwnershipContext(); @@ -48,7 +49,8 @@ function funcTransferOwnershipThunk(ctx: wasmlib.ScFuncContext): void { function funcUpdateMetadataThunk(ctx: wasmlib.ScFuncContext): void { ctx.log("tokenregistry.funcUpdateMetadata"); - // TODO the one who can change the token info + + // TODO the one who can change the token info ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); let f = new sc.UpdateMetadataContext(); diff --git a/contracts/wasm/update_hardcoded.cmd b/contracts/wasm/update_hardcoded.cmd index e93c60ebf6..affb61cee6 100644 --- a/contracts/wasm/update_hardcoded.cmd +++ b/contracts/wasm/update_hardcoded.cmd @@ -2,4 +2,7 @@ for /d %%f in (*.) do if exist %%f\pkg\%%f*_bg.wasm copy /y %%f\pkg\%%f*_bg.wasm %%f\test\*.* if exist testcore\pkg\testcore_bg.wasm copy /y testcore\pkg\testcore_bg.wasm ..\..\packages\vm\core\testcore\sbtests\sbtestsc\*.* if exist inccounter\pkg\inccounter_bg.wasm copy /y inccounter\pkg\inccounter_bg.wasm ..\..\tools\cluster\tests\wasm\*.* - +cd ..\..\documentation\tutorial-examples +wasm-pack build +copy /y pkg\example_tutorial_bg.wasm test +cd ..\..\contracts\wasm diff --git a/tools/schema/generator/emitter.go b/tools/schema/generator/emitter.go index f4041c3d32..246181d316 100644 --- a/tools/schema/generator/emitter.go +++ b/tools/schema/generator/emitter.go @@ -2,7 +2,10 @@ package generator import ( "regexp" + "strconv" "strings" + + "github.com/iotaledger/wasp/packages/iscp" ) const ( @@ -243,8 +246,12 @@ func (g *GenBase) emitIf(line string) { case KeyView: condition = g.keys["kind"] == KeyView default: - g.error(line) - return + key, ok := g.keys[parts[1]] + if !ok { + g.error(line) + return + } + condition = key != "" } if condition { @@ -289,3 +296,63 @@ func (g *GenBase) fieldIsTypeDef() bool { } return false } + +func (g *GenBase) setCommonKeys() { + g.keys["false"] = "" + g.keys["true"] = "true" + g.keys["empty"] = "" + g.keys["space"] = " " + g.keys["package"] = g.s.Name + g.keys["Package"] = g.s.FullName + g.keys["module"] = moduleName + strings.Replace(moduleCwd[len(modulePath):], "\\", "/", -1) + scName := g.s.Name + if g.s.CoreContracts { + // strip off "core" prefix + scName = scName[4:] + } + g.keys["scName"] = scName + g.keys["hscName"] = iscp.Hn(scName).String() + g.keys["scDesc"] = g.s.Description + g.keys["maxIndex"] = strconv.Itoa(g.s.KeyID) +} + +func (g *GenBase) setFieldKeys(pad bool) { + g.setMultiKeyValues("fldName", g.currentField.Name) + g.setMultiKeyValues("fldType", g.currentField.Type) + + g.keys["fldAlias"] = g.currentField.Alias + g.keys["fldComment"] = g.currentField.Comment + g.keys["fldMapKey"] = g.currentField.MapKey + g.keys["fldIndex"] = strconv.Itoa(g.currentField.KeyID) + + if pad { + g.keys["fldPad"] = spaces[:g.maxCamelFldLen-len(g.keys["fldName"])] + g.keys["fld_pad"] = spaces[:g.maxSnakeFldLen-len(g.keys["fld_name"])] + } +} + +func (g *GenBase) setFuncKeys() { + g.setMultiKeyValues("funcName", g.currentFunc.Name) + g.setMultiKeyValues("kind", g.currentFunc.Kind) + g.keys["funcHName"] = iscp.Hn(g.keys["funcName"]).String() + grant := g.currentFunc.Access + comment := "" + index := strings.Index(grant, "//") + if index >= 0 { + comment = grant[index:] + grant = strings.TrimSpace(grant[:index]) + } + g.keys["funcAccess"] = grant + g.keys["funcAccessComment"] = comment + + g.keys["funcPad"] = spaces[:g.maxCamelFuncLen-len(g.keys["funcName"])] + g.keys["func_pad"] = spaces[:g.maxSnakeFuncLen-len(g.keys["func_name"])] +} + +func (g *GenBase) setMultiKeyValues(key, value string) { + value = uncapitalize(value) + g.keys[key] = value + g.keys[capitalize(key)] = capitalize(value) + g.keys[snake(key)] = snake(value) + g.keys[upper(snake(key))] = upper(snake(value)) +} diff --git a/tools/schema/generator/generator.go b/tools/schema/generator/generator.go index ae5803d8db..3eac9d823f 100644 --- a/tools/schema/generator/generator.go +++ b/tools/schema/generator/generator.go @@ -8,10 +8,7 @@ import ( "fmt" "os" "regexp" - "strconv" "strings" - - "github.com/iotaledger/wasp/packages/iscp" ) // TODO nested structs @@ -152,15 +149,15 @@ func (g *GenBase) generateCode() error { if err != nil { return err } - err = g.createSourceFile("contract", true) + err = g.createSourceFile("keys", !g.s.CoreContracts) if err != nil { return err } - err = g.createSourceFile("keys", !g.s.CoreContracts) + err = g.createSourceFile("structs", len(g.s.Structs) != 0) if err != nil { return err } - err = g.createSourceFile("lib", !g.s.CoreContracts) + err = g.createSourceFile("typedefs", len(g.s.Typedefs) != 0) if err != nil { return err } @@ -176,11 +173,11 @@ func (g *GenBase) generateCode() error { if err != nil { return err } - err = g.createSourceFile("structs", len(g.s.Structs) != 0) + err = g.createSourceFile("contract", true) if err != nil { return err } - err = g.createSourceFile("typedefs", len(g.s.Typedefs) != 0) + err = g.createSourceFile("lib", !g.s.CoreContracts) if err != nil { return err } @@ -282,60 +279,3 @@ func (g *GenBase) scanExistingCode(path string, existing *StringMap, lines *[]st return scanner.Err() }) } - -func (g *GenBase) setCommonKeys() { - g.keys["space"] = " " - g.keys["package"] = g.s.Name - g.keys["Package"] = g.s.FullName - g.keys["module"] = moduleName + strings.Replace(moduleCwd[len(modulePath):], "\\", "/", -1) - scName := g.s.Name - if g.s.CoreContracts { - // strip off "core" prefix - scName = scName[4:] - } - g.keys["scName"] = scName - g.keys["hscName"] = iscp.Hn(scName).String() - g.keys["scDesc"] = g.s.Description - g.keys["maxIndex"] = strconv.Itoa(g.s.KeyID) -} - -func (g *GenBase) setFieldKeys(pad bool) { - g.setMultiKeyValues("fldName", g.currentField.Name) - g.setMultiKeyValues("fldType", g.currentField.Type) - - g.keys["fldAlias"] = g.currentField.Alias - g.keys["fldComment"] = g.currentField.Comment - g.keys["fldMapKey"] = g.currentField.MapKey - g.keys["fldIndex"] = strconv.Itoa(g.currentField.KeyID) - - if pad { - g.keys["fldPad"] = spaces[:g.maxCamelFldLen-len(g.keys["fldName"])] - g.keys["fld_pad"] = spaces[:g.maxSnakeFldLen-len(g.keys["fld_name"])] - } -} - -func (g *GenBase) setFuncKeys() { - g.setMultiKeyValues("funcName", g.currentFunc.Name) - g.setMultiKeyValues("kind", g.currentFunc.Kind) - g.keys["funcHName"] = iscp.Hn(g.keys["funcName"]).String() - grant := g.currentFunc.Access - comment := "" - index := strings.Index(grant, "//") - if index >= 0 { - comment = fmt.Sprintf(" %s\n", grant[index:]) - grant = strings.TrimSpace(grant[:index]) - } - g.keys["funcAccess"] = grant - g.keys["funcAccessComment"] = comment - - g.keys["funcPad"] = spaces[:g.maxCamelFuncLen-len(g.keys["funcName"])] - g.keys["func_pad"] = spaces[:g.maxSnakeFuncLen-len(g.keys["func_name"])] -} - -func (g *GenBase) setMultiKeyValues(key, value string) { - value = uncapitalize(value) - g.keys[key] = value - g.keys[capitalize(key)] = capitalize(value) - g.keys[snake(key)] = snake(value) - g.keys[upper(snake(key))] = upper(snake(value)) -} diff --git a/tools/schema/generator/gotemplates/lib.go b/tools/schema/generator/gotemplates/lib.go index e76e06263b..9b73337fb9 100644 --- a/tools/schema/generator/gotemplates/lib.go +++ b/tools/schema/generator/gotemplates/lib.go @@ -101,30 +101,39 @@ $#set accessFinalize accessDone `, // ******************************* "caseAccessself": ` -$funcAccessComment ctx.Require(ctx.Caller() == ctx.AccountID(), "no permission") +$#if funcAccessComment accessComment + ctx.Require(ctx.Caller() == ctx.AccountID(), "no permission") $#set accessFinalize accessDone `, // ******************************* "caseAccesschain": ` -$funcAccessComment ctx.Require(ctx.Caller() == ctx.ChainOwnerID(), "no permission") +$#if funcAccessComment accessComment + ctx.Require(ctx.Caller() == ctx.ChainOwnerID(), "no permission") $#set accessFinalize accessDone `, // ******************************* "caseAccesscreator": ` -$funcAccessComment ctx.Require(ctx.Caller() == ctx.ContractCreator(), "no permission") +$#if funcAccessComment accessComment + ctx.Require(ctx.Caller() == ctx.ContractCreator(), "no permission") $#set accessFinalize accessDone `, // ******************************* "accessOther": ` -$funcAccessComment access := ctx.State().GetAgentID(wasmlib.Key("$funcAccess")) +$#if funcAccessComment accessComment + access := ctx.State().GetAgentID(wasmlib.Key("$funcAccess")) ctx.Require(access.Exists(), "access not set: $funcAccess") ctx.Require(ctx.Caller() == access.Value(), "no permission") `, // ******************************* "accessDone": ` +`, + // ******************************* + "accessComment": ` + + $funcAccessComment `, } diff --git a/tools/schema/generator/rstemplates/lib.go b/tools/schema/generator/rstemplates/lib.go index f1257d73d0..63304cdaa2 100644 --- a/tools/schema/generator/rstemplates/lib.go +++ b/tools/schema/generator/rstemplates/lib.go @@ -124,30 +124,39 @@ $#set accessFinalize accessDone `, // ******************************* "caseAccessself": ` -$funcAccessComment ctx.require(ctx.caller() == ctx.account_id(), "no permission"); +$#if funcAccessComment accessComment + ctx.require(ctx.caller() == ctx.account_id(), "no permission"); $#set accessFinalize accessDone `, // ******************************* "caseAccesschain": ` -$funcAccessComment ctx.require(ctx.caller() == ctx.chain_owner_id(), "no permission"); +$#if funcAccessComment accessComment + ctx.require(ctx.caller() == ctx.chain_owner_id(), "no permission"); $#set accessFinalize accessDone `, // ******************************* "caseAccesscreator": ` -$funcAccessComment ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); +$#if funcAccessComment accessComment + ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); $#set accessFinalize accessDone `, // ******************************* "accessOther": ` -$funcAccessComment let access = ctx.state().get_agent_id("$funcAccess"); +$#if funcAccessComment accessComment + let access = ctx.state().get_agent_id("$funcAccess"); ctx.require(access.exists(), "access not set: $funcAccess"); ctx.require(ctx.caller() == access.value(), "no permission"); `, // ******************************* "accessDone": ` +`, + // ******************************* + "accessComment": ` + + $funcAccessComment `, } diff --git a/tools/schema/generator/tstemplates/lib.go b/tools/schema/generator/tstemplates/lib.go index d0b3f5d1ae..fa20ef1595 100644 --- a/tools/schema/generator/tstemplates/lib.go +++ b/tools/schema/generator/tstemplates/lib.go @@ -63,30 +63,39 @@ $#set accessFinalize accessDone `, // ******************************* "caseAccessself": ` -$funcAccessComment ctx.require(ctx.caller().equals(ctx.accountID()), "no permission"); +$#if funcAccessComment accessComment + ctx.require(ctx.caller().equals(ctx.accountID()), "no permission"); $#set accessFinalize accessDone `, // ******************************* "caseAccesschain": ` -$funcAccessComment ctx.require(ctx.caller().equals(ctx.chainOwnerID()), "no permission"); +$#if funcAccessComment accessComment + ctx.require(ctx.caller().equals(ctx.chainOwnerID()), "no permission"); $#set accessFinalize accessDone `, // ******************************* "caseAccesscreator": ` -$funcAccessComment ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); +$#if funcAccessComment accessComment + ctx.require(ctx.caller().equals(ctx.contractCreator()), "no permission"); $#set accessFinalize accessDone `, // ******************************* "accessOther": ` -$funcAccessComment let access = ctx.state().getAgentID(wasmlib.Key32.fromString("$funcAccess")); +$#if funcAccessComment accessComment + let access = ctx.state().getAgentID(wasmlib.Key32.fromString("$funcAccess")); ctx.require(access.exists(), "access not set: $funcAccess"); ctx.require(ctx.caller().equals(access.value()), "no permission"); `, // ******************************* "accessDone": ` +`, + // ******************************* + "accessComment": ` + + $funcAccessComment `, } From bc63db08579d9c9cc1979ef510ad8fd92241ec10 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Mon, 8 Nov 2021 08:19:30 -0800 Subject: [PATCH 048/198] Readability improvements --- contracts/wasm/dividend/src/contract.rs | 5 +++ contracts/wasm/dividend/src/params.rs | 8 ----- contracts/wasm/dividend/src/results.rs | 4 --- contracts/wasm/dividend/src/state.rs | 2 -- .../wasm/dividend/ts/dividend/contract.ts | 1 - contracts/wasm/dividend/ts/dividend/params.ts | 8 ----- .../wasm/dividend/ts/dividend/results.ts | 4 --- contracts/wasm/dividend/ts/dividend/state.ts | 2 -- .../wasm/donatewithfeedback/src/contract.rs | 3 ++ .../wasm/donatewithfeedback/src/params.rs | 6 ---- .../wasm/donatewithfeedback/src/results.rs | 4 --- .../wasm/donatewithfeedback/src/state.rs | 2 -- .../ts/donatewithfeedback/contract.ts | 1 - .../ts/donatewithfeedback/params.ts | 6 ---- .../ts/donatewithfeedback/results.ts | 4 --- .../ts/donatewithfeedback/state.ts | 2 -- contracts/wasm/erc20/src/contract.rs | 6 ++++ contracts/wasm/erc20/src/params.rs | 12 ------- contracts/wasm/erc20/src/results.rs | 6 ---- contracts/wasm/erc20/src/state.rs | 2 -- contracts/wasm/erc20/ts/erc20/contract.ts | 1 - contracts/wasm/erc20/ts/erc20/params.ts | 12 ------- contracts/wasm/erc20/ts/erc20/results.ts | 6 ---- contracts/wasm/erc20/ts/erc20/state.ts | 2 -- contracts/wasm/fairauction/src/contract.rs | 4 +++ contracts/wasm/fairauction/src/params.rs | 10 ------ contracts/wasm/fairauction/src/results.rs | 2 -- contracts/wasm/fairauction/src/state.rs | 2 -- .../fairauction/ts/fairauction/contract.ts | 1 - .../wasm/fairauction/ts/fairauction/params.ts | 10 ------ .../fairauction/ts/fairauction/results.ts | 2 -- .../wasm/fairauction/ts/fairauction/state.ts | 2 -- contracts/wasm/fairroulette/src/contract.rs | 8 +++++ contracts/wasm/fairroulette/src/params.rs | 4 --- contracts/wasm/fairroulette/src/results.rs | 8 ----- contracts/wasm/fairroulette/src/state.rs | 2 -- .../fairroulette/ts/fairroulette/contract.ts | 1 - .../fairroulette/ts/fairroulette/params.ts | 4 --- .../fairroulette/ts/fairroulette/results.ts | 8 ----- .../fairroulette/ts/fairroulette/state.ts | 2 -- contracts/wasm/helloworld/src/contract.rs | 1 + contracts/wasm/helloworld/src/results.rs | 2 -- .../wasm/helloworld/ts/helloworld/contract.ts | 1 - .../wasm/helloworld/ts/helloworld/results.ts | 2 -- contracts/wasm/inccounter/src/contract.rs | 13 ++++++++ contracts/wasm/inccounter/src/params.rs | 8 ----- contracts/wasm/inccounter/src/results.rs | 2 -- contracts/wasm/inccounter/src/state.rs | 2 -- .../wasm/inccounter/ts/inccounter/contract.ts | 1 - .../wasm/inccounter/ts/inccounter/params.ts | 8 ----- .../wasm/inccounter/ts/inccounter/results.ts | 2 -- .../wasm/inccounter/ts/inccounter/state.ts | 2 -- contracts/wasm/testcore/src/contract.rs | 31 +++++++++++++++++++ contracts/wasm/testcore/src/params.rs | 30 ------------------ contracts/wasm/testcore/src/results.rs | 20 ------------ contracts/wasm/testcore/src/state.rs | 2 -- .../wasm/testcore/ts/testcore/contract.ts | 1 - contracts/wasm/testcore/ts/testcore/params.ts | 30 ------------------ .../wasm/testcore/ts/testcore/results.ts | 20 ------------ contracts/wasm/testcore/ts/testcore/state.ts | 2 -- contracts/wasm/testwasmlib/src/contract.rs | 10 ++++++ contracts/wasm/testwasmlib/src/params.rs | 16 ---------- contracts/wasm/testwasmlib/src/results.rs | 12 ------- contracts/wasm/testwasmlib/src/state.rs | 2 -- .../testwasmlib/ts/testwasmlib/contract.ts | 1 - .../wasm/testwasmlib/ts/testwasmlib/params.ts | 16 ---------- .../testwasmlib/ts/testwasmlib/results.ts | 12 ------- .../wasm/testwasmlib/ts/testwasmlib/state.ts | 2 -- contracts/wasm/timestamp/src/contract.rs | 1 + contracts/wasm/timestamp/src/results.rs | 2 -- contracts/wasm/timestamp/src/state.rs | 2 -- .../wasm/timestamp/ts/timestamp/contract.ts | 1 - .../wasm/timestamp/ts/timestamp/results.ts | 2 -- .../wasm/timestamp/ts/timestamp/state.ts | 2 -- contracts/wasm/tokenregistry/src/contract.rs | 3 ++ contracts/wasm/tokenregistry/src/params.rs | 8 ----- contracts/wasm/tokenregistry/src/state.rs | 2 -- .../ts/tokenregistry/contract.ts | 1 - .../tokenregistry/ts/tokenregistry/params.ts | 8 ----- .../tokenregistry/ts/tokenregistry/state.ts | 2 -- .../vm/wasmlib/src/coreaccounts/contract.rs | 6 ++++ .../vm/wasmlib/src/coreaccounts/params.rs | 8 ----- .../vm/wasmlib/src/coreaccounts/results.rs | 8 ----- packages/vm/wasmlib/src/coreblob/contract.rs | 3 ++ packages/vm/wasmlib/src/coreblob/params.rs | 6 ---- packages/vm/wasmlib/src/coreblob/results.rs | 8 ----- .../vm/wasmlib/src/coreblocklog/contract.rs | 9 ++++++ .../vm/wasmlib/src/coreblocklog/params.rs | 16 ---------- .../vm/wasmlib/src/coreblocklog/results.rs | 20 ------------ .../vm/wasmlib/src/coregovernance/contract.rs | 11 +++++++ .../vm/wasmlib/src/coregovernance/params.rs | 16 ---------- .../vm/wasmlib/src/coregovernance/results.rs | 8 ----- packages/vm/wasmlib/src/coreroot/contract.rs | 4 +++ packages/vm/wasmlib/src/coreroot/params.rs | 8 ----- packages/vm/wasmlib/src/coreroot/results.rs | 4 --- .../ts/wasmlib/coreaccounts/contract.ts | 1 - .../wasmlib/ts/wasmlib/coreaccounts/params.ts | 8 ----- .../ts/wasmlib/coreaccounts/results.ts | 8 ----- .../wasmlib/ts/wasmlib/coreblob/contract.ts | 1 - .../vm/wasmlib/ts/wasmlib/coreblob/params.ts | 6 ---- .../vm/wasmlib/ts/wasmlib/coreblob/results.ts | 8 ----- .../ts/wasmlib/coreblocklog/contract.ts | 1 - .../wasmlib/ts/wasmlib/coreblocklog/params.ts | 16 ---------- .../ts/wasmlib/coreblocklog/results.ts | 20 ------------ .../ts/wasmlib/coregovernance/contract.ts | 1 - .../ts/wasmlib/coregovernance/params.ts | 16 ---------- .../ts/wasmlib/coregovernance/results.ts | 8 ----- .../wasmlib/ts/wasmlib/coreroot/contract.ts | 1 - .../vm/wasmlib/ts/wasmlib/coreroot/params.ts | 8 ----- .../vm/wasmlib/ts/wasmlib/coreroot/results.ts | 4 --- .../schema/generator/rstemplates/contract.go | 3 ++ tools/schema/generator/rstemplates/params.go | 1 + tools/schema/generator/rstemplates/proxy.go | 7 ++--- tools/schema/generator/rstemplates/results.go | 1 + tools/schema/generator/rstemplates/state.go | 1 + tools/schema/generator/templates.go | 4 +++ .../schema/generator/tstemplates/contract.go | 4 ++- tools/schema/generator/tstemplates/params.go | 1 + tools/schema/generator/tstemplates/proxy.go | 7 ++--- tools/schema/generator/tstemplates/results.go | 1 + tools/schema/generator/tstemplates/state.go | 1 + 121 files changed, 138 insertions(+), 599 deletions(-) diff --git a/contracts/wasm/dividend/src/contract.rs b/contracts/wasm/dividend/src/contract.rs index 29c11380e9..794ea5c465 100644 --- a/contracts/wasm/dividend/src/contract.rs +++ b/contracts/wasm/dividend/src/contract.rs @@ -54,6 +54,7 @@ impl ScFuncs { func: ScFunc::new(HSC_NAME, HFUNC_DIVIDE), } } + pub fn init(_ctx: & dyn ScFuncCallContext) -> InitCall { let mut f = InitCall { func: ScInitFunc::new(HSC_NAME, HFUNC_INIT), @@ -62,6 +63,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn member(_ctx: & dyn ScFuncCallContext) -> MemberCall { let mut f = MemberCall { func: ScFunc::new(HSC_NAME, HFUNC_MEMBER), @@ -70,6 +72,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn set_owner(_ctx: & dyn ScFuncCallContext) -> SetOwnerCall { let mut f = SetOwnerCall { func: ScFunc::new(HSC_NAME, HFUNC_SET_OWNER), @@ -78,6 +81,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn get_factor(_ctx: & dyn ScViewCallContext) -> GetFactorCall { let mut f = GetFactorCall { func: ScView::new(HSC_NAME, HVIEW_GET_FACTOR), @@ -87,6 +91,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn get_owner(_ctx: & dyn ScViewCallContext) -> GetOwnerCall { let mut f = GetOwnerCall { func: ScView::new(HSC_NAME, HVIEW_GET_OWNER), diff --git a/contracts/wasm/dividend/src/params.rs b/contracts/wasm/dividend/src/params.rs index 72ea177294..a8ddbef09f 100644 --- a/contracts/wasm/dividend/src/params.rs +++ b/contracts/wasm/dividend/src/params.rs @@ -20,7 +20,6 @@ pub struct ImmutableInitParams { } impl ImmutableInitParams { - pub fn owner(&self) -> ScImmutableAgentID { ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) } @@ -32,7 +31,6 @@ pub struct MutableInitParams { } impl MutableInitParams { - pub fn owner(&self) -> ScMutableAgentID { ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) } @@ -44,7 +42,6 @@ pub struct ImmutableMemberParams { } impl ImmutableMemberParams { - pub fn address(&self) -> ScImmutableAddress { ScImmutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) } @@ -60,7 +57,6 @@ pub struct MutableMemberParams { } impl MutableMemberParams { - pub fn address(&self) -> ScMutableAddress { ScMutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) } @@ -76,7 +72,6 @@ pub struct ImmutableSetOwnerParams { } impl ImmutableSetOwnerParams { - pub fn owner(&self) -> ScImmutableAgentID { ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) } @@ -88,7 +83,6 @@ pub struct MutableSetOwnerParams { } impl MutableSetOwnerParams { - pub fn owner(&self) -> ScMutableAgentID { ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) } @@ -100,7 +94,6 @@ pub struct ImmutableGetFactorParams { } impl ImmutableGetFactorParams { - pub fn address(&self) -> ScImmutableAddress { ScImmutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) } @@ -112,7 +105,6 @@ pub struct MutableGetFactorParams { } impl MutableGetFactorParams { - pub fn address(&self) -> ScMutableAddress { ScMutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) } diff --git a/contracts/wasm/dividend/src/results.rs b/contracts/wasm/dividend/src/results.rs index efece102d2..373e293a53 100644 --- a/contracts/wasm/dividend/src/results.rs +++ b/contracts/wasm/dividend/src/results.rs @@ -20,7 +20,6 @@ pub struct ImmutableGetFactorResults { } impl ImmutableGetFactorResults { - pub fn factor(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_FACTOR)) } @@ -32,7 +31,6 @@ pub struct MutableGetFactorResults { } impl MutableGetFactorResults { - pub fn factor(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_RESULT_FACTOR)) } @@ -44,7 +42,6 @@ pub struct ImmutableGetOwnerResults { } impl ImmutableGetOwnerResults { - pub fn owner(&self) -> ScImmutableAgentID { ScImmutableAgentID::new(self.id, idx_map(IDX_RESULT_OWNER)) } @@ -56,7 +53,6 @@ pub struct MutableGetOwnerResults { } impl MutableGetOwnerResults { - pub fn owner(&self) -> ScMutableAgentID { ScMutableAgentID::new(self.id, idx_map(IDX_RESULT_OWNER)) } diff --git a/contracts/wasm/dividend/src/state.rs b/contracts/wasm/dividend/src/state.rs index 0cd7684d9f..1181e0fd48 100644 --- a/contracts/wasm/dividend/src/state.rs +++ b/contracts/wasm/dividend/src/state.rs @@ -44,7 +44,6 @@ pub struct ImmutableDividendState { } impl ImmutableDividendState { - pub fn member_list(&self) -> ArrayOfImmutableAddress { let arr_id = get_object_id(self.id, idx_map(IDX_STATE_MEMBER_LIST), TYPE_ARRAY | TYPE_ADDRESS); ArrayOfImmutableAddress { obj_id: arr_id } @@ -102,7 +101,6 @@ pub struct MutableDividendState { } impl MutableDividendState { - pub fn member_list(&self) -> ArrayOfMutableAddress { let arr_id = get_object_id(self.id, idx_map(IDX_STATE_MEMBER_LIST), TYPE_ARRAY | TYPE_ADDRESS); ArrayOfMutableAddress { obj_id: arr_id } diff --git a/contracts/wasm/dividend/ts/dividend/contract.ts b/contracts/wasm/dividend/ts/dividend/contract.ts index b007d35980..929d85e4ac 100644 --- a/contracts/wasm/dividend/ts/dividend/contract.ts +++ b/contracts/wasm/dividend/ts/dividend/contract.ts @@ -69,7 +69,6 @@ export class GetOwnerContext { } export class ScFuncs { - static divide(ctx: wasmlib.ScFuncCallContext): DivideCall { return new DivideCall(); } diff --git a/contracts/wasm/dividend/ts/dividend/params.ts b/contracts/wasm/dividend/ts/dividend/params.ts index 78ccbae6d5..9182269073 100644 --- a/contracts/wasm/dividend/ts/dividend/params.ts +++ b/contracts/wasm/dividend/ts/dividend/params.ts @@ -9,21 +9,18 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableInitParams extends wasmlib.ScMapID { - owner(): wasmlib.ScImmutableAgentID { return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); } } export class MutableInitParams extends wasmlib.ScMapID { - owner(): wasmlib.ScMutableAgentID { return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); } } export class ImmutableMemberParams extends wasmlib.ScMapID { - address(): wasmlib.ScImmutableAddress { return new wasmlib.ScImmutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); } @@ -34,7 +31,6 @@ export class ImmutableMemberParams extends wasmlib.ScMapID { } export class MutableMemberParams extends wasmlib.ScMapID { - address(): wasmlib.ScMutableAddress { return new wasmlib.ScMutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); } @@ -45,28 +41,24 @@ export class MutableMemberParams extends wasmlib.ScMapID { } export class ImmutableSetOwnerParams extends wasmlib.ScMapID { - owner(): wasmlib.ScImmutableAgentID { return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); } } export class MutableSetOwnerParams extends wasmlib.ScMapID { - owner(): wasmlib.ScMutableAgentID { return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); } } export class ImmutableGetFactorParams extends wasmlib.ScMapID { - address(): wasmlib.ScImmutableAddress { return new wasmlib.ScImmutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); } } export class MutableGetFactorParams extends wasmlib.ScMapID { - address(): wasmlib.ScMutableAddress { return new wasmlib.ScMutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); } diff --git a/contracts/wasm/dividend/ts/dividend/results.ts b/contracts/wasm/dividend/ts/dividend/results.ts index 6fa46cace8..3bac84f77e 100644 --- a/contracts/wasm/dividend/ts/dividend/results.ts +++ b/contracts/wasm/dividend/ts/dividend/results.ts @@ -9,28 +9,24 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableGetFactorResults extends wasmlib.ScMapID { - factor(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultFactor]); } } export class MutableGetFactorResults extends wasmlib.ScMapID { - factor(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultFactor]); } } export class ImmutableGetOwnerResults extends wasmlib.ScMapID { - owner(): wasmlib.ScImmutableAgentID { return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxResultOwner]); } } export class MutableGetOwnerResults extends wasmlib.ScMapID { - owner(): wasmlib.ScMutableAgentID { return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxResultOwner]); } diff --git a/contracts/wasm/dividend/ts/dividend/state.ts b/contracts/wasm/dividend/ts/dividend/state.ts index 74d23e984e..b7a24f7015 100644 --- a/contracts/wasm/dividend/ts/dividend/state.ts +++ b/contracts/wasm/dividend/ts/dividend/state.ts @@ -37,7 +37,6 @@ export class MapAddressToImmutableInt64 { } export class ImmutableDividendState extends wasmlib.ScMapID { - memberList(): sc.ArrayOfImmutableAddress { let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateMemberList], wasmlib.TYPE_ARRAY|wasmlib.TYPE_ADDRESS); return new sc.ArrayOfImmutableAddress(arrID); @@ -94,7 +93,6 @@ export class MapAddressToMutableInt64 { } export class MutableDividendState extends wasmlib.ScMapID { - memberList(): sc.ArrayOfMutableAddress { let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateMemberList], wasmlib.TYPE_ARRAY|wasmlib.TYPE_ADDRESS); return new sc.ArrayOfMutableAddress(arrID); diff --git a/contracts/wasm/donatewithfeedback/src/contract.rs b/contracts/wasm/donatewithfeedback/src/contract.rs index 69a43c1288..d726d153ca 100644 --- a/contracts/wasm/donatewithfeedback/src/contract.rs +++ b/contracts/wasm/donatewithfeedback/src/contract.rs @@ -48,6 +48,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn withdraw(_ctx: & dyn ScFuncCallContext) -> WithdrawCall { let mut f = WithdrawCall { func: ScFunc::new(HSC_NAME, HFUNC_WITHDRAW), @@ -56,6 +57,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn donation(_ctx: & dyn ScViewCallContext) -> DonationCall { let mut f = DonationCall { func: ScView::new(HSC_NAME, HVIEW_DONATION), @@ -65,6 +67,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn donation_info(_ctx: & dyn ScViewCallContext) -> DonationInfoCall { let mut f = DonationInfoCall { func: ScView::new(HSC_NAME, HVIEW_DONATION_INFO), diff --git a/contracts/wasm/donatewithfeedback/src/params.rs b/contracts/wasm/donatewithfeedback/src/params.rs index 9fe6f6fb7a..df63e977cf 100644 --- a/contracts/wasm/donatewithfeedback/src/params.rs +++ b/contracts/wasm/donatewithfeedback/src/params.rs @@ -20,7 +20,6 @@ pub struct ImmutableDonateParams { } impl ImmutableDonateParams { - pub fn feedback(&self) -> ScImmutableString { ScImmutableString::new(self.id, idx_map(IDX_PARAM_FEEDBACK)) } @@ -32,7 +31,6 @@ pub struct MutableDonateParams { } impl MutableDonateParams { - pub fn feedback(&self) -> ScMutableString { ScMutableString::new(self.id, idx_map(IDX_PARAM_FEEDBACK)) } @@ -44,7 +42,6 @@ pub struct ImmutableWithdrawParams { } impl ImmutableWithdrawParams { - pub fn amount(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_AMOUNT)) } @@ -56,7 +53,6 @@ pub struct MutableWithdrawParams { } impl MutableWithdrawParams { - pub fn amount(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_PARAM_AMOUNT)) } @@ -68,7 +64,6 @@ pub struct ImmutableDonationParams { } impl ImmutableDonationParams { - pub fn nr(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_NR)) } @@ -80,7 +75,6 @@ pub struct MutableDonationParams { } impl MutableDonationParams { - pub fn nr(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_PARAM_NR)) } diff --git a/contracts/wasm/donatewithfeedback/src/results.rs b/contracts/wasm/donatewithfeedback/src/results.rs index 05bedeb1a6..6d3b0ad322 100644 --- a/contracts/wasm/donatewithfeedback/src/results.rs +++ b/contracts/wasm/donatewithfeedback/src/results.rs @@ -21,7 +21,6 @@ pub struct ImmutableDonationResults { } impl ImmutableDonationResults { - pub fn amount(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_AMOUNT)) } @@ -49,7 +48,6 @@ pub struct MutableDonationResults { } impl MutableDonationResults { - pub fn amount(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_RESULT_AMOUNT)) } @@ -77,7 +75,6 @@ pub struct ImmutableDonationInfoResults { } impl ImmutableDonationInfoResults { - pub fn count(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_COUNT)) } @@ -97,7 +94,6 @@ pub struct MutableDonationInfoResults { } impl MutableDonationInfoResults { - pub fn count(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_RESULT_COUNT)) } diff --git a/contracts/wasm/donatewithfeedback/src/state.rs b/contracts/wasm/donatewithfeedback/src/state.rs index 7bb4d36765..9fc1c32e0f 100644 --- a/contracts/wasm/donatewithfeedback/src/state.rs +++ b/contracts/wasm/donatewithfeedback/src/state.rs @@ -35,7 +35,6 @@ pub struct ImmutableDonateWithFeedbackState { } impl ImmutableDonateWithFeedbackState { - pub fn log(&self) -> ArrayOfImmutableDonation { let arr_id = get_object_id(self.id, idx_map(IDX_STATE_LOG), TYPE_ARRAY | TYPE_BYTES); ArrayOfImmutableDonation { obj_id: arr_id } @@ -74,7 +73,6 @@ pub struct MutableDonateWithFeedbackState { } impl MutableDonateWithFeedbackState { - pub fn log(&self) -> ArrayOfMutableDonation { let arr_id = get_object_id(self.id, idx_map(IDX_STATE_LOG), TYPE_ARRAY | TYPE_BYTES); ArrayOfMutableDonation { obj_id: arr_id } diff --git a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/contract.ts b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/contract.ts index a68343d6f9..c3d9d5a0eb 100644 --- a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/contract.ts +++ b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/contract.ts @@ -51,7 +51,6 @@ export class DonationInfoContext { } export class ScFuncs { - static donate(ctx: wasmlib.ScFuncCallContext): DonateCall { let f = new DonateCall(); f.func.setPtrs(f.params, null); diff --git a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/params.ts b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/params.ts index acfecf4821..81558202a8 100644 --- a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/params.ts +++ b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/params.ts @@ -9,42 +9,36 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableDonateParams extends wasmlib.ScMapID { - feedback(): wasmlib.ScImmutableString { return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamFeedback]); } } export class MutableDonateParams extends wasmlib.ScMapID { - feedback(): wasmlib.ScMutableString { return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamFeedback]); } } export class ImmutableWithdrawParams extends wasmlib.ScMapID { - amount(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamAmount]); } } export class MutableWithdrawParams extends wasmlib.ScMapID { - amount(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamAmount]); } } export class ImmutableDonationParams extends wasmlib.ScMapID { - nr(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamNr]); } } export class MutableDonationParams extends wasmlib.ScMapID { - nr(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamNr]); } diff --git a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/results.ts b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/results.ts index d0b4ea12cd..2d9329bd9d 100644 --- a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/results.ts +++ b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/results.ts @@ -9,7 +9,6 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableDonationResults extends wasmlib.ScMapID { - amount(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultAmount]); } @@ -32,7 +31,6 @@ export class ImmutableDonationResults extends wasmlib.ScMapID { } export class MutableDonationResults extends wasmlib.ScMapID { - amount(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultAmount]); } @@ -55,7 +53,6 @@ export class MutableDonationResults extends wasmlib.ScMapID { } export class ImmutableDonationInfoResults extends wasmlib.ScMapID { - count(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultCount]); } @@ -70,7 +67,6 @@ export class ImmutableDonationInfoResults extends wasmlib.ScMapID { } export class MutableDonationInfoResults extends wasmlib.ScMapID { - count(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultCount]); } diff --git a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/state.ts b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/state.ts index dca3b721fb..0a946bfcf1 100644 --- a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/state.ts +++ b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/state.ts @@ -25,7 +25,6 @@ export class ArrayOfImmutableDonation { } export class ImmutableDonateWithFeedbackState extends wasmlib.ScMapID { - log(): sc.ArrayOfImmutableDonation { let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateLog], wasmlib.TYPE_ARRAY|wasmlib.TYPE_BYTES); return new sc.ArrayOfImmutableDonation(arrID); @@ -61,7 +60,6 @@ export class ArrayOfMutableDonation { } export class MutableDonateWithFeedbackState extends wasmlib.ScMapID { - log(): sc.ArrayOfMutableDonation { let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateLog], wasmlib.TYPE_ARRAY|wasmlib.TYPE_BYTES); return new sc.ArrayOfMutableDonation(arrID); diff --git a/contracts/wasm/erc20/src/contract.rs b/contracts/wasm/erc20/src/contract.rs index 9442eae9ce..cc412c413d 100644 --- a/contracts/wasm/erc20/src/contract.rs +++ b/contracts/wasm/erc20/src/contract.rs @@ -64,6 +64,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn init(_ctx: & dyn ScFuncCallContext) -> InitCall { let mut f = InitCall { func: ScInitFunc::new(HSC_NAME, HFUNC_INIT), @@ -72,6 +73,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn transfer(_ctx: & dyn ScFuncCallContext) -> TransferCall { let mut f = TransferCall { func: ScFunc::new(HSC_NAME, HFUNC_TRANSFER), @@ -80,6 +82,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn transfer_from(_ctx: & dyn ScFuncCallContext) -> TransferFromCall { let mut f = TransferFromCall { func: ScFunc::new(HSC_NAME, HFUNC_TRANSFER_FROM), @@ -88,6 +91,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn allowance(_ctx: & dyn ScViewCallContext) -> AllowanceCall { let mut f = AllowanceCall { func: ScView::new(HSC_NAME, HVIEW_ALLOWANCE), @@ -97,6 +101,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn balance_of(_ctx: & dyn ScViewCallContext) -> BalanceOfCall { let mut f = BalanceOfCall { func: ScView::new(HSC_NAME, HVIEW_BALANCE_OF), @@ -106,6 +111,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn total_supply(_ctx: & dyn ScViewCallContext) -> TotalSupplyCall { let mut f = TotalSupplyCall { func: ScView::new(HSC_NAME, HVIEW_TOTAL_SUPPLY), diff --git a/contracts/wasm/erc20/src/params.rs b/contracts/wasm/erc20/src/params.rs index 2af59079fd..17cb7f1c61 100644 --- a/contracts/wasm/erc20/src/params.rs +++ b/contracts/wasm/erc20/src/params.rs @@ -20,7 +20,6 @@ pub struct ImmutableApproveParams { } impl ImmutableApproveParams { - pub fn amount(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_AMOUNT)) } @@ -36,7 +35,6 @@ pub struct MutableApproveParams { } impl MutableApproveParams { - pub fn amount(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_PARAM_AMOUNT)) } @@ -52,7 +50,6 @@ pub struct ImmutableInitParams { } impl ImmutableInitParams { - pub fn creator(&self) -> ScImmutableAgentID { ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_CREATOR)) } @@ -68,7 +65,6 @@ pub struct MutableInitParams { } impl MutableInitParams { - pub fn creator(&self) -> ScMutableAgentID { ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_CREATOR)) } @@ -84,7 +80,6 @@ pub struct ImmutableTransferParams { } impl ImmutableTransferParams { - pub fn account(&self) -> ScImmutableAgentID { ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) } @@ -100,7 +95,6 @@ pub struct MutableTransferParams { } impl MutableTransferParams { - pub fn account(&self) -> ScMutableAgentID { ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) } @@ -116,7 +110,6 @@ pub struct ImmutableTransferFromParams { } impl ImmutableTransferFromParams { - pub fn account(&self) -> ScImmutableAgentID { ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) } @@ -136,7 +129,6 @@ pub struct MutableTransferFromParams { } impl MutableTransferFromParams { - pub fn account(&self) -> ScMutableAgentID { ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) } @@ -156,7 +148,6 @@ pub struct ImmutableAllowanceParams { } impl ImmutableAllowanceParams { - pub fn account(&self) -> ScImmutableAgentID { ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) } @@ -172,7 +163,6 @@ pub struct MutableAllowanceParams { } impl MutableAllowanceParams { - pub fn account(&self) -> ScMutableAgentID { ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) } @@ -188,7 +178,6 @@ pub struct ImmutableBalanceOfParams { } impl ImmutableBalanceOfParams { - pub fn account(&self) -> ScImmutableAgentID { ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) } @@ -200,7 +189,6 @@ pub struct MutableBalanceOfParams { } impl MutableBalanceOfParams { - pub fn account(&self) -> ScMutableAgentID { ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_ACCOUNT)) } diff --git a/contracts/wasm/erc20/src/results.rs b/contracts/wasm/erc20/src/results.rs index 9fcf06e9b6..30ffd7c1f1 100644 --- a/contracts/wasm/erc20/src/results.rs +++ b/contracts/wasm/erc20/src/results.rs @@ -20,7 +20,6 @@ pub struct ImmutableAllowanceResults { } impl ImmutableAllowanceResults { - pub fn amount(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_AMOUNT)) } @@ -32,7 +31,6 @@ pub struct MutableAllowanceResults { } impl MutableAllowanceResults { - pub fn amount(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_RESULT_AMOUNT)) } @@ -44,7 +42,6 @@ pub struct ImmutableBalanceOfResults { } impl ImmutableBalanceOfResults { - pub fn amount(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_AMOUNT)) } @@ -56,7 +53,6 @@ pub struct MutableBalanceOfResults { } impl MutableBalanceOfResults { - pub fn amount(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_RESULT_AMOUNT)) } @@ -68,7 +64,6 @@ pub struct ImmutableTotalSupplyResults { } impl ImmutableTotalSupplyResults { - pub fn supply(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_SUPPLY)) } @@ -80,7 +75,6 @@ pub struct MutableTotalSupplyResults { } impl MutableTotalSupplyResults { - pub fn supply(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_RESULT_SUPPLY)) } diff --git a/contracts/wasm/erc20/src/state.rs b/contracts/wasm/erc20/src/state.rs index 45b7bbc939..c67adb6537 100644 --- a/contracts/wasm/erc20/src/state.rs +++ b/contracts/wasm/erc20/src/state.rs @@ -32,7 +32,6 @@ pub struct ImmutableErc20State { } impl ImmutableErc20State { - pub fn all_allowances(&self) -> MapAgentIDToImmutableAllowancesForAgent { let map_id = get_object_id(self.id, idx_map(IDX_STATE_ALL_ALLOWANCES), TYPE_MAP); MapAgentIDToImmutableAllowancesForAgent { obj_id: map_id } @@ -69,7 +68,6 @@ pub struct MutableErc20State { } impl MutableErc20State { - pub fn all_allowances(&self) -> MapAgentIDToMutableAllowancesForAgent { let map_id = get_object_id(self.id, idx_map(IDX_STATE_ALL_ALLOWANCES), TYPE_MAP); MapAgentIDToMutableAllowancesForAgent { obj_id: map_id } diff --git a/contracts/wasm/erc20/ts/erc20/contract.ts b/contracts/wasm/erc20/ts/erc20/contract.ts index 4bff148b84..050766e474 100644 --- a/contracts/wasm/erc20/ts/erc20/contract.ts +++ b/contracts/wasm/erc20/ts/erc20/contract.ts @@ -83,7 +83,6 @@ export class TotalSupplyContext { } export class ScFuncs { - static approve(ctx: wasmlib.ScFuncCallContext): ApproveCall { let f = new ApproveCall(); f.func.setPtrs(f.params, null); diff --git a/contracts/wasm/erc20/ts/erc20/params.ts b/contracts/wasm/erc20/ts/erc20/params.ts index 40d3da1431..0fb5a88612 100644 --- a/contracts/wasm/erc20/ts/erc20/params.ts +++ b/contracts/wasm/erc20/ts/erc20/params.ts @@ -9,7 +9,6 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableApproveParams extends wasmlib.ScMapID { - amount(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamAmount]); } @@ -20,7 +19,6 @@ export class ImmutableApproveParams extends wasmlib.ScMapID { } export class MutableApproveParams extends wasmlib.ScMapID { - amount(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamAmount]); } @@ -31,7 +29,6 @@ export class MutableApproveParams extends wasmlib.ScMapID { } export class ImmutableInitParams extends wasmlib.ScMapID { - creator(): wasmlib.ScImmutableAgentID { return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamCreator]); } @@ -42,7 +39,6 @@ export class ImmutableInitParams extends wasmlib.ScMapID { } export class MutableInitParams extends wasmlib.ScMapID { - creator(): wasmlib.ScMutableAgentID { return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamCreator]); } @@ -53,7 +49,6 @@ export class MutableInitParams extends wasmlib.ScMapID { } export class ImmutableTransferParams extends wasmlib.ScMapID { - account(): wasmlib.ScImmutableAgentID { return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); } @@ -64,7 +59,6 @@ export class ImmutableTransferParams extends wasmlib.ScMapID { } export class MutableTransferParams extends wasmlib.ScMapID { - account(): wasmlib.ScMutableAgentID { return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); } @@ -75,7 +69,6 @@ export class MutableTransferParams extends wasmlib.ScMapID { } export class ImmutableTransferFromParams extends wasmlib.ScMapID { - account(): wasmlib.ScImmutableAgentID { return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); } @@ -90,7 +83,6 @@ export class ImmutableTransferFromParams extends wasmlib.ScMapID { } export class MutableTransferFromParams extends wasmlib.ScMapID { - account(): wasmlib.ScMutableAgentID { return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); } @@ -105,7 +97,6 @@ export class MutableTransferFromParams extends wasmlib.ScMapID { } export class ImmutableAllowanceParams extends wasmlib.ScMapID { - account(): wasmlib.ScImmutableAgentID { return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); } @@ -116,7 +107,6 @@ export class ImmutableAllowanceParams extends wasmlib.ScMapID { } export class MutableAllowanceParams extends wasmlib.ScMapID { - account(): wasmlib.ScMutableAgentID { return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); } @@ -127,14 +117,12 @@ export class MutableAllowanceParams extends wasmlib.ScMapID { } export class ImmutableBalanceOfParams extends wasmlib.ScMapID { - account(): wasmlib.ScImmutableAgentID { return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); } } export class MutableBalanceOfParams extends wasmlib.ScMapID { - account(): wasmlib.ScMutableAgentID { return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAccount]); } diff --git a/contracts/wasm/erc20/ts/erc20/results.ts b/contracts/wasm/erc20/ts/erc20/results.ts index d20eac6efc..ceab965434 100644 --- a/contracts/wasm/erc20/ts/erc20/results.ts +++ b/contracts/wasm/erc20/ts/erc20/results.ts @@ -9,42 +9,36 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableAllowanceResults extends wasmlib.ScMapID { - amount(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultAmount]); } } export class MutableAllowanceResults extends wasmlib.ScMapID { - amount(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultAmount]); } } export class ImmutableBalanceOfResults extends wasmlib.ScMapID { - amount(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultAmount]); } } export class MutableBalanceOfResults extends wasmlib.ScMapID { - amount(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultAmount]); } } export class ImmutableTotalSupplyResults extends wasmlib.ScMapID { - supply(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultSupply]); } } export class MutableTotalSupplyResults extends wasmlib.ScMapID { - supply(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultSupply]); } diff --git a/contracts/wasm/erc20/ts/erc20/state.ts b/contracts/wasm/erc20/ts/erc20/state.ts index 65f197bca1..132fad2c0b 100644 --- a/contracts/wasm/erc20/ts/erc20/state.ts +++ b/contracts/wasm/erc20/ts/erc20/state.ts @@ -22,7 +22,6 @@ export class MapAgentIDToImmutableAllowancesForAgent { } export class ImmutableErc20State extends wasmlib.ScMapID { - allAllowances(): sc.MapAgentIDToImmutableAllowancesForAgent { let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateAllAllowances], wasmlib.TYPE_MAP); return new sc.MapAgentIDToImmutableAllowancesForAgent(mapID); @@ -56,7 +55,6 @@ export class MapAgentIDToMutableAllowancesForAgent { } export class MutableErc20State extends wasmlib.ScMapID { - allAllowances(): sc.MapAgentIDToMutableAllowancesForAgent { let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateAllAllowances], wasmlib.TYPE_MAP); return new sc.MapAgentIDToMutableAllowancesForAgent(mapID); diff --git a/contracts/wasm/fairauction/src/contract.rs b/contracts/wasm/fairauction/src/contract.rs index eedbe31941..78cd2681ae 100644 --- a/contracts/wasm/fairauction/src/contract.rs +++ b/contracts/wasm/fairauction/src/contract.rs @@ -53,6 +53,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn place_bid(_ctx: & dyn ScFuncCallContext) -> PlaceBidCall { let mut f = PlaceBidCall { func: ScFunc::new(HSC_NAME, HFUNC_PLACE_BID), @@ -61,6 +62,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn set_owner_margin(_ctx: & dyn ScFuncCallContext) -> SetOwnerMarginCall { let mut f = SetOwnerMarginCall { func: ScFunc::new(HSC_NAME, HFUNC_SET_OWNER_MARGIN), @@ -69,6 +71,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn start_auction(_ctx: & dyn ScFuncCallContext) -> StartAuctionCall { let mut f = StartAuctionCall { func: ScFunc::new(HSC_NAME, HFUNC_START_AUCTION), @@ -77,6 +80,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn get_info(_ctx: & dyn ScViewCallContext) -> GetInfoCall { let mut f = GetInfoCall { func: ScView::new(HSC_NAME, HVIEW_GET_INFO), diff --git a/contracts/wasm/fairauction/src/params.rs b/contracts/wasm/fairauction/src/params.rs index e022b2b18b..a9e5bef5d0 100644 --- a/contracts/wasm/fairauction/src/params.rs +++ b/contracts/wasm/fairauction/src/params.rs @@ -20,7 +20,6 @@ pub struct ImmutableFinalizeAuctionParams { } impl ImmutableFinalizeAuctionParams { - pub fn color(&self) -> ScImmutableColor { ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) } @@ -32,7 +31,6 @@ pub struct MutableFinalizeAuctionParams { } impl MutableFinalizeAuctionParams { - pub fn color(&self) -> ScMutableColor { ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) } @@ -44,7 +42,6 @@ pub struct ImmutablePlaceBidParams { } impl ImmutablePlaceBidParams { - pub fn color(&self) -> ScImmutableColor { ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) } @@ -56,7 +53,6 @@ pub struct MutablePlaceBidParams { } impl MutablePlaceBidParams { - pub fn color(&self) -> ScMutableColor { ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) } @@ -68,7 +64,6 @@ pub struct ImmutableSetOwnerMarginParams { } impl ImmutableSetOwnerMarginParams { - pub fn owner_margin(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_OWNER_MARGIN)) } @@ -80,7 +75,6 @@ pub struct MutableSetOwnerMarginParams { } impl MutableSetOwnerMarginParams { - pub fn owner_margin(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_PARAM_OWNER_MARGIN)) } @@ -92,7 +86,6 @@ pub struct ImmutableStartAuctionParams { } impl ImmutableStartAuctionParams { - pub fn color(&self) -> ScImmutableColor { ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) } @@ -116,7 +109,6 @@ pub struct MutableStartAuctionParams { } impl MutableStartAuctionParams { - pub fn color(&self) -> ScMutableColor { ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) } @@ -140,7 +132,6 @@ pub struct ImmutableGetInfoParams { } impl ImmutableGetInfoParams { - pub fn color(&self) -> ScImmutableColor { ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) } @@ -152,7 +143,6 @@ pub struct MutableGetInfoParams { } impl MutableGetInfoParams { - pub fn color(&self) -> ScMutableColor { ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) } diff --git a/contracts/wasm/fairauction/src/results.rs b/contracts/wasm/fairauction/src/results.rs index 7d9644094b..c883bf6c12 100644 --- a/contracts/wasm/fairauction/src/results.rs +++ b/contracts/wasm/fairauction/src/results.rs @@ -21,7 +21,6 @@ pub struct ImmutableGetInfoResults { } impl ImmutableGetInfoResults { - pub fn bidders(&self) -> ScImmutableInt32 { ScImmutableInt32::new(self.id, idx_map(IDX_RESULT_BIDDERS)) } @@ -77,7 +76,6 @@ pub struct MutableGetInfoResults { } impl MutableGetInfoResults { - pub fn bidders(&self) -> ScMutableInt32 { ScMutableInt32::new(self.id, idx_map(IDX_RESULT_BIDDERS)) } diff --git a/contracts/wasm/fairauction/src/state.rs b/contracts/wasm/fairauction/src/state.rs index c98ea0c7eb..aeff8bb397 100644 --- a/contracts/wasm/fairauction/src/state.rs +++ b/contracts/wasm/fairauction/src/state.rs @@ -54,7 +54,6 @@ pub struct ImmutableFairAuctionState { } impl ImmutableFairAuctionState { - pub fn auctions(&self) -> MapColorToImmutableAuction { let map_id = get_object_id(self.id, idx_map(IDX_STATE_AUCTIONS), TYPE_MAP); MapColorToImmutableAuction { obj_id: map_id } @@ -125,7 +124,6 @@ pub struct MutableFairAuctionState { } impl MutableFairAuctionState { - pub fn auctions(&self) -> MapColorToMutableAuction { let map_id = get_object_id(self.id, idx_map(IDX_STATE_AUCTIONS), TYPE_MAP); MapColorToMutableAuction { obj_id: map_id } diff --git a/contracts/wasm/fairauction/ts/fairauction/contract.ts b/contracts/wasm/fairauction/ts/fairauction/contract.ts index 0d5e9bb799..56b06394f3 100644 --- a/contracts/wasm/fairauction/ts/fairauction/contract.ts +++ b/contracts/wasm/fairauction/ts/fairauction/contract.ts @@ -61,7 +61,6 @@ export class GetInfoContext { } export class ScFuncs { - static finalizeAuction(ctx: wasmlib.ScFuncCallContext): FinalizeAuctionCall { let f = new FinalizeAuctionCall(); f.func.setPtrs(f.params, null); diff --git a/contracts/wasm/fairauction/ts/fairauction/params.ts b/contracts/wasm/fairauction/ts/fairauction/params.ts index c500ce8e54..eccc9a4cb5 100644 --- a/contracts/wasm/fairauction/ts/fairauction/params.ts +++ b/contracts/wasm/fairauction/ts/fairauction/params.ts @@ -9,49 +9,42 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableFinalizeAuctionParams extends wasmlib.ScMapID { - color(): wasmlib.ScImmutableColor { return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); } } export class MutableFinalizeAuctionParams extends wasmlib.ScMapID { - color(): wasmlib.ScMutableColor { return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); } } export class ImmutablePlaceBidParams extends wasmlib.ScMapID { - color(): wasmlib.ScImmutableColor { return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); } } export class MutablePlaceBidParams extends wasmlib.ScMapID { - color(): wasmlib.ScMutableColor { return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); } } export class ImmutableSetOwnerMarginParams extends wasmlib.ScMapID { - ownerMargin(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamOwnerMargin]); } } export class MutableSetOwnerMarginParams extends wasmlib.ScMapID { - ownerMargin(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamOwnerMargin]); } } export class ImmutableStartAuctionParams extends wasmlib.ScMapID { - color(): wasmlib.ScImmutableColor { return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); } @@ -70,7 +63,6 @@ export class ImmutableStartAuctionParams extends wasmlib.ScMapID { } export class MutableStartAuctionParams extends wasmlib.ScMapID { - color(): wasmlib.ScMutableColor { return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); } @@ -89,14 +81,12 @@ export class MutableStartAuctionParams extends wasmlib.ScMapID { } export class ImmutableGetInfoParams extends wasmlib.ScMapID { - color(): wasmlib.ScImmutableColor { return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); } } export class MutableGetInfoParams extends wasmlib.ScMapID { - color(): wasmlib.ScMutableColor { return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); } diff --git a/contracts/wasm/fairauction/ts/fairauction/results.ts b/contracts/wasm/fairauction/ts/fairauction/results.ts index 1729fb30db..3e55c1bb0e 100644 --- a/contracts/wasm/fairauction/ts/fairauction/results.ts +++ b/contracts/wasm/fairauction/ts/fairauction/results.ts @@ -9,7 +9,6 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableGetInfoResults extends wasmlib.ScMapID { - bidders(): wasmlib.ScImmutableInt32 { return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxResultBidders]); } @@ -60,7 +59,6 @@ export class ImmutableGetInfoResults extends wasmlib.ScMapID { } export class MutableGetInfoResults extends wasmlib.ScMapID { - bidders(): wasmlib.ScMutableInt32 { return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxResultBidders]); } diff --git a/contracts/wasm/fairauction/ts/fairauction/state.ts b/contracts/wasm/fairauction/ts/fairauction/state.ts index fc4b9db39a..cc35e60b89 100644 --- a/contracts/wasm/fairauction/ts/fairauction/state.ts +++ b/contracts/wasm/fairauction/ts/fairauction/state.ts @@ -47,7 +47,6 @@ export class MapColorToImmutableBids { } export class ImmutableFairAuctionState extends wasmlib.ScMapID { - auctions(): sc.MapColorToImmutableAuction { let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateAuctions], wasmlib.TYPE_MAP); return new sc.MapColorToImmutableAuction(mapID); @@ -119,7 +118,6 @@ export class MapColorToMutableBids { } export class MutableFairAuctionState extends wasmlib.ScMapID { - auctions(): sc.MapColorToMutableAuction { let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateAuctions], wasmlib.TYPE_MAP); return new sc.MapColorToMutableAuction(mapID); diff --git a/contracts/wasm/fairroulette/src/contract.rs b/contracts/wasm/fairroulette/src/contract.rs index 729e69008e..cfdd6239e9 100644 --- a/contracts/wasm/fairroulette/src/contract.rs +++ b/contracts/wasm/fairroulette/src/contract.rs @@ -66,16 +66,19 @@ impl ScFuncs { func: ScFunc::new(HSC_NAME, HFUNC_FORCE_PAYOUT), } } + pub fn force_reset(_ctx: & dyn ScFuncCallContext) -> ForceResetCall { ForceResetCall { func: ScFunc::new(HSC_NAME, HFUNC_FORCE_RESET), } } + pub fn pay_winners(_ctx: & dyn ScFuncCallContext) -> PayWinnersCall { PayWinnersCall { func: ScFunc::new(HSC_NAME, HFUNC_PAY_WINNERS), } } + pub fn place_bet(_ctx: & dyn ScFuncCallContext) -> PlaceBetCall { let mut f = PlaceBetCall { func: ScFunc::new(HSC_NAME, HFUNC_PLACE_BET), @@ -84,6 +87,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn play_period(_ctx: & dyn ScFuncCallContext) -> PlayPeriodCall { let mut f = PlayPeriodCall { func: ScFunc::new(HSC_NAME, HFUNC_PLAY_PERIOD), @@ -92,6 +96,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn last_winning_number(_ctx: & dyn ScViewCallContext) -> LastWinningNumberCall { let mut f = LastWinningNumberCall { func: ScView::new(HSC_NAME, HVIEW_LAST_WINNING_NUMBER), @@ -100,6 +105,7 @@ impl ScFuncs { f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); f } + pub fn round_number(_ctx: & dyn ScViewCallContext) -> RoundNumberCall { let mut f = RoundNumberCall { func: ScView::new(HSC_NAME, HVIEW_ROUND_NUMBER), @@ -108,6 +114,7 @@ impl ScFuncs { f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); f } + pub fn round_started_at(_ctx: & dyn ScViewCallContext) -> RoundStartedAtCall { let mut f = RoundStartedAtCall { func: ScView::new(HSC_NAME, HVIEW_ROUND_STARTED_AT), @@ -116,6 +123,7 @@ impl ScFuncs { f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); f } + pub fn round_status(_ctx: & dyn ScViewCallContext) -> RoundStatusCall { let mut f = RoundStatusCall { func: ScView::new(HSC_NAME, HVIEW_ROUND_STATUS), diff --git a/contracts/wasm/fairroulette/src/params.rs b/contracts/wasm/fairroulette/src/params.rs index 6c1213d216..5139e7f947 100644 --- a/contracts/wasm/fairroulette/src/params.rs +++ b/contracts/wasm/fairroulette/src/params.rs @@ -20,7 +20,6 @@ pub struct ImmutablePlaceBetParams { } impl ImmutablePlaceBetParams { - pub fn number(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_NUMBER)) } @@ -32,7 +31,6 @@ pub struct MutablePlaceBetParams { } impl MutablePlaceBetParams { - pub fn number(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_PARAM_NUMBER)) } @@ -44,7 +42,6 @@ pub struct ImmutablePlayPeriodParams { } impl ImmutablePlayPeriodParams { - pub fn play_period(&self) -> ScImmutableInt32 { ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_PLAY_PERIOD)) } @@ -56,7 +53,6 @@ pub struct MutablePlayPeriodParams { } impl MutablePlayPeriodParams { - pub fn play_period(&self) -> ScMutableInt32 { ScMutableInt32::new(self.id, idx_map(IDX_PARAM_PLAY_PERIOD)) } diff --git a/contracts/wasm/fairroulette/src/results.rs b/contracts/wasm/fairroulette/src/results.rs index f0cc1508ab..2b6d0b4360 100644 --- a/contracts/wasm/fairroulette/src/results.rs +++ b/contracts/wasm/fairroulette/src/results.rs @@ -21,7 +21,6 @@ pub struct ImmutableLastWinningNumberResults { } impl ImmutableLastWinningNumberResults { - pub fn last_winning_number(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_LAST_WINNING_NUMBER)) } @@ -33,7 +32,6 @@ pub struct MutableLastWinningNumberResults { } impl MutableLastWinningNumberResults { - pub fn last_winning_number(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_RESULT_LAST_WINNING_NUMBER)) } @@ -45,7 +43,6 @@ pub struct ImmutableRoundNumberResults { } impl ImmutableRoundNumberResults { - pub fn round_number(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_ROUND_NUMBER)) } @@ -57,7 +54,6 @@ pub struct MutableRoundNumberResults { } impl MutableRoundNumberResults { - pub fn round_number(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_RESULT_ROUND_NUMBER)) } @@ -69,7 +65,6 @@ pub struct ImmutableRoundStartedAtResults { } impl ImmutableRoundStartedAtResults { - pub fn round_started_at(&self) -> ScImmutableInt32 { ScImmutableInt32::new(self.id, idx_map(IDX_RESULT_ROUND_STARTED_AT)) } @@ -81,7 +76,6 @@ pub struct MutableRoundStartedAtResults { } impl MutableRoundStartedAtResults { - pub fn round_started_at(&self) -> ScMutableInt32 { ScMutableInt32::new(self.id, idx_map(IDX_RESULT_ROUND_STARTED_AT)) } @@ -93,7 +87,6 @@ pub struct ImmutableRoundStatusResults { } impl ImmutableRoundStatusResults { - pub fn round_status(&self) -> ScImmutableInt16 { ScImmutableInt16::new(self.id, idx_map(IDX_RESULT_ROUND_STATUS)) } @@ -105,7 +98,6 @@ pub struct MutableRoundStatusResults { } impl MutableRoundStatusResults { - pub fn round_status(&self) -> ScMutableInt16 { ScMutableInt16::new(self.id, idx_map(IDX_RESULT_ROUND_STATUS)) } diff --git a/contracts/wasm/fairroulette/src/state.rs b/contracts/wasm/fairroulette/src/state.rs index a9c95dd8ca..7277b6f457 100644 --- a/contracts/wasm/fairroulette/src/state.rs +++ b/contracts/wasm/fairroulette/src/state.rs @@ -35,7 +35,6 @@ pub struct ImmutableFairRouletteState { } impl ImmutableFairRouletteState { - pub fn bets(&self) -> ArrayOfImmutableBet { let arr_id = get_object_id(self.id, idx_map(IDX_STATE_BETS), TYPE_ARRAY | TYPE_BYTES); ArrayOfImmutableBet { obj_id: arr_id } @@ -86,7 +85,6 @@ pub struct MutableFairRouletteState { } impl MutableFairRouletteState { - pub fn bets(&self) -> ArrayOfMutableBet { let arr_id = get_object_id(self.id, idx_map(IDX_STATE_BETS), TYPE_ARRAY | TYPE_BYTES); ArrayOfMutableBet { obj_id: arr_id } diff --git a/contracts/wasm/fairroulette/ts/fairroulette/contract.ts b/contracts/wasm/fairroulette/ts/fairroulette/contract.ts index 234f757701..529abe5a23 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/contract.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/contract.ts @@ -93,7 +93,6 @@ export class RoundStatusContext { } export class ScFuncs { - static forcePayout(ctx: wasmlib.ScFuncCallContext): ForcePayoutCall { return new ForcePayoutCall(); } diff --git a/contracts/wasm/fairroulette/ts/fairroulette/params.ts b/contracts/wasm/fairroulette/ts/fairroulette/params.ts index 7b02e49c17..d4640d30e3 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/params.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/params.ts @@ -9,28 +9,24 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutablePlaceBetParams extends wasmlib.ScMapID { - number(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamNumber]); } } export class MutablePlaceBetParams extends wasmlib.ScMapID { - number(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamNumber]); } } export class ImmutablePlayPeriodParams extends wasmlib.ScMapID { - playPeriod(): wasmlib.ScImmutableInt32 { return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamPlayPeriod]); } } export class MutablePlayPeriodParams extends wasmlib.ScMapID { - playPeriod(): wasmlib.ScMutableInt32 { return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamPlayPeriod]); } diff --git a/contracts/wasm/fairroulette/ts/fairroulette/results.ts b/contracts/wasm/fairroulette/ts/fairroulette/results.ts index d0a4a08db4..8a55504a12 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/results.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/results.ts @@ -9,56 +9,48 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableLastWinningNumberResults extends wasmlib.ScMapID { - lastWinningNumber(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultLastWinningNumber]); } } export class MutableLastWinningNumberResults extends wasmlib.ScMapID { - lastWinningNumber(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultLastWinningNumber]); } } export class ImmutableRoundNumberResults extends wasmlib.ScMapID { - roundNumber(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultRoundNumber]); } } export class MutableRoundNumberResults extends wasmlib.ScMapID { - roundNumber(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultRoundNumber]); } } export class ImmutableRoundStartedAtResults extends wasmlib.ScMapID { - roundStartedAt(): wasmlib.ScImmutableInt32 { return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxResultRoundStartedAt]); } } export class MutableRoundStartedAtResults extends wasmlib.ScMapID { - roundStartedAt(): wasmlib.ScMutableInt32 { return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxResultRoundStartedAt]); } } export class ImmutableRoundStatusResults extends wasmlib.ScMapID { - roundStatus(): wasmlib.ScImmutableInt16 { return new wasmlib.ScImmutableInt16(this.mapID, sc.idxMap[sc.IdxResultRoundStatus]); } } export class MutableRoundStatusResults extends wasmlib.ScMapID { - roundStatus(): wasmlib.ScMutableInt16 { return new wasmlib.ScMutableInt16(this.mapID, sc.idxMap[sc.IdxResultRoundStatus]); } diff --git a/contracts/wasm/fairroulette/ts/fairroulette/state.ts b/contracts/wasm/fairroulette/ts/fairroulette/state.ts index ceb215f1d8..08059c1fc0 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/state.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/state.ts @@ -25,7 +25,6 @@ export class ArrayOfImmutableBet { } export class ImmutableFairRouletteState extends wasmlib.ScMapID { - bets(): sc.ArrayOfImmutableBet { let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateBets], wasmlib.TYPE_ARRAY|wasmlib.TYPE_BYTES); return new sc.ArrayOfImmutableBet(arrID); @@ -73,7 +72,6 @@ export class ArrayOfMutableBet { } export class MutableFairRouletteState extends wasmlib.ScMapID { - bets(): sc.ArrayOfMutableBet { let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateBets], wasmlib.TYPE_ARRAY|wasmlib.TYPE_BYTES); return new sc.ArrayOfMutableBet(arrID); diff --git a/contracts/wasm/helloworld/src/contract.rs b/contracts/wasm/helloworld/src/contract.rs index 1813698fe1..ca5b365fd9 100644 --- a/contracts/wasm/helloworld/src/contract.rs +++ b/contracts/wasm/helloworld/src/contract.rs @@ -32,6 +32,7 @@ impl ScFuncs { func: ScFunc::new(HSC_NAME, HFUNC_HELLO_WORLD), } } + pub fn get_hello_world(_ctx: & dyn ScViewCallContext) -> GetHelloWorldCall { let mut f = GetHelloWorldCall { func: ScView::new(HSC_NAME, HVIEW_GET_HELLO_WORLD), diff --git a/contracts/wasm/helloworld/src/results.rs b/contracts/wasm/helloworld/src/results.rs index ceeaf09a46..d17c7c68e5 100644 --- a/contracts/wasm/helloworld/src/results.rs +++ b/contracts/wasm/helloworld/src/results.rs @@ -20,7 +20,6 @@ pub struct ImmutableGetHelloWorldResults { } impl ImmutableGetHelloWorldResults { - pub fn hello_world(&self) -> ScImmutableString { ScImmutableString::new(self.id, idx_map(IDX_RESULT_HELLO_WORLD)) } @@ -32,7 +31,6 @@ pub struct MutableGetHelloWorldResults { } impl MutableGetHelloWorldResults { - pub fn hello_world(&self) -> ScMutableString { ScMutableString::new(self.id, idx_map(IDX_RESULT_HELLO_WORLD)) } diff --git a/contracts/wasm/helloworld/ts/helloworld/contract.ts b/contracts/wasm/helloworld/ts/helloworld/contract.ts index df2b0e44a0..3740f30ca3 100644 --- a/contracts/wasm/helloworld/ts/helloworld/contract.ts +++ b/contracts/wasm/helloworld/ts/helloworld/contract.ts @@ -27,7 +27,6 @@ export class GetHelloWorldContext { } export class ScFuncs { - static helloWorld(ctx: wasmlib.ScFuncCallContext): HelloWorldCall { return new HelloWorldCall(); } diff --git a/contracts/wasm/helloworld/ts/helloworld/results.ts b/contracts/wasm/helloworld/ts/helloworld/results.ts index c668e8061c..8af55ab264 100644 --- a/contracts/wasm/helloworld/ts/helloworld/results.ts +++ b/contracts/wasm/helloworld/ts/helloworld/results.ts @@ -9,14 +9,12 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableGetHelloWorldResults extends wasmlib.ScMapID { - helloWorld(): wasmlib.ScImmutableString { return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxResultHelloWorld]); } } export class MutableGetHelloWorldResults extends wasmlib.ScMapID { - helloWorld(): wasmlib.ScMutableString { return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxResultHelloWorld]); } diff --git a/contracts/wasm/inccounter/src/contract.rs b/contracts/wasm/inccounter/src/contract.rs index 81262cdf82..5f5c59845c 100644 --- a/contracts/wasm/inccounter/src/contract.rs +++ b/contracts/wasm/inccounter/src/contract.rs @@ -85,21 +85,25 @@ impl ScFuncs { func: ScFunc::new(HSC_NAME, HFUNC_CALL_INCREMENT), } } + pub fn call_increment_recurse5x(_ctx: & dyn ScFuncCallContext) -> CallIncrementRecurse5xCall { CallIncrementRecurse5xCall { func: ScFunc::new(HSC_NAME, HFUNC_CALL_INCREMENT_RECURSE5X), } } + pub fn endless_loop(_ctx: & dyn ScFuncCallContext) -> EndlessLoopCall { EndlessLoopCall { func: ScFunc::new(HSC_NAME, HFUNC_ENDLESS_LOOP), } } + pub fn increment(_ctx: & dyn ScFuncCallContext) -> IncrementCall { IncrementCall { func: ScFunc::new(HSC_NAME, HFUNC_INCREMENT), } } + pub fn increment_with_delay(_ctx: & dyn ScFuncCallContext) -> IncrementWithDelayCall { let mut f = IncrementWithDelayCall { func: ScFunc::new(HSC_NAME, HFUNC_INCREMENT_WITH_DELAY), @@ -108,6 +112,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn init(_ctx: & dyn ScFuncCallContext) -> InitCall { let mut f = InitCall { func: ScInitFunc::new(HSC_NAME, HFUNC_INIT), @@ -116,26 +121,31 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn local_state_internal_call(_ctx: & dyn ScFuncCallContext) -> LocalStateInternalCallCall { LocalStateInternalCallCall { func: ScFunc::new(HSC_NAME, HFUNC_LOCAL_STATE_INTERNAL_CALL), } } + pub fn local_state_post(_ctx: & dyn ScFuncCallContext) -> LocalStatePostCall { LocalStatePostCall { func: ScFunc::new(HSC_NAME, HFUNC_LOCAL_STATE_POST), } } + pub fn local_state_sandbox_call(_ctx: & dyn ScFuncCallContext) -> LocalStateSandboxCallCall { LocalStateSandboxCallCall { func: ScFunc::new(HSC_NAME, HFUNC_LOCAL_STATE_SANDBOX_CALL), } } + pub fn post_increment(_ctx: & dyn ScFuncCallContext) -> PostIncrementCall { PostIncrementCall { func: ScFunc::new(HSC_NAME, HFUNC_POST_INCREMENT), } } + pub fn repeat_many(_ctx: & dyn ScFuncCallContext) -> RepeatManyCall { let mut f = RepeatManyCall { func: ScFunc::new(HSC_NAME, HFUNC_REPEAT_MANY), @@ -144,11 +154,13 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn test_leb128(_ctx: & dyn ScFuncCallContext) -> TestLeb128Call { TestLeb128Call { func: ScFunc::new(HSC_NAME, HFUNC_TEST_LEB128), } } + pub fn when_must_increment(_ctx: & dyn ScFuncCallContext) -> WhenMustIncrementCall { let mut f = WhenMustIncrementCall { func: ScFunc::new(HSC_NAME, HFUNC_WHEN_MUST_INCREMENT), @@ -157,6 +169,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn get_counter(_ctx: & dyn ScViewCallContext) -> GetCounterCall { let mut f = GetCounterCall { func: ScView::new(HSC_NAME, HVIEW_GET_COUNTER), diff --git a/contracts/wasm/inccounter/src/params.rs b/contracts/wasm/inccounter/src/params.rs index d5f225eba1..edcb169d0a 100644 --- a/contracts/wasm/inccounter/src/params.rs +++ b/contracts/wasm/inccounter/src/params.rs @@ -20,7 +20,6 @@ pub struct ImmutableIncrementWithDelayParams { } impl ImmutableIncrementWithDelayParams { - pub fn delay(&self) -> ScImmutableInt32 { ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_DELAY)) } @@ -32,7 +31,6 @@ pub struct MutableIncrementWithDelayParams { } impl MutableIncrementWithDelayParams { - pub fn delay(&self) -> ScMutableInt32 { ScMutableInt32::new(self.id, idx_map(IDX_PARAM_DELAY)) } @@ -44,7 +42,6 @@ pub struct ImmutableInitParams { } impl ImmutableInitParams { - pub fn counter(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_COUNTER)) } @@ -56,7 +53,6 @@ pub struct MutableInitParams { } impl MutableInitParams { - pub fn counter(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_PARAM_COUNTER)) } @@ -68,7 +64,6 @@ pub struct ImmutableRepeatManyParams { } impl ImmutableRepeatManyParams { - pub fn num_repeats(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_NUM_REPEATS)) } @@ -80,7 +75,6 @@ pub struct MutableRepeatManyParams { } impl MutableRepeatManyParams { - pub fn num_repeats(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_PARAM_NUM_REPEATS)) } @@ -92,7 +86,6 @@ pub struct ImmutableWhenMustIncrementParams { } impl ImmutableWhenMustIncrementParams { - pub fn dummy(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_DUMMY)) } @@ -104,7 +97,6 @@ pub struct MutableWhenMustIncrementParams { } impl MutableWhenMustIncrementParams { - pub fn dummy(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_PARAM_DUMMY)) } diff --git a/contracts/wasm/inccounter/src/results.rs b/contracts/wasm/inccounter/src/results.rs index b61936d6ce..74b1aa5bdd 100644 --- a/contracts/wasm/inccounter/src/results.rs +++ b/contracts/wasm/inccounter/src/results.rs @@ -20,7 +20,6 @@ pub struct ImmutableGetCounterResults { } impl ImmutableGetCounterResults { - pub fn counter(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_COUNTER)) } @@ -32,7 +31,6 @@ pub struct MutableGetCounterResults { } impl MutableGetCounterResults { - pub fn counter(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_RESULT_COUNTER)) } diff --git a/contracts/wasm/inccounter/src/state.rs b/contracts/wasm/inccounter/src/state.rs index 09eb8231ee..36d65f563f 100644 --- a/contracts/wasm/inccounter/src/state.rs +++ b/contracts/wasm/inccounter/src/state.rs @@ -20,7 +20,6 @@ pub struct ImmutableIncCounterState { } impl ImmutableIncCounterState { - pub fn counter(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_STATE_COUNTER)) } @@ -36,7 +35,6 @@ pub struct MutableIncCounterState { } impl MutableIncCounterState { - pub fn counter(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_STATE_COUNTER)) } diff --git a/contracts/wasm/inccounter/ts/inccounter/contract.ts b/contracts/wasm/inccounter/ts/inccounter/contract.ts index 7295028420..497a9052cc 100644 --- a/contracts/wasm/inccounter/ts/inccounter/contract.ts +++ b/contracts/wasm/inccounter/ts/inccounter/contract.ts @@ -131,7 +131,6 @@ export class GetCounterContext { } export class ScFuncs { - static callIncrement(ctx: wasmlib.ScFuncCallContext): CallIncrementCall { return new CallIncrementCall(); } diff --git a/contracts/wasm/inccounter/ts/inccounter/params.ts b/contracts/wasm/inccounter/ts/inccounter/params.ts index 0f04ff8e41..7d4de79561 100644 --- a/contracts/wasm/inccounter/ts/inccounter/params.ts +++ b/contracts/wasm/inccounter/ts/inccounter/params.ts @@ -9,56 +9,48 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableIncrementWithDelayParams extends wasmlib.ScMapID { - delay(): wasmlib.ScImmutableInt32 { return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamDelay]); } } export class MutableIncrementWithDelayParams extends wasmlib.ScMapID { - delay(): wasmlib.ScMutableInt32 { return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamDelay]); } } export class ImmutableInitParams extends wasmlib.ScMapID { - counter(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamCounter]); } } export class MutableInitParams extends wasmlib.ScMapID { - counter(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamCounter]); } } export class ImmutableRepeatManyParams extends wasmlib.ScMapID { - numRepeats(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamNumRepeats]); } } export class MutableRepeatManyParams extends wasmlib.ScMapID { - numRepeats(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamNumRepeats]); } } export class ImmutableWhenMustIncrementParams extends wasmlib.ScMapID { - dummy(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamDummy]); } } export class MutableWhenMustIncrementParams extends wasmlib.ScMapID { - dummy(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamDummy]); } diff --git a/contracts/wasm/inccounter/ts/inccounter/results.ts b/contracts/wasm/inccounter/ts/inccounter/results.ts index 98b6f94072..db9dc68924 100644 --- a/contracts/wasm/inccounter/ts/inccounter/results.ts +++ b/contracts/wasm/inccounter/ts/inccounter/results.ts @@ -9,14 +9,12 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableGetCounterResults extends wasmlib.ScMapID { - counter(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultCounter]); } } export class MutableGetCounterResults extends wasmlib.ScMapID { - counter(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultCounter]); } diff --git a/contracts/wasm/inccounter/ts/inccounter/state.ts b/contracts/wasm/inccounter/ts/inccounter/state.ts index 836ec2088f..d292899376 100644 --- a/contracts/wasm/inccounter/ts/inccounter/state.ts +++ b/contracts/wasm/inccounter/ts/inccounter/state.ts @@ -9,7 +9,6 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableIncCounterState extends wasmlib.ScMapID { - counter(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateCounter]); } @@ -20,7 +19,6 @@ export class ImmutableIncCounterState extends wasmlib.ScMapID { } export class MutableIncCounterState extends wasmlib.ScMapID { - counter(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateCounter]); } diff --git a/contracts/wasm/testcore/src/contract.rs b/contracts/wasm/testcore/src/contract.rs index 3c611ea492..a00e5b9eeb 100644 --- a/contracts/wasm/testcore/src/contract.rs +++ b/contracts/wasm/testcore/src/contract.rs @@ -181,6 +181,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn check_context_from_full_ep(_ctx: & dyn ScFuncCallContext) -> CheckContextFromFullEPCall { let mut f = CheckContextFromFullEPCall { func: ScFunc::new(HSC_NAME, HFUNC_CHECK_CONTEXT_FROM_FULL_EP), @@ -189,11 +190,13 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn do_nothing(_ctx: & dyn ScFuncCallContext) -> DoNothingCall { DoNothingCall { func: ScFunc::new(HSC_NAME, HFUNC_DO_NOTHING), } } + pub fn get_minted_supply(_ctx: & dyn ScFuncCallContext) -> GetMintedSupplyCall { let mut f = GetMintedSupplyCall { func: ScFunc::new(HSC_NAME, HFUNC_GET_MINTED_SUPPLY), @@ -202,11 +205,13 @@ impl ScFuncs { f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); f } + pub fn inc_counter(_ctx: & dyn ScFuncCallContext) -> IncCounterCall { IncCounterCall { func: ScFunc::new(HSC_NAME, HFUNC_INC_COUNTER), } } + pub fn init(_ctx: & dyn ScFuncCallContext) -> InitCall { let mut f = InitCall { func: ScInitFunc::new(HSC_NAME, HFUNC_INIT), @@ -215,6 +220,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn pass_types_full(_ctx: & dyn ScFuncCallContext) -> PassTypesFullCall { let mut f = PassTypesFullCall { func: ScFunc::new(HSC_NAME, HFUNC_PASS_TYPES_FULL), @@ -223,6 +229,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn run_recursion(_ctx: & dyn ScFuncCallContext) -> RunRecursionCall { let mut f = RunRecursionCall { func: ScFunc::new(HSC_NAME, HFUNC_RUN_RECURSION), @@ -232,6 +239,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn send_to_address(_ctx: & dyn ScFuncCallContext) -> SendToAddressCall { let mut f = SendToAddressCall { func: ScFunc::new(HSC_NAME, HFUNC_SEND_TO_ADDRESS), @@ -240,6 +248,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn set_int(_ctx: & dyn ScFuncCallContext) -> SetIntCall { let mut f = SetIntCall { func: ScFunc::new(HSC_NAME, HFUNC_SET_INT), @@ -248,6 +257,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn spawn(_ctx: & dyn ScFuncCallContext) -> SpawnCall { let mut f = SpawnCall { func: ScFunc::new(HSC_NAME, HFUNC_SPAWN), @@ -256,26 +266,31 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn test_block_context1(_ctx: & dyn ScFuncCallContext) -> TestBlockContext1Call { TestBlockContext1Call { func: ScFunc::new(HSC_NAME, HFUNC_TEST_BLOCK_CONTEXT1), } } + pub fn test_block_context2(_ctx: & dyn ScFuncCallContext) -> TestBlockContext2Call { TestBlockContext2Call { func: ScFunc::new(HSC_NAME, HFUNC_TEST_BLOCK_CONTEXT2), } } + pub fn test_call_panic_full_ep(_ctx: & dyn ScFuncCallContext) -> TestCallPanicFullEPCall { TestCallPanicFullEPCall { func: ScFunc::new(HSC_NAME, HFUNC_TEST_CALL_PANIC_FULL_EP), } } + pub fn test_call_panic_view_ep_from_full(_ctx: & dyn ScFuncCallContext) -> TestCallPanicViewEPFromFullCall { TestCallPanicViewEPFromFullCall { func: ScFunc::new(HSC_NAME, HFUNC_TEST_CALL_PANIC_VIEW_EP_FROM_FULL), } } + pub fn test_chain_owner_id_full(_ctx: & dyn ScFuncCallContext) -> TestChainOwnerIDFullCall { let mut f = TestChainOwnerIDFullCall { func: ScFunc::new(HSC_NAME, HFUNC_TEST_CHAIN_OWNER_ID_FULL), @@ -284,16 +299,19 @@ impl ScFuncs { f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); f } + pub fn test_event_log_deploy(_ctx: & dyn ScFuncCallContext) -> TestEventLogDeployCall { TestEventLogDeployCall { func: ScFunc::new(HSC_NAME, HFUNC_TEST_EVENT_LOG_DEPLOY), } } + pub fn test_event_log_event_data(_ctx: & dyn ScFuncCallContext) -> TestEventLogEventDataCall { TestEventLogEventDataCall { func: ScFunc::new(HSC_NAME, HFUNC_TEST_EVENT_LOG_EVENT_DATA), } } + pub fn test_event_log_generic_data(_ctx: & dyn ScFuncCallContext) -> TestEventLogGenericDataCall { let mut f = TestEventLogGenericDataCall { func: ScFunc::new(HSC_NAME, HFUNC_TEST_EVENT_LOG_GENERIC_DATA), @@ -302,11 +320,13 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn test_panic_full_ep(_ctx: & dyn ScFuncCallContext) -> TestPanicFullEPCall { TestPanicFullEPCall { func: ScFunc::new(HSC_NAME, HFUNC_TEST_PANIC_FULL_EP), } } + pub fn withdraw_to_chain(_ctx: & dyn ScFuncCallContext) -> WithdrawToChainCall { let mut f = WithdrawToChainCall { func: ScFunc::new(HSC_NAME, HFUNC_WITHDRAW_TO_CHAIN), @@ -315,6 +335,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn check_context_from_view_ep(_ctx: & dyn ScViewCallContext) -> CheckContextFromViewEPCall { let mut f = CheckContextFromViewEPCall { func: ScView::new(HSC_NAME, HVIEW_CHECK_CONTEXT_FROM_VIEW_EP), @@ -323,6 +344,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn fibonacci(_ctx: & dyn ScViewCallContext) -> FibonacciCall { let mut f = FibonacciCall { func: ScView::new(HSC_NAME, HVIEW_FIBONACCI), @@ -332,6 +354,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn get_counter(_ctx: & dyn ScViewCallContext) -> GetCounterCall { let mut f = GetCounterCall { func: ScView::new(HSC_NAME, HVIEW_GET_COUNTER), @@ -340,6 +363,7 @@ impl ScFuncs { f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); f } + pub fn get_int(_ctx: & dyn ScViewCallContext) -> GetIntCall { let mut f = GetIntCall { func: ScView::new(HSC_NAME, HVIEW_GET_INT), @@ -349,6 +373,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn get_string_value(_ctx: & dyn ScViewCallContext) -> GetStringValueCall { let mut f = GetStringValueCall { func: ScView::new(HSC_NAME, HVIEW_GET_STRING_VALUE), @@ -358,11 +383,13 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn just_view(_ctx: & dyn ScViewCallContext) -> JustViewCall { JustViewCall { func: ScView::new(HSC_NAME, HVIEW_JUST_VIEW), } } + pub fn pass_types_view(_ctx: & dyn ScViewCallContext) -> PassTypesViewCall { let mut f = PassTypesViewCall { func: ScView::new(HSC_NAME, HVIEW_PASS_TYPES_VIEW), @@ -371,11 +398,13 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn test_call_panic_view_ep_from_view(_ctx: & dyn ScViewCallContext) -> TestCallPanicViewEPFromViewCall { TestCallPanicViewEPFromViewCall { func: ScView::new(HSC_NAME, HVIEW_TEST_CALL_PANIC_VIEW_EP_FROM_VIEW), } } + pub fn test_chain_owner_id_view(_ctx: & dyn ScViewCallContext) -> TestChainOwnerIDViewCall { let mut f = TestChainOwnerIDViewCall { func: ScView::new(HSC_NAME, HVIEW_TEST_CHAIN_OWNER_ID_VIEW), @@ -384,11 +413,13 @@ impl ScFuncs { f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); f } + pub fn test_panic_view_ep(_ctx: & dyn ScViewCallContext) -> TestPanicViewEPCall { TestPanicViewEPCall { func: ScView::new(HSC_NAME, HVIEW_TEST_PANIC_VIEW_EP), } } + pub fn test_sandbox_call(_ctx: & dyn ScViewCallContext) -> TestSandboxCallCall { let mut f = TestSandboxCallCall { func: ScView::new(HSC_NAME, HVIEW_TEST_SANDBOX_CALL), diff --git a/contracts/wasm/testcore/src/params.rs b/contracts/wasm/testcore/src/params.rs index e361105afd..ef58895846 100644 --- a/contracts/wasm/testcore/src/params.rs +++ b/contracts/wasm/testcore/src/params.rs @@ -20,7 +20,6 @@ pub struct ImmutableCallOnChainParams { } impl ImmutableCallOnChainParams { - pub fn hname_contract(&self) -> ScImmutableHname { ScImmutableHname::new(self.id, idx_map(IDX_PARAM_HNAME_CONTRACT)) } @@ -40,7 +39,6 @@ pub struct MutableCallOnChainParams { } impl MutableCallOnChainParams { - pub fn hname_contract(&self) -> ScMutableHname { ScMutableHname::new(self.id, idx_map(IDX_PARAM_HNAME_CONTRACT)) } @@ -60,7 +58,6 @@ pub struct ImmutableCheckContextFromFullEPParams { } impl ImmutableCheckContextFromFullEPParams { - pub fn agent_id(&self) -> ScImmutableAgentID { ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) } @@ -88,7 +85,6 @@ pub struct MutableCheckContextFromFullEPParams { } impl MutableCheckContextFromFullEPParams { - pub fn agent_id(&self) -> ScMutableAgentID { ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) } @@ -116,7 +112,6 @@ pub struct ImmutableInitParams { } impl ImmutableInitParams { - pub fn fail(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_FAIL)) } @@ -128,7 +123,6 @@ pub struct MutableInitParams { } impl MutableInitParams { - pub fn fail(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_PARAM_FAIL)) } @@ -140,7 +134,6 @@ pub struct ImmutablePassTypesFullParams { } impl ImmutablePassTypesFullParams { - pub fn address(&self) -> ScImmutableAddress { ScImmutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) } @@ -192,7 +185,6 @@ pub struct MutablePassTypesFullParams { } impl MutablePassTypesFullParams { - pub fn address(&self) -> ScMutableAddress { ScMutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) } @@ -244,7 +236,6 @@ pub struct ImmutableRunRecursionParams { } impl ImmutableRunRecursionParams { - pub fn int_value(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) } @@ -256,7 +247,6 @@ pub struct MutableRunRecursionParams { } impl MutableRunRecursionParams { - pub fn int_value(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) } @@ -268,7 +258,6 @@ pub struct ImmutableSendToAddressParams { } impl ImmutableSendToAddressParams { - pub fn address(&self) -> ScImmutableAddress { ScImmutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) } @@ -280,7 +269,6 @@ pub struct MutableSendToAddressParams { } impl MutableSendToAddressParams { - pub fn address(&self) -> ScMutableAddress { ScMutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) } @@ -292,7 +280,6 @@ pub struct ImmutableSetIntParams { } impl ImmutableSetIntParams { - pub fn int_value(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) } @@ -308,7 +295,6 @@ pub struct MutableSetIntParams { } impl MutableSetIntParams { - pub fn int_value(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) } @@ -324,7 +310,6 @@ pub struct ImmutableSpawnParams { } impl ImmutableSpawnParams { - pub fn prog_hash(&self) -> ScImmutableHash { ScImmutableHash::new(self.id, idx_map(IDX_PARAM_PROG_HASH)) } @@ -336,7 +321,6 @@ pub struct MutableSpawnParams { } impl MutableSpawnParams { - pub fn prog_hash(&self) -> ScMutableHash { ScMutableHash::new(self.id, idx_map(IDX_PARAM_PROG_HASH)) } @@ -348,7 +332,6 @@ pub struct ImmutableTestEventLogGenericDataParams { } impl ImmutableTestEventLogGenericDataParams { - pub fn counter(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_COUNTER)) } @@ -360,7 +343,6 @@ pub struct MutableTestEventLogGenericDataParams { } impl MutableTestEventLogGenericDataParams { - pub fn counter(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_PARAM_COUNTER)) } @@ -372,7 +354,6 @@ pub struct ImmutableWithdrawToChainParams { } impl ImmutableWithdrawToChainParams { - pub fn chain_id(&self) -> ScImmutableChainID { ScImmutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) } @@ -384,7 +365,6 @@ pub struct MutableWithdrawToChainParams { } impl MutableWithdrawToChainParams { - pub fn chain_id(&self) -> ScMutableChainID { ScMutableChainID::new(self.id, idx_map(IDX_PARAM_CHAIN_ID)) } @@ -396,7 +376,6 @@ pub struct ImmutableCheckContextFromViewEPParams { } impl ImmutableCheckContextFromViewEPParams { - pub fn agent_id(&self) -> ScImmutableAgentID { ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) } @@ -420,7 +399,6 @@ pub struct MutableCheckContextFromViewEPParams { } impl MutableCheckContextFromViewEPParams { - pub fn agent_id(&self) -> ScMutableAgentID { ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) } @@ -444,7 +422,6 @@ pub struct ImmutableFibonacciParams { } impl ImmutableFibonacciParams { - pub fn int_value(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) } @@ -456,7 +433,6 @@ pub struct MutableFibonacciParams { } impl MutableFibonacciParams { - pub fn int_value(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT_VALUE)) } @@ -468,7 +444,6 @@ pub struct ImmutableGetIntParams { } impl ImmutableGetIntParams { - pub fn name(&self) -> ScImmutableString { ScImmutableString::new(self.id, idx_map(IDX_PARAM_NAME)) } @@ -480,7 +455,6 @@ pub struct MutableGetIntParams { } impl MutableGetIntParams { - pub fn name(&self) -> ScMutableString { ScMutableString::new(self.id, idx_map(IDX_PARAM_NAME)) } @@ -492,7 +466,6 @@ pub struct ImmutableGetStringValueParams { } impl ImmutableGetStringValueParams { - pub fn var_name(&self) -> ScImmutableString { ScImmutableString::new(self.id, idx_map(IDX_PARAM_VAR_NAME)) } @@ -504,7 +477,6 @@ pub struct MutableGetStringValueParams { } impl MutableGetStringValueParams { - pub fn var_name(&self) -> ScMutableString { ScMutableString::new(self.id, idx_map(IDX_PARAM_VAR_NAME)) } @@ -516,7 +488,6 @@ pub struct ImmutablePassTypesViewParams { } impl ImmutablePassTypesViewParams { - pub fn address(&self) -> ScImmutableAddress { ScImmutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) } @@ -568,7 +539,6 @@ pub struct MutablePassTypesViewParams { } impl MutablePassTypesViewParams { - pub fn address(&self) -> ScMutableAddress { ScMutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) } diff --git a/contracts/wasm/testcore/src/results.rs b/contracts/wasm/testcore/src/results.rs index 7f65107ec9..974409c2dc 100644 --- a/contracts/wasm/testcore/src/results.rs +++ b/contracts/wasm/testcore/src/results.rs @@ -20,7 +20,6 @@ pub struct ImmutableCallOnChainResults { } impl ImmutableCallOnChainResults { - pub fn int_value(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_INT_VALUE)) } @@ -32,7 +31,6 @@ pub struct MutableCallOnChainResults { } impl MutableCallOnChainResults { - pub fn int_value(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_RESULT_INT_VALUE)) } @@ -44,7 +42,6 @@ pub struct ImmutableGetMintedSupplyResults { } impl ImmutableGetMintedSupplyResults { - pub fn minted_color(&self) -> ScImmutableColor { ScImmutableColor::new(self.id, idx_map(IDX_RESULT_MINTED_COLOR)) } @@ -60,7 +57,6 @@ pub struct MutableGetMintedSupplyResults { } impl MutableGetMintedSupplyResults { - pub fn minted_color(&self) -> ScMutableColor { ScMutableColor::new(self.id, idx_map(IDX_RESULT_MINTED_COLOR)) } @@ -76,7 +72,6 @@ pub struct ImmutableRunRecursionResults { } impl ImmutableRunRecursionResults { - pub fn int_value(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_INT_VALUE)) } @@ -88,7 +83,6 @@ pub struct MutableRunRecursionResults { } impl MutableRunRecursionResults { - pub fn int_value(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_RESULT_INT_VALUE)) } @@ -100,7 +94,6 @@ pub struct ImmutableTestChainOwnerIDFullResults { } impl ImmutableTestChainOwnerIDFullResults { - pub fn chain_owner_id(&self) -> ScImmutableAgentID { ScImmutableAgentID::new(self.id, idx_map(IDX_RESULT_CHAIN_OWNER_ID)) } @@ -112,7 +105,6 @@ pub struct MutableTestChainOwnerIDFullResults { } impl MutableTestChainOwnerIDFullResults { - pub fn chain_owner_id(&self) -> ScMutableAgentID { ScMutableAgentID::new(self.id, idx_map(IDX_RESULT_CHAIN_OWNER_ID)) } @@ -124,7 +116,6 @@ pub struct ImmutableFibonacciResults { } impl ImmutableFibonacciResults { - pub fn int_value(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_INT_VALUE)) } @@ -136,7 +127,6 @@ pub struct MutableFibonacciResults { } impl MutableFibonacciResults { - pub fn int_value(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_RESULT_INT_VALUE)) } @@ -148,7 +138,6 @@ pub struct ImmutableGetCounterResults { } impl ImmutableGetCounterResults { - pub fn counter(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_COUNTER)) } @@ -160,7 +149,6 @@ pub struct MutableGetCounterResults { } impl MutableGetCounterResults { - pub fn counter(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_RESULT_COUNTER)) } @@ -182,7 +170,6 @@ pub struct ImmutableGetIntResults { } impl ImmutableGetIntResults { - pub fn values(&self) -> MapStringToImmutableInt64 { MapStringToImmutableInt64 { obj_id: self.id } } @@ -208,7 +195,6 @@ pub struct MutableGetIntResults { } impl MutableGetIntResults { - pub fn values(&self) -> MapStringToMutableInt64 { MapStringToMutableInt64 { obj_id: self.id } } @@ -230,7 +216,6 @@ pub struct ImmutableGetStringValueResults { } impl ImmutableGetStringValueResults { - pub fn vars(&self) -> MapStringToImmutableString { MapStringToImmutableString { obj_id: self.id } } @@ -256,7 +241,6 @@ pub struct MutableGetStringValueResults { } impl MutableGetStringValueResults { - pub fn vars(&self) -> MapStringToMutableString { MapStringToMutableString { obj_id: self.id } } @@ -268,7 +252,6 @@ pub struct ImmutableTestChainOwnerIDViewResults { } impl ImmutableTestChainOwnerIDViewResults { - pub fn chain_owner_id(&self) -> ScImmutableAgentID { ScImmutableAgentID::new(self.id, idx_map(IDX_RESULT_CHAIN_OWNER_ID)) } @@ -280,7 +263,6 @@ pub struct MutableTestChainOwnerIDViewResults { } impl MutableTestChainOwnerIDViewResults { - pub fn chain_owner_id(&self) -> ScMutableAgentID { ScMutableAgentID::new(self.id, idx_map(IDX_RESULT_CHAIN_OWNER_ID)) } @@ -292,7 +274,6 @@ pub struct ImmutableTestSandboxCallResults { } impl ImmutableTestSandboxCallResults { - pub fn sandbox_call(&self) -> ScImmutableString { ScImmutableString::new(self.id, idx_map(IDX_RESULT_SANDBOX_CALL)) } @@ -304,7 +285,6 @@ pub struct MutableTestSandboxCallResults { } impl MutableTestSandboxCallResults { - pub fn sandbox_call(&self) -> ScMutableString { ScMutableString::new(self.id, idx_map(IDX_RESULT_SANDBOX_CALL)) } diff --git a/contracts/wasm/testcore/src/state.rs b/contracts/wasm/testcore/src/state.rs index f59ea788fe..1f62a862ac 100644 --- a/contracts/wasm/testcore/src/state.rs +++ b/contracts/wasm/testcore/src/state.rs @@ -20,7 +20,6 @@ pub struct ImmutableTestCoreState { } impl ImmutableTestCoreState { - pub fn counter(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_STATE_COUNTER)) } @@ -49,7 +48,6 @@ pub struct MutableTestCoreState { } impl MutableTestCoreState { - pub fn counter(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_STATE_COUNTER)) } diff --git a/contracts/wasm/testcore/ts/testcore/contract.ts b/contracts/wasm/testcore/ts/testcore/contract.ts index de8e6bf012..8c45bf2c57 100644 --- a/contracts/wasm/testcore/ts/testcore/contract.ts +++ b/contracts/wasm/testcore/ts/testcore/contract.ts @@ -315,7 +315,6 @@ export class TestSandboxCallContext { } export class ScFuncs { - static callOnChain(ctx: wasmlib.ScFuncCallContext): CallOnChainCall { let f = new CallOnChainCall(); f.func.setPtrs(f.params, f.results); diff --git a/contracts/wasm/testcore/ts/testcore/params.ts b/contracts/wasm/testcore/ts/testcore/params.ts index f39660b2d6..8e90695611 100644 --- a/contracts/wasm/testcore/ts/testcore/params.ts +++ b/contracts/wasm/testcore/ts/testcore/params.ts @@ -9,7 +9,6 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableCallOnChainParams extends wasmlib.ScMapID { - hnameContract(): wasmlib.ScImmutableHname { return new wasmlib.ScImmutableHname(this.mapID, sc.idxMap[sc.IdxParamHnameContract]); } @@ -24,7 +23,6 @@ export class ImmutableCallOnChainParams extends wasmlib.ScMapID { } export class MutableCallOnChainParams extends wasmlib.ScMapID { - hnameContract(): wasmlib.ScMutableHname { return new wasmlib.ScMutableHname(this.mapID, sc.idxMap[sc.IdxParamHnameContract]); } @@ -39,7 +37,6 @@ export class MutableCallOnChainParams extends wasmlib.ScMapID { } export class ImmutableCheckContextFromFullEPParams extends wasmlib.ScMapID { - agentID(): wasmlib.ScImmutableAgentID { return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); } @@ -62,7 +59,6 @@ export class ImmutableCheckContextFromFullEPParams extends wasmlib.ScMapID { } export class MutableCheckContextFromFullEPParams extends wasmlib.ScMapID { - agentID(): wasmlib.ScMutableAgentID { return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); } @@ -85,21 +81,18 @@ export class MutableCheckContextFromFullEPParams extends wasmlib.ScMapID { } export class ImmutableInitParams extends wasmlib.ScMapID { - fail(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamFail]); } } export class MutableInitParams extends wasmlib.ScMapID { - fail(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamFail]); } } export class ImmutablePassTypesFullParams extends wasmlib.ScMapID { - address(): wasmlib.ScImmutableAddress { return new wasmlib.ScImmutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); } @@ -146,7 +139,6 @@ export class ImmutablePassTypesFullParams extends wasmlib.ScMapID { } export class MutablePassTypesFullParams extends wasmlib.ScMapID { - address(): wasmlib.ScMutableAddress { return new wasmlib.ScMutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); } @@ -193,35 +185,30 @@ export class MutablePassTypesFullParams extends wasmlib.ScMapID { } export class ImmutableRunRecursionParams extends wasmlib.ScMapID { - intValue(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); } } export class MutableRunRecursionParams extends wasmlib.ScMapID { - intValue(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); } } export class ImmutableSendToAddressParams extends wasmlib.ScMapID { - address(): wasmlib.ScImmutableAddress { return new wasmlib.ScImmutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); } } export class MutableSendToAddressParams extends wasmlib.ScMapID { - address(): wasmlib.ScMutableAddress { return new wasmlib.ScMutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); } } export class ImmutableSetIntParams extends wasmlib.ScMapID { - intValue(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); } @@ -232,7 +219,6 @@ export class ImmutableSetIntParams extends wasmlib.ScMapID { } export class MutableSetIntParams extends wasmlib.ScMapID { - intValue(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); } @@ -243,49 +229,42 @@ export class MutableSetIntParams extends wasmlib.ScMapID { } export class ImmutableSpawnParams extends wasmlib.ScMapID { - progHash(): wasmlib.ScImmutableHash { return new wasmlib.ScImmutableHash(this.mapID, sc.idxMap[sc.IdxParamProgHash]); } } export class MutableSpawnParams extends wasmlib.ScMapID { - progHash(): wasmlib.ScMutableHash { return new wasmlib.ScMutableHash(this.mapID, sc.idxMap[sc.IdxParamProgHash]); } } export class ImmutableTestEventLogGenericDataParams extends wasmlib.ScMapID { - counter(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamCounter]); } } export class MutableTestEventLogGenericDataParams extends wasmlib.ScMapID { - counter(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamCounter]); } } export class ImmutableWithdrawToChainParams extends wasmlib.ScMapID { - chainID(): wasmlib.ScImmutableChainID { return new wasmlib.ScImmutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); } } export class MutableWithdrawToChainParams extends wasmlib.ScMapID { - chainID(): wasmlib.ScMutableChainID { return new wasmlib.ScMutableChainID(this.mapID, sc.idxMap[sc.IdxParamChainID]); } } export class ImmutableCheckContextFromViewEPParams extends wasmlib.ScMapID { - agentID(): wasmlib.ScImmutableAgentID { return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); } @@ -304,7 +283,6 @@ export class ImmutableCheckContextFromViewEPParams extends wasmlib.ScMapID { } export class MutableCheckContextFromViewEPParams extends wasmlib.ScMapID { - agentID(): wasmlib.ScMutableAgentID { return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); } @@ -323,49 +301,42 @@ export class MutableCheckContextFromViewEPParams extends wasmlib.ScMapID { } export class ImmutableFibonacciParams extends wasmlib.ScMapID { - intValue(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); } } export class MutableFibonacciParams extends wasmlib.ScMapID { - intValue(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamIntValue]); } } export class ImmutableGetIntParams extends wasmlib.ScMapID { - name(): wasmlib.ScImmutableString { return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamName]); } } export class MutableGetIntParams extends wasmlib.ScMapID { - name(): wasmlib.ScMutableString { return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamName]); } } export class ImmutableGetStringValueParams extends wasmlib.ScMapID { - varName(): wasmlib.ScImmutableString { return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamVarName]); } } export class MutableGetStringValueParams extends wasmlib.ScMapID { - varName(): wasmlib.ScMutableString { return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamVarName]); } } export class ImmutablePassTypesViewParams extends wasmlib.ScMapID { - address(): wasmlib.ScImmutableAddress { return new wasmlib.ScImmutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); } @@ -412,7 +383,6 @@ export class ImmutablePassTypesViewParams extends wasmlib.ScMapID { } export class MutablePassTypesViewParams extends wasmlib.ScMapID { - address(): wasmlib.ScMutableAddress { return new wasmlib.ScMutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); } diff --git a/contracts/wasm/testcore/ts/testcore/results.ts b/contracts/wasm/testcore/ts/testcore/results.ts index 0728435078..af01e712ce 100644 --- a/contracts/wasm/testcore/ts/testcore/results.ts +++ b/contracts/wasm/testcore/ts/testcore/results.ts @@ -9,21 +9,18 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableCallOnChainResults extends wasmlib.ScMapID { - intValue(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultIntValue]); } } export class MutableCallOnChainResults extends wasmlib.ScMapID { - intValue(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultIntValue]); } } export class ImmutableGetMintedSupplyResults extends wasmlib.ScMapID { - mintedColor(): wasmlib.ScImmutableColor { return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxResultMintedColor]); } @@ -34,7 +31,6 @@ export class ImmutableGetMintedSupplyResults extends wasmlib.ScMapID { } export class MutableGetMintedSupplyResults extends wasmlib.ScMapID { - mintedColor(): wasmlib.ScMutableColor { return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxResultMintedColor]); } @@ -45,56 +41,48 @@ export class MutableGetMintedSupplyResults extends wasmlib.ScMapID { } export class ImmutableRunRecursionResults extends wasmlib.ScMapID { - intValue(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultIntValue]); } } export class MutableRunRecursionResults extends wasmlib.ScMapID { - intValue(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultIntValue]); } } export class ImmutableTestChainOwnerIDFullResults extends wasmlib.ScMapID { - chainOwnerID(): wasmlib.ScImmutableAgentID { return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxResultChainOwnerID]); } } export class MutableTestChainOwnerIDFullResults extends wasmlib.ScMapID { - chainOwnerID(): wasmlib.ScMutableAgentID { return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxResultChainOwnerID]); } } export class ImmutableFibonacciResults extends wasmlib.ScMapID { - intValue(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultIntValue]); } } export class MutableFibonacciResults extends wasmlib.ScMapID { - intValue(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultIntValue]); } } export class ImmutableGetCounterResults extends wasmlib.ScMapID { - counter(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultCounter]); } } export class MutableGetCounterResults extends wasmlib.ScMapID { - counter(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultCounter]); } @@ -113,7 +101,6 @@ export class MapStringToImmutableInt64 { } export class ImmutableGetIntResults extends wasmlib.ScMapID { - values(): sc.MapStringToImmutableInt64 { return new sc.MapStringToImmutableInt64(this.mapID); } @@ -136,7 +123,6 @@ export class MapStringToMutableInt64 { } export class MutableGetIntResults extends wasmlib.ScMapID { - values(): sc.MapStringToMutableInt64 { return new sc.MapStringToMutableInt64(this.mapID); } @@ -155,7 +141,6 @@ export class MapStringToImmutableString { } export class ImmutableGetStringValueResults extends wasmlib.ScMapID { - vars(): sc.MapStringToImmutableString { return new sc.MapStringToImmutableString(this.mapID); } @@ -178,35 +163,30 @@ export class MapStringToMutableString { } export class MutableGetStringValueResults extends wasmlib.ScMapID { - vars(): sc.MapStringToMutableString { return new sc.MapStringToMutableString(this.mapID); } } export class ImmutableTestChainOwnerIDViewResults extends wasmlib.ScMapID { - chainOwnerID(): wasmlib.ScImmutableAgentID { return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxResultChainOwnerID]); } } export class MutableTestChainOwnerIDViewResults extends wasmlib.ScMapID { - chainOwnerID(): wasmlib.ScMutableAgentID { return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxResultChainOwnerID]); } } export class ImmutableTestSandboxCallResults extends wasmlib.ScMapID { - sandboxCall(): wasmlib.ScImmutableString { return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxResultSandboxCall]); } } export class MutableTestSandboxCallResults extends wasmlib.ScMapID { - sandboxCall(): wasmlib.ScMutableString { return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxResultSandboxCall]); } diff --git a/contracts/wasm/testcore/ts/testcore/state.ts b/contracts/wasm/testcore/ts/testcore/state.ts index 2cd57331e4..3a20e3d512 100644 --- a/contracts/wasm/testcore/ts/testcore/state.ts +++ b/contracts/wasm/testcore/ts/testcore/state.ts @@ -9,7 +9,6 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableTestCoreState extends wasmlib.ScMapID { - counter(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateCounter]); } @@ -33,7 +32,6 @@ export class ImmutableTestCoreState extends wasmlib.ScMapID { } export class MutableTestCoreState extends wasmlib.ScMapID { - counter(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateCounter]); } diff --git a/contracts/wasm/testwasmlib/src/contract.rs b/contracts/wasm/testwasmlib/src/contract.rs index 0018676707..5df0ede6ee 100644 --- a/contracts/wasm/testwasmlib/src/contract.rs +++ b/contracts/wasm/testwasmlib/src/contract.rs @@ -85,6 +85,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn array_create(_ctx: & dyn ScFuncCallContext) -> ArrayCreateCall { let mut f = ArrayCreateCall { func: ScFunc::new(HSC_NAME, HFUNC_ARRAY_CREATE), @@ -93,6 +94,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn array_set(_ctx: & dyn ScFuncCallContext) -> ArraySetCall { let mut f = ArraySetCall { func: ScFunc::new(HSC_NAME, HFUNC_ARRAY_SET), @@ -101,6 +103,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn param_types(_ctx: & dyn ScFuncCallContext) -> ParamTypesCall { let mut f = ParamTypesCall { func: ScFunc::new(HSC_NAME, HFUNC_PARAM_TYPES), @@ -109,11 +112,13 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn random(_ctx: & dyn ScFuncCallContext) -> RandomCall { RandomCall { func: ScFunc::new(HSC_NAME, HFUNC_RANDOM), } } + pub fn array_length(_ctx: & dyn ScViewCallContext) -> ArrayLengthCall { let mut f = ArrayLengthCall { func: ScView::new(HSC_NAME, HVIEW_ARRAY_LENGTH), @@ -123,6 +128,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn array_value(_ctx: & dyn ScViewCallContext) -> ArrayValueCall { let mut f = ArrayValueCall { func: ScView::new(HSC_NAME, HVIEW_ARRAY_VALUE), @@ -132,6 +138,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn block_record(_ctx: & dyn ScViewCallContext) -> BlockRecordCall { let mut f = BlockRecordCall { func: ScView::new(HSC_NAME, HVIEW_BLOCK_RECORD), @@ -141,6 +148,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn block_records(_ctx: & dyn ScViewCallContext) -> BlockRecordsCall { let mut f = BlockRecordsCall { func: ScView::new(HSC_NAME, HVIEW_BLOCK_RECORDS), @@ -150,6 +158,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn get_random(_ctx: & dyn ScViewCallContext) -> GetRandomCall { let mut f = GetRandomCall { func: ScView::new(HSC_NAME, HVIEW_GET_RANDOM), @@ -158,6 +167,7 @@ impl ScFuncs { f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); f } + pub fn iota_balance(_ctx: & dyn ScViewCallContext) -> IotaBalanceCall { let mut f = IotaBalanceCall { func: ScView::new(HSC_NAME, HVIEW_IOTA_BALANCE), diff --git a/contracts/wasm/testwasmlib/src/params.rs b/contracts/wasm/testwasmlib/src/params.rs index ae7362202f..5405642ba6 100644 --- a/contracts/wasm/testwasmlib/src/params.rs +++ b/contracts/wasm/testwasmlib/src/params.rs @@ -20,7 +20,6 @@ pub struct ImmutableArrayClearParams { } impl ImmutableArrayClearParams { - pub fn name(&self) -> ScImmutableString { ScImmutableString::new(self.id, idx_map(IDX_PARAM_NAME)) } @@ -32,7 +31,6 @@ pub struct MutableArrayClearParams { } impl MutableArrayClearParams { - pub fn name(&self) -> ScMutableString { ScMutableString::new(self.id, idx_map(IDX_PARAM_NAME)) } @@ -44,7 +42,6 @@ pub struct ImmutableArrayCreateParams { } impl ImmutableArrayCreateParams { - pub fn name(&self) -> ScImmutableString { ScImmutableString::new(self.id, idx_map(IDX_PARAM_NAME)) } @@ -56,7 +53,6 @@ pub struct MutableArrayCreateParams { } impl MutableArrayCreateParams { - pub fn name(&self) -> ScMutableString { ScMutableString::new(self.id, idx_map(IDX_PARAM_NAME)) } @@ -68,7 +64,6 @@ pub struct ImmutableArraySetParams { } impl ImmutableArraySetParams { - pub fn index(&self) -> ScImmutableInt32 { ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_INDEX)) } @@ -88,7 +83,6 @@ pub struct MutableArraySetParams { } impl MutableArraySetParams { - pub fn index(&self) -> ScMutableInt32 { ScMutableInt32::new(self.id, idx_map(IDX_PARAM_INDEX)) } @@ -118,7 +112,6 @@ pub struct ImmutableParamTypesParams { } impl ImmutableParamTypesParams { - pub fn address(&self) -> ScImmutableAddress { ScImmutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) } @@ -192,7 +185,6 @@ pub struct MutableParamTypesParams { } impl MutableParamTypesParams { - pub fn address(&self) -> ScMutableAddress { ScMutableAddress::new(self.id, idx_map(IDX_PARAM_ADDRESS)) } @@ -252,7 +244,6 @@ pub struct ImmutableArrayLengthParams { } impl ImmutableArrayLengthParams { - pub fn name(&self) -> ScImmutableString { ScImmutableString::new(self.id, idx_map(IDX_PARAM_NAME)) } @@ -264,7 +255,6 @@ pub struct MutableArrayLengthParams { } impl MutableArrayLengthParams { - pub fn name(&self) -> ScMutableString { ScMutableString::new(self.id, idx_map(IDX_PARAM_NAME)) } @@ -276,7 +266,6 @@ pub struct ImmutableArrayValueParams { } impl ImmutableArrayValueParams { - pub fn index(&self) -> ScImmutableInt32 { ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_INDEX)) } @@ -292,7 +281,6 @@ pub struct MutableArrayValueParams { } impl MutableArrayValueParams { - pub fn index(&self) -> ScMutableInt32 { ScMutableInt32::new(self.id, idx_map(IDX_PARAM_INDEX)) } @@ -308,7 +296,6 @@ pub struct ImmutableBlockRecordParams { } impl ImmutableBlockRecordParams { - pub fn block_index(&self) -> ScImmutableInt32 { ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_BLOCK_INDEX)) } @@ -324,7 +311,6 @@ pub struct MutableBlockRecordParams { } impl MutableBlockRecordParams { - pub fn block_index(&self) -> ScMutableInt32 { ScMutableInt32::new(self.id, idx_map(IDX_PARAM_BLOCK_INDEX)) } @@ -340,7 +326,6 @@ pub struct ImmutableBlockRecordsParams { } impl ImmutableBlockRecordsParams { - pub fn block_index(&self) -> ScImmutableInt32 { ScImmutableInt32::new(self.id, idx_map(IDX_PARAM_BLOCK_INDEX)) } @@ -352,7 +337,6 @@ pub struct MutableBlockRecordsParams { } impl MutableBlockRecordsParams { - pub fn block_index(&self) -> ScMutableInt32 { ScMutableInt32::new(self.id, idx_map(IDX_PARAM_BLOCK_INDEX)) } diff --git a/contracts/wasm/testwasmlib/src/results.rs b/contracts/wasm/testwasmlib/src/results.rs index d3257eb4db..d5b42d0c3a 100644 --- a/contracts/wasm/testwasmlib/src/results.rs +++ b/contracts/wasm/testwasmlib/src/results.rs @@ -20,7 +20,6 @@ pub struct ImmutableArrayLengthResults { } impl ImmutableArrayLengthResults { - pub fn length(&self) -> ScImmutableInt32 { ScImmutableInt32::new(self.id, idx_map(IDX_RESULT_LENGTH)) } @@ -32,7 +31,6 @@ pub struct MutableArrayLengthResults { } impl MutableArrayLengthResults { - pub fn length(&self) -> ScMutableInt32 { ScMutableInt32::new(self.id, idx_map(IDX_RESULT_LENGTH)) } @@ -44,7 +42,6 @@ pub struct ImmutableArrayValueResults { } impl ImmutableArrayValueResults { - pub fn value(&self) -> ScImmutableString { ScImmutableString::new(self.id, idx_map(IDX_RESULT_VALUE)) } @@ -56,7 +53,6 @@ pub struct MutableArrayValueResults { } impl MutableArrayValueResults { - pub fn value(&self) -> ScMutableString { ScMutableString::new(self.id, idx_map(IDX_RESULT_VALUE)) } @@ -68,7 +64,6 @@ pub struct ImmutableBlockRecordResults { } impl ImmutableBlockRecordResults { - pub fn record(&self) -> ScImmutableBytes { ScImmutableBytes::new(self.id, idx_map(IDX_RESULT_RECORD)) } @@ -80,7 +75,6 @@ pub struct MutableBlockRecordResults { } impl MutableBlockRecordResults { - pub fn record(&self) -> ScMutableBytes { ScMutableBytes::new(self.id, idx_map(IDX_RESULT_RECORD)) } @@ -92,7 +86,6 @@ pub struct ImmutableBlockRecordsResults { } impl ImmutableBlockRecordsResults { - pub fn count(&self) -> ScImmutableInt32 { ScImmutableInt32::new(self.id, idx_map(IDX_RESULT_COUNT)) } @@ -104,7 +97,6 @@ pub struct MutableBlockRecordsResults { } impl MutableBlockRecordsResults { - pub fn count(&self) -> ScMutableInt32 { ScMutableInt32::new(self.id, idx_map(IDX_RESULT_COUNT)) } @@ -116,7 +108,6 @@ pub struct ImmutableGetRandomResults { } impl ImmutableGetRandomResults { - pub fn random(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_RANDOM)) } @@ -128,7 +119,6 @@ pub struct MutableGetRandomResults { } impl MutableGetRandomResults { - pub fn random(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_RESULT_RANDOM)) } @@ -140,7 +130,6 @@ pub struct ImmutableIotaBalanceResults { } impl ImmutableIotaBalanceResults { - pub fn iotas(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_IOTAS)) } @@ -152,7 +141,6 @@ pub struct MutableIotaBalanceResults { } impl MutableIotaBalanceResults { - pub fn iotas(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_RESULT_IOTAS)) } diff --git a/contracts/wasm/testwasmlib/src/state.rs b/contracts/wasm/testwasmlib/src/state.rs index 246c4049b9..e2dfc69350 100644 --- a/contracts/wasm/testwasmlib/src/state.rs +++ b/contracts/wasm/testwasmlib/src/state.rs @@ -32,7 +32,6 @@ pub struct ImmutableTestWasmLibState { } impl ImmutableTestWasmLibState { - pub fn arrays(&self) -> MapStringToImmutableStringArray { let map_id = get_object_id(self.id, idx_map(IDX_STATE_ARRAYS), TYPE_MAP); MapStringToImmutableStringArray { obj_id: map_id } @@ -64,7 +63,6 @@ pub struct MutableTestWasmLibState { } impl MutableTestWasmLibState { - pub fn arrays(&self) -> MapStringToMutableStringArray { let map_id = get_object_id(self.id, idx_map(IDX_STATE_ARRAYS), TYPE_MAP); MapStringToMutableStringArray { obj_id: map_id } diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/contract.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/contract.ts index ee2aaefb4b..7e24c61f0f 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/contract.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/contract.ts @@ -125,7 +125,6 @@ export class IotaBalanceContext { } export class ScFuncs { - static arrayClear(ctx: wasmlib.ScFuncCallContext): ArrayClearCall { let f = new ArrayClearCall(); f.func.setPtrs(f.params, null); diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/params.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/params.ts index 90d2e67579..1802402c5d 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/params.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/params.ts @@ -9,35 +9,30 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableArrayClearParams extends wasmlib.ScMapID { - name(): wasmlib.ScImmutableString { return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamName]); } } export class MutableArrayClearParams extends wasmlib.ScMapID { - name(): wasmlib.ScMutableString { return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamName]); } } export class ImmutableArrayCreateParams extends wasmlib.ScMapID { - name(): wasmlib.ScImmutableString { return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamName]); } } export class MutableArrayCreateParams extends wasmlib.ScMapID { - name(): wasmlib.ScMutableString { return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamName]); } } export class ImmutableArraySetParams extends wasmlib.ScMapID { - index(): wasmlib.ScImmutableInt32 { return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamIndex]); } @@ -52,7 +47,6 @@ export class ImmutableArraySetParams extends wasmlib.ScMapID { } export class MutableArraySetParams extends wasmlib.ScMapID { - index(): wasmlib.ScMutableInt32 { return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamIndex]); } @@ -79,7 +73,6 @@ export class MapStringToImmutableBytes { } export class ImmutableParamTypesParams extends wasmlib.ScMapID { - address(): wasmlib.ScImmutableAddress { return new wasmlib.ScImmutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); } @@ -150,7 +143,6 @@ export class MapStringToMutableBytes { } export class MutableParamTypesParams extends wasmlib.ScMapID { - address(): wasmlib.ScMutableAddress { return new wasmlib.ScMutableAddress(this.mapID, sc.idxMap[sc.IdxParamAddress]); } @@ -205,21 +197,18 @@ export class MutableParamTypesParams extends wasmlib.ScMapID { } export class ImmutableArrayLengthParams extends wasmlib.ScMapID { - name(): wasmlib.ScImmutableString { return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamName]); } } export class MutableArrayLengthParams extends wasmlib.ScMapID { - name(): wasmlib.ScMutableString { return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamName]); } } export class ImmutableArrayValueParams extends wasmlib.ScMapID { - index(): wasmlib.ScImmutableInt32 { return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamIndex]); } @@ -230,7 +219,6 @@ export class ImmutableArrayValueParams extends wasmlib.ScMapID { } export class MutableArrayValueParams extends wasmlib.ScMapID { - index(): wasmlib.ScMutableInt32 { return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamIndex]); } @@ -241,7 +229,6 @@ export class MutableArrayValueParams extends wasmlib.ScMapID { } export class ImmutableBlockRecordParams extends wasmlib.ScMapID { - blockIndex(): wasmlib.ScImmutableInt32 { return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamBlockIndex]); } @@ -252,7 +239,6 @@ export class ImmutableBlockRecordParams extends wasmlib.ScMapID { } export class MutableBlockRecordParams extends wasmlib.ScMapID { - blockIndex(): wasmlib.ScMutableInt32 { return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamBlockIndex]); } @@ -263,14 +249,12 @@ export class MutableBlockRecordParams extends wasmlib.ScMapID { } export class ImmutableBlockRecordsParams extends wasmlib.ScMapID { - blockIndex(): wasmlib.ScImmutableInt32 { return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxParamBlockIndex]); } } export class MutableBlockRecordsParams extends wasmlib.ScMapID { - blockIndex(): wasmlib.ScMutableInt32 { return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxParamBlockIndex]); } diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/results.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/results.ts index c86afff8b1..5c4de29bc1 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/results.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/results.ts @@ -9,84 +9,72 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableArrayLengthResults extends wasmlib.ScMapID { - length(): wasmlib.ScImmutableInt32 { return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxResultLength]); } } export class MutableArrayLengthResults extends wasmlib.ScMapID { - length(): wasmlib.ScMutableInt32 { return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxResultLength]); } } export class ImmutableArrayValueResults extends wasmlib.ScMapID { - value(): wasmlib.ScImmutableString { return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxResultValue]); } } export class MutableArrayValueResults extends wasmlib.ScMapID { - value(): wasmlib.ScMutableString { return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxResultValue]); } } export class ImmutableBlockRecordResults extends wasmlib.ScMapID { - record(): wasmlib.ScImmutableBytes { return new wasmlib.ScImmutableBytes(this.mapID, sc.idxMap[sc.IdxResultRecord]); } } export class MutableBlockRecordResults extends wasmlib.ScMapID { - record(): wasmlib.ScMutableBytes { return new wasmlib.ScMutableBytes(this.mapID, sc.idxMap[sc.IdxResultRecord]); } } export class ImmutableBlockRecordsResults extends wasmlib.ScMapID { - count(): wasmlib.ScImmutableInt32 { return new wasmlib.ScImmutableInt32(this.mapID, sc.idxMap[sc.IdxResultCount]); } } export class MutableBlockRecordsResults extends wasmlib.ScMapID { - count(): wasmlib.ScMutableInt32 { return new wasmlib.ScMutableInt32(this.mapID, sc.idxMap[sc.IdxResultCount]); } } export class ImmutableGetRandomResults extends wasmlib.ScMapID { - random(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultRandom]); } } export class MutableGetRandomResults extends wasmlib.ScMapID { - random(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultRandom]); } } export class ImmutableIotaBalanceResults extends wasmlib.ScMapID { - iotas(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultIotas]); } } export class MutableIotaBalanceResults extends wasmlib.ScMapID { - iotas(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultIotas]); } diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/state.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/state.ts index d32fb0c4aa..ddce3923cd 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/state.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/state.ts @@ -22,7 +22,6 @@ export class MapStringToImmutableStringArray { } export class ImmutableTestWasmLibState extends wasmlib.ScMapID { - arrays(): sc.MapStringToImmutableStringArray { let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateArrays], wasmlib.TYPE_MAP); return new sc.MapStringToImmutableStringArray(mapID); @@ -51,7 +50,6 @@ export class MapStringToMutableStringArray { } export class MutableTestWasmLibState extends wasmlib.ScMapID { - arrays(): sc.MapStringToMutableStringArray { let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateArrays], wasmlib.TYPE_MAP); return new sc.MapStringToMutableStringArray(mapID); diff --git a/contracts/wasm/timestamp/src/contract.rs b/contracts/wasm/timestamp/src/contract.rs index 20fb3c9e91..91ec41f186 100644 --- a/contracts/wasm/timestamp/src/contract.rs +++ b/contracts/wasm/timestamp/src/contract.rs @@ -32,6 +32,7 @@ impl ScFuncs { func: ScFunc::new(HSC_NAME, HFUNC_NOW), } } + pub fn get_timestamp(_ctx: & dyn ScViewCallContext) -> GetTimestampCall { let mut f = GetTimestampCall { func: ScView::new(HSC_NAME, HVIEW_GET_TIMESTAMP), diff --git a/contracts/wasm/timestamp/src/results.rs b/contracts/wasm/timestamp/src/results.rs index cb99d165b4..53e7d5cf08 100644 --- a/contracts/wasm/timestamp/src/results.rs +++ b/contracts/wasm/timestamp/src/results.rs @@ -20,7 +20,6 @@ pub struct ImmutableGetTimestampResults { } impl ImmutableGetTimestampResults { - pub fn timestamp(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_RESULT_TIMESTAMP)) } @@ -32,7 +31,6 @@ pub struct MutableGetTimestampResults { } impl MutableGetTimestampResults { - pub fn timestamp(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_RESULT_TIMESTAMP)) } diff --git a/contracts/wasm/timestamp/src/state.rs b/contracts/wasm/timestamp/src/state.rs index fd1a0eb14a..f5554bae10 100644 --- a/contracts/wasm/timestamp/src/state.rs +++ b/contracts/wasm/timestamp/src/state.rs @@ -20,7 +20,6 @@ pub struct ImmutabletimestampState { } impl ImmutabletimestampState { - pub fn timestamp(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, idx_map(IDX_STATE_TIMESTAMP)) } @@ -32,7 +31,6 @@ pub struct MutabletimestampState { } impl MutabletimestampState { - pub fn timestamp(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, idx_map(IDX_STATE_TIMESTAMP)) } diff --git a/contracts/wasm/timestamp/ts/timestamp/contract.ts b/contracts/wasm/timestamp/ts/timestamp/contract.ts index 490a9fadf7..f95a487aa2 100644 --- a/contracts/wasm/timestamp/ts/timestamp/contract.ts +++ b/contracts/wasm/timestamp/ts/timestamp/contract.ts @@ -27,7 +27,6 @@ export class GetTimestampContext { } export class ScFuncs { - static now(ctx: wasmlib.ScFuncCallContext): NowCall { return new NowCall(); } diff --git a/contracts/wasm/timestamp/ts/timestamp/results.ts b/contracts/wasm/timestamp/ts/timestamp/results.ts index 5b0e8765bf..3eb8e9ffba 100644 --- a/contracts/wasm/timestamp/ts/timestamp/results.ts +++ b/contracts/wasm/timestamp/ts/timestamp/results.ts @@ -9,14 +9,12 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableGetTimestampResults extends wasmlib.ScMapID { - timestamp(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxResultTimestamp]); } } export class MutableGetTimestampResults extends wasmlib.ScMapID { - timestamp(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxResultTimestamp]); } diff --git a/contracts/wasm/timestamp/ts/timestamp/state.ts b/contracts/wasm/timestamp/ts/timestamp/state.ts index 27f220e2a5..cfa1eaab07 100644 --- a/contracts/wasm/timestamp/ts/timestamp/state.ts +++ b/contracts/wasm/timestamp/ts/timestamp/state.ts @@ -9,14 +9,12 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutabletimestampState extends wasmlib.ScMapID { - timestamp(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxStateTimestamp]); } } export class MutabletimestampState extends wasmlib.ScMapID { - timestamp(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxStateTimestamp]); } diff --git a/contracts/wasm/tokenregistry/src/contract.rs b/contracts/wasm/tokenregistry/src/contract.rs index b344e00ad3..d99016a400 100644 --- a/contracts/wasm/tokenregistry/src/contract.rs +++ b/contracts/wasm/tokenregistry/src/contract.rs @@ -46,6 +46,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn transfer_ownership(_ctx: & dyn ScFuncCallContext) -> TransferOwnershipCall { let mut f = TransferOwnershipCall { func: ScFunc::new(HSC_NAME, HFUNC_TRANSFER_OWNERSHIP), @@ -54,6 +55,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn update_metadata(_ctx: & dyn ScFuncCallContext) -> UpdateMetadataCall { let mut f = UpdateMetadataCall { func: ScFunc::new(HSC_NAME, HFUNC_UPDATE_METADATA), @@ -62,6 +64,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn get_info(_ctx: & dyn ScViewCallContext) -> GetInfoCall { let mut f = GetInfoCall { func: ScView::new(HSC_NAME, HVIEW_GET_INFO), diff --git a/contracts/wasm/tokenregistry/src/params.rs b/contracts/wasm/tokenregistry/src/params.rs index a5161c9435..66088d60ef 100644 --- a/contracts/wasm/tokenregistry/src/params.rs +++ b/contracts/wasm/tokenregistry/src/params.rs @@ -20,7 +20,6 @@ pub struct ImmutableMintSupplyParams { } impl ImmutableMintSupplyParams { - pub fn description(&self) -> ScImmutableString { ScImmutableString::new(self.id, idx_map(IDX_PARAM_DESCRIPTION)) } @@ -36,7 +35,6 @@ pub struct MutableMintSupplyParams { } impl MutableMintSupplyParams { - pub fn description(&self) -> ScMutableString { ScMutableString::new(self.id, idx_map(IDX_PARAM_DESCRIPTION)) } @@ -52,7 +50,6 @@ pub struct ImmutableTransferOwnershipParams { } impl ImmutableTransferOwnershipParams { - pub fn color(&self) -> ScImmutableColor { ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) } @@ -64,7 +61,6 @@ pub struct MutableTransferOwnershipParams { } impl MutableTransferOwnershipParams { - pub fn color(&self) -> ScMutableColor { ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) } @@ -76,7 +72,6 @@ pub struct ImmutableUpdateMetadataParams { } impl ImmutableUpdateMetadataParams { - pub fn color(&self) -> ScImmutableColor { ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) } @@ -88,7 +83,6 @@ pub struct MutableUpdateMetadataParams { } impl MutableUpdateMetadataParams { - pub fn color(&self) -> ScMutableColor { ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) } @@ -100,7 +94,6 @@ pub struct ImmutableGetInfoParams { } impl ImmutableGetInfoParams { - pub fn color(&self) -> ScImmutableColor { ScImmutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) } @@ -112,7 +105,6 @@ pub struct MutableGetInfoParams { } impl MutableGetInfoParams { - pub fn color(&self) -> ScMutableColor { ScMutableColor::new(self.id, idx_map(IDX_PARAM_COLOR)) } diff --git a/contracts/wasm/tokenregistry/src/state.rs b/contracts/wasm/tokenregistry/src/state.rs index b1debc3005..3726c7b438 100644 --- a/contracts/wasm/tokenregistry/src/state.rs +++ b/contracts/wasm/tokenregistry/src/state.rs @@ -45,7 +45,6 @@ pub struct ImmutableTokenRegistryState { } impl ImmutableTokenRegistryState { - pub fn color_list(&self) -> ArrayOfImmutableColor { let arr_id = get_object_id(self.id, idx_map(IDX_STATE_COLOR_LIST), TYPE_ARRAY | TYPE_COLOR); ArrayOfImmutableColor { obj_id: arr_id } @@ -95,7 +94,6 @@ pub struct MutableTokenRegistryState { } impl MutableTokenRegistryState { - pub fn color_list(&self) -> ArrayOfMutableColor { let arr_id = get_object_id(self.id, idx_map(IDX_STATE_COLOR_LIST), TYPE_ARRAY | TYPE_COLOR); ArrayOfMutableColor { obj_id: arr_id } diff --git a/contracts/wasm/tokenregistry/ts/tokenregistry/contract.ts b/contracts/wasm/tokenregistry/ts/tokenregistry/contract.ts index 9c4a118484..c0b4241dbc 100644 --- a/contracts/wasm/tokenregistry/ts/tokenregistry/contract.ts +++ b/contracts/wasm/tokenregistry/ts/tokenregistry/contract.ts @@ -49,7 +49,6 @@ export class GetInfoContext { } export class ScFuncs { - static mintSupply(ctx: wasmlib.ScFuncCallContext): MintSupplyCall { let f = new MintSupplyCall(); f.func.setPtrs(f.params, null); diff --git a/contracts/wasm/tokenregistry/ts/tokenregistry/params.ts b/contracts/wasm/tokenregistry/ts/tokenregistry/params.ts index 3ce2ae7764..8d16af038f 100644 --- a/contracts/wasm/tokenregistry/ts/tokenregistry/params.ts +++ b/contracts/wasm/tokenregistry/ts/tokenregistry/params.ts @@ -9,7 +9,6 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableMintSupplyParams extends wasmlib.ScMapID { - description(): wasmlib.ScImmutableString { return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamDescription]); } @@ -20,7 +19,6 @@ export class ImmutableMintSupplyParams extends wasmlib.ScMapID { } export class MutableMintSupplyParams extends wasmlib.ScMapID { - description(): wasmlib.ScMutableString { return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamDescription]); } @@ -31,42 +29,36 @@ export class MutableMintSupplyParams extends wasmlib.ScMapID { } export class ImmutableTransferOwnershipParams extends wasmlib.ScMapID { - color(): wasmlib.ScImmutableColor { return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); } } export class MutableTransferOwnershipParams extends wasmlib.ScMapID { - color(): wasmlib.ScMutableColor { return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); } } export class ImmutableUpdateMetadataParams extends wasmlib.ScMapID { - color(): wasmlib.ScImmutableColor { return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); } } export class MutableUpdateMetadataParams extends wasmlib.ScMapID { - color(): wasmlib.ScMutableColor { return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); } } export class ImmutableGetInfoParams extends wasmlib.ScMapID { - color(): wasmlib.ScImmutableColor { return new wasmlib.ScImmutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); } } export class MutableGetInfoParams extends wasmlib.ScMapID { - color(): wasmlib.ScMutableColor { return new wasmlib.ScMutableColor(this.mapID, sc.idxMap[sc.IdxParamColor]); } diff --git a/contracts/wasm/tokenregistry/ts/tokenregistry/state.ts b/contracts/wasm/tokenregistry/ts/tokenregistry/state.ts index 7467cf2e9e..bdbf15f919 100644 --- a/contracts/wasm/tokenregistry/ts/tokenregistry/state.ts +++ b/contracts/wasm/tokenregistry/ts/tokenregistry/state.ts @@ -37,7 +37,6 @@ export class MapColorToImmutableToken { } export class ImmutableTokenRegistryState extends wasmlib.ScMapID { - colorList(): sc.ArrayOfImmutableColor { let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateColorList], wasmlib.TYPE_ARRAY|wasmlib.TYPE_COLOR); return new sc.ArrayOfImmutableColor(arrID); @@ -86,7 +85,6 @@ export class MapColorToMutableToken { } export class MutableTokenRegistryState extends wasmlib.ScMapID { - colorList(): sc.ArrayOfMutableColor { let arrID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateColorList], wasmlib.TYPE_ARRAY|wasmlib.TYPE_COLOR); return new sc.ArrayOfMutableColor(arrID); diff --git a/packages/vm/wasmlib/src/coreaccounts/contract.rs b/packages/vm/wasmlib/src/coreaccounts/contract.rs index afa4cc6d91..8b6e25016e 100644 --- a/packages/vm/wasmlib/src/coreaccounts/contract.rs +++ b/packages/vm/wasmlib/src/coreaccounts/contract.rs @@ -60,6 +60,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn harvest(_ctx: & dyn ScFuncCallContext) -> HarvestCall { let mut f = HarvestCall { func: ScFunc::new(HSC_NAME, HFUNC_HARVEST), @@ -68,11 +69,13 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn withdraw(_ctx: & dyn ScFuncCallContext) -> WithdrawCall { WithdrawCall { func: ScFunc::new(HSC_NAME, HFUNC_WITHDRAW), } } + pub fn accounts(_ctx: & dyn ScViewCallContext) -> AccountsCall { let mut f = AccountsCall { func: ScView::new(HSC_NAME, HVIEW_ACCOUNTS), @@ -81,6 +84,7 @@ impl ScFuncs { f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); f } + pub fn balance(_ctx: & dyn ScViewCallContext) -> BalanceCall { let mut f = BalanceCall { func: ScView::new(HSC_NAME, HVIEW_BALANCE), @@ -90,6 +94,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn get_account_nonce(_ctx: & dyn ScViewCallContext) -> GetAccountNonceCall { let mut f = GetAccountNonceCall { func: ScView::new(HSC_NAME, HVIEW_GET_ACCOUNT_NONCE), @@ -99,6 +104,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn total_assets(_ctx: & dyn ScViewCallContext) -> TotalAssetsCall { let mut f = TotalAssetsCall { func: ScView::new(HSC_NAME, HVIEW_TOTAL_ASSETS), diff --git a/packages/vm/wasmlib/src/coreaccounts/params.rs b/packages/vm/wasmlib/src/coreaccounts/params.rs index b2d494d366..5c61b19e05 100644 --- a/packages/vm/wasmlib/src/coreaccounts/params.rs +++ b/packages/vm/wasmlib/src/coreaccounts/params.rs @@ -18,7 +18,6 @@ pub struct ImmutableDepositParams { } impl ImmutableDepositParams { - pub fn agent_id(&self) -> ScImmutableAgentID { ScImmutableAgentID::new(self.id, PARAM_AGENT_ID.get_key_id()) } @@ -30,7 +29,6 @@ pub struct MutableDepositParams { } impl MutableDepositParams { - pub fn agent_id(&self) -> ScMutableAgentID { ScMutableAgentID::new(self.id, PARAM_AGENT_ID.get_key_id()) } @@ -42,7 +40,6 @@ pub struct ImmutableHarvestParams { } impl ImmutableHarvestParams { - pub fn withdraw_amount(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, PARAM_WITHDRAW_AMOUNT.get_key_id()) } @@ -58,7 +55,6 @@ pub struct MutableHarvestParams { } impl MutableHarvestParams { - pub fn withdraw_amount(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, PARAM_WITHDRAW_AMOUNT.get_key_id()) } @@ -74,7 +70,6 @@ pub struct ImmutableBalanceParams { } impl ImmutableBalanceParams { - pub fn agent_id(&self) -> ScImmutableAgentID { ScImmutableAgentID::new(self.id, PARAM_AGENT_ID.get_key_id()) } @@ -86,7 +81,6 @@ pub struct MutableBalanceParams { } impl MutableBalanceParams { - pub fn agent_id(&self) -> ScMutableAgentID { ScMutableAgentID::new(self.id, PARAM_AGENT_ID.get_key_id()) } @@ -98,7 +92,6 @@ pub struct ImmutableGetAccountNonceParams { } impl ImmutableGetAccountNonceParams { - pub fn agent_id(&self) -> ScImmutableAgentID { ScImmutableAgentID::new(self.id, PARAM_AGENT_ID.get_key_id()) } @@ -110,7 +103,6 @@ pub struct MutableGetAccountNonceParams { } impl MutableGetAccountNonceParams { - pub fn agent_id(&self) -> ScMutableAgentID { ScMutableAgentID::new(self.id, PARAM_AGENT_ID.get_key_id()) } diff --git a/packages/vm/wasmlib/src/coreaccounts/results.rs b/packages/vm/wasmlib/src/coreaccounts/results.rs index 9d9e7df557..918522561e 100644 --- a/packages/vm/wasmlib/src/coreaccounts/results.rs +++ b/packages/vm/wasmlib/src/coreaccounts/results.rs @@ -28,7 +28,6 @@ pub struct ImmutableAccountsResults { } impl ImmutableAccountsResults { - pub fn agents(&self) -> MapAgentIDToImmutableBytes { MapAgentIDToImmutableBytes { obj_id: self.id } } @@ -54,7 +53,6 @@ pub struct MutableAccountsResults { } impl MutableAccountsResults { - pub fn agents(&self) -> MapAgentIDToMutableBytes { MapAgentIDToMutableBytes { obj_id: self.id } } @@ -76,7 +74,6 @@ pub struct ImmutableBalanceResults { } impl ImmutableBalanceResults { - pub fn balances(&self) -> MapColorToImmutableInt64 { MapColorToImmutableInt64 { obj_id: self.id } } @@ -102,7 +99,6 @@ pub struct MutableBalanceResults { } impl MutableBalanceResults { - pub fn balances(&self) -> MapColorToMutableInt64 { MapColorToMutableInt64 { obj_id: self.id } } @@ -114,7 +110,6 @@ pub struct ImmutableGetAccountNonceResults { } impl ImmutableGetAccountNonceResults { - pub fn account_nonce(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, RESULT_ACCOUNT_NONCE.get_key_id()) } @@ -126,7 +121,6 @@ pub struct MutableGetAccountNonceResults { } impl MutableGetAccountNonceResults { - pub fn account_nonce(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, RESULT_ACCOUNT_NONCE.get_key_id()) } @@ -138,7 +132,6 @@ pub struct ImmutableTotalAssetsResults { } impl ImmutableTotalAssetsResults { - pub fn balances(&self) -> MapColorToImmutableInt64 { MapColorToImmutableInt64 { obj_id: self.id } } @@ -150,7 +143,6 @@ pub struct MutableTotalAssetsResults { } impl MutableTotalAssetsResults { - pub fn balances(&self) -> MapColorToMutableInt64 { MapColorToMutableInt64 { obj_id: self.id } } diff --git a/packages/vm/wasmlib/src/coreblob/contract.rs b/packages/vm/wasmlib/src/coreblob/contract.rs index 83949d5d0c..0f080a4c02 100644 --- a/packages/vm/wasmlib/src/coreblob/contract.rs +++ b/packages/vm/wasmlib/src/coreblob/contract.rs @@ -48,6 +48,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn get_blob_field(_ctx: & dyn ScViewCallContext) -> GetBlobFieldCall { let mut f = GetBlobFieldCall { func: ScView::new(HSC_NAME, HVIEW_GET_BLOB_FIELD), @@ -57,6 +58,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn get_blob_info(_ctx: & dyn ScViewCallContext) -> GetBlobInfoCall { let mut f = GetBlobInfoCall { func: ScView::new(HSC_NAME, HVIEW_GET_BLOB_INFO), @@ -66,6 +68,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn list_blobs(_ctx: & dyn ScViewCallContext) -> ListBlobsCall { let mut f = ListBlobsCall { func: ScView::new(HSC_NAME, HVIEW_LIST_BLOBS), diff --git a/packages/vm/wasmlib/src/coreblob/params.rs b/packages/vm/wasmlib/src/coreblob/params.rs index 81434f838f..54c0d9bebe 100644 --- a/packages/vm/wasmlib/src/coreblob/params.rs +++ b/packages/vm/wasmlib/src/coreblob/params.rs @@ -28,7 +28,6 @@ pub struct ImmutableStoreBlobParams { } impl ImmutableStoreBlobParams { - pub fn blobs(&self) -> MapStringToImmutableBytes { MapStringToImmutableBytes { obj_id: self.id } } @@ -54,7 +53,6 @@ pub struct MutableStoreBlobParams { } impl MutableStoreBlobParams { - pub fn blobs(&self) -> MapStringToMutableBytes { MapStringToMutableBytes { obj_id: self.id } } @@ -66,7 +64,6 @@ pub struct ImmutableGetBlobFieldParams { } impl ImmutableGetBlobFieldParams { - pub fn field(&self) -> ScImmutableString { ScImmutableString::new(self.id, PARAM_FIELD.get_key_id()) } @@ -82,7 +79,6 @@ pub struct MutableGetBlobFieldParams { } impl MutableGetBlobFieldParams { - pub fn field(&self) -> ScMutableString { ScMutableString::new(self.id, PARAM_FIELD.get_key_id()) } @@ -98,7 +94,6 @@ pub struct ImmutableGetBlobInfoParams { } impl ImmutableGetBlobInfoParams { - pub fn hash(&self) -> ScImmutableHash { ScImmutableHash::new(self.id, PARAM_HASH.get_key_id()) } @@ -110,7 +105,6 @@ pub struct MutableGetBlobInfoParams { } impl MutableGetBlobInfoParams { - pub fn hash(&self) -> ScMutableHash { ScMutableHash::new(self.id, PARAM_HASH.get_key_id()) } diff --git a/packages/vm/wasmlib/src/coreblob/results.rs b/packages/vm/wasmlib/src/coreblob/results.rs index cfd5172a1e..dd06064b2e 100644 --- a/packages/vm/wasmlib/src/coreblob/results.rs +++ b/packages/vm/wasmlib/src/coreblob/results.rs @@ -18,7 +18,6 @@ pub struct ImmutableStoreBlobResults { } impl ImmutableStoreBlobResults { - pub fn hash(&self) -> ScImmutableHash { ScImmutableHash::new(self.id, RESULT_HASH.get_key_id()) } @@ -30,7 +29,6 @@ pub struct MutableStoreBlobResults { } impl MutableStoreBlobResults { - pub fn hash(&self) -> ScMutableHash { ScMutableHash::new(self.id, RESULT_HASH.get_key_id()) } @@ -42,7 +40,6 @@ pub struct ImmutableGetBlobFieldResults { } impl ImmutableGetBlobFieldResults { - pub fn bytes(&self) -> ScImmutableBytes { ScImmutableBytes::new(self.id, RESULT_BYTES.get_key_id()) } @@ -54,7 +51,6 @@ pub struct MutableGetBlobFieldResults { } impl MutableGetBlobFieldResults { - pub fn bytes(&self) -> ScMutableBytes { ScMutableBytes::new(self.id, RESULT_BYTES.get_key_id()) } @@ -76,7 +72,6 @@ pub struct ImmutableGetBlobInfoResults { } impl ImmutableGetBlobInfoResults { - pub fn blob_sizes(&self) -> MapStringToImmutableInt32 { MapStringToImmutableInt32 { obj_id: self.id } } @@ -102,7 +97,6 @@ pub struct MutableGetBlobInfoResults { } impl MutableGetBlobInfoResults { - pub fn blob_sizes(&self) -> MapStringToMutableInt32 { MapStringToMutableInt32 { obj_id: self.id } } @@ -124,7 +118,6 @@ pub struct ImmutableListBlobsResults { } impl ImmutableListBlobsResults { - pub fn blob_sizes(&self) -> MapHashToImmutableInt32 { MapHashToImmutableInt32 { obj_id: self.id } } @@ -150,7 +143,6 @@ pub struct MutableListBlobsResults { } impl MutableListBlobsResults { - pub fn blob_sizes(&self) -> MapHashToMutableInt32 { MapHashToMutableInt32 { obj_id: self.id } } diff --git a/packages/vm/wasmlib/src/coreblocklog/contract.rs b/packages/vm/wasmlib/src/coreblocklog/contract.rs index b4ae59d384..e8bad48177 100644 --- a/packages/vm/wasmlib/src/coreblocklog/contract.rs +++ b/packages/vm/wasmlib/src/coreblocklog/contract.rs @@ -82,6 +82,7 @@ impl ScFuncs { f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); f } + pub fn get_block_info(_ctx: & dyn ScViewCallContext) -> GetBlockInfoCall { let mut f = GetBlockInfoCall { func: ScView::new(HSC_NAME, HVIEW_GET_BLOCK_INFO), @@ -91,6 +92,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn get_events_for_block(_ctx: & dyn ScViewCallContext) -> GetEventsForBlockCall { let mut f = GetEventsForBlockCall { func: ScView::new(HSC_NAME, HVIEW_GET_EVENTS_FOR_BLOCK), @@ -100,6 +102,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn get_events_for_contract(_ctx: & dyn ScViewCallContext) -> GetEventsForContractCall { let mut f = GetEventsForContractCall { func: ScView::new(HSC_NAME, HVIEW_GET_EVENTS_FOR_CONTRACT), @@ -109,6 +112,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn get_events_for_request(_ctx: & dyn ScViewCallContext) -> GetEventsForRequestCall { let mut f = GetEventsForRequestCall { func: ScView::new(HSC_NAME, HVIEW_GET_EVENTS_FOR_REQUEST), @@ -118,6 +122,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn get_latest_block_info(_ctx: & dyn ScViewCallContext) -> GetLatestBlockInfoCall { let mut f = GetLatestBlockInfoCall { func: ScView::new(HSC_NAME, HVIEW_GET_LATEST_BLOCK_INFO), @@ -126,6 +131,7 @@ impl ScFuncs { f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); f } + pub fn get_request_i_ds_for_block(_ctx: & dyn ScViewCallContext) -> GetRequestIDsForBlockCall { let mut f = GetRequestIDsForBlockCall { func: ScView::new(HSC_NAME, HVIEW_GET_REQUEST_I_DS_FOR_BLOCK), @@ -135,6 +141,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn get_request_receipt(_ctx: & dyn ScViewCallContext) -> GetRequestReceiptCall { let mut f = GetRequestReceiptCall { func: ScView::new(HSC_NAME, HVIEW_GET_REQUEST_RECEIPT), @@ -144,6 +151,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn get_request_receipts_for_block(_ctx: & dyn ScViewCallContext) -> GetRequestReceiptsForBlockCall { let mut f = GetRequestReceiptsForBlockCall { func: ScView::new(HSC_NAME, HVIEW_GET_REQUEST_RECEIPTS_FOR_BLOCK), @@ -153,6 +161,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn is_request_processed(_ctx: & dyn ScViewCallContext) -> IsRequestProcessedCall { let mut f = IsRequestProcessedCall { func: ScView::new(HSC_NAME, HVIEW_IS_REQUEST_PROCESSED), diff --git a/packages/vm/wasmlib/src/coreblocklog/params.rs b/packages/vm/wasmlib/src/coreblocklog/params.rs index bfae6fd591..01b87611c2 100644 --- a/packages/vm/wasmlib/src/coreblocklog/params.rs +++ b/packages/vm/wasmlib/src/coreblocklog/params.rs @@ -18,7 +18,6 @@ pub struct ImmutableGetBlockInfoParams { } impl ImmutableGetBlockInfoParams { - pub fn block_index(&self) -> ScImmutableInt32 { ScImmutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) } @@ -30,7 +29,6 @@ pub struct MutableGetBlockInfoParams { } impl MutableGetBlockInfoParams { - pub fn block_index(&self) -> ScMutableInt32 { ScMutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) } @@ -42,7 +40,6 @@ pub struct ImmutableGetEventsForBlockParams { } impl ImmutableGetEventsForBlockParams { - pub fn block_index(&self) -> ScImmutableInt32 { ScImmutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) } @@ -54,7 +51,6 @@ pub struct MutableGetEventsForBlockParams { } impl MutableGetEventsForBlockParams { - pub fn block_index(&self) -> ScMutableInt32 { ScMutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) } @@ -66,7 +62,6 @@ pub struct ImmutableGetEventsForContractParams { } impl ImmutableGetEventsForContractParams { - pub fn contract_hname(&self) -> ScImmutableHname { ScImmutableHname::new(self.id, PARAM_CONTRACT_HNAME.get_key_id()) } @@ -86,7 +81,6 @@ pub struct MutableGetEventsForContractParams { } impl MutableGetEventsForContractParams { - pub fn contract_hname(&self) -> ScMutableHname { ScMutableHname::new(self.id, PARAM_CONTRACT_HNAME.get_key_id()) } @@ -106,7 +100,6 @@ pub struct ImmutableGetEventsForRequestParams { } impl ImmutableGetEventsForRequestParams { - pub fn request_id(&self) -> ScImmutableRequestID { ScImmutableRequestID::new(self.id, PARAM_REQUEST_ID.get_key_id()) } @@ -118,7 +111,6 @@ pub struct MutableGetEventsForRequestParams { } impl MutableGetEventsForRequestParams { - pub fn request_id(&self) -> ScMutableRequestID { ScMutableRequestID::new(self.id, PARAM_REQUEST_ID.get_key_id()) } @@ -130,7 +122,6 @@ pub struct ImmutableGetRequestIDsForBlockParams { } impl ImmutableGetRequestIDsForBlockParams { - pub fn block_index(&self) -> ScImmutableInt32 { ScImmutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) } @@ -142,7 +133,6 @@ pub struct MutableGetRequestIDsForBlockParams { } impl MutableGetRequestIDsForBlockParams { - pub fn block_index(&self) -> ScMutableInt32 { ScMutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) } @@ -154,7 +144,6 @@ pub struct ImmutableGetRequestReceiptParams { } impl ImmutableGetRequestReceiptParams { - pub fn request_id(&self) -> ScImmutableRequestID { ScImmutableRequestID::new(self.id, PARAM_REQUEST_ID.get_key_id()) } @@ -166,7 +155,6 @@ pub struct MutableGetRequestReceiptParams { } impl MutableGetRequestReceiptParams { - pub fn request_id(&self) -> ScMutableRequestID { ScMutableRequestID::new(self.id, PARAM_REQUEST_ID.get_key_id()) } @@ -178,7 +166,6 @@ pub struct ImmutableGetRequestReceiptsForBlockParams { } impl ImmutableGetRequestReceiptsForBlockParams { - pub fn block_index(&self) -> ScImmutableInt32 { ScImmutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) } @@ -190,7 +177,6 @@ pub struct MutableGetRequestReceiptsForBlockParams { } impl MutableGetRequestReceiptsForBlockParams { - pub fn block_index(&self) -> ScMutableInt32 { ScMutableInt32::new(self.id, PARAM_BLOCK_INDEX.get_key_id()) } @@ -202,7 +188,6 @@ pub struct ImmutableIsRequestProcessedParams { } impl ImmutableIsRequestProcessedParams { - pub fn request_id(&self) -> ScImmutableRequestID { ScImmutableRequestID::new(self.id, PARAM_REQUEST_ID.get_key_id()) } @@ -214,7 +199,6 @@ pub struct MutableIsRequestProcessedParams { } impl MutableIsRequestProcessedParams { - pub fn request_id(&self) -> ScMutableRequestID { ScMutableRequestID::new(self.id, PARAM_REQUEST_ID.get_key_id()) } diff --git a/packages/vm/wasmlib/src/coreblocklog/results.rs b/packages/vm/wasmlib/src/coreblocklog/results.rs index bee504d09f..19809b8973 100644 --- a/packages/vm/wasmlib/src/coreblocklog/results.rs +++ b/packages/vm/wasmlib/src/coreblocklog/results.rs @@ -18,7 +18,6 @@ pub struct ImmutableControlAddressesResults { } impl ImmutableControlAddressesResults { - pub fn block_index(&self) -> ScImmutableInt32 { ScImmutableInt32::new(self.id, RESULT_BLOCK_INDEX.get_key_id()) } @@ -38,7 +37,6 @@ pub struct MutableControlAddressesResults { } impl MutableControlAddressesResults { - pub fn block_index(&self) -> ScMutableInt32 { ScMutableInt32::new(self.id, RESULT_BLOCK_INDEX.get_key_id()) } @@ -58,7 +56,6 @@ pub struct ImmutableGetBlockInfoResults { } impl ImmutableGetBlockInfoResults { - pub fn block_info(&self) -> ScImmutableBytes { ScImmutableBytes::new(self.id, RESULT_BLOCK_INFO.get_key_id()) } @@ -70,7 +67,6 @@ pub struct MutableGetBlockInfoResults { } impl MutableGetBlockInfoResults { - pub fn block_info(&self) -> ScMutableBytes { ScMutableBytes::new(self.id, RESULT_BLOCK_INFO.get_key_id()) } @@ -96,7 +92,6 @@ pub struct ImmutableGetEventsForBlockResults { } impl ImmutableGetEventsForBlockResults { - pub fn event(&self) -> ArrayOfImmutableBytes { let arr_id = get_object_id(self.id, RESULT_EVENT.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); ArrayOfImmutableBytes { obj_id: arr_id } @@ -127,7 +122,6 @@ pub struct MutableGetEventsForBlockResults { } impl MutableGetEventsForBlockResults { - pub fn event(&self) -> ArrayOfMutableBytes { let arr_id = get_object_id(self.id, RESULT_EVENT.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); ArrayOfMutableBytes { obj_id: arr_id } @@ -140,7 +134,6 @@ pub struct ImmutableGetEventsForContractResults { } impl ImmutableGetEventsForContractResults { - pub fn event(&self) -> ArrayOfImmutableBytes { let arr_id = get_object_id(self.id, RESULT_EVENT.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); ArrayOfImmutableBytes { obj_id: arr_id } @@ -153,7 +146,6 @@ pub struct MutableGetEventsForContractResults { } impl MutableGetEventsForContractResults { - pub fn event(&self) -> ArrayOfMutableBytes { let arr_id = get_object_id(self.id, RESULT_EVENT.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); ArrayOfMutableBytes { obj_id: arr_id } @@ -166,7 +158,6 @@ pub struct ImmutableGetEventsForRequestResults { } impl ImmutableGetEventsForRequestResults { - pub fn event(&self) -> ArrayOfImmutableBytes { let arr_id = get_object_id(self.id, RESULT_EVENT.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); ArrayOfImmutableBytes { obj_id: arr_id } @@ -179,7 +170,6 @@ pub struct MutableGetEventsForRequestResults { } impl MutableGetEventsForRequestResults { - pub fn event(&self) -> ArrayOfMutableBytes { let arr_id = get_object_id(self.id, RESULT_EVENT.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); ArrayOfMutableBytes { obj_id: arr_id } @@ -192,7 +182,6 @@ pub struct ImmutableGetLatestBlockInfoResults { } impl ImmutableGetLatestBlockInfoResults { - pub fn block_index(&self) -> ScImmutableInt32 { ScImmutableInt32::new(self.id, RESULT_BLOCK_INDEX.get_key_id()) } @@ -208,7 +197,6 @@ pub struct MutableGetLatestBlockInfoResults { } impl MutableGetLatestBlockInfoResults { - pub fn block_index(&self) -> ScMutableInt32 { ScMutableInt32::new(self.id, RESULT_BLOCK_INDEX.get_key_id()) } @@ -238,7 +226,6 @@ pub struct ImmutableGetRequestIDsForBlockResults { } impl ImmutableGetRequestIDsForBlockResults { - pub fn request_id(&self) -> ArrayOfImmutableRequestID { let arr_id = get_object_id(self.id, RESULT_REQUEST_ID.get_key_id(), TYPE_ARRAY16 | TYPE_REQUEST_ID); ArrayOfImmutableRequestID { obj_id: arr_id } @@ -269,7 +256,6 @@ pub struct MutableGetRequestIDsForBlockResults { } impl MutableGetRequestIDsForBlockResults { - pub fn request_id(&self) -> ArrayOfMutableRequestID { let arr_id = get_object_id(self.id, RESULT_REQUEST_ID.get_key_id(), TYPE_ARRAY16 | TYPE_REQUEST_ID); ArrayOfMutableRequestID { obj_id: arr_id } @@ -282,7 +268,6 @@ pub struct ImmutableGetRequestReceiptResults { } impl ImmutableGetRequestReceiptResults { - pub fn block_index(&self) -> ScImmutableInt32 { ScImmutableInt32::new(self.id, RESULT_BLOCK_INDEX.get_key_id()) } @@ -302,7 +287,6 @@ pub struct MutableGetRequestReceiptResults { } impl MutableGetRequestReceiptResults { - pub fn block_index(&self) -> ScMutableInt32 { ScMutableInt32::new(self.id, RESULT_BLOCK_INDEX.get_key_id()) } @@ -322,7 +306,6 @@ pub struct ImmutableGetRequestReceiptsForBlockResults { } impl ImmutableGetRequestReceiptsForBlockResults { - pub fn request_record(&self) -> ArrayOfImmutableBytes { let arr_id = get_object_id(self.id, RESULT_REQUEST_RECORD.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); ArrayOfImmutableBytes { obj_id: arr_id } @@ -335,7 +318,6 @@ pub struct MutableGetRequestReceiptsForBlockResults { } impl MutableGetRequestReceiptsForBlockResults { - pub fn request_record(&self) -> ArrayOfMutableBytes { let arr_id = get_object_id(self.id, RESULT_REQUEST_RECORD.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); ArrayOfMutableBytes { obj_id: arr_id } @@ -348,7 +330,6 @@ pub struct ImmutableIsRequestProcessedResults { } impl ImmutableIsRequestProcessedResults { - pub fn request_processed(&self) -> ScImmutableString { ScImmutableString::new(self.id, RESULT_REQUEST_PROCESSED.get_key_id()) } @@ -360,7 +341,6 @@ pub struct MutableIsRequestProcessedResults { } impl MutableIsRequestProcessedResults { - pub fn request_processed(&self) -> ScMutableString { ScMutableString::new(self.id, RESULT_REQUEST_PROCESSED.get_key_id()) } diff --git a/packages/vm/wasmlib/src/coregovernance/contract.rs b/packages/vm/wasmlib/src/coregovernance/contract.rs index 461139a606..333b15d675 100644 --- a/packages/vm/wasmlib/src/coregovernance/contract.rs +++ b/packages/vm/wasmlib/src/coregovernance/contract.rs @@ -84,11 +84,13 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn claim_chain_ownership(_ctx: & dyn ScFuncCallContext) -> ClaimChainOwnershipCall { ClaimChainOwnershipCall { func: ScFunc::new(HSC_NAME, HFUNC_CLAIM_CHAIN_OWNERSHIP), } } + pub fn delegate_chain_ownership(_ctx: & dyn ScFuncCallContext) -> DelegateChainOwnershipCall { let mut f = DelegateChainOwnershipCall { func: ScFunc::new(HSC_NAME, HFUNC_DELEGATE_CHAIN_OWNERSHIP), @@ -97,6 +99,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn remove_allowed_state_controller_address(_ctx: & dyn ScFuncCallContext) -> RemoveAllowedStateControllerAddressCall { let mut f = RemoveAllowedStateControllerAddressCall { func: ScFunc::new(HSC_NAME, HFUNC_REMOVE_ALLOWED_STATE_CONTROLLER_ADDRESS), @@ -105,6 +108,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn rotate_state_controller(_ctx: & dyn ScFuncCallContext) -> RotateStateControllerCall { let mut f = RotateStateControllerCall { func: ScFunc::new(HSC_NAME, HFUNC_ROTATE_STATE_CONTROLLER), @@ -113,6 +117,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn set_chain_info(_ctx: & dyn ScFuncCallContext) -> SetChainInfoCall { let mut f = SetChainInfoCall { func: ScFunc::new(HSC_NAME, HFUNC_SET_CHAIN_INFO), @@ -121,6 +126,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn set_contract_fee(_ctx: & dyn ScFuncCallContext) -> SetContractFeeCall { let mut f = SetContractFeeCall { func: ScFunc::new(HSC_NAME, HFUNC_SET_CONTRACT_FEE), @@ -129,6 +135,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn set_default_fee(_ctx: & dyn ScFuncCallContext) -> SetDefaultFeeCall { let mut f = SetDefaultFeeCall { func: ScFunc::new(HSC_NAME, HFUNC_SET_DEFAULT_FEE), @@ -137,6 +144,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn get_allowed_state_controller_addresses(_ctx: & dyn ScViewCallContext) -> GetAllowedStateControllerAddressesCall { let mut f = GetAllowedStateControllerAddressesCall { func: ScView::new(HSC_NAME, HVIEW_GET_ALLOWED_STATE_CONTROLLER_ADDRESSES), @@ -145,6 +153,7 @@ impl ScFuncs { f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); f } + pub fn get_chain_info(_ctx: & dyn ScViewCallContext) -> GetChainInfoCall { let mut f = GetChainInfoCall { func: ScView::new(HSC_NAME, HVIEW_GET_CHAIN_INFO), @@ -153,6 +162,7 @@ impl ScFuncs { f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); f } + pub fn get_fee_info(_ctx: & dyn ScViewCallContext) -> GetFeeInfoCall { let mut f = GetFeeInfoCall { func: ScView::new(HSC_NAME, HVIEW_GET_FEE_INFO), @@ -162,6 +172,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn get_max_blob_size(_ctx: & dyn ScViewCallContext) -> GetMaxBlobSizeCall { let mut f = GetMaxBlobSizeCall { func: ScView::new(HSC_NAME, HVIEW_GET_MAX_BLOB_SIZE), diff --git a/packages/vm/wasmlib/src/coregovernance/params.rs b/packages/vm/wasmlib/src/coregovernance/params.rs index 5e2b68a05e..e995d10b14 100644 --- a/packages/vm/wasmlib/src/coregovernance/params.rs +++ b/packages/vm/wasmlib/src/coregovernance/params.rs @@ -18,7 +18,6 @@ pub struct ImmutableAddAllowedStateControllerAddressParams { } impl ImmutableAddAllowedStateControllerAddressParams { - pub fn chain_owner(&self) -> ScImmutableAgentID { ScImmutableAgentID::new(self.id, PARAM_CHAIN_OWNER.get_key_id()) } @@ -38,7 +37,6 @@ pub struct MutableAddAllowedStateControllerAddressParams { } impl MutableAddAllowedStateControllerAddressParams { - pub fn chain_owner(&self) -> ScMutableAgentID { ScMutableAgentID::new(self.id, PARAM_CHAIN_OWNER.get_key_id()) } @@ -58,7 +56,6 @@ pub struct ImmutableDelegateChainOwnershipParams { } impl ImmutableDelegateChainOwnershipParams { - pub fn chain_owner(&self) -> ScImmutableAgentID { ScImmutableAgentID::new(self.id, PARAM_CHAIN_OWNER.get_key_id()) } @@ -70,7 +67,6 @@ pub struct MutableDelegateChainOwnershipParams { } impl MutableDelegateChainOwnershipParams { - pub fn chain_owner(&self) -> ScMutableAgentID { ScMutableAgentID::new(self.id, PARAM_CHAIN_OWNER.get_key_id()) } @@ -82,7 +78,6 @@ pub struct ImmutableRemoveAllowedStateControllerAddressParams { } impl ImmutableRemoveAllowedStateControllerAddressParams { - pub fn state_controller_address(&self) -> ScImmutableAddress { ScImmutableAddress::new(self.id, PARAM_STATE_CONTROLLER_ADDRESS.get_key_id()) } @@ -94,7 +89,6 @@ pub struct MutableRemoveAllowedStateControllerAddressParams { } impl MutableRemoveAllowedStateControllerAddressParams { - pub fn state_controller_address(&self) -> ScMutableAddress { ScMutableAddress::new(self.id, PARAM_STATE_CONTROLLER_ADDRESS.get_key_id()) } @@ -106,7 +100,6 @@ pub struct ImmutableRotateStateControllerParams { } impl ImmutableRotateStateControllerParams { - pub fn state_controller_address(&self) -> ScImmutableAddress { ScImmutableAddress::new(self.id, PARAM_STATE_CONTROLLER_ADDRESS.get_key_id()) } @@ -118,7 +111,6 @@ pub struct MutableRotateStateControllerParams { } impl MutableRotateStateControllerParams { - pub fn state_controller_address(&self) -> ScMutableAddress { ScMutableAddress::new(self.id, PARAM_STATE_CONTROLLER_ADDRESS.get_key_id()) } @@ -130,7 +122,6 @@ pub struct ImmutableSetChainInfoParams { } impl ImmutableSetChainInfoParams { - pub fn max_blob_size(&self) -> ScImmutableInt32 { ScImmutableInt32::new(self.id, PARAM_MAX_BLOB_SIZE.get_key_id()) } @@ -158,7 +149,6 @@ pub struct MutableSetChainInfoParams { } impl MutableSetChainInfoParams { - pub fn max_blob_size(&self) -> ScMutableInt32 { ScMutableInt32::new(self.id, PARAM_MAX_BLOB_SIZE.get_key_id()) } @@ -186,7 +176,6 @@ pub struct ImmutableSetContractFeeParams { } impl ImmutableSetContractFeeParams { - pub fn hname(&self) -> ScImmutableHname { ScImmutableHname::new(self.id, PARAM_HNAME.get_key_id()) } @@ -206,7 +195,6 @@ pub struct MutableSetContractFeeParams { } impl MutableSetContractFeeParams { - pub fn hname(&self) -> ScMutableHname { ScMutableHname::new(self.id, PARAM_HNAME.get_key_id()) } @@ -226,7 +214,6 @@ pub struct ImmutableSetDefaultFeeParams { } impl ImmutableSetDefaultFeeParams { - pub fn owner_fee(&self) -> ScImmutableInt64 { ScImmutableInt64::new(self.id, PARAM_OWNER_FEE.get_key_id()) } @@ -242,7 +229,6 @@ pub struct MutableSetDefaultFeeParams { } impl MutableSetDefaultFeeParams { - pub fn owner_fee(&self) -> ScMutableInt64 { ScMutableInt64::new(self.id, PARAM_OWNER_FEE.get_key_id()) } @@ -258,7 +244,6 @@ pub struct ImmutableGetFeeInfoParams { } impl ImmutableGetFeeInfoParams { - pub fn hname(&self) -> ScImmutableHname { ScImmutableHname::new(self.id, PARAM_HNAME.get_key_id()) } @@ -270,7 +255,6 @@ pub struct MutableGetFeeInfoParams { } impl MutableGetFeeInfoParams { - pub fn hname(&self) -> ScMutableHname { ScMutableHname::new(self.id, PARAM_HNAME.get_key_id()) } diff --git a/packages/vm/wasmlib/src/coregovernance/results.rs b/packages/vm/wasmlib/src/coregovernance/results.rs index 6ed02d94f3..0c5e2c9709 100644 --- a/packages/vm/wasmlib/src/coregovernance/results.rs +++ b/packages/vm/wasmlib/src/coregovernance/results.rs @@ -32,7 +32,6 @@ pub struct ImmutableGetAllowedStateControllerAddressesResults { } impl ImmutableGetAllowedStateControllerAddressesResults { - pub fn allowed_state_controller_addresses(&self) -> ArrayOfImmutableBytes { let arr_id = get_object_id(self.id, RESULT_ALLOWED_STATE_CONTROLLER_ADDRESSES.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); ArrayOfImmutableBytes { obj_id: arr_id } @@ -63,7 +62,6 @@ pub struct MutableGetAllowedStateControllerAddressesResults { } impl MutableGetAllowedStateControllerAddressesResults { - pub fn allowed_state_controller_addresses(&self) -> ArrayOfMutableBytes { let arr_id = get_object_id(self.id, RESULT_ALLOWED_STATE_CONTROLLER_ADDRESSES.get_key_id(), TYPE_ARRAY16 | TYPE_BYTES); ArrayOfMutableBytes { obj_id: arr_id } @@ -76,7 +74,6 @@ pub struct ImmutableGetChainInfoResults { } impl ImmutableGetChainInfoResults { - pub fn chain_id(&self) -> ScImmutableChainID { ScImmutableChainID::new(self.id, RESULT_CHAIN_ID.get_key_id()) } @@ -120,7 +117,6 @@ pub struct MutableGetChainInfoResults { } impl MutableGetChainInfoResults { - pub fn chain_id(&self) -> ScMutableChainID { ScMutableChainID::new(self.id, RESULT_CHAIN_ID.get_key_id()) } @@ -164,7 +160,6 @@ pub struct ImmutableGetFeeInfoResults { } impl ImmutableGetFeeInfoResults { - pub fn fee_color(&self) -> ScImmutableColor { ScImmutableColor::new(self.id, RESULT_FEE_COLOR.get_key_id()) } @@ -184,7 +179,6 @@ pub struct MutableGetFeeInfoResults { } impl MutableGetFeeInfoResults { - pub fn fee_color(&self) -> ScMutableColor { ScMutableColor::new(self.id, RESULT_FEE_COLOR.get_key_id()) } @@ -204,7 +198,6 @@ pub struct ImmutableGetMaxBlobSizeResults { } impl ImmutableGetMaxBlobSizeResults { - pub fn max_blob_size(&self) -> ScImmutableInt32 { ScImmutableInt32::new(self.id, RESULT_MAX_BLOB_SIZE.get_key_id()) } @@ -216,7 +209,6 @@ pub struct MutableGetMaxBlobSizeResults { } impl MutableGetMaxBlobSizeResults { - pub fn max_blob_size(&self) -> ScMutableInt32 { ScMutableInt32::new(self.id, RESULT_MAX_BLOB_SIZE.get_key_id()) } diff --git a/packages/vm/wasmlib/src/coreroot/contract.rs b/packages/vm/wasmlib/src/coreroot/contract.rs index ace1553977..99fb71ce4c 100644 --- a/packages/vm/wasmlib/src/coreroot/contract.rs +++ b/packages/vm/wasmlib/src/coreroot/contract.rs @@ -50,6 +50,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn grant_deploy_permission(_ctx: & dyn ScFuncCallContext) -> GrantDeployPermissionCall { let mut f = GrantDeployPermissionCall { func: ScFunc::new(HSC_NAME, HFUNC_GRANT_DEPLOY_PERMISSION), @@ -58,6 +59,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn revoke_deploy_permission(_ctx: & dyn ScFuncCallContext) -> RevokeDeployPermissionCall { let mut f = RevokeDeployPermissionCall { func: ScFunc::new(HSC_NAME, HFUNC_REVOKE_DEPLOY_PERMISSION), @@ -66,6 +68,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); f } + pub fn find_contract(_ctx: & dyn ScViewCallContext) -> FindContractCall { let mut f = FindContractCall { func: ScView::new(HSC_NAME, HVIEW_FIND_CONTRACT), @@ -75,6 +78,7 @@ impl ScFuncs { f.func.set_ptrs(&mut f.params.id, &mut f.results.id); f } + pub fn get_contract_records(_ctx: & dyn ScViewCallContext) -> GetContractRecordsCall { let mut f = GetContractRecordsCall { func: ScView::new(HSC_NAME, HVIEW_GET_CONTRACT_RECORDS), diff --git a/packages/vm/wasmlib/src/coreroot/params.rs b/packages/vm/wasmlib/src/coreroot/params.rs index 67ce97e7ed..59257f5334 100644 --- a/packages/vm/wasmlib/src/coreroot/params.rs +++ b/packages/vm/wasmlib/src/coreroot/params.rs @@ -18,7 +18,6 @@ pub struct ImmutableDeployContractParams { } impl ImmutableDeployContractParams { - pub fn description(&self) -> ScImmutableString { ScImmutableString::new(self.id, PARAM_DESCRIPTION.get_key_id()) } @@ -38,7 +37,6 @@ pub struct MutableDeployContractParams { } impl MutableDeployContractParams { - pub fn description(&self) -> ScMutableString { ScMutableString::new(self.id, PARAM_DESCRIPTION.get_key_id()) } @@ -58,7 +56,6 @@ pub struct ImmutableGrantDeployPermissionParams { } impl ImmutableGrantDeployPermissionParams { - pub fn deployer(&self) -> ScImmutableAgentID { ScImmutableAgentID::new(self.id, PARAM_DEPLOYER.get_key_id()) } @@ -70,7 +67,6 @@ pub struct MutableGrantDeployPermissionParams { } impl MutableGrantDeployPermissionParams { - pub fn deployer(&self) -> ScMutableAgentID { ScMutableAgentID::new(self.id, PARAM_DEPLOYER.get_key_id()) } @@ -82,7 +78,6 @@ pub struct ImmutableRevokeDeployPermissionParams { } impl ImmutableRevokeDeployPermissionParams { - pub fn deployer(&self) -> ScImmutableAgentID { ScImmutableAgentID::new(self.id, PARAM_DEPLOYER.get_key_id()) } @@ -94,7 +89,6 @@ pub struct MutableRevokeDeployPermissionParams { } impl MutableRevokeDeployPermissionParams { - pub fn deployer(&self) -> ScMutableAgentID { ScMutableAgentID::new(self.id, PARAM_DEPLOYER.get_key_id()) } @@ -106,7 +100,6 @@ pub struct ImmutableFindContractParams { } impl ImmutableFindContractParams { - pub fn hname(&self) -> ScImmutableHname { ScImmutableHname::new(self.id, PARAM_HNAME.get_key_id()) } @@ -118,7 +111,6 @@ pub struct MutableFindContractParams { } impl MutableFindContractParams { - pub fn hname(&self) -> ScMutableHname { ScMutableHname::new(self.id, PARAM_HNAME.get_key_id()) } diff --git a/packages/vm/wasmlib/src/coreroot/results.rs b/packages/vm/wasmlib/src/coreroot/results.rs index 1bc85dd63d..7014cfb78c 100644 --- a/packages/vm/wasmlib/src/coreroot/results.rs +++ b/packages/vm/wasmlib/src/coreroot/results.rs @@ -18,7 +18,6 @@ pub struct ImmutableFindContractResults { } impl ImmutableFindContractResults { - pub fn contract_found(&self) -> ScImmutableBytes { ScImmutableBytes::new(self.id, RESULT_CONTRACT_FOUND.get_key_id()) } @@ -34,7 +33,6 @@ pub struct MutableFindContractResults { } impl MutableFindContractResults { - pub fn contract_found(&self) -> ScMutableBytes { ScMutableBytes::new(self.id, RESULT_CONTRACT_FOUND.get_key_id()) } @@ -60,7 +58,6 @@ pub struct ImmutableGetContractRecordsResults { } impl ImmutableGetContractRecordsResults { - pub fn contract_registry(&self) -> MapHnameToImmutableBytes { let map_id = get_object_id(self.id, RESULT_CONTRACT_REGISTRY.get_key_id(), TYPE_MAP); MapHnameToImmutableBytes { obj_id: map_id } @@ -87,7 +84,6 @@ pub struct MutableGetContractRecordsResults { } impl MutableGetContractRecordsResults { - pub fn contract_registry(&self) -> MapHnameToMutableBytes { let map_id = get_object_id(self.id, RESULT_CONTRACT_REGISTRY.get_key_id(), TYPE_MAP); MapHnameToMutableBytes { obj_id: map_id } diff --git a/packages/vm/wasmlib/ts/wasmlib/coreaccounts/contract.ts b/packages/vm/wasmlib/ts/wasmlib/coreaccounts/contract.ts index 86852b5a9d..a8fa2cb85b 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreaccounts/contract.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreaccounts/contract.ts @@ -45,7 +45,6 @@ export class TotalAssetsCall { } export class ScFuncs { - static deposit(ctx: wasmlib.ScFuncCallContext): DepositCall { let f = new DepositCall(); f.func.setPtrs(f.params, null); diff --git a/packages/vm/wasmlib/ts/wasmlib/coreaccounts/params.ts b/packages/vm/wasmlib/ts/wasmlib/coreaccounts/params.ts index 355c64978c..973afb6f3e 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreaccounts/params.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreaccounts/params.ts @@ -9,21 +9,18 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableDepositParams extends wasmlib.ScMapID { - agentID(): wasmlib.ScImmutableAgentID { return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamAgentID)); } } export class MutableDepositParams extends wasmlib.ScMapID { - agentID(): wasmlib.ScMutableAgentID { return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamAgentID)); } } export class ImmutableHarvestParams extends wasmlib.ScMapID { - withdrawAmount(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamWithdrawAmount)); } @@ -34,7 +31,6 @@ export class ImmutableHarvestParams extends wasmlib.ScMapID { } export class MutableHarvestParams extends wasmlib.ScMapID { - withdrawAmount(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamWithdrawAmount)); } @@ -45,28 +41,24 @@ export class MutableHarvestParams extends wasmlib.ScMapID { } export class ImmutableBalanceParams extends wasmlib.ScMapID { - agentID(): wasmlib.ScImmutableAgentID { return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamAgentID)); } } export class MutableBalanceParams extends wasmlib.ScMapID { - agentID(): wasmlib.ScMutableAgentID { return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamAgentID)); } } export class ImmutableGetAccountNonceParams extends wasmlib.ScMapID { - agentID(): wasmlib.ScImmutableAgentID { return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamAgentID)); } } export class MutableGetAccountNonceParams extends wasmlib.ScMapID { - agentID(): wasmlib.ScMutableAgentID { return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamAgentID)); } diff --git a/packages/vm/wasmlib/ts/wasmlib/coreaccounts/results.ts b/packages/vm/wasmlib/ts/wasmlib/coreaccounts/results.ts index 77a27821b3..a6c043e58f 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreaccounts/results.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreaccounts/results.ts @@ -21,7 +21,6 @@ export class MapAgentIDToImmutableBytes { } export class ImmutableAccountsResults extends wasmlib.ScMapID { - agents(): sc.MapAgentIDToImmutableBytes { return new sc.MapAgentIDToImmutableBytes(this.mapID); } @@ -44,7 +43,6 @@ export class MapAgentIDToMutableBytes { } export class MutableAccountsResults extends wasmlib.ScMapID { - agents(): sc.MapAgentIDToMutableBytes { return new sc.MapAgentIDToMutableBytes(this.mapID); } @@ -63,7 +61,6 @@ export class MapColorToImmutableInt64 { } export class ImmutableBalanceResults extends wasmlib.ScMapID { - balances(): sc.MapColorToImmutableInt64 { return new sc.MapColorToImmutableInt64(this.mapID); } @@ -86,35 +83,30 @@ export class MapColorToMutableInt64 { } export class MutableBalanceResults extends wasmlib.ScMapID { - balances(): sc.MapColorToMutableInt64 { return new sc.MapColorToMutableInt64(this.mapID); } } export class ImmutableGetAccountNonceResults extends wasmlib.ScMapID { - accountNonce(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultAccountNonce)); } } export class MutableGetAccountNonceResults extends wasmlib.ScMapID { - accountNonce(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ResultAccountNonce)); } } export class ImmutableTotalAssetsResults extends wasmlib.ScMapID { - balances(): sc.MapColorToImmutableInt64 { return new sc.MapColorToImmutableInt64(this.mapID); } } export class MutableTotalAssetsResults extends wasmlib.ScMapID { - balances(): sc.MapColorToMutableInt64 { return new sc.MapColorToMutableInt64(this.mapID); } diff --git a/packages/vm/wasmlib/ts/wasmlib/coreblob/contract.ts b/packages/vm/wasmlib/ts/wasmlib/coreblob/contract.ts index 9180a863fd..61e3359ae3 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreblob/contract.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreblob/contract.ts @@ -32,7 +32,6 @@ export class ListBlobsCall { } export class ScFuncs { - static storeBlob(ctx: wasmlib.ScFuncCallContext): StoreBlobCall { let f = new StoreBlobCall(); f.func.setPtrs(f.params, f.results); diff --git a/packages/vm/wasmlib/ts/wasmlib/coreblob/params.ts b/packages/vm/wasmlib/ts/wasmlib/coreblob/params.ts index 1447252c98..d4eef4d06e 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreblob/params.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreblob/params.ts @@ -21,7 +21,6 @@ export class MapStringToImmutableBytes { } export class ImmutableStoreBlobParams extends wasmlib.ScMapID { - blobs(): sc.MapStringToImmutableBytes { return new sc.MapStringToImmutableBytes(this.mapID); } @@ -44,14 +43,12 @@ export class MapStringToMutableBytes { } export class MutableStoreBlobParams extends wasmlib.ScMapID { - blobs(): sc.MapStringToMutableBytes { return new sc.MapStringToMutableBytes(this.mapID); } } export class ImmutableGetBlobFieldParams extends wasmlib.ScMapID { - field(): wasmlib.ScImmutableString { return new wasmlib.ScImmutableString(this.mapID, wasmlib.Key32.fromString(sc.ParamField)); } @@ -62,7 +59,6 @@ export class ImmutableGetBlobFieldParams extends wasmlib.ScMapID { } export class MutableGetBlobFieldParams extends wasmlib.ScMapID { - field(): wasmlib.ScMutableString { return new wasmlib.ScMutableString(this.mapID, wasmlib.Key32.fromString(sc.ParamField)); } @@ -73,14 +69,12 @@ export class MutableGetBlobFieldParams extends wasmlib.ScMapID { } export class ImmutableGetBlobInfoParams extends wasmlib.ScMapID { - hash(): wasmlib.ScImmutableHash { return new wasmlib.ScImmutableHash(this.mapID, wasmlib.Key32.fromString(sc.ParamHash)); } } export class MutableGetBlobInfoParams extends wasmlib.ScMapID { - hash(): wasmlib.ScMutableHash { return new wasmlib.ScMutableHash(this.mapID, wasmlib.Key32.fromString(sc.ParamHash)); } diff --git a/packages/vm/wasmlib/ts/wasmlib/coreblob/results.ts b/packages/vm/wasmlib/ts/wasmlib/coreblob/results.ts index 512f6ad85e..5069e76d45 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreblob/results.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreblob/results.ts @@ -9,28 +9,24 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableStoreBlobResults extends wasmlib.ScMapID { - hash(): wasmlib.ScImmutableHash { return new wasmlib.ScImmutableHash(this.mapID, wasmlib.Key32.fromString(sc.ResultHash)); } } export class MutableStoreBlobResults extends wasmlib.ScMapID { - hash(): wasmlib.ScMutableHash { return new wasmlib.ScMutableHash(this.mapID, wasmlib.Key32.fromString(sc.ResultHash)); } } export class ImmutableGetBlobFieldResults extends wasmlib.ScMapID { - bytes(): wasmlib.ScImmutableBytes { return new wasmlib.ScImmutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultBytes)); } } export class MutableGetBlobFieldResults extends wasmlib.ScMapID { - bytes(): wasmlib.ScMutableBytes { return new wasmlib.ScMutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultBytes)); } @@ -49,7 +45,6 @@ export class MapStringToImmutableInt32 { } export class ImmutableGetBlobInfoResults extends wasmlib.ScMapID { - blobSizes(): sc.MapStringToImmutableInt32 { return new sc.MapStringToImmutableInt32(this.mapID); } @@ -72,7 +67,6 @@ export class MapStringToMutableInt32 { } export class MutableGetBlobInfoResults extends wasmlib.ScMapID { - blobSizes(): sc.MapStringToMutableInt32 { return new sc.MapStringToMutableInt32(this.mapID); } @@ -91,7 +85,6 @@ export class MapHashToImmutableInt32 { } export class ImmutableListBlobsResults extends wasmlib.ScMapID { - blobSizes(): sc.MapHashToImmutableInt32 { return new sc.MapHashToImmutableInt32(this.mapID); } @@ -114,7 +107,6 @@ export class MapHashToMutableInt32 { } export class MutableListBlobsResults extends wasmlib.ScMapID { - blobSizes(): sc.MapHashToMutableInt32 { return new sc.MapHashToMutableInt32(this.mapID); } diff --git a/packages/vm/wasmlib/ts/wasmlib/coreblocklog/contract.ts b/packages/vm/wasmlib/ts/wasmlib/coreblocklog/contract.ts index a8160f9572..4c7fe2800f 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreblocklog/contract.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreblocklog/contract.ts @@ -67,7 +67,6 @@ export class IsRequestProcessedCall { } export class ScFuncs { - static controlAddresses(ctx: wasmlib.ScViewCallContext): ControlAddressesCall { let f = new ControlAddressesCall(); f.func.setPtrs(null, f.results); diff --git a/packages/vm/wasmlib/ts/wasmlib/coreblocklog/params.ts b/packages/vm/wasmlib/ts/wasmlib/coreblocklog/params.ts index aa4fbef70e..0343cbf2e7 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreblocklog/params.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreblocklog/params.ts @@ -9,35 +9,30 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableGetBlockInfoParams extends wasmlib.ScMapID { - blockIndex(): wasmlib.ScImmutableInt32 { return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); } } export class MutableGetBlockInfoParams extends wasmlib.ScMapID { - blockIndex(): wasmlib.ScMutableInt32 { return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); } } export class ImmutableGetEventsForBlockParams extends wasmlib.ScMapID { - blockIndex(): wasmlib.ScImmutableInt32 { return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); } } export class MutableGetEventsForBlockParams extends wasmlib.ScMapID { - blockIndex(): wasmlib.ScMutableInt32 { return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); } } export class ImmutableGetEventsForContractParams extends wasmlib.ScMapID { - contractHname(): wasmlib.ScImmutableHname { return new wasmlib.ScImmutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamContractHname)); } @@ -52,7 +47,6 @@ export class ImmutableGetEventsForContractParams extends wasmlib.ScMapID { } export class MutableGetEventsForContractParams extends wasmlib.ScMapID { - contractHname(): wasmlib.ScMutableHname { return new wasmlib.ScMutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamContractHname)); } @@ -67,70 +61,60 @@ export class MutableGetEventsForContractParams extends wasmlib.ScMapID { } export class ImmutableGetEventsForRequestParams extends wasmlib.ScMapID { - requestID(): wasmlib.ScImmutableRequestID { return new wasmlib.ScImmutableRequestID(this.mapID, wasmlib.Key32.fromString(sc.ParamRequestID)); } } export class MutableGetEventsForRequestParams extends wasmlib.ScMapID { - requestID(): wasmlib.ScMutableRequestID { return new wasmlib.ScMutableRequestID(this.mapID, wasmlib.Key32.fromString(sc.ParamRequestID)); } } export class ImmutableGetRequestIDsForBlockParams extends wasmlib.ScMapID { - blockIndex(): wasmlib.ScImmutableInt32 { return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); } } export class MutableGetRequestIDsForBlockParams extends wasmlib.ScMapID { - blockIndex(): wasmlib.ScMutableInt32 { return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); } } export class ImmutableGetRequestReceiptParams extends wasmlib.ScMapID { - requestID(): wasmlib.ScImmutableRequestID { return new wasmlib.ScImmutableRequestID(this.mapID, wasmlib.Key32.fromString(sc.ParamRequestID)); } } export class MutableGetRequestReceiptParams extends wasmlib.ScMapID { - requestID(): wasmlib.ScMutableRequestID { return new wasmlib.ScMutableRequestID(this.mapID, wasmlib.Key32.fromString(sc.ParamRequestID)); } } export class ImmutableGetRequestReceiptsForBlockParams extends wasmlib.ScMapID { - blockIndex(): wasmlib.ScImmutableInt32 { return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); } } export class MutableGetRequestReceiptsForBlockParams extends wasmlib.ScMapID { - blockIndex(): wasmlib.ScMutableInt32 { return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamBlockIndex)); } } export class ImmutableIsRequestProcessedParams extends wasmlib.ScMapID { - requestID(): wasmlib.ScImmutableRequestID { return new wasmlib.ScImmutableRequestID(this.mapID, wasmlib.Key32.fromString(sc.ParamRequestID)); } } export class MutableIsRequestProcessedParams extends wasmlib.ScMapID { - requestID(): wasmlib.ScMutableRequestID { return new wasmlib.ScMutableRequestID(this.mapID, wasmlib.Key32.fromString(sc.ParamRequestID)); } diff --git a/packages/vm/wasmlib/ts/wasmlib/coreblocklog/results.ts b/packages/vm/wasmlib/ts/wasmlib/coreblocklog/results.ts index 565f8a079d..0cdeab00e9 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreblocklog/results.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreblocklog/results.ts @@ -9,7 +9,6 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableControlAddressesResults extends wasmlib.ScMapID { - blockIndex(): wasmlib.ScImmutableInt32 { return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockIndex)); } @@ -24,7 +23,6 @@ export class ImmutableControlAddressesResults extends wasmlib.ScMapID { } export class MutableControlAddressesResults extends wasmlib.ScMapID { - blockIndex(): wasmlib.ScMutableInt32 { return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockIndex)); } @@ -39,14 +37,12 @@ export class MutableControlAddressesResults extends wasmlib.ScMapID { } export class ImmutableGetBlockInfoResults extends wasmlib.ScMapID { - blockInfo(): wasmlib.ScImmutableBytes { return new wasmlib.ScImmutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockInfo)); } } export class MutableGetBlockInfoResults extends wasmlib.ScMapID { - blockInfo(): wasmlib.ScMutableBytes { return new wasmlib.ScMutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockInfo)); } @@ -69,7 +65,6 @@ export class ArrayOfImmutableBytes { } export class ImmutableGetEventsForBlockResults extends wasmlib.ScMapID { - event(): sc.ArrayOfImmutableBytes { let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); return new sc.ArrayOfImmutableBytes(arrID); @@ -97,7 +92,6 @@ export class ArrayOfMutableBytes { } export class MutableGetEventsForBlockResults extends wasmlib.ScMapID { - event(): sc.ArrayOfMutableBytes { let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); return new sc.ArrayOfMutableBytes(arrID); @@ -105,7 +99,6 @@ export class MutableGetEventsForBlockResults extends wasmlib.ScMapID { } export class ImmutableGetEventsForContractResults extends wasmlib.ScMapID { - event(): sc.ArrayOfImmutableBytes { let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); return new sc.ArrayOfImmutableBytes(arrID); @@ -113,7 +106,6 @@ export class ImmutableGetEventsForContractResults extends wasmlib.ScMapID { } export class MutableGetEventsForContractResults extends wasmlib.ScMapID { - event(): sc.ArrayOfMutableBytes { let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); return new sc.ArrayOfMutableBytes(arrID); @@ -121,7 +113,6 @@ export class MutableGetEventsForContractResults extends wasmlib.ScMapID { } export class ImmutableGetEventsForRequestResults extends wasmlib.ScMapID { - event(): sc.ArrayOfImmutableBytes { let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); return new sc.ArrayOfImmutableBytes(arrID); @@ -129,7 +120,6 @@ export class ImmutableGetEventsForRequestResults extends wasmlib.ScMapID { } export class MutableGetEventsForRequestResults extends wasmlib.ScMapID { - event(): sc.ArrayOfMutableBytes { let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultEvent), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); return new sc.ArrayOfMutableBytes(arrID); @@ -137,7 +127,6 @@ export class MutableGetEventsForRequestResults extends wasmlib.ScMapID { } export class ImmutableGetLatestBlockInfoResults extends wasmlib.ScMapID { - blockIndex(): wasmlib.ScImmutableInt32 { return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockIndex)); } @@ -148,7 +137,6 @@ export class ImmutableGetLatestBlockInfoResults extends wasmlib.ScMapID { } export class MutableGetLatestBlockInfoResults extends wasmlib.ScMapID { - blockIndex(): wasmlib.ScMutableInt32 { return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockIndex)); } @@ -175,7 +163,6 @@ export class ArrayOfImmutableRequestID { } export class ImmutableGetRequestIDsForBlockResults extends wasmlib.ScMapID { - requestID(): sc.ArrayOfImmutableRequestID { let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestID), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_REQUEST_ID); return new sc.ArrayOfImmutableRequestID(arrID); @@ -203,7 +190,6 @@ export class ArrayOfMutableRequestID { } export class MutableGetRequestIDsForBlockResults extends wasmlib.ScMapID { - requestID(): sc.ArrayOfMutableRequestID { let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestID), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_REQUEST_ID); return new sc.ArrayOfMutableRequestID(arrID); @@ -211,7 +197,6 @@ export class MutableGetRequestIDsForBlockResults extends wasmlib.ScMapID { } export class ImmutableGetRequestReceiptResults extends wasmlib.ScMapID { - blockIndex(): wasmlib.ScImmutableInt32 { return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockIndex)); } @@ -226,7 +211,6 @@ export class ImmutableGetRequestReceiptResults extends wasmlib.ScMapID { } export class MutableGetRequestReceiptResults extends wasmlib.ScMapID { - blockIndex(): wasmlib.ScMutableInt32 { return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultBlockIndex)); } @@ -241,7 +225,6 @@ export class MutableGetRequestReceiptResults extends wasmlib.ScMapID { } export class ImmutableGetRequestReceiptsForBlockResults extends wasmlib.ScMapID { - requestRecord(): sc.ArrayOfImmutableBytes { let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestRecord), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); return new sc.ArrayOfImmutableBytes(arrID); @@ -249,7 +232,6 @@ export class ImmutableGetRequestReceiptsForBlockResults extends wasmlib.ScMapID } export class MutableGetRequestReceiptsForBlockResults extends wasmlib.ScMapID { - requestRecord(): sc.ArrayOfMutableBytes { let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestRecord), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); return new sc.ArrayOfMutableBytes(arrID); @@ -257,14 +239,12 @@ export class MutableGetRequestReceiptsForBlockResults extends wasmlib.ScMapID { } export class ImmutableIsRequestProcessedResults extends wasmlib.ScMapID { - requestProcessed(): wasmlib.ScImmutableString { return new wasmlib.ScImmutableString(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestProcessed)); } } export class MutableIsRequestProcessedResults extends wasmlib.ScMapID { - requestProcessed(): wasmlib.ScMutableString { return new wasmlib.ScMutableString(this.mapID, wasmlib.Key32.fromString(sc.ResultRequestProcessed)); } diff --git a/packages/vm/wasmlib/ts/wasmlib/coregovernance/contract.ts b/packages/vm/wasmlib/ts/wasmlib/coregovernance/contract.ts index d5218719c8..045e454730 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coregovernance/contract.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coregovernance/contract.ts @@ -69,7 +69,6 @@ export class GetMaxBlobSizeCall { } export class ScFuncs { - static addAllowedStateControllerAddress(ctx: wasmlib.ScFuncCallContext): AddAllowedStateControllerAddressCall { let f = new AddAllowedStateControllerAddressCall(); f.func.setPtrs(f.params, null); diff --git a/packages/vm/wasmlib/ts/wasmlib/coregovernance/params.ts b/packages/vm/wasmlib/ts/wasmlib/coregovernance/params.ts index d1b56a563a..8e0b37cb46 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coregovernance/params.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coregovernance/params.ts @@ -9,7 +9,6 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableAddAllowedStateControllerAddressParams extends wasmlib.ScMapID { - chainOwner(): wasmlib.ScImmutableAgentID { return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamChainOwner)); } @@ -24,7 +23,6 @@ export class ImmutableAddAllowedStateControllerAddressParams extends wasmlib.ScM } export class MutableAddAllowedStateControllerAddressParams extends wasmlib.ScMapID { - chainOwner(): wasmlib.ScMutableAgentID { return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamChainOwner)); } @@ -39,49 +37,42 @@ export class MutableAddAllowedStateControllerAddressParams extends wasmlib.ScMap } export class ImmutableDelegateChainOwnershipParams extends wasmlib.ScMapID { - chainOwner(): wasmlib.ScImmutableAgentID { return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamChainOwner)); } } export class MutableDelegateChainOwnershipParams extends wasmlib.ScMapID { - chainOwner(): wasmlib.ScMutableAgentID { return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamChainOwner)); } } export class ImmutableRemoveAllowedStateControllerAddressParams extends wasmlib.ScMapID { - stateControllerAddress(): wasmlib.ScImmutableAddress { return new wasmlib.ScImmutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ParamStateControllerAddress)); } } export class MutableRemoveAllowedStateControllerAddressParams extends wasmlib.ScMapID { - stateControllerAddress(): wasmlib.ScMutableAddress { return new wasmlib.ScMutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ParamStateControllerAddress)); } } export class ImmutableRotateStateControllerParams extends wasmlib.ScMapID { - stateControllerAddress(): wasmlib.ScImmutableAddress { return new wasmlib.ScImmutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ParamStateControllerAddress)); } } export class MutableRotateStateControllerParams extends wasmlib.ScMapID { - stateControllerAddress(): wasmlib.ScMutableAddress { return new wasmlib.ScMutableAddress(this.mapID, wasmlib.Key32.fromString(sc.ParamStateControllerAddress)); } } export class ImmutableSetChainInfoParams extends wasmlib.ScMapID { - maxBlobSize(): wasmlib.ScImmutableInt32 { return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamMaxBlobSize)); } @@ -104,7 +95,6 @@ export class ImmutableSetChainInfoParams extends wasmlib.ScMapID { } export class MutableSetChainInfoParams extends wasmlib.ScMapID { - maxBlobSize(): wasmlib.ScMutableInt32 { return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ParamMaxBlobSize)); } @@ -127,7 +117,6 @@ export class MutableSetChainInfoParams extends wasmlib.ScMapID { } export class ImmutableSetContractFeeParams extends wasmlib.ScMapID { - hname(): wasmlib.ScImmutableHname { return new wasmlib.ScImmutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamHname)); } @@ -142,7 +131,6 @@ export class ImmutableSetContractFeeParams extends wasmlib.ScMapID { } export class MutableSetContractFeeParams extends wasmlib.ScMapID { - hname(): wasmlib.ScMutableHname { return new wasmlib.ScMutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamHname)); } @@ -157,7 +145,6 @@ export class MutableSetContractFeeParams extends wasmlib.ScMapID { } export class ImmutableSetDefaultFeeParams extends wasmlib.ScMapID { - ownerFee(): wasmlib.ScImmutableInt64 { return new wasmlib.ScImmutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamOwnerFee)); } @@ -168,7 +155,6 @@ export class ImmutableSetDefaultFeeParams extends wasmlib.ScMapID { } export class MutableSetDefaultFeeParams extends wasmlib.ScMapID { - ownerFee(): wasmlib.ScMutableInt64 { return new wasmlib.ScMutableInt64(this.mapID, wasmlib.Key32.fromString(sc.ParamOwnerFee)); } @@ -179,14 +165,12 @@ export class MutableSetDefaultFeeParams extends wasmlib.ScMapID { } export class ImmutableGetFeeInfoParams extends wasmlib.ScMapID { - hname(): wasmlib.ScImmutableHname { return new wasmlib.ScImmutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamHname)); } } export class MutableGetFeeInfoParams extends wasmlib.ScMapID { - hname(): wasmlib.ScMutableHname { return new wasmlib.ScMutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamHname)); } diff --git a/packages/vm/wasmlib/ts/wasmlib/coregovernance/results.ts b/packages/vm/wasmlib/ts/wasmlib/coregovernance/results.ts index ac122e3d04..96b3881322 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coregovernance/results.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coregovernance/results.ts @@ -25,7 +25,6 @@ export class ArrayOfImmutableBytes { } export class ImmutableGetAllowedStateControllerAddressesResults extends wasmlib.ScMapID { - allowedStateControllerAddresses(): sc.ArrayOfImmutableBytes { let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultAllowedStateControllerAddresses), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); return new sc.ArrayOfImmutableBytes(arrID); @@ -53,7 +52,6 @@ export class ArrayOfMutableBytes { } export class MutableGetAllowedStateControllerAddressesResults extends wasmlib.ScMapID { - allowedStateControllerAddresses(): sc.ArrayOfMutableBytes { let arrID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultAllowedStateControllerAddresses), wasmlib.TYPE_ARRAY16|wasmlib.TYPE_BYTES); return new sc.ArrayOfMutableBytes(arrID); @@ -61,7 +59,6 @@ export class MutableGetAllowedStateControllerAddressesResults extends wasmlib.Sc } export class ImmutableGetChainInfoResults extends wasmlib.ScMapID { - chainID(): wasmlib.ScImmutableChainID { return new wasmlib.ScImmutableChainID(this.mapID, wasmlib.Key32.fromString(sc.ResultChainID)); } @@ -100,7 +97,6 @@ export class ImmutableGetChainInfoResults extends wasmlib.ScMapID { } export class MutableGetChainInfoResults extends wasmlib.ScMapID { - chainID(): wasmlib.ScMutableChainID { return new wasmlib.ScMutableChainID(this.mapID, wasmlib.Key32.fromString(sc.ResultChainID)); } @@ -139,7 +135,6 @@ export class MutableGetChainInfoResults extends wasmlib.ScMapID { } export class ImmutableGetFeeInfoResults extends wasmlib.ScMapID { - feeColor(): wasmlib.ScImmutableColor { return new wasmlib.ScImmutableColor(this.mapID, wasmlib.Key32.fromString(sc.ResultFeeColor)); } @@ -154,7 +149,6 @@ export class ImmutableGetFeeInfoResults extends wasmlib.ScMapID { } export class MutableGetFeeInfoResults extends wasmlib.ScMapID { - feeColor(): wasmlib.ScMutableColor { return new wasmlib.ScMutableColor(this.mapID, wasmlib.Key32.fromString(sc.ResultFeeColor)); } @@ -169,14 +163,12 @@ export class MutableGetFeeInfoResults extends wasmlib.ScMapID { } export class ImmutableGetMaxBlobSizeResults extends wasmlib.ScMapID { - maxBlobSize(): wasmlib.ScImmutableInt32 { return new wasmlib.ScImmutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultMaxBlobSize)); } } export class MutableGetMaxBlobSizeResults extends wasmlib.ScMapID { - maxBlobSize(): wasmlib.ScMutableInt32 { return new wasmlib.ScMutableInt32(this.mapID, wasmlib.Key32.fromString(sc.ResultMaxBlobSize)); } diff --git a/packages/vm/wasmlib/ts/wasmlib/coreroot/contract.ts b/packages/vm/wasmlib/ts/wasmlib/coreroot/contract.ts index f9589a3ffa..7ab3399228 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreroot/contract.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreroot/contract.ts @@ -35,7 +35,6 @@ export class GetContractRecordsCall { } export class ScFuncs { - static deployContract(ctx: wasmlib.ScFuncCallContext): DeployContractCall { let f = new DeployContractCall(); f.func.setPtrs(f.params, null); diff --git a/packages/vm/wasmlib/ts/wasmlib/coreroot/params.ts b/packages/vm/wasmlib/ts/wasmlib/coreroot/params.ts index ada0c18029..9129658507 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreroot/params.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreroot/params.ts @@ -9,7 +9,6 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableDeployContractParams extends wasmlib.ScMapID { - description(): wasmlib.ScImmutableString { return new wasmlib.ScImmutableString(this.mapID, wasmlib.Key32.fromString(sc.ParamDescription)); } @@ -24,7 +23,6 @@ export class ImmutableDeployContractParams extends wasmlib.ScMapID { } export class MutableDeployContractParams extends wasmlib.ScMapID { - description(): wasmlib.ScMutableString { return new wasmlib.ScMutableString(this.mapID, wasmlib.Key32.fromString(sc.ParamDescription)); } @@ -39,42 +37,36 @@ export class MutableDeployContractParams extends wasmlib.ScMapID { } export class ImmutableGrantDeployPermissionParams extends wasmlib.ScMapID { - deployer(): wasmlib.ScImmutableAgentID { return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamDeployer)); } } export class MutableGrantDeployPermissionParams extends wasmlib.ScMapID { - deployer(): wasmlib.ScMutableAgentID { return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamDeployer)); } } export class ImmutableRevokeDeployPermissionParams extends wasmlib.ScMapID { - deployer(): wasmlib.ScImmutableAgentID { return new wasmlib.ScImmutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamDeployer)); } } export class MutableRevokeDeployPermissionParams extends wasmlib.ScMapID { - deployer(): wasmlib.ScMutableAgentID { return new wasmlib.ScMutableAgentID(this.mapID, wasmlib.Key32.fromString(sc.ParamDeployer)); } } export class ImmutableFindContractParams extends wasmlib.ScMapID { - hname(): wasmlib.ScImmutableHname { return new wasmlib.ScImmutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamHname)); } } export class MutableFindContractParams extends wasmlib.ScMapID { - hname(): wasmlib.ScMutableHname { return new wasmlib.ScMutableHname(this.mapID, wasmlib.Key32.fromString(sc.ParamHname)); } diff --git a/packages/vm/wasmlib/ts/wasmlib/coreroot/results.ts b/packages/vm/wasmlib/ts/wasmlib/coreroot/results.ts index fe194d1eb4..7a7cf43c50 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreroot/results.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreroot/results.ts @@ -9,7 +9,6 @@ import * as wasmlib from "wasmlib"; import * as sc from "./index"; export class ImmutableFindContractResults extends wasmlib.ScMapID { - contractFound(): wasmlib.ScImmutableBytes { return new wasmlib.ScImmutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultContractFound)); } @@ -20,7 +19,6 @@ export class ImmutableFindContractResults extends wasmlib.ScMapID { } export class MutableFindContractResults extends wasmlib.ScMapID { - contractFound(): wasmlib.ScMutableBytes { return new wasmlib.ScMutableBytes(this.mapID, wasmlib.Key32.fromString(sc.ResultContractFound)); } @@ -43,7 +41,6 @@ export class MapHnameToImmutableBytes { } export class ImmutableGetContractRecordsResults extends wasmlib.ScMapID { - contractRegistry(): sc.MapHnameToImmutableBytes { let mapID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultContractRegistry), wasmlib.TYPE_MAP); return new sc.MapHnameToImmutableBytes(mapID); @@ -67,7 +64,6 @@ export class MapHnameToMutableBytes { } export class MutableGetContractRecordsResults extends wasmlib.ScMapID { - contractRegistry(): sc.MapHnameToMutableBytes { let mapID = wasmlib.getObjectID(this.mapID, wasmlib.Key32.fromString(sc.ResultContractRegistry), wasmlib.TYPE_MAP); return new sc.MapHnameToMutableBytes(mapID); diff --git a/tools/schema/generator/rstemplates/contract.go b/tools/schema/generator/rstemplates/contract.go index 74d1a00336..f43624e968 100644 --- a/tools/schema/generator/rstemplates/contract.go +++ b/tools/schema/generator/rstemplates/contract.go @@ -15,6 +15,7 @@ pub struct ScFuncs { } impl ScFuncs { +$#set separator $false $#each func FuncNameForCall } `, @@ -46,6 +47,8 @@ $#if result ImmutableFuncNameResults // ******************************* "FuncNameForCall": ` $#emit setupInitFunc +$#if separator newline +$#set separator $true pub fn $func_name(_ctx: & dyn Sc$Kind$+CallContext) -> $FuncName$+Call { $#set paramsID ptr::null_mut() $#set resultsID ptr::null_mut() diff --git a/tools/schema/generator/rstemplates/params.go b/tools/schema/generator/rstemplates/params.go index 3f67a2e5fc..769201645f 100644 --- a/tools/schema/generator/rstemplates/params.go +++ b/tools/schema/generator/rstemplates/params.go @@ -41,6 +41,7 @@ pub struct $TypeName { } impl $TypeName { +$#set separator $false $#each param proxyMethods } `, diff --git a/tools/schema/generator/rstemplates/proxy.go b/tools/schema/generator/rstemplates/proxy.go index 0b4faac3fe..84c60b0936 100644 --- a/tools/schema/generator/rstemplates/proxy.go +++ b/tools/schema/generator/rstemplates/proxy.go @@ -8,6 +8,8 @@ $#if map typedefProxyMap `, // ******************************* "proxyMethods": ` +$#if separator newline +$#set separator $true $#set varID idx_map(IDX_$Kind$FLD_NAME) $#if core setCoreVarID $#if array proxyArray proxyMethods2 @@ -26,7 +28,6 @@ $#set varID $Kind$FLD_NAME.get_key_id() `, // ******************************* "proxyArray": ` - pub fn $fld_name(&self) -> ArrayOf$mut$FldType { let arr_id = get_object_id(self.id, $varID, $arrayTypeID | $fldTypeID); ArrayOf$mut$FldType { obj_id: arr_id } @@ -38,14 +39,12 @@ $#if this proxyMapThis proxyMapOther `, // ******************************* "proxyMapThis": ` - pub fn $fld_name(&self) -> Map$fldMapKey$+To$mut$FldType { Map$fldMapKey$+To$mut$FldType { obj_id: self.id } } `, // ******************************* "proxyMapOther": `55544444.0 - pub fn $fld_name(&self) -> Map$fldMapKey$+To$mut$FldType { let map_id = get_object_id(self.id, $varID, TYPE_MAP); Map$fldMapKey$+To$mut$FldType { obj_id: map_id } @@ -53,14 +52,12 @@ $#if this proxyMapThis proxyMapOther `, // ******************************* "proxyBaseType": ` - pub fn $fld_name(&self) -> Sc$mut$FldType { Sc$mut$FldType::new(self.id, $varID) } `, // ******************************* "proxyNewType": ` - pub fn $fld_name(&self) -> $mut$FldType { $mut$FldType { obj_id: self.id, key_id: $varID } } diff --git a/tools/schema/generator/rstemplates/results.go b/tools/schema/generator/rstemplates/results.go index 278179446c..54af672184 100644 --- a/tools/schema/generator/rstemplates/results.go +++ b/tools/schema/generator/rstemplates/results.go @@ -42,6 +42,7 @@ pub struct $TypeName { } impl $TypeName { +$#set separator $false $#each result proxyMethods } `, diff --git a/tools/schema/generator/rstemplates/state.go b/tools/schema/generator/rstemplates/state.go index 335fbb2e2f..2dbdabed25 100644 --- a/tools/schema/generator/rstemplates/state.go +++ b/tools/schema/generator/rstemplates/state.go @@ -34,6 +34,7 @@ $#if state stateProxyImpl "stateProxyImpl": ` impl $TypeName { +$#set separator $false $#each state proxyMethods } `, diff --git a/tools/schema/generator/templates.go b/tools/schema/generator/templates.go index 7935fedc25..9289a6abd1 100644 --- a/tools/schema/generator/templates.go +++ b/tools/schema/generator/templates.go @@ -6,6 +6,10 @@ var commonTemplates = map[string]string{ `, // ******************************* "nil": ` +`, + // ******************************* + "newline": ` + `, // ******************************* "copyright": ` diff --git a/tools/schema/generator/tstemplates/contract.go b/tools/schema/generator/tstemplates/contract.go index c5f12460f8..a85f6517c4 100644 --- a/tools/schema/generator/tstemplates/contract.go +++ b/tools/schema/generator/tstemplates/contract.go @@ -7,6 +7,7 @@ $#emit tsImports $#each func FuncNameCall export class ScFuncs { +$#set separator $false $#each func FuncNameForCall } `, @@ -58,7 +59,8 @@ $#if view ImmutablePackageState // ******************************* "FuncNameForCall": ` $#emit setupInitFunc - +$#if separator newline +$#set separator $true static $funcName(ctx: wasmlib.Sc$Kind$+CallContext): $FuncName$+Call { $#set paramsID null $#set resultsID null diff --git a/tools/schema/generator/tstemplates/params.go b/tools/schema/generator/tstemplates/params.go index 2230957701..8216ac2135 100644 --- a/tools/schema/generator/tstemplates/params.go +++ b/tools/schema/generator/tstemplates/params.go @@ -24,6 +24,7 @@ $#set TypeName $mut$FuncName$+Params $#each param proxyContainers export class $TypeName extends wasmlib.ScMapID { +$#set separator $false $#each param proxyMethods } `, diff --git a/tools/schema/generator/tstemplates/proxy.go b/tools/schema/generator/tstemplates/proxy.go index 9bbe54b156..9f03571eee 100644 --- a/tools/schema/generator/tstemplates/proxy.go +++ b/tools/schema/generator/tstemplates/proxy.go @@ -8,6 +8,8 @@ $#if map typedefProxyMap `, // ******************************* "proxyMethods": ` +$#if separator newline +$#set separator $true $#set varID sc.idxMap[sc.Idx$Kind$FldName] $#if core setCoreVarID $#if array proxyArray proxyMethods2 @@ -26,7 +28,6 @@ $#set varID wasmlib.Key32.fromString(sc.$Kind$FldName) `, // ******************************* "proxyArray": ` - $fldName(): sc.ArrayOf$mut$FldType { let arrID = wasmlib.getObjectID(this.mapID, $varID, $arrayTypeID|$fldTypeID); return new sc.ArrayOf$mut$FldType(arrID); @@ -38,14 +39,12 @@ $#if this proxyMapThis proxyMapOther `, // ******************************* "proxyMapThis": ` - $fldName(): sc.Map$fldMapKey$+To$mut$FldType { return new sc.Map$fldMapKey$+To$mut$FldType(this.mapID); } `, // ******************************* "proxyMapOther": ` - $fldName(): sc.Map$fldMapKey$+To$mut$FldType { let mapID = wasmlib.getObjectID(this.mapID, $varID, wasmlib.TYPE_MAP); return new sc.Map$fldMapKey$+To$mut$FldType(mapID); @@ -53,14 +52,12 @@ $#if this proxyMapThis proxyMapOther `, // ******************************* "proxyBaseType": ` - $fldName(): wasmlib.Sc$mut$FldType { return new wasmlib.Sc$mut$FldType(this.mapID, $varID); } `, // ******************************* "proxyNewType": ` - $fldName(): sc.$mut$FldType { return new sc.$mut$FldType(this.mapID, $varID); } diff --git a/tools/schema/generator/tstemplates/results.go b/tools/schema/generator/tstemplates/results.go index 33290f8e28..61dabe5049 100644 --- a/tools/schema/generator/tstemplates/results.go +++ b/tools/schema/generator/tstemplates/results.go @@ -24,6 +24,7 @@ $#set TypeName $mut$FuncName$+Results $#each result proxyContainers export class $TypeName extends wasmlib.ScMapID { +$#set separator $false $#each result proxyMethods } `, diff --git a/tools/schema/generator/tstemplates/state.go b/tools/schema/generator/tstemplates/state.go index 497057b605..f624be1471 100644 --- a/tools/schema/generator/tstemplates/state.go +++ b/tools/schema/generator/tstemplates/state.go @@ -16,6 +16,7 @@ $#set TypeName $mut$Package$+State $#each state proxyContainers export class $TypeName extends wasmlib.ScMapID { +$#set separator $false $#each state proxyMethods } `, From 362ad45bbd0a988b3d25a9f486233165f34715ba Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Mon, 8 Nov 2021 17:26:55 -0800 Subject: [PATCH 049/198] Created WasmEdge VM plugin, added Wasmer VM plugin --- go.mod | 2 + go.sum | 6 + packages/vm/wasmhost/wasmedgevm.go | 211 +++++++++++++++++++++++++++++ packages/vm/wasmhost/wasmervm.go | 163 ++++++++++++++++++++++ packages/vm/wasmhost/wasmtimevm.go | 39 ++---- packages/vm/wasmhost/wasmvm.go | 59 ++++---- 6 files changed, 428 insertions(+), 52 deletions(-) create mode 100644 packages/vm/wasmhost/wasmedgevm.go create mode 100644 packages/vm/wasmhost/wasmervm.go diff --git a/go.mod b/go.mod index 06bfcd5faf..6516c70238 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,8 @@ require ( github.com/anthdm/hbbft v0.0.0-20190702061856-0826ffdcf567 github.com/bygui86/multi-profile/v2 v2.1.0 github.com/bytecodealliance/wasmtime-go v0.21.0 + github.com/wasmerio/wasmer-go v1.0.4 + github.com/second-state/WasmEdge-go v0.9.0-rc3 // indirect github.com/ethereum/go-ethereum v1.10.10 github.com/iotaledger/goshimmer v0.7.5-0.20210811162925-25c827e8326a github.com/iotaledger/hive.go v0.0.0-20210625103722-68b2cf52ef4e diff --git a/go.sum b/go.sum index c6ebbb0c29..51235010a7 100644 --- a/go.sum +++ b/go.sum @@ -1289,6 +1289,10 @@ github.com/sasha-s/go-deadlock v0.2.0 h1:lMqc+fUb7RrFS3gQLtoQsJ7/6TV/pAIFvBsqX73 github.com/sasha-s/go-deadlock v0.2.0/go.mod h1:StQn567HiB1fF2yJ44N9au7wOhrPS3iZqiDbRupzT10= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/second-state/WasmEdge-go v0.8.2 h1:dD5+ZKY9Vr+Ye5F9VZGP/WP2MnXfORQocUxXQvXUVE0= +github.com/second-state/WasmEdge-go v0.8.2/go.mod h1:Q3h79fwQs7GUSOm3ZzHXK+j4cKmCFP3SKpGfFNDtqD8= +github.com/second-state/WasmEdge-go v0.9.0-rc3 h1:Ol6KaPguuqyd42vb9W7VCRR4V92yZdVpqUh0MWD07Y4= +github.com/second-state/WasmEdge-go v0.9.0-rc3/go.mod h1:Q3h79fwQs7GUSOm3ZzHXK+j4cKmCFP3SKpGfFNDtqD8= github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/sercand/kuberesolver v2.1.0+incompatible/go.mod h1:lWF3GL0xptCB/vCiJPl/ZshwPsX/n4Y7u0CW9E7aQIQ= @@ -1423,6 +1427,8 @@ github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+ github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= +github.com/wasmerio/wasmer-go v1.0.4 h1:MnqHoOGfiQ8MMq2RF6wyCeebKOe84G88h5yv+vmxJgs= +github.com/wasmerio/wasmer-go v1.0.4/go.mod h1:0gzVdSfg6pysA6QVp6iVRPTagC6Wq9pOE8J86WKb2Fk= github.com/weaveworks/common v0.0.0-20200512154658-384f10054ec5/go.mod h1:c98fKi5B9u8OsKGiWHLRKus6ToQ1Tubeow44ECO1uxY= github.com/weaveworks/promrus v1.2.0/go.mod h1:SaE82+OJ91yqjrE1rsvBWVzNZKcHYFtMUyS1+Ogs/KA= github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod h1:8UvriyWtv5Q5EOgjHaSseUEdkQfvwFv1I/In/O2M9gc= diff --git a/packages/vm/wasmhost/wasmedgevm.go b/packages/vm/wasmhost/wasmedgevm.go new file mode 100644 index 0000000000..560db9f327 --- /dev/null +++ b/packages/vm/wasmhost/wasmedgevm.go @@ -0,0 +1,211 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// +build wasmedge + +package wasmhost + +import ( + "errors" + + "github.com/second-state/WasmEdge-go/wasmedge" +) + +type WasmEdgeVM struct { + WasmVMBase + edge *wasmedge.VM + memory *wasmedge.Memory + module *wasmedge.ImportObject + store *wasmedge.Store + importers []*wasmedge.ImportObject +} + +var _ WasmVM = &WasmEdgeVM{} + +type HostFunction func(params []interface{}) []interface{} + +const I32 = wasmedge.ValType_I32 + +var i32 = []wasmedge.ValType{I32, I32, I32, I32, I32} + +func NewWasmEdgeVM() *WasmEdgeVM { + vm := &WasmEdgeVM{} + wasmedge.SetLogErrorLevel() + + vm.edge = wasmedge.NewVM() + + //config := wasmedge.NewConfig() + //config.SetInterruptable(true) + //vm.store = wasmedge.NewStore(wasmedge.NewEngineWithConfig(config)) + //vm.interrupt, _ = vm.store.InterruptHandle() + return vm +} + +//TODO +func (vm *WasmEdgeVM) Interrupt() { + panic("implement me") +} + +func (vm *WasmEdgeVM) importFunc(nrParams int, nrResults int, funcName string, function HostFunction) { + wrapper := func(_data interface{}, _mem *wasmedge.Memory, params []interface{}) ([]interface{}, wasmedge.Result) { + return function(params), wasmedge.Result_Success + } + funcType := wasmedge.NewFunctionType(i32[:nrParams], i32[:nrResults]) + funcWrapper := wasmedge.NewFunction(funcType, wrapper, nil, 0) + vm.module.AddFunction(funcName, funcWrapper) +} + +func (vm *WasmEdgeVM) importModule(name string) { + vm.module = wasmedge.NewImportObject(name) + vm.importers = append(vm.importers, vm.module) +} + +func (vm *WasmEdgeVM) LinkHost(impl WasmVM, host *WasmHost) error { + _ = vm.WasmVMBase.LinkHost(impl, host) + + vm.importModule("WasmLib") + vm.importFunc(5, 1, "hostGetBytes", vm.exportHostGetBytes) + vm.importFunc(2, 1, "hostGetKeyID", vm.exportHostGetKeyID) + vm.importFunc(3, 1, "hostGetObjectID", vm.exportHostGetObjectID) + vm.importFunc(5, 0, "hostSetBytes", vm.exportHostSetBytes) + err := vm.edge.RegisterImport(vm.module) + if err != nil { + return err + } + + // AssemblyScript Wasm versions uses this one to write panic message to console + vm.importModule("env") + vm.importFunc(4, 0, "abort", vm.exportAbort) + err = vm.edge.RegisterImport(vm.module) + if err != nil { + return err + } + + // TinyGo Wasm versions uses these to write panic message to console + vm.importModule("wasi_unstable") + vm.importFunc(4, 1, "fd_write", vm.exportFdWrite) + err = vm.edge.RegisterImport(vm.module) + if err != nil { + return err + } + vm.importModule("wasi_snapshot_preview1") + vm.importFunc(4, 1, "fd_write", vm.exportFdWrite) + return vm.edge.RegisterImport(vm.module) +} + +func (vm *WasmEdgeVM) LoadWasm(wasmData []byte) error { + err := vm.edge.LoadWasmBuffer(wasmData) + if err != nil { + return err + } + err = vm.edge.Validate() + if err != nil { + return err + } + err = vm.edge.Instantiate() + if err != nil { + return err + } + vm.memory = vm.edge.GetStore().FindMemory("memory") + if vm.memory == nil { + return errors.New("no memory export") + } + return nil +} + +func (vm *WasmEdgeVM) RunFunction(functionName string, args ...interface{}) error { + return vm.Run(func() (err error) { + _,err = vm.edge.Execute(functionName, args...) + return err + }) +} + +func (vm *WasmEdgeVM) RunScFunction(index int32) error { + frame := vm.PreCall() + defer vm.PostCall(frame) + + return vm.Run(func() (err error) { + _,err = vm.edge.Execute("on_call", index) + return err + }) +} + +func (vm *WasmEdgeVM) UnsafeMemory() []byte { + panic("wasmedge.UnsafeMemory") + return nil +} + +func (vm *WasmEdgeVM) VMGetBytes(offset int32, size int32) []byte { + bytes, err := vm.memory.GetData(uint(offset), uint(size)) + if err != nil { + panic("wasmedge.VMGetBytes: " + err.Error()) + } + return bytes +} + +func (vm *WasmEdgeVM) VMGetSize() int32 { + return int32(vm.memory.GetPageSize() << 16) +} + +func (vm *WasmEdgeVM) VMSetBytes(offset int32, size int32, bytes []byte) int32 { + if size != 0 { + err := vm.memory.SetData(bytes, uint(offset), uint(size)) + if err != nil { + panic("wasmedge.VMSetBytes: " + err.Error()) + } + } + return int32(len(bytes)) +} + +func (vm *WasmEdgeVM) exportAbort(args []interface{}) []interface{} { + errMsg := args[0].(int32) + fileName := args[1].(int32) + line := args[2].(int32) + col := args[3].(int32) + vm.EnvAbort(errMsg, fileName, line, col) + return nil +} + +func (vm *WasmEdgeVM) exportFdWrite(args []interface{}) []interface{} { + fd := args[0].(int32) + iovs := args[1].(int32) + size := args[2].(int32) + written := args[3].(int32) + ret := vm.HostFdWrite(fd, iovs, size, written) + return []interface{}{ret} +} + +func (vm *WasmEdgeVM) exportHostGetBytes(args []interface{}) []interface{} { + objID := args[0].(int32) + keyID := args[1].(int32) + typeID := args[2].(int32) + stringRef := args[3].(int32) + size := args[4].(int32) + ret := vm.HostGetBytes(objID, keyID, typeID, stringRef, size) + return []interface{}{ret} +} + +func (vm *WasmEdgeVM) exportHostGetKeyID(args []interface{}) []interface{} { + keyRef := args[0].(int32) + size := args[1].(int32) + ret := vm.HostGetKeyID(keyRef, size) + return []interface{}{ret} +} + +func (vm *WasmEdgeVM) exportHostGetObjectID(args []interface{}) []interface{} { + objID := args[0].(int32) + keyID := args[1].(int32) + typeID := args[2].(int32) + ret := vm.HostGetObjectID(objID, keyID, typeID) + return []interface{}{ret} +} + +func (vm *WasmEdgeVM) exportHostSetBytes(args []interface{}) []interface{} { + objID := args[0].(int32) + keyID := args[1].(int32) + typeID := args[2].(int32) + stringRef := args[3].(int32) + size := args[4].(int32) + vm.HostSetBytes(objID, keyID, typeID, stringRef, size) + return nil +} diff --git a/packages/vm/wasmhost/wasmervm.go b/packages/vm/wasmhost/wasmervm.go new file mode 100644 index 0000000000..36f0fe269a --- /dev/null +++ b/packages/vm/wasmhost/wasmervm.go @@ -0,0 +1,163 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// +build wasmer + +package wasmhost + +import ( + "github.com/wasmerio/wasmer-go/wasmer" +) + +type WasmerVM struct { + WasmVMBase + instance *wasmer.Instance + linker *wasmer.ImportObject + memory *wasmer.Memory + module *wasmer.Module + store *wasmer.Store +} + +var _ WasmVM = &WasmerVM{} + +var i32 = []wasmer.ValueKind{wasmer.I32, wasmer.I32, wasmer.I32, wasmer.I32, wasmer.I32} + +func NewWasmerVM() *WasmerVM { + vm := &WasmerVM{} + vm.store = wasmer.NewStore(wasmer.NewEngine()) + vm.linker = wasmer.NewImportObject() + return vm +} + +//TODO +func (vm *WasmerVM) Interrupt() { + panic("implement me") +} + +func (vm *WasmerVM) LinkHost(impl WasmVM, host *WasmHost) error { + _ = vm.WasmVMBase.LinkHost(impl, host) + + funcs := map[string]wasmer.IntoExtern{ + "hostGetBytes": vm.importFunc(5, 1, vm.exportHostGetBytes), + "hostGetKeyID": vm.importFunc(2, 1, vm.exportHostGetKeyID), + "hostGetObjectID": vm.importFunc(3, 1, vm.exportHostGetObjectID), + "hostSetBytes": vm.importFunc(5, 0, vm.exportHostSetBytes), + } + vm.linker.Register("WasmLib", funcs) + + funcs = map[string]wasmer.IntoExtern{ + "abort": vm.importFunc(4, 0, vm.exportAbort), + } + vm.linker.Register("env", funcs) + + // TinyGo Wasm implementation uses this one to write panic message to console + funcs = map[string]wasmer.IntoExtern{ + "fd_write": vm.importFunc(4, 1, vm.exportFdWrite), + } + vm.linker.Register("wasi_unstable", funcs) + vm.linker.Register("wasi_snapshot_preview1", funcs) + return nil +} + +func (vm *WasmerVM) importFunc(nrParams, nrResults int, function func([]wasmer.Value) ([]wasmer.Value, error)) *wasmer.Extern { + params := wasmer.NewValueTypes(i32[:nrParams]...) + results := wasmer.NewValueTypes(i32[:nrResults]...) + funcType := wasmer.NewFunctionType(params, results) + return wasmer.NewFunction(vm.store, funcType, function).IntoExtern() +} + +func (vm *WasmerVM) LoadWasm(wasmData []byte) error { + var err error + vm.module, err = wasmer.NewModule(vm.store, wasmData) + if err != nil { + return err + } + vm.instance, err = wasmer.NewInstance(vm.module, vm.linker) + if err != nil { + return err + } + vm.memory, err = vm.instance.Exports.GetMemory("memory") + return err +} + +func (vm *WasmerVM) RunFunction(functionName string, args ...interface{}) error { + export, err := vm.instance.Exports.GetFunction(functionName) + if err != nil { + return err + } + return vm.Run(func() error { + _, err = export(args...) + return err + }) +} + +func (vm *WasmerVM) RunScFunction(index int32) error { + export, err := vm.instance.Exports.GetFunction("on_call") + if err != nil { + return err + } + frame := vm.PreCall() + err = vm.Run(func() error { + _, err = export(index) + return err + }) + vm.PostCall(frame) + return err +} + +func (vm *WasmerVM) UnsafeMemory() []byte { + return vm.memory.Data() +} + +func (vm *WasmerVM) exportAbort(args []wasmer.Value) ([]wasmer.Value, error) { + errMsg := args[0].I32() + fileName := args[1].I32() + line := args[2].I32() + col := args[3].I32() + vm.EnvAbort(errMsg, fileName, line, col) + return nil, nil +} + +func (vm *WasmerVM) exportFdWrite(args []wasmer.Value) ([]wasmer.Value, error) { + fd := args[0].I32() + iovs := args[1].I32() + size := args[2].I32() + written := args[3].I32() + ret := vm.HostFdWrite(fd, iovs, size, written) + return []wasmer.Value{wasmer.NewI32(ret)}, nil +} + +func (vm *WasmerVM) exportHostGetBytes(args []wasmer.Value) ([]wasmer.Value, error) { + objID := args[0].I32() + keyID := args[1].I32() + typeID := args[2].I32() + stringRef := args[3].I32() + size := args[4].I32() + ret := vm.HostGetBytes(objID, keyID, typeID, stringRef, size) + return []wasmer.Value{wasmer.NewI32(ret)}, nil +} + +func (vm *WasmerVM) exportHostGetKeyID(args []wasmer.Value) ([]wasmer.Value, error) { + keyRef := args[0].I32() + size := args[1].I32() + ret := vm.HostGetKeyID(keyRef, size) + return []wasmer.Value{wasmer.NewI32(ret)}, nil +} + +func (vm *WasmerVM) exportHostGetObjectID(args []wasmer.Value) ([]wasmer.Value, error) { + objID := args[0].I32() + keyID := args[1].I32() + typeID := args[2].I32() + ret := vm.HostGetObjectID(objID, keyID, typeID) + return []wasmer.Value{wasmer.NewI32(ret)}, nil +} + +func (vm *WasmerVM) exportHostSetBytes(args []wasmer.Value) ([]wasmer.Value, error) { + objID := args[0].I32() + keyID := args[1].I32() + typeID := args[2].I32() + stringRef := args[3].I32() + size := args[4].I32() + vm.HostSetBytes(objID, keyID, typeID, stringRef, size) + return nil, nil +} diff --git a/packages/vm/wasmhost/wasmtimevm.go b/packages/vm/wasmhost/wasmtimevm.go index 136a489d69..09948c1d50 100644 --- a/packages/vm/wasmhost/wasmtimevm.go +++ b/packages/vm/wasmhost/wasmtimevm.go @@ -38,57 +38,38 @@ func (vm *WasmTimeVM) Interrupt() { func (vm *WasmTimeVM) LinkHost(impl WasmVM, host *WasmHost) error { _ = vm.WasmVMBase.LinkHost(impl, host) - err := vm.linker.DefineFunc("WasmLib", "hostGetBytes", - func(objID, keyID, typeID, stringRef, size int32) int32 { - return vm.HostGetBytes(objID, keyID, typeID, stringRef, size) - }) + err := vm.linker.DefineFunc("WasmLib", "hostGetBytes", vm.HostGetBytes) if err != nil { return err } - err = vm.linker.DefineFunc("WasmLib", "hostGetKeyID", - func(keyRef, size int32) int32 { - return vm.HostGetKeyID(keyRef, size) - }) + err = vm.linker.DefineFunc("WasmLib", "hostGetKeyID", vm.HostGetKeyID) if err != nil { return err } - err = vm.linker.DefineFunc("WasmLib", "hostGetObjectID", - func(objID, keyID, typeID int32) int32 { - return vm.HostGetObjectID(objID, keyID, typeID) - }) + err = vm.linker.DefineFunc("WasmLib", "hostGetObjectID", vm.HostGetObjectID) if err != nil { return err } - err = vm.linker.DefineFunc("WasmLib", "hostSetBytes", - func(objID, keyID, typeID, stringRef, size int32) { - vm.HostSetBytes(objID, keyID, typeID, stringRef, size) - }) + err = vm.linker.DefineFunc("WasmLib", "hostSetBytes", vm.HostSetBytes) if err != nil { return err } // AssemblyScript Wasm versions uses this one to write panic message to console - err = vm.linker.DefineFunc("env", "abort", - func(p1, p2, p3, p4 int32) { - vm.EnvAbort(p1, p2, p3, p4) - }) + err = vm.linker.DefineFunc("env", "abort", vm.EnvAbort) if err != nil { return err } // TinyGo Wasm versions uses this one to write panic message to console - fdWrite := func(fd, iovs, size, written int32) int32 { - return vm.HostFdWrite(fd, iovs, size, written) - } - err = vm.linker.DefineFunc("wasi_unstable", "fd_write", fdWrite) + err = vm.linker.DefineFunc("wasi_unstable", "fd_write", vm.HostFdWrite) if err != nil { return err } - return vm.linker.DefineFunc("wasi_snapshot_preview1", "fd_write", fdWrite) + return vm.linker.DefineFunc("wasi_snapshot_preview1", "fd_write", vm.HostFdWrite) } -func (vm *WasmTimeVM) LoadWasm(wasmData []byte) error { - var err error +func (vm *WasmTimeVM) LoadWasm(wasmData []byte) (err error) { vm.module, err = wasmtime.NewModule(vm.store.Engine, wasmData) if err != nil { return err @@ -115,7 +96,7 @@ func (vm *WasmTimeVM) RunFunction(functionName string, args ...interface{}) erro } return vm.Run(func() (err error) { _, err = export.Func().Call(args...) - return + return err }) } @@ -130,7 +111,7 @@ func (vm *WasmTimeVM) RunScFunction(index int32) error { return vm.Run(func() (err error) { _, err = export.Func().Call(index) - return + return err }) } diff --git a/packages/vm/wasmhost/wasmvm.go b/packages/vm/wasmhost/wasmvm.go index 1bee0d4bf4..c7afeaa96c 100644 --- a/packages/vm/wasmhost/wasmvm.go +++ b/packages/vm/wasmhost/wasmvm.go @@ -34,6 +34,7 @@ type WasmVM interface { SaveMemory() UnsafeMemory() []byte VMGetBytes(offset int32, size int32) []byte + VMGetSize() int32 VMSetBytes(offset int32, size int32, bytes []byte) int32 } @@ -42,25 +43,29 @@ type WasmVMBase struct { host *WasmHost memoryCopy []byte memoryDirty bool - memoryNonZero int + memoryNonZero int32 result []byte resultKeyID int32 timeoutStarted bool } func (vm *WasmVMBase) EnvAbort(errMsg, fileName, line, col int32) { - ptr := vm.impl.UnsafeMemory() + // crude implementation assumes texts to only use ASCII part of UTF-16 // null-terminated UTF-16 error message str1 := make([]byte, 0) - for i := errMsg; ptr[i] != 0; i += 2 { - str1 = append(str1, ptr[i]) + ptr := vm.impl.VMGetBytes(errMsg, 2) + for i := errMsg; ptr[0] != 0; i += 2 { + str1 = append(str1, ptr[0]) + ptr = vm.impl.VMGetBytes(i, 2) } // null-terminated UTF-16 file name str2 := make([]byte, 0) - for i := fileName; ptr[i] != 0; i += 2 { - str2 = append(str2, ptr[i]) + ptr = vm.impl.VMGetBytes(fileName, 2) + for i := fileName; ptr[0] != 0; i += 2 { + str2 = append(str2, ptr[0]) + ptr = vm.impl.VMGetBytes(i, 2) } panic(fmt.Sprintf("AssemblyScript panic: %s (%s %d:%d)", string(str1), string(str2), line, col)) @@ -71,16 +76,19 @@ func (vm *WasmVMBase) getKvStore(id int32) *KvStoreHost { return vm.host.getKvStore(id) } -func (vm *WasmVMBase) HostFdWrite(fd, iovs, size, written int32) int32 { +func (vm *WasmVMBase) HostFdWrite(_fd, iovs, _size, written int32) int32 { host := vm.getKvStore(0) host.TraceAllf("HostFdWrite(...)") // very basic implementation that expects fd to be stdout and iovs to be only one element - ptr := vm.impl.UnsafeMemory() - txt := binary.LittleEndian.Uint32(ptr[iovs : iovs+4]) - siz := binary.LittleEndian.Uint32(ptr[iovs+4 : iovs+8]) - fmt.Print(string(ptr[txt : txt+siz])) - binary.LittleEndian.PutUint32(ptr[written:written+4], siz) - return int32(siz) + ptr := vm.impl.VMGetBytes(iovs, 8) + text := int32(binary.LittleEndian.Uint32(ptr[0:4])) + size := int32(binary.LittleEndian.Uint32(ptr[4:8])) + msg := vm.impl.VMGetBytes(text, size) + fmt.Print(string(msg)) + ptr = make([]byte, 4) + binary.LittleEndian.PutUint32(ptr, uint32(size)) + vm.impl.VMSetBytes(written, size, ptr) + return size } func (vm *WasmVMBase) HostGetBytes(objID, keyID, typeID, stringRef, size int32) int32 { @@ -168,21 +176,20 @@ func (vm *WasmVMBase) LinkHost(impl WasmVM, host *WasmHost) error { } func (vm *WasmVMBase) PreCall() []byte { - ptr := vm.impl.UnsafeMemory() - frame := make([]byte, len(ptr)) - copy(frame, ptr) + bytes := vm.impl.VMGetSize() + frame := vm.impl.VMGetBytes(0, bytes) if vm.memoryDirty { // clear memory and restore initialized data range - copy(ptr, make([]byte, len(ptr))) - copy(ptr[vm.memoryNonZero:], vm.memoryCopy) + vm.impl.VMSetBytes(0, bytes, make([]byte, bytes)) + size := int32(len(vm.memoryCopy)) + vm.impl.VMSetBytes(vm.memoryNonZero, size, vm.memoryCopy) } vm.memoryDirty = true return frame } func (vm *WasmVMBase) PostCall(frame []byte) { - ptr := vm.impl.UnsafeMemory() - copy(ptr, frame) + vm.impl.VMSetBytes(0, int32(len(frame)), frame) } func (vm *WasmVMBase) Run(runner func() error) (err error) { @@ -220,7 +227,8 @@ func (vm *WasmVMBase) Run(runner func() error) (err error) { func (vm *WasmVMBase) SaveMemory() { // find initialized data range in memory - ptr := vm.impl.UnsafeMemory() + bytes := vm.impl.VMGetSize() + ptr := vm.impl.VMGetBytes(0, bytes) if ptr == nil { // this vm implementation does not communicate via mem pool return @@ -237,9 +245,9 @@ func (vm *WasmVMBase) SaveMemory() { } // save copy of initialized data range - vm.memoryNonZero = len(ptr) + vm.memoryNonZero = bytes if firstNonZero >= 0 { - vm.memoryNonZero = firstNonZero + vm.memoryNonZero = int32(firstNonZero) size := lastNonZero + 1 - firstNonZero vm.memoryCopy = make([]byte, size) copy(vm.memoryCopy, ptr[vm.memoryNonZero:]) @@ -253,6 +261,11 @@ func (vm *WasmVMBase) VMGetBytes(offset, size int32) []byte { return bytes } +func (vm *WasmVMBase) VMGetSize() int32 { + ptr := vm.impl.UnsafeMemory() + return int32(len(ptr)) +} + func (vm *WasmVMBase) VMSetBytes(offset, size int32, bytes []byte) int32 { if size != 0 { ptr := vm.impl.UnsafeMemory() From 659cc87a2881e981bdbd23619959a6606f26fc1d Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Mon, 8 Nov 2021 21:56:14 -0800 Subject: [PATCH 050/198] WasmLib bugfix --- .../test/donatewithfeedback_bg.wasm | Bin 36272 -> 36378 bytes .../wasm/fairauction/test/fairauction_bg.wasm | Bin 42516 -> 42599 bytes .../fairroulette/test/fairroulette_bg.wasm | Bin 41044 -> 41127 bytes contracts/wasm/go_build.cmd | 2 +- .../wasm/inccounter/test/inccounter_bg.wasm | Bin 36836 -> 36919 bytes contracts/wasm/rust_build.cmd | 2 +- contracts/wasm/ts_build.cmd | 2 +- packages/vm/wasmlib/go/wasmlib/bytes.go | 3 +++ packages/vm/wasmlib/src/bytes.rs | 3 +++ packages/vm/wasmlib/ts/wasmlib/bytes.ts | 3 +++ tools/cluster/tests/wasm/inccounter_bg.wasm | Bin 36836 -> 36919 bytes 11 files changed, 12 insertions(+), 3 deletions(-) diff --git a/contracts/wasm/donatewithfeedback/test/donatewithfeedback_bg.wasm b/contracts/wasm/donatewithfeedback/test/donatewithfeedback_bg.wasm index 9a69d35a578a58ae55737d2f2e03c4aadab86198..51a1dfea40e7987a854800c8101665f76705c91a 100644 GIT binary patch delta 8855 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 Bigo}1 diff --git a/contracts/wasm/fairauction/test/fairauction_bg.wasm b/contracts/wasm/fairauction/test/fairauction_bg.wasm index f66a931d16e32d3fbfe9c92c0a57fcf3106e466d..dd6d5ae480cefb524766bf460e9612efe38c5299 100644 GIT binary patch delta 10529 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 diff --git a/contracts/wasm/fairroulette/test/fairroulette_bg.wasm b/contracts/wasm/fairroulette/test/fairroulette_bg.wasm index 597abd63875b69716915cecea717517ae885eef9..30fe7c995a834f7302cc900d66f0203502b7434d 100644 GIT binary patch delta 9178 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 diff --git a/contracts/wasm/go_build.cmd b/contracts/wasm/go_build.cmd index feeee21a1b..69285a482e 100644 --- a/contracts/wasm/go_build.cmd +++ b/contracts/wasm/go_build.cmd @@ -1,6 +1,6 @@ @echo off cd %1 -if not exist schema.yaml goto :xit +if not exist schema.yaml if not exist schema.json goto :xit echo Building %1 schema -go %2 echo compiling %1_go.wasm diff --git a/contracts/wasm/inccounter/test/inccounter_bg.wasm b/contracts/wasm/inccounter/test/inccounter_bg.wasm index e3d9a2038628ad2bf748a7e028a82294f4128e8d..4677231d6333136822704b7bd95911f1630cc2b2 100644 GIT binary patch delta 8510 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 UPd#KN6VwEm$B<`L-R`ab11{=!fdBvi delta 8532 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 DdbLst diff --git a/contracts/wasm/rust_build.cmd b/contracts/wasm/rust_build.cmd index 1ede3fd3e6..f152c0d98d 100644 --- a/contracts/wasm/rust_build.cmd +++ b/contracts/wasm/rust_build.cmd @@ -1,6 +1,6 @@ @echo off cd %1 -if not exist schema.yaml goto :xit +if not exist schema.yaml if not exist schema.json goto :xit echo Building %1 schema -rust %2 echo compiling %1_bg.wasm diff --git a/contracts/wasm/ts_build.cmd b/contracts/wasm/ts_build.cmd index 2450d76056..cdcf0d6155 100644 --- a/contracts/wasm/ts_build.cmd +++ b/contracts/wasm/ts_build.cmd @@ -1,6 +1,6 @@ @echo off cd %1 -if not exist schema.yaml goto :xit +if not exist schema.yaml if not exist schema.json goto :xit echo Building %1 schema -ts %2 echo compiling %1_ts.wasm diff --git a/packages/vm/wasmlib/go/wasmlib/bytes.go b/packages/vm/wasmlib/go/wasmlib/bytes.go index df90a25487..6c17e5ebe8 100644 --- a/packages/vm/wasmlib/go/wasmlib/bytes.go +++ b/packages/vm/wasmlib/go/wasmlib/bytes.go @@ -8,6 +8,9 @@ type BytesDecoder struct { } func NewBytesDecoder(data []byte) *BytesDecoder { + if len(data) == 0 { + panic("cannot decode empty byte array, use exist()") + } return &BytesDecoder{data: data} } diff --git a/packages/vm/wasmlib/src/bytes.rs b/packages/vm/wasmlib/src/bytes.rs index 9e7a969d66..2ec2e5a14f 100644 --- a/packages/vm/wasmlib/src/bytes.rs +++ b/packages/vm/wasmlib/src/bytes.rs @@ -12,6 +12,9 @@ pub struct BytesDecoder<'a> { impl BytesDecoder<'_> { // constructs a decoder pub fn new(data: &[u8]) -> BytesDecoder { + if data.len() == 0 { + panic("cannot decode empty byte array, use exist()"); + } BytesDecoder { buf: data } } diff --git a/packages/vm/wasmlib/ts/wasmlib/bytes.ts b/packages/vm/wasmlib/ts/wasmlib/bytes.ts index 35cab0e438..0e45ed0ced 100644 --- a/packages/vm/wasmlib/ts/wasmlib/bytes.ts +++ b/packages/vm/wasmlib/ts/wasmlib/bytes.ts @@ -11,6 +11,9 @@ export class BytesDecoder { // constructs a decoder constructor(data: u8[]) { + if (data.length == 0) { + panic("cannot decode empty byte array, use exist()"); + } this.buf = data; } diff --git a/tools/cluster/tests/wasm/inccounter_bg.wasm b/tools/cluster/tests/wasm/inccounter_bg.wasm index e3d9a2038628ad2bf748a7e028a82294f4128e8d..4677231d6333136822704b7bd95911f1630cc2b2 100644 GIT binary patch delta 8510 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 UPd#KN6VwEm$B<`L-R`ab11{=!fdBvi delta 8532 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 DdbLst From fcb70bb3d64340145dd26af39b797843592a5351 Mon Sep 17 00:00:00 2001 From: lucastortora Date: Tue, 9 Nov 2021 14:22:12 +0100 Subject: [PATCH 051/198] * Added warning about breaking changes and link to a specific Goshimmer version in running-a-node.md --- .../docs/guide/chains_and_nodes/running-a-node.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/documentation/docs/guide/chains_and_nodes/running-a-node.md b/documentation/docs/guide/chains_and_nodes/running-a-node.md index 2847489581..4f34e6e8e8 100644 --- a/documentation/docs/guide/chains_and_nodes/running-a-node.md +++ b/documentation/docs/guide/chains_and_nodes/running-a-node.md @@ -31,7 +31,13 @@ If you prefer, you can also configure a node [using a docker image](docker.md) ( - [Go 1.16](https://golang.org/doc/install) - [RocksDB](https://github.com/facebook/rocksdb/blob/master/INSTALL.md) - Access to a [GoShimmer](https://github.com/iotaledger/goshimmer) node for - production operation + production operation. + +:::warning + +GoShimmer is a developing prototype, so some things are prone to break. For a smooth development experience, you should use the GoShimmer code at [this commit](https://github.com/iotaledger/goshimmer/commit/25c827e8326a). + +::: :::info note From 41fb4dcc47c4252f376932da9be50bdbad5e0b0e Mon Sep 17 00:00:00 2001 From: Jorge Silva Date: Fri, 5 Nov 2021 11:58:37 +0000 Subject: [PATCH 052/198] Feat: add bool type to codec --- packages/kv/codec/bool.go | 29 ++++++++++++++++++++++ packages/kv/codec/bool_test.go | 19 ++++++++++++++ packages/kv/kvdecoder/kvdecoder.go | 11 ++++++++ packages/vm/core/root/rootimpl/impl.go | 12 ++++----- packages/vm/core/root/rootimpl/internal.go | 6 ++++- 5 files changed, 69 insertions(+), 8 deletions(-) create mode 100644 packages/kv/codec/bool.go create mode 100644 packages/kv/codec/bool_test.go diff --git a/packages/kv/codec/bool.go b/packages/kv/codec/bool.go new file mode 100644 index 0000000000..902c2a5bc5 --- /dev/null +++ b/packages/kv/codec/bool.go @@ -0,0 +1,29 @@ +package codec + +import ( + "bytes" + + "github.com/iotaledger/wasp/packages/util" + "golang.org/x/xerrors" +) + +func DecodeBool(b []byte, def ...bool) (bool, error) { + if b == nil { + if len(def) == 0 { + return false, xerrors.Errorf("cannot decode nil bytes") + } + return def[0], nil + } + var ret bool + err := util.ReadBoolByte(bytes.NewReader(b), &ret) + return ret, err +} + +func EncodeBool(value bool) []byte { + buf := bytes.NewBuffer(make([]byte, 0)) + err := util.WriteBoolByte(buf, value) + if err != nil { + return nil + } + return buf.Bytes() +} diff --git a/packages/kv/codec/bool_test.go b/packages/kv/codec/bool_test.go new file mode 100644 index 0000000000..2ebe5282be --- /dev/null +++ b/packages/kv/codec/bool_test.go @@ -0,0 +1,19 @@ +package codec + +import ( + "testing" + + "github.com/stretchr/testify/require" +) + +func testBoolEncodeDecode(t *testing.T, b bool) { + bin0 := EncodeBool(b) + zback, err := DecodeBool(bin0) + require.NoError(t, err) + require.Equal(t, zback, b) +} + +func TestBoolEncoding(t *testing.T) { + testBoolEncodeDecode(t, true) + testBoolEncodeDecode(t, false) +} diff --git a/packages/kv/kvdecoder/kvdecoder.go b/packages/kv/kvdecoder/kvdecoder.go index 5fa7f5b300..61018180e0 100644 --- a/packages/kv/kvdecoder/kvdecoder.go +++ b/packages/kv/kvdecoder/kvdecoder.go @@ -110,6 +110,17 @@ func (p *Decoder) MustGetUint64(key kv.Key, def ...uint64) uint64 { return ret } +func (p *Decoder) GetBool(key kv.Key, def ...bool) (bool, error) { + v, err := codec.DecodeBool(p.kv.MustGet(key), def...) + return v, p.wrapError(key, err) +} + +func (p *Decoder) MustGetBool(key kv.Key, def ...bool) bool { + ret, err := p.GetBool(key, def...) + p.check(err) + return ret +} + func (p *Decoder) GetTime(key kv.Key, def ...time.Time) (time.Time, error) { v, err := codec.DecodeTime(p.kv.MustGet(key), def...) return v, p.wrapError(key, err) diff --git a/packages/vm/core/root/rootimpl/impl.go b/packages/vm/core/root/rootimpl/impl.go index a57d23a132..62e39c9b56 100644 --- a/packages/vm/core/root/rootimpl/impl.go +++ b/packages/vm/core/root/rootimpl/impl.go @@ -11,6 +11,7 @@ import ( "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/assert" + "github.com/iotaledger/wasp/packages/kv/codec" "github.com/iotaledger/wasp/packages/kv/collections" "github.com/iotaledger/wasp/packages/kv/dict" "github.com/iotaledger/wasp/packages/kv/kvdecoder" @@ -62,7 +63,7 @@ func initialize(ctx iscp.Sandbox) (dict.Dict, error) { govParams.Set(governance.ParamChainOwner, ctx.Caller().Bytes()) // chain owner is whoever sends init request mustStoreAndInitCoreContract(ctx, governance.Contract, a, govParams) - state.Set(root.VarDeployPermissionsEnabled, []byte{1}) + state.Set(root.VarDeployPermissionsEnabled, codec.EncodeBool(true)) state.Set(root.VarStateInitialized, []byte{0xFF}) ctx.Log().Debugf("root.initialize.success") @@ -185,11 +186,8 @@ func requireDeployPermissions(ctx iscp.Sandbox) (dict.Dict, error) { a := assert.NewAssert(ctx.Log()) a.Require(isChainOwner(a, ctx), "root.revokeDeployPermissions: not authorized") params := kvdecoder.New(ctx.Params()) - permissionsEnabled := params.MustGetBytes(root.ParamDeployPermissionsEnabled)[0] == 1 - val := []byte{0} - if permissionsEnabled { - val = []byte{1} - } - ctx.State().Set(root.VarDeployPermissionsEnabled, val) + a.Require(ctx.Params().MustHas(root.ParamDeployPermissionsEnabled), "root.revokeDeployPermissions: ParamDeployPermissionsEnabled missing") + permissionsEnabled := params.MustGetBool(root.ParamDeployPermissionsEnabled) + ctx.State().Set(root.VarDeployPermissionsEnabled, codec.EncodeBool(permissionsEnabled)) return nil, nil } diff --git a/packages/vm/core/root/rootimpl/internal.go b/packages/vm/core/root/rootimpl/internal.go index ba45fb9950..6fb1824ba3 100644 --- a/packages/vm/core/root/rootimpl/internal.go +++ b/packages/vm/core/root/rootimpl/internal.go @@ -36,7 +36,11 @@ func mustStoreContractRecord(ctx iscp.Sandbox, rec *root.ContractRecord, a asser // isAuthorizedToDeploy checks if caller is authorized to deploy smart contract func isAuthorizedToDeploy(ctx iscp.Sandbox) bool { - if ctx.State().MustGet(root.VarDeployPermissionsEnabled)[0] == 0 { + permissionsEnabled, err := codec.DecodeBool(ctx.State().MustGet(root.VarDeployPermissionsEnabled)) + if err != nil { + return false + } + if !permissionsEnabled { return true } From 30b3db2054793d5a5f754d8644b9497a31061bd4 Mon Sep 17 00:00:00 2001 From: Diego Essaya Date: Tue, 9 Nov 2021 11:55:17 -0300 Subject: [PATCH 053/198] evm: configurable gas limit & block keep amount (evmlight only) (fixes #588) --- contracts/native/evm/evmchain/impl.go | 6 +- .../evm/evmlight/emulator/blockchaindb.go | 55 ++++++++++++++----- .../native/evm/evmlight/emulator/emulator.go | 4 +- .../evm/evmlight/emulator/emulator_test.go | 10 ++-- contracts/native/evm/evmlight/impl.go | 9 ++- contracts/native/evm/interface.go | 10 +++- tools/evm/evmcli/deploy.go | 29 +++++++--- tools/evm/evmemulator/main.go | 3 + tools/wasp-cli/chain/evm.go | 7 ++- 9 files changed, 99 insertions(+), 34 deletions(-) diff --git a/contracts/native/evm/evmchain/impl.go b/contracts/native/evm/evmchain/impl.go index fac2545ecd..c2f1e1ea0e 100644 --- a/contracts/native/evm/evmchain/impl.go +++ b/contracts/native/evm/evmchain/impl.go @@ -43,13 +43,17 @@ func initialize(ctx iscp.Sandbox) (dict.Dict, error) { a := assert.NewAssert(ctx.Log()) genesisAlloc, err := evmtypes.DecodeGenesisAlloc(ctx.Params().MustGet(evm.FieldGenesisAlloc)) a.RequireNoError(err) + + gasLimit, err := codec.DecodeUint64(ctx.Params().MustGet(evm.FieldGasLimit), evm.GasLimitDefault) + a.RequireNoError(err) + chainID, err := codec.DecodeUint16(ctx.Params().MustGet(evm.FieldChainID), evm.DefaultChainID) a.RequireNoError(err) emulator.InitGenesis( int(chainID), rawdb.NewDatabase(emulator.NewKVAdapter(evminternal.EVMStateSubrealm(ctx.State()))), genesisAlloc, - evm.GasLimitDefault, + gasLimit, timestamp(ctx), ) evminternal.InitializeManagement(ctx) diff --git a/contracts/native/evm/evmlight/emulator/blockchaindb.go b/contracts/native/evm/evmlight/emulator/blockchaindb.go index 5db8764dfd..da24443fb7 100644 --- a/contracts/native/evm/evmlight/emulator/blockchaindb.go +++ b/contracts/native/evm/evmlight/emulator/blockchaindb.go @@ -20,8 +20,12 @@ import ( const ( // config values: - keyChainID = "c" + // EVM chain ID + keyChainID = "c" + // Block gas limit keyGasLimit = "g" + // Amount of blocks to keep in DB. Older blocks will be pruned every time a transaction is added + keyKeepAmount = "k" // blocks: @@ -38,9 +42,6 @@ const ( keyBlockIndexByTxHash = "th:i" ) -// Amount of blocks to keep in DB. Older blocks will be pruned every time a transaction is added -const keepAmount = 100 - // BlockchainDB contains logic for storing a fake blockchain (more like a list of blocks), // intended for satisfying EVM tools that depend on the concept of a block. type BlockchainDB struct { @@ -55,9 +56,10 @@ func (bc *BlockchainDB) Initialized() bool { return bc.kv.MustGet(keyChainID) != nil } -func (bc *BlockchainDB) Init(chainID uint16, gasLimit, timestamp uint64) { +func (bc *BlockchainDB) Init(chainID uint16, keepAmount int32, gasLimit, timestamp uint64) { bc.SetChainID(chainID) bc.SetGasLimit(gasLimit) + bc.SetKeepAmount(keepAmount) bc.addBlock(bc.makeHeader(nil, nil, 0, timestamp), timestamp+1) } @@ -85,6 +87,18 @@ func (bc *BlockchainDB) GetGasLimit() uint64 { return gas } +func (bc *BlockchainDB) SetKeepAmount(keepAmount int32) { + bc.kv.Set(keyKeepAmount, codec.EncodeInt32(keepAmount)) +} + +func (bc *BlockchainDB) keepAmount() int32 { + gas, err := codec.DecodeInt32(bc.kv.MustGet(keyKeepAmount), -1) + if err != nil { + panic(err) + } + return gas +} + func (bc *BlockchainDB) setPendingTimestamp(timestamp uint64) { bc.kv.Set(keyPendingTimestamp, codec.EncodeUint64(timestamp)) } @@ -198,22 +212,37 @@ func (bc *BlockchainDB) MintBlock(timestamp uint64) { } func (bc *BlockchainDB) prune(currentNumber uint64) { - if currentNumber <= keepAmount { + keepAmount := bc.keepAmount() + if keepAmount < 0 { + // keep all blocks return } - forget := currentNumber - keepAmount - blockHash := bc.GetBlockHashByBlockNumber(forget) - txs := bc.getTxArray(forget) + if currentNumber <= uint64(keepAmount) { + return + } + toDelete := currentNumber - uint64(keepAmount) + // assume that all blocks prior to `toDelete` have been already deleted, so + // we only need to delete this one. + bc.deleteBlock(toDelete) +} + +func (bc *BlockchainDB) deleteBlock(blockNumber uint64) { + header := bc.getHeaderGobByBlockNumber(blockNumber) + if header == nil { + // already deleted? + return + } + txs := bc.getTxArray(blockNumber) n := txs.MustLen() for i := uint32(0); i < n; i++ { - txHash := bc.GetTransactionByBlockNumberAndIndex(forget, i).Hash() + txHash := bc.GetTransactionByBlockNumberAndIndex(blockNumber, i).Hash() bc.kv.Del(makeBlockNumberByTxHashKey(txHash)) bc.kv.Del(makeBlockIndexByTxHashKey(txHash)) } txs.MustErase() - bc.getReceiptArray(forget).MustErase() - bc.kv.Del(makeBlockHeaderByBlockNumberKey(forget)) - bc.kv.Del(makeBlockNumberByBlockHashKey(blockHash)) + bc.getReceiptArray(blockNumber).MustErase() + bc.kv.Del(makeBlockHeaderByBlockNumberKey(blockNumber)) + bc.kv.Del(makeBlockNumberByBlockHashKey(header.Hash)) } type headerGob struct { diff --git a/contracts/native/evm/evmlight/emulator/emulator.go b/contracts/native/evm/evmlight/emulator/emulator.go index 6fa8459f37..32eb4fa9a6 100644 --- a/contracts/native/evm/evmlight/emulator/emulator.go +++ b/contracts/native/evm/evmlight/emulator/emulator.go @@ -63,12 +63,12 @@ func newBlockchainDB(store kv.KVStore) *BlockchainDB { } // Init initializes the EVM state with the provided genesis allocation parameters -func Init(store kv.KVStore, chainID uint16, gasLimit, timestamp uint64, alloc core.GenesisAlloc) { +func Init(store kv.KVStore, chainID uint16, blockKeepAmount int32, gasLimit, timestamp uint64, alloc core.GenesisAlloc) { bdb := newBlockchainDB(store) if bdb.Initialized() { panic("evm state already initialized in kvstore") } - bdb.Init(chainID, gasLimit, timestamp) + bdb.Init(chainID, blockKeepAmount, gasLimit, timestamp) statedb := newStateDB(store) for addr, account := range alloc { diff --git a/contracts/native/evm/evmlight/emulator/emulator_test.go b/contracts/native/evm/evmlight/emulator/emulator_test.go index cdd64354a6..69fdbdfbe5 100644 --- a/contracts/native/evm/evmlight/emulator/emulator_test.go +++ b/contracts/native/evm/evmlight/emulator/emulator_test.go @@ -74,7 +74,7 @@ func TestBlockchain(t *testing.T) { } db := dict.Dict{} - Init(db, evm.DefaultChainID, evm.GasLimitDefault, 0, genesisAlloc) + Init(db, evm.DefaultChainID, evm.BlockKeepAll, evm.GasLimitDefault, 0, genesisAlloc) emu := NewEVMEmulator(db, 1, &iscpBackend{}) // some assertions @@ -153,7 +153,7 @@ func TestBlockchainPersistence(t *testing.T) { transferAmount := big.NewInt(1000) db := dict.Dict{} - Init(db, evm.DefaultChainID, evm.GasLimitDefault, 0, genesisAlloc) + Init(db, evm.DefaultChainID, evm.BlockKeepAll, evm.GasLimitDefault, 0, genesisAlloc) // do a transfer using one instance of EVMEmulator func() { @@ -255,7 +255,7 @@ func TestStorageContract(t *testing.T) { } db := dict.Dict{} - Init(db, evm.DefaultChainID, evm.GasLimitDefault, 0, genesisAlloc) + Init(db, evm.DefaultChainID, evm.BlockKeepAll, evm.GasLimitDefault, 0, genesisAlloc) emu := NewEVMEmulator(db, 1, &iscpBackend{}) contractABI, err := abi.JSON(strings.NewReader(evmtest.StorageContractABI)) @@ -329,7 +329,7 @@ func TestERC20Contract(t *testing.T) { } db := dict.Dict{} - Init(db, evm.DefaultChainID, evm.GasLimitDefault, 0, genesisAlloc) + Init(db, evm.DefaultChainID, evm.BlockKeepAll, evm.GasLimitDefault, 0, genesisAlloc) emu := NewEVMEmulator(db, 1, &iscpBackend{}) contractABI, err := abi.JSON(strings.NewReader(evmtest.ERC20ContractABI)) @@ -420,7 +420,7 @@ func initBenchmark(b *testing.B) (*EVMEmulator, []*types.Transaction, dict.Dict) } db := dict.Dict{} - Init(db, evm.DefaultChainID, evm.GasLimitDefault, 0, genesisAlloc) + Init(db, evm.DefaultChainID, evm.BlockKeepAll, evm.GasLimitDefault, 0, genesisAlloc) emu := NewEVMEmulator(db, 1, &iscpBackend{}) contractABI, err := abi.JSON(strings.NewReader(evmtest.StorageContractABI)) diff --git a/contracts/native/evm/evmlight/impl.go b/contracts/native/evm/evmlight/impl.go index 6178d93e23..5ecee157cb 100644 --- a/contracts/native/evm/evmlight/impl.go +++ b/contracts/native/evm/evmlight/impl.go @@ -47,6 +47,12 @@ func initialize(ctx iscp.Sandbox) (dict.Dict, error) { genesisAlloc, err := evmtypes.DecodeGenesisAlloc(ctx.Params().MustGet(evm.FieldGenesisAlloc)) a.RequireNoError(err) + gasLimit, err := codec.DecodeUint64(ctx.Params().MustGet(evm.FieldGasLimit), evm.GasLimitDefault) + a.RequireNoError(err) + + blockKeepAmount, err := codec.DecodeInt32(ctx.Params().MustGet(evm.FieldBlockKeepAmount), evm.BlockKeepAmountDefault) + a.RequireNoError(err) + // add the standard ISCP contract at arbitrary address 0x1074 iscpcontract.DeployOnGenesis(genesisAlloc, ctx.ChainID()) @@ -55,7 +61,8 @@ func initialize(ctx iscp.Sandbox) (dict.Dict, error) { emulator.Init( evminternal.EVMStateSubrealm(ctx.State()), chainID, - evm.GasLimitDefault, // TODO: make gas limit configurable + blockKeepAmount, + gasLimit, timestamp(ctx), genesisAlloc, ) diff --git a/contracts/native/evm/interface.go b/contracts/native/evm/interface.go index 2c8ec3c5eb..2ae60496e2 100644 --- a/contracts/native/evm/interface.go +++ b/contracts/native/evm/interface.go @@ -60,8 +60,13 @@ const ( FieldGasPerIota = "w" FieldGasFee = "f" FieldGasUsed = "gu" + FieldGasLimit = "gl" FieldFilterQuery = "fq" - FieldBlockTime = "bt" // uint32, avg block time in seconds + + // evmlight only: + + FieldBlockTime = "bt" // uint32, avg block time in seconds + FieldBlockKeepAmount = "bk" // int32 ) const ( @@ -69,6 +74,9 @@ const ( DefaultGasPerIota uint64 = 1000 GasLimitDefault = uint64(15000000) + + BlockKeepAll = -1 + BlockKeepAmountDefault = BlockKeepAll ) var GasPrice = big.NewInt(0) diff --git a/tools/evm/evmcli/deploy.go b/tools/evm/evmcli/deploy.go index 427cf483c8..eaeb1850e6 100644 --- a/tools/evm/evmcli/deploy.go +++ b/tools/evm/evmcli/deploy.go @@ -20,14 +20,16 @@ import ( ) type DeployParams struct { - evmFlavor string - ChainID int - name string - description string - alloc []string - allocBase64 string - GasPerIOTA uint64 - blockTime uint32 + evmFlavor string + ChainID int + name string + description string + alloc []string + allocBase64 string + GasPerIOTA uint64 + GasLimit uint64 + blockTime uint32 + blockKeepAmount int32 } func (d *DeployParams) InitFlags(cmd *cobra.Command) { @@ -38,7 +40,9 @@ func (d *DeployParams) InitFlags(cmd *cobra.Command) { cmd.Flags().StringSliceVarP(&d.alloc, "alloc", "", nil, "Genesis allocation (format:
:,
:,...)") cmd.Flags().StringVarP(&d.allocBase64, "alloc-bytes", "", "", "Genesis allocation (base64-encoded)") cmd.Flags().Uint64VarP(&d.GasPerIOTA, "gas-per-iota", "", evm.DefaultGasPerIota, "Gas per IOTA charged as fee") - cmd.Flags().Uint32VarP(&d.blockTime, "block-time", "", 0, "Average block time (0: disabled) (only supported by evmlight)") + cmd.Flags().Uint32VarP(&d.blockTime, "block-time", "", 0, "Average block time (0: disabled) [evmlight only]") + cmd.Flags().Uint64VarP(&d.GasLimit, "gas-limit", "", evm.GasLimitDefault, "Block gas limit") + cmd.Flags().Int32VarP(&d.blockKeepAmount, "block-keep-amount", "", evm.BlockKeepAmountDefault, "Amount of blocks to keep in DB (-1: keep all blocks) [evmlight only]") } func (d *DeployParams) Name() string { @@ -70,6 +74,13 @@ func (d *DeployParams) BlockTime() uint32 { return d.blockTime } +func (d *DeployParams) BlockKeepAmount() int32 { + if d.blockKeepAmount > 0 && d.evmFlavor != "evmlight" { + log.Fatalf("block-keep-amount is only supported by evmlight flavor") + } + return d.blockKeepAmount +} + func (d *DeployParams) GetGenesis(def core.GenesisAlloc) core.GenesisAlloc { if len(d.alloc) != 0 && d.allocBase64 != "" { log.Fatalf("--alloc and --alloc-bytes are mutually exclusive") diff --git a/tools/evm/evmemulator/main.go b/tools/evm/evmemulator/main.go index 319b36efa5..f5755b851c 100644 --- a/tools/evm/evmemulator/main.go +++ b/tools/evm/evmemulator/main.go @@ -69,6 +69,7 @@ By default the server has no unlocked accounts. To send transactions, either: func start(cmd *cobra.Command, args []string) { blockTime := deployParams.BlockTime() + blockKeepAmount := deployParams.BlockKeepAmount() evmFlavor := deployParams.EVMFlavor() env := solo.New(solo.NewTestContext("evmemulator"), log.DebugFlag, log.DebugFlag). @@ -82,6 +83,8 @@ func start(cmd *cobra.Command, args []string) { evmtest.FaucetAddress: {Balance: evmtest.FaucetSupply}, })), evm.FieldGasPerIota, deployParams.GasPerIOTA, + evm.FieldGasLimit, deployParams.GasLimit, + evm.FieldBlockKeepAmount, blockKeepAmount, ) log.Check(err) diff --git a/tools/wasp-cli/chain/evm.go b/tools/wasp-cli/chain/evm.go index 5187306435..19fad4cda2 100644 --- a/tools/wasp-cli/chain/evm.go +++ b/tools/wasp-cli/chain/evm.go @@ -44,9 +44,12 @@ func initEVMDeploy(evmCmd *cobra.Command) { Short: "Deploy the evmchain/evmlight contract (i.e. create a new EVM chain)", Run: func(cmd *cobra.Command, args []string) { blockTime := deployParams.BlockTime() + blockKeepAmount := deployParams.BlockKeepAmount() deployContract(deployParams.Name(), deployParams.Description(), deployParams.EVMFlavor().ProgramHash, dict.Dict{ - evm.FieldChainID: codec.EncodeUint16(uint16(deployParams.ChainID)), - evm.FieldGenesisAlloc: evmtypes.EncodeGenesisAlloc(deployParams.GetGenesis(nil)), + evm.FieldChainID: codec.EncodeUint16(uint16(deployParams.ChainID)), + evm.FieldGenesisAlloc: evmtypes.EncodeGenesisAlloc(deployParams.GetGenesis(nil)), + evm.FieldGasLimit: codec.EncodeUint64(deployParams.GasLimit), + evm.FieldBlockKeepAmount: codec.EncodeInt32(blockKeepAmount), }) log.Printf("%s contract successfully deployed.\n", deployParams.Name()) From 0ad4f85daed6d2e575f3af816c2c3e0c0775bab9 Mon Sep 17 00:00:00 2001 From: Jorge Silva Date: Tue, 9 Nov 2021 14:59:42 +0000 Subject: [PATCH 054/198] add bool type to wasp-cli --- tools/wasp-cli/util/types.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/wasp-cli/util/types.go b/tools/wasp-cli/util/types.go index 5e792c341d..237d0466c1 100644 --- a/tools/wasp-cli/util/types.go +++ b/tools/wasp-cli/util/types.go @@ -33,6 +33,10 @@ func ValueFromString(vtype, s string) []byte { n, err := strconv.Atoi(s) log.Check(err) return codec.EncodeInt64(int64(n)) + case "bool": + b, err := strconv.ParseBool(s) + log.Check(err) + return codec.EncodeBool(b) case "color": col, err := ledgerstate.ColorFromBase58EncodedString(s) log.Check(err) From f1ed8ffd590c319d533b4c3b9656e102e725f4a4 Mon Sep 17 00:00:00 2001 From: Jorge Silva Date: Tue, 9 Nov 2021 15:22:31 +0000 Subject: [PATCH 055/198] test fix --- packages/vm/core/testcore/blob_deploy_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/vm/core/testcore/blob_deploy_test.go b/packages/vm/core/testcore/blob_deploy_test.go index f923964c43..a3805063b0 100644 --- a/packages/vm/core/testcore/blob_deploy_test.go +++ b/packages/vm/core/testcore/blob_deploy_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/kv/codec" "github.com/iotaledger/wasp/packages/solo" "github.com/iotaledger/wasp/packages/vm/core" "github.com/iotaledger/wasp/packages/vm/core/blob" @@ -215,7 +216,7 @@ func TestOpenDeploymentToAnyone(t *testing.T) { // enable open deployments req := solo.NewCallParams(root.Contract.Name, root.FuncRequireDeployPermissions.Name, - root.ParamDeployPermissionsEnabled, []byte{0}, + root.ParamDeployPermissionsEnabled, codec.EncodeBool(false), ) _, err = chain.PostRequestSync(req.WithIotas(1), nil) require.NoError(t, err) @@ -226,7 +227,7 @@ func TestOpenDeploymentToAnyone(t *testing.T) { // disable open deployments req = solo.NewCallParams(root.Contract.Name, root.FuncRequireDeployPermissions.Name, - root.ParamDeployPermissionsEnabled, []byte{1}, + root.ParamDeployPermissionsEnabled, codec.EncodeBool(true), ) _, err = chain.PostRequestSync(req.WithIotas(1), nil) require.NoError(t, err) From 2ec64e0f5b02c924f82545782c7c9c1f42d987e4 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Fri, 29 Oct 2021 13:12:55 +0300 Subject: [PATCH 056/198] Peer messages are queued instead of events in lpp peering --- packages/peering/lpp/lppNetImpl.go | 11 ++--------- packages/peering/lpp/lppPeer.go | 12 ++++++++++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/packages/peering/lpp/lppNetImpl.go b/packages/peering/lpp/lppNetImpl.go index 141de24aa8..10472812eb 100644 --- a/packages/peering/lpp/lppNetImpl.go +++ b/packages/peering/lpp/lppNetImpl.go @@ -213,14 +213,7 @@ func (n *netImpl) lppPeeringProtocolHandler(stream network.Stream) { n.log.Warnf("Error while decoding a message, reason=%v", err) return } - remotePeer.noteReceived() - peerMsg.SenderNetID = remotePeer.NetID() - remotePeer.RecvMsg( - &peering.RecvEvent{ - From: remotePeer, - Msg: peerMsg, - }, - ) + remotePeer.RecvMsg(peerMsg) } func (n *netImpl) lppHeartbeatProtocolHandler(stream network.Stream) { @@ -418,7 +411,7 @@ func (n *netImpl) SendMsg(msg *peering.PeerMessage) { }) } -func (n *netImpl) triggerRecvEvents(msg interface{}) { +func (n *netImpl) triggerRecvEvents(msg *peering.RecvEvent) { n.recvEvents.Trigger(msg) } diff --git a/packages/peering/lpp/lppPeer.go b/packages/peering/lpp/lppPeer.go index 7fa4042f35..2a54b05ee2 100644 --- a/packages/peering/lpp/lppPeer.go +++ b/packages/peering/lpp/lppPeer.go @@ -135,7 +135,9 @@ func (p *peer) SendMsg(msg *peering.PeerMessage) { p.sendPipe.In() <- msg } -func (p *peer) RecvMsg(msg *peering.RecvEvent) { +func (p *peer) RecvMsg(msg *peering.PeerMessage) { + p.noteReceived() + msg.SenderNetID = p.NetID() p.recvPipe.In() <- msg } @@ -147,7 +149,13 @@ func (p *peer) sendLoop() { func (p *peer) recvLoop() { for msg := range p.recvPipe.Out() { - p.net.triggerRecvEvents(msg) + peerMsg, ok := msg.(*peering.PeerMessage) + if ok { + p.net.triggerRecvEvents(&peering.RecvEvent{ + From: p, + Msg: peerMsg, + }) + } } } From 3b38c3d1de028b998c57030754e5e9f2697e9fb4 Mon Sep 17 00:00:00 2001 From: Diego Essaya Date: Tue, 9 Nov 2021 17:58:16 -0300 Subject: [PATCH 057/198] feat: show request details in dashboard & wasp-cli --- packages/chain/mempool/mempool_test.go | 4 +- packages/dashboard/base.go | 1 + packages/dashboard/templates/chainblock.tmpl | 52 ++++++++------- packages/dashboard/util.go | 5 ++ packages/iscp/request.go | 14 +++- packages/iscp/request/request.go | 10 +-- packages/iscp/rotate/rotate.go | 4 +- packages/vm/vmcontext/runreq.go | 11 ++-- tools/cluster/tests/wasp-cli_test.go | 22 +++++-- tools/wasp-cli/chain/blocklog.go | 68 +++++++++++++++----- tools/wasp-cli/log/log.go | 40 ++++++++++++ 11 files changed, 173 insertions(+), 58 deletions(-) diff --git a/packages/chain/mempool/mempool_test.go b/packages/chain/mempool/mempool_test.go index e1d5672dea..2a8d71edf7 100644 --- a/packages/chain/mempool/mempool_test.go +++ b/packages/chain/mempool/mempool_test.go @@ -196,8 +196,8 @@ func TestAddOffLedgerRequest(t *testing.T) { onLedgerRequests, keyPair := getRequestsOnLedger(t, 2) offFromOnLedgerFun := func(onLedger *request.OnLedger) *request.OffLedger { - contract, emptyPoint := onLedger.Target() - return request.NewOffLedger(contract, emptyPoint, onLedger.GetMetadata().Args()) + target := onLedger.Target() + return request.NewOffLedger(target.Contract, target.EntryPoint, onLedger.GetMetadata().Args()) } offLedgerRequestUnsigned := offFromOnLedgerFun(onLedgerRequests[0]) offLedgerRequestSigned := offFromOnLedgerFun(onLedgerRequests[1]) diff --git a/packages/dashboard/base.go b/packages/dashboard/base.go index df85bf0e9c..83ffed4b62 100644 --- a/packages/dashboard/base.go +++ b/packages/dashboard/base.go @@ -102,6 +102,7 @@ func (d *Dashboard) makeTemplate(e *echo.Echo, parts ...string) *template.Templa "incUint32": incUint32, "decUint32": decUint32, "bytesToString": bytesToString, + "keyToString": keyToString, "base58": base58.Encode, "replace": strings.Replace, "uri": func(s string, p ...interface{}) string { return e.Reverse(s, p...) }, diff --git a/packages/dashboard/templates/chainblock.tmpl b/packages/dashboard/templates/chainblock.tmpl index b46879b07f..7432ef9605 100644 --- a/packages/dashboard/templates/chainblock.tmpl +++ b/packages/dashboard/templates/chainblock.tmpl @@ -12,31 +12,37 @@

Requests

-
-
#Total
{{ .Block.TotalRequests }}
-
#Successful
{{ .Block.NumSuccessfulRequests }}
-
#Off-ledger
{{ .Block.NumOffLedgerRequests }}
-
- - - - - - - - - - {{range $i, $r := .Receipts}} - - - - - - + {{ $req := $r.Request }} +
+

Request #{{$i}}

+
+
ID
{{ $req.ID.Base58 }}
+
Type
{{ if $req.IsOffLedger -}} off-ledger {{- else -}} on-ledger {{- end }}
+
Fee prepaid
{{ if $req.IsFeePrepaid -}} yes {{- else -}} no {{- end }}
+ {{ if $r.Error }} +
Error
{{ $r.Error }}
+ {{ end }} +
Sender
{{template "agentid" (args $chainid $req.SenderAccount)}}
+
Contract Hname
{{$req.Target.Contract}}
+
Entry point
{{$req.Target.EntryPoint}}
+ {{ if not $req.IsOffLedger }} +
Transaction timestamp
{{ formatTimestamp $req.Timestamp }}
+ {{ end }} +
+
Arguments
+ {{if gt (len $req.Args) 0}} +
+ {{range $k, $v := $req.Args}} +
{{ $k | keyToString | trim 30 }}
+ 
{{ $v | bytesToString | trim 100 }}
+ {{end}} +
+ {{else}} +

(empty)

+ {{end}} +
{{end}} - -
IndexIDOff-ledger?Error
{{$i}}{{$r.Request.ID.Base58}}{{ if $r.Request.IsOffLedger -}} yes {{- else -}} no {{- end }}{{ $r.Error }}
diff --git a/packages/dashboard/util.go b/packages/dashboard/util.go index 5a9eb86900..3d54af2af6 100644 --- a/packages/dashboard/util.go +++ b/packages/dashboard/util.go @@ -7,6 +7,7 @@ import ( "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/wasp/packages/hashing" "github.com/iotaledger/wasp/packages/iscp/colored" + "github.com/iotaledger/wasp/packages/kv" ) func args(args ...interface{}) []interface{} { @@ -39,6 +40,10 @@ func decUint32(n uint32) uint32 { return n - 1 } +func keyToString(k kv.Key) string { + return string(k) +} + func bytesToString(b []byte) string { return string(b) } diff --git a/packages/iscp/request.go b/packages/iscp/request.go index 4c9fea20f6..ca8deab995 100644 --- a/packages/iscp/request.go +++ b/packages/iscp/request.go @@ -28,7 +28,7 @@ type Request interface { // address of the sender for all requests, SenderAddress() ledgerstate.Address // returns contract/entry point pair - Target() (Hname, Hname) + Target() RequestTarget // Timestamp returns a request TX timestamp, if such TX exist, otherwise zero is returned. Timestamp() time.Time // Bytes returns binary representation of the request @@ -39,6 +39,18 @@ type Request interface { String() string } +type RequestTarget struct { + Contract Hname + EntryPoint Hname +} + +func NewRequestTarget(contract, entryPoint Hname) RequestTarget { + return RequestTarget{ + Contract: contract, + EntryPoint: entryPoint, + } +} + func TakeRequestIDs(reqs ...Request) []RequestID { ret := make([]RequestID, len(reqs)) for i := range reqs { diff --git a/packages/iscp/request/request.go b/packages/iscp/request/request.go index 1836e9495f..b13e9683f3 100644 --- a/packages/iscp/request/request.go +++ b/packages/iscp/request/request.go @@ -289,6 +289,7 @@ func (req *OnLedger) Output() ledgerstate.Output { // Params returns solid args if decoded already or nil otherwise func (req *OnLedger) Params() (dict.Dict, bool) { + // FIXME: this returns nil after deserializing a processed request (see tools/wasp-cli/chain/blocklog.go) par := req.params.Load() if par == nil { return nil, false @@ -305,8 +306,8 @@ func (req *OnLedger) SenderAddress() ledgerstate.Address { } // Target returns target contract and target entry point -func (req *OnLedger) Target() (iscp.Hname, iscp.Hname) { - return req.requestMetadata.TargetContract(), req.requestMetadata.EntryPoint() +func (req *OnLedger) Target() iscp.RequestTarget { + return iscp.NewRequestTarget(req.requestMetadata.TargetContract(), req.requestMetadata.EntryPoint()) } func (req *OnLedger) Timestamp() time.Time { @@ -541,6 +542,7 @@ func (req *OffLedger) IsOffLedger() bool { } func (req *OffLedger) Params() (dict.Dict, bool) { + // FIXME: this returns nil after deserializing a processed request (see tools/wasp-cli/chain/blocklog.go) par := req.params.Load() if par == nil { return nil, false @@ -559,8 +561,8 @@ func (req *OffLedger) SenderAddress() ledgerstate.Address { return req.sender } -func (req *OffLedger) Target() (iscp.Hname, iscp.Hname) { - return req.contract, req.entryPoint +func (req *OffLedger) Target() iscp.RequestTarget { + return iscp.NewRequestTarget(req.contract, req.entryPoint) } func (req *OffLedger) Timestamp() time.Time { diff --git a/packages/iscp/rotate/rotate.go b/packages/iscp/rotate/rotate.go index 3557aec6e5..534f70f189 100644 --- a/packages/iscp/rotate/rotate.go +++ b/packages/iscp/rotate/rotate.go @@ -17,8 +17,8 @@ import ( // IsRotateStateControllerRequest determines if request may be a committee rotation request func IsRotateStateControllerRequest(req iscp.Request) bool { - targetContract, targetEP := req.Target() - return targetContract == coreutil.CoreContractGovernanceHname && targetEP == coreutil.CoreEPRotateStateControllerHname + target := req.Target() + return target.Contract == coreutil.CoreContractGovernanceHname && target.EntryPoint == coreutil.CoreEPRotateStateControllerHname } func NewRotateRequestOffLedger(newStateAddress ledgerstate.Address, keyPair *ed25519.KeyPair) iscp.Request { diff --git a/packages/vm/vmcontext/runreq.go b/packages/vm/vmcontext/runreq.go index c0ce4dbcfb..6d93ca6d78 100644 --- a/packages/vm/vmcontext/runreq.go +++ b/packages/vm/vmcontext/runreq.go @@ -145,7 +145,7 @@ func (vmctx *VMContext) mustSetUpRequestContext(req iscp.Request, requestIndex u vmctx.remainingAfterFees = vmctx.adjustOffLedgerTransfer() } - targetContract, _ := req.Target() + targetContract := req.Target().Contract var ok bool vmctx.contractRecord, ok = vmctx.findContractByHname(targetContract) if !ok { @@ -304,7 +304,7 @@ func (vmctx *VMContext) mustCallFromRequest() { vmctx.mustUpdateOffledgerRequestMaxAssumedNonce() // calling only non view entry points. Calling the view will trigger error and fallback - _, entryPoint := vmctx.req.Target() + entryPoint := vmctx.req.Target().EntryPoint targetContract := vmctx.contractRecord.Hname() params, _ := vmctx.req.Params() vmctx.lastResult, vmctx.lastError = vmctx.callNonViewByProgramHash( @@ -330,10 +330,9 @@ func (vmctx *VMContext) mustFinalizeRequestCall() { vmctx.virtualState.ApplyStateUpdates(vmctx.currentStateUpdate) vmctx.currentStateUpdate = nil - _, ep := vmctx.req.Target() vmctx.log.Debug("runTheRequest OUT. ", "reqId: ", vmctx.req.ID().Short(), - " entry point: ", ep.String(), + " entry point: ", vmctx.req.Target().EntryPoint.String(), ) } @@ -350,8 +349,8 @@ func (vmctx *VMContext) getChainConfigFromState() { } func (vmctx *VMContext) isInitChainRequest() bool { - targetContract, entryPoint := vmctx.req.Target() - return targetContract == root.Contract.Hname() && entryPoint == iscp.EntryPointInit + target := vmctx.req.Target() + return target.Contract == root.Contract.Hname() && target.EntryPoint == iscp.EntryPointInit } func isRequestTimeLockedNow(req iscp.Request, nowis time.Time) bool { diff --git a/tools/cluster/tests/wasp-cli_test.go b/tools/cluster/tests/wasp-cli_test.go index 2d368ea6b7..1bbea3234a 100644 --- a/tools/cluster/tests/wasp-cli_test.go +++ b/tools/cluster/tests/wasp-cli_test.go @@ -1,6 +1,7 @@ package tests import ( + "encoding/hex" "fmt" "regexp" "strconv" @@ -178,19 +179,22 @@ func TestWaspCLIBlockLog(t *testing.T) { require.Equal(t, "Block index: 2", out[0]) out = w.Run("chain", "request", reqID) - t.Logf("%+v", out) + found = false for _, line := range out { - if strings.Contains(line, "Error:") { - t.Fail() + if strings.Contains(line, "Error: (empty)") { + found = true + break } } + require.True(t, found) // try an unsuccessful request (missing params) - out = w.Run("chain", "post-request", "root", "deployContract") + out = w.Run("chain", "post-request", "root", "deployContract", "string", "foo", "string", "bar") reqID = findRequestIDInOutput(out) require.NotEmpty(t, reqID) out = w.Run("chain", "request", reqID) + found = false for _, line := range out { if strings.Contains(line, "Error: ") { @@ -200,6 +204,16 @@ func TestWaspCLIBlockLog(t *testing.T) { } } require.True(t, found) + + found = false + for _, line := range out { + if strings.Contains(line, "foo") { + found = true + require.Contains(t, line, hex.EncodeToString([]byte("bar"))) + break + } + } + require.True(t, found) } func TestWaspCLIBlobContract(t *testing.T) { diff --git a/tools/wasp-cli/chain/blocklog.go b/tools/wasp-cli/chain/blocklog.go index a0fd92d423..0b087bb211 100644 --- a/tools/wasp-cli/chain/blocklog.go +++ b/tools/wasp-cli/chain/blocklog.go @@ -6,6 +6,7 @@ import ( "time" "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/iscp/request" "github.com/iotaledger/wasp/packages/kv/codec" "github.com/iotaledger/wasp/packages/kv/collections" "github.com/iotaledger/wasp/packages/kv/dict" @@ -61,25 +62,59 @@ func logRequestsInBlock(index uint32) { }) log.Check(err) arr := collections.NewArray16ReadOnly(ret, blocklog.ParamRequestRecord) - header := []string{"request ID", "kind", "error"} - rows := make([][]string, arr.MustLen()) for i := uint16(0); i < arr.MustLen(); i++ { - req, err := blocklog.RequestReceiptFromBytes(arr.MustGetAt(i)) + receipt, err := blocklog.RequestReceiptFromBytes(arr.MustGetAt(i)) log.Check(err) + logReceipt(receipt, i) + } +} - kind := "on-ledger" - if req.Request.IsOffLedger() { - kind = "off-ledger" - } +func logReceipt(receipt *blocklog.RequestReceipt, index ...uint16) { + req := receipt.Request - rows[i] = []string{ - req.Request.ID().Base58(), - kind, - fmt.Sprintf("%q", req.Error), - } + feePrepaid := "no" + if req.IsFeePrepaid() { + feePrepaid = "yes" } - log.Printf("Total %d requests\n", arr.MustLen()) - log.PrintTable(header, rows) + + kind := "on-ledger" + if req.IsOffLedger() { + kind = "off-ledger" + } + + timestamp := "n/a" + if !req.IsOffLedger() { + timestamp = req.Timestamp().UTC().Format(time.RFC3339) + } + + // TODO: use req.Params() instead (buggy atm) + args := req.(request.SolidifiableRequest).Args() + var argsTree interface{} = "(empty)" + if len(args) > 0 { + argsTree = dict.Dict(args) + } + + errMsg := "(empty)" + if receipt.Error != "" { + errMsg = fmt.Sprintf("%q", receipt.Error) + } + + tree := []log.TreeItem{ + {K: "Kind", V: kind}, + {K: "Fee prepaid", V: feePrepaid}, + {K: "Sender", V: req.SenderAccount().String()}, + {K: "Contract Hname", V: req.Target().Contract.String()}, + {K: "Entry point", V: req.Target().EntryPoint.String()}, + {K: "Timestamp", V: timestamp}, + {K: "Arguments", V: argsTree}, + {K: "Error", V: errMsg}, + } + if len(index) > 0 { + log.Printf("Request #%d (%s):\n", index[0], req.ID().Base58()) + } else { + log.Printf("Request %s:\n", req.ID().Base58()) + } + log.PrintTree(tree, 2, 2) } func logEventsInBlock(index uint32) { @@ -108,10 +143,11 @@ func requestCmd() *cobra.Command { receipt, err := blocklog.RequestReceiptFromBytes(ret.MustGet(blocklog.ParamRequestRecord)) log.Check(err) - log.Printf("request included in block %d\n, %s\n", blockIndex, receipt.String()) - + log.Printf("Request found in block %d\n\n", blockIndex) + logReceipt(receipt) log.Printf("\n") logEventsInRequest(reqID) + log.Printf("\n") }, } } diff --git a/tools/wasp-cli/log/log.go b/tools/wasp-cli/log/log.go index 670e360eb5..51a64f1e08 100644 --- a/tools/wasp-cli/log/log.go +++ b/tools/wasp-cli/log/log.go @@ -1,11 +1,13 @@ package log import ( + "encoding/hex" "fmt" "os" "strings" "text/tabwriter" + "github.com/iotaledger/wasp/packages/kv/dict" "github.com/spf13/cobra" ) @@ -73,3 +75,41 @@ func makeSeparator(header []string) []string { } return ret } + +type TreeItem struct { + K string + V interface{} +} + +func PrintTree(node interface{}, tab, tabwidth int) { + indent := strings.Repeat(" ", tab) + switch node := node.(type) { + case []TreeItem: + for _, item := range node { + fmt.Printf("%s%s: ", indent, item.K) + if s, ok := item.V.(string); ok { + fmt.Printf("%s\n", s) + } else { + fmt.Print("\n") + PrintTree(item.V, tab+tabwidth, tabwidth) + } + } + case dict.Dict: + if len(node) == 0 { + fmt.Printf("%s(empty)", indent) + return + } + tree := make([]TreeItem, 0, len(node)) + for k, v := range node { + tree = append(tree, TreeItem{ + K: fmt.Sprintf("%q", string(k)), + V: fmt.Sprintf("0x%s", hex.EncodeToString(v)), + }) + } + PrintTree(tree, tab, tabwidth) + case string: + fmt.Printf("%s%s\n", indent, node) + default: + panic(fmt.Sprintf("no handler of value of type %T", node)) + } +} From 397cce5d4ae0bdb7174c3c9824d51ea1621dcf1d Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Thu, 11 Nov 2021 10:02:26 +0200 Subject: [PATCH 058/198] Fixes after merge --- packages/chain/chainimpl/chainimpl.go | 19 +++----- packages/chain/chainimpl/eventproc.go | 70 +++++++++++++-------------- packages/chain/chainimpl/interface.go | 16 +++--- packages/peering/lpp/lppPeer.go | 4 +- 4 files changed, 53 insertions(+), 56 deletions(-) diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index c4522f02de..b41ba6807d 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -36,7 +36,7 @@ import ( "golang.org/x/xerrors" ) -const maxMsgBuffer = 10000 +const maxMsgBuffer = 1000 var ( _ chain.Chain = &chainObj{} @@ -111,9 +111,6 @@ func NewChain( chainLog := log.Named(chainID.Base58()[:6] + ".") chainStateSync := coreutil.NewChainStateSync() - messagePriorityFun := func(msg interface{}) bool { - TODO - } ret := &chainObj{ mempool: mempool.New(state.NewOptimisticStateReader(db, chainStateSync), blobProvider, chainLog, chainMetrics), procset: processors.MustNew(processorConfig), @@ -141,13 +138,13 @@ func NewChain( peeringID: chainID.Array(), attachIDs: make([]interface{}, 0), chainMetrics: chainMetrics, - dismissChainMsgChannel: pipe.NewLimitPriorityInfinitePipe(messagePriorityFun, maxMsgBuffer), - stateMsgChannel: pipe.NewLimitPriorityInfinitePipe(messagePriorityFun, maxMsgBuffer), - offLedgerRequestPeerMsgChannel: pipe.NewLimitPriorityInfinitePipe(messagePriorityFun, maxMsgBuffer), - requestAckPeerMsgChannel: pipe.NewLimitPriorityInfinitePipe(messagePriorityFun, maxMsgBuffer), - missingRequestIDsPeerMsgChannel: pipe.NewLimitPriorityInfinitePipe(messagePriorityFun, maxMsgBuffer), - missingRequestPeerMsgChannel: pipe.NewLimitPriorityInfinitePipe(messagePriorityFun, maxMsgBuffer), - timerTickMsgChannel: pipe.NewLimitPriorityInfinitePipe(messagePriorityFun, maxMsgBuffer), + dismissChainMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), + stateMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), + offLedgerRequestPeerMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), + requestAckPeerMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), + missingRequestIDsPeerMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), + missingRequestPeerMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), + timerTickMsgPipe: pipe.NewLimitInfinitePipe(1), } ret.committee.Store(&committeeStruct{}) ret.eventChainTransition.Attach(events.NewClosure(ret.processChainTransition)) diff --git a/packages/chain/chainimpl/eventproc.go b/packages/chain/chainimpl/eventproc.go index e89d4b1cff..9c3577bf85 100644 --- a/packages/chain/chainimpl/eventproc.go +++ b/packages/chain/chainimpl/eventproc.go @@ -18,72 +18,72 @@ import ( ) func (c *chainObj) handleMessagesLoop() { - nDismissChainMsgChannel := c.dismissChainMsgChannel.Out() - nStateMsgChannel := c.stateMsgChannel.Out() - nOffLedgerRequestPeerMsgChannel := c.offLedgerRequestPeerMsgChannel.Out() - nRequestAckPeerMsgChannel := c.requestAckPeerMsgChannel.Out() - nMissingRequestIDsPeerMsgChannel := c.missingRequestIDsPeerMsgChannel.Out() - nMissingRequestPeerMsgChannel := c.missingRequestPeerMsgChannel.Out() - nTimerTickMsgChannel := c.timerTickMsgChannel.Out() + dismissChainMsgChannel := c.dismissChainMsgPipe.Out() + stateMsgChannel := c.stateMsgPipe.Out() + offLedgerRequestPeerMsgChannel := c.offLedgerRequestPeerMsgPipe.Out() + requestAckPeerMsgChannel := c.requestAckPeerMsgPipe.Out() + missingRequestIDsPeerMsgChannel := c.missingRequestIDsPeerMsgPipe.Out() + missingRequestPeerMsgChannel := c.missingRequestPeerMsgPipe.Out() + timerTickMsgChannel := c.timerTickMsgPipe.Out() for { select { - case msg, ok := <-nDismissChainMsgChannel: + case msg, ok := <-dismissChainMsgChannel: if ok { c.handleDismissChain(msg.(DismissChainMsg)) } else { - nDismissChainMsgChannel = nil + dismissChainMsgChannel = nil } - case msg, ok := <-nStateMsgChannel: + case msg, ok := <-stateMsgChannel: if ok { c.handleLedgerState(msg.(*messages.StateMsg)) } else { - nStateMsgChannel = nil + stateMsgChannel = nil } - case msg, ok := <-nOffLedgerRequestPeerMsgChannel: + case msg, ok := <-offLedgerRequestPeerMsgChannel: if ok { c.handleOffLedgerRequestPeerMsg(msg.(OffLedgerRequestMsg)) } else { - nOffLedgerRequestPeerMsgChannel = nil + offLedgerRequestPeerMsgChannel = nil } - case msg, ok := <-nRequestAckPeerMsgChannel: + case msg, ok := <-requestAckPeerMsgChannel: if ok { c.handleRequestAckPeerMsg(msg.(RequestAckMsg)) } else { - nRequestAckPeerMsgChannel = nil + requestAckPeerMsgChannel = nil } - case msg, ok := <-nMissingRequestIDsPeerMsgChannel: + case msg, ok := <-missingRequestIDsPeerMsgChannel: if ok { c.handleMissingRequestIDsPeerMsg(msg.(*peering.PeerMessage)) } else { - nMissingRequestIDsPeerMsgChannel = nil + missingRequestIDsPeerMsgChannel = nil } - case msg, ok := <-nMissingRequestPeerMsgChannel: + case msg, ok := <-missingRequestPeerMsgChannel: if ok { c.handleMissingRequestPeerMsg(msg.(*peering.PeerMessage)) } else { - nMissingRequestPeerMsgChannel = nil + missingRequestPeerMsgChannel = nil } - case msg, ok := <-nTimerTickMsgChannel: + case msg, ok := <-timerTickMsgChannel: if ok { c.handleTimerTick(msg.(messages.TimerTick)) } else { - nTimerTickMsgChannel = nil + timerTickMsgChannel = nil } } - if nDismissChainMsgChannel == nil && - nStateMsgChannel == nil && - nOffLedgerRequestPeerMsgChannel == nil && - nRequestAckPeerMsgChannel == nil && - nMissingRequestIDsPeerMsgChannel == nil && - nMissingRequestPeerMsgChannel == nil && - nTimerTickMsgChannel == nil { + if dismissChainMsgChannel == nil && + stateMsgChannel == nil && + offLedgerRequestPeerMsgChannel == nil && + requestAckPeerMsgChannel == nil && + missingRequestIDsPeerMsgChannel == nil && + missingRequestPeerMsgChannel == nil && + timerTickMsgChannel == nil { return } } } func (c *chainObj) EnqueueDismissChain(reason string) { - c.dismissChainMsgChannel.In() <- DismissChainMsg{Reason: reason} + c.dismissChainMsgPipe.In() <- DismissChainMsg{Reason: reason} } func (c *chainObj) handleDismissChain(msg DismissChainMsg) { @@ -91,7 +91,7 @@ func (c *chainObj) handleDismissChain(msg DismissChainMsg) { } func (c *chainObj) EnqueueLedgerState(chainOutput *ledgerstate.AliasOutput, timestamp time.Time) { - c.stateMsgChannel.In() <- &messages.StateMsg{ + c.stateMsgPipe.In() <- &messages.StateMsg{ ChainOutput: chainOutput, Timestamp: timestamp, } @@ -124,7 +124,7 @@ func (c *chainObj) handleLedgerState(msg *messages.StateMsg) { } func (c *chainObj) EnqueueOffLedgerRequestPeerMsg(req *request.OffLedger, senderNetID string) { - c.offLedgerRequestPeerMsgChannel.In() <- OffLedgerRequestMsg{ + c.offLedgerRequestPeerMsgPipe.In() <- OffLedgerRequestMsg{ Req: req, SenderNetID: senderNetID, } @@ -143,7 +143,7 @@ func (c *chainObj) handleOffLedgerRequestPeerMsg(msg OffLedgerRequestMsg) { } func (c *chainObj) enqueueRequestAckPeerMsg(requestID *iscp.RequestID, senderNetID string) { - c.requestAckPeerMsgChannel.In() <- RequestAckMsg{ + c.requestAckPeerMsgPipe.In() <- RequestAckMsg{ ReqID: requestID, SenderNetID: senderNetID, } @@ -154,7 +154,7 @@ func (c *chainObj) handleRequestAckPeerMsg(msg RequestAckMsg) { } func (c *chainObj) enqueueMissingRequestIDsPeerMsg(peerMsg *peering.PeerMessage) { - c.missingRequestIDsPeerMsgChannel.In() <- peerMsg + c.missingRequestIDsPeerMsgPipe.In() <- peerMsg } func (c *chainObj) handleMissingRequestIDsPeerMsg(peerMsg *peering.PeerMessage) { @@ -177,7 +177,7 @@ func (c *chainObj) handleMissingRequestIDsPeerMsg(peerMsg *peering.PeerMessage) } func (c *chainObj) enqueueMissingRequestPeerMsg(peerMsg *peering.PeerMessage) { - c.missingRequestPeerMsgChannel.In() <- peerMsg + c.missingRequestPeerMsgPipe.In() <- peerMsg } func (c *chainObj) handleMissingRequestPeerMsg(peerMsg *peering.PeerMessage) { @@ -195,7 +195,7 @@ func (c *chainObj) handleMissingRequestPeerMsg(peerMsg *peering.PeerMessage) { } func (c *chainObj) enqueueTimerTick(tick int) { - c.timerTickMsgChannel.In() <- messages.TimerTick(tick) + c.timerTickMsgPipe.In() <- messages.TimerTick(tick) } func (c *chainObj) handleTimerTick(msg messages.TimerTick) { diff --git a/packages/chain/chainimpl/interface.go b/packages/chain/chainimpl/interface.go index 085cdd4f80..c9488b8026 100644 --- a/packages/chain/chainimpl/interface.go +++ b/packages/chain/chainimpl/interface.go @@ -63,13 +63,13 @@ func (c *chainObj) Dismiss(reason string) { c.dismissOnce.Do(func() { c.dismissed.Store(true) - c.dismissChainMsgChannel.Close() - c.stateMsgChannel.Close() - c.offLedgerRequestPeerMsgChannel.Close() - c.requestAckPeerMsgChannel.Close() - c.missingRequestIDsPeerMsgChannel.Close() - c.missingRequestPeerMsgChannel.Close() - c.timerTickMsgChannel.Close() + c.dismissChainMsgPipe.Close() + c.stateMsgPipe.Close() + c.offLedgerRequestPeerMsgPipe.Close() + c.requestAckPeerMsgPipe.Close() + c.missingRequestIDsPeerMsgPipe.Close() + c.missingRequestPeerMsgPipe.Close() + c.timerTickMsgPipe.Close() c.mempool.Close() c.stateMgr.Close() @@ -100,7 +100,7 @@ func (c *chainObj) AttachToPeerMessages(fun func(recv *peering.RecvEvent)) { func (c *chainObj) StateCandidateToStateManager(virtualState state.VirtualStateAccess, outputID ledgerstate.OutputID) { c.stateMgr.EventStateCandidateMsg(virtualState, outputID) - } +} // ReceiveMessage accepts an incoming message asynchronously. /*func (c *chainObj) ReceiveMessage(msg interface{}) { diff --git a/packages/peering/lpp/lppPeer.go b/packages/peering/lpp/lppPeer.go index 0507bf6b8b..2a54b05ee2 100644 --- a/packages/peering/lpp/lppPeer.go +++ b/packages/peering/lpp/lppPeer.go @@ -138,7 +138,7 @@ func (p *peer) SendMsg(msg *peering.PeerMessage) { func (p *peer) RecvMsg(msg *peering.PeerMessage) { p.noteReceived() msg.SenderNetID = p.NetID() - p.recvCh.In() <- msg + p.recvPipe.In() <- msg } func (p *peer) sendLoop() { @@ -148,7 +148,7 @@ func (p *peer) sendLoop() { } func (p *peer) recvLoop() { - for msg := range p.recvCh.Out() { + for msg := range p.recvPipe.Out() { peerMsg, ok := msg.(*peering.PeerMessage) if ok { p.net.triggerRecvEvents(&peering.RecvEvent{ From 44a7678c789788d066fb659c79332e0e2001bffa Mon Sep 17 00:00:00 2001 From: lunfardo314 Date: Thu, 11 Nov 2021 10:59:35 +0200 Subject: [PATCH 059/198] replace architecture doc with whitepaper --- README.md | 3 +++ .../ISCP architecture description v3.pdf | Bin 888055 -> 0 bytes documentation/ISC_WP_Nov_10_2021.pdf | Bin 0 -> 679356 bytes .../docs/guide/core_concepts/consensus.md | 3 ++- .../guide/core_concepts/iscp-architecture.md | 6 +++--- 5 files changed, 8 insertions(+), 4 deletions(-) delete mode 100644 documentation/ISCP architecture description v3.pdf create mode 100644 documentation/ISC_WP_Nov_10_2021.pdf diff --git a/README.md b/README.md index cb3fcf6a78..3d52418289 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,9 @@ introduction](https://blog.iota.org/an-introduction-to-iota-smart-contracts-16ea6f247936) into ISCP. +The comprehensive overview of design decisions of _IOTA Smart Contracts_ can be found in the +[whitepaper](https://github.com/iotaledger/wasp/raw/master/documentation/ISC_WP_Nov_10_2021.pdf). + ## Documentation The documentation for Wasp and IOTA Smart Contracts can be found on the [IOTA Wiki](https://wiki.iota.org/wasp/overview). diff --git a/documentation/ISCP architecture description v3.pdf b/documentation/ISCP architecture description v3.pdf deleted file mode 100644 index 7dcf7330db50230103014acaa07f5dcdc4b456e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 888055 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

VYn%6?RxYfj=xw>;c1heiWx0uY^={d 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⁡K|^=s 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

*bw*bLj!-g@XcVL{p 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νo6eJ7}F6S{w7a|MgilMSM>?MBez{I5} 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

k33As^^0)y9MYvaHLNh$|a%Lm`~kS_a| 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 E0R0WvDgXcg diff --git a/documentation/ISC_WP_Nov_10_2021.pdf b/documentation/ISC_WP_Nov_10_2021.pdf new file mode 100644 index 0000000000000000000000000000000000000000..0393f9ef012572e89e30632f3a2bf59ec0529569 GIT binary patch literal 679356 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

Rum)C!e;wZD8KT!muL&QgZn_2Fkl=zMUN5iJFK zMM08GNp;&CYbFvEts`|l1^yTl8&wOosuRS64k~%CRe=*P#pug ztmQq8)~``QKzICdnhB7UdX|phsCW&cEJ-T6py26VzQA1pQzhfa_adeKsJ|Bc!&6x` zUMG-R`KcCn2*FTM(dTu32)NY$+LHrBS+IBsvcqn2ot(O(O4op8a^{** zMndY^8-WfjP!6eWHh+0_w)k#Zj4fmgFf)Z}V^&@yk}O|wWIP$zMSb9iabFw0$WGf3 z8zt~hxm>50G>V-hm@=#gxhbR_Gw4N(t!dKswAZ2Ws3xBpl2T&IBLU1FOzZh*%}Ml| z-0$*gml=CcA};nX>Lu${f z`f^}c2;Ro>2Y0Kvmy?!VLqUHfLG&c|gq!#3DS`A65QA=gTkY@D<7Zv*`+EmxSn zwaa6b?$7KV&OsNEG)h_6)@j+|(-Jgif)j#0`jCs5gMllWYW65U(5;$ShGb+Iu3l(N zA`_S^oS?t=G-x*ORz%{wkaT07neoq9uYR8O^o8Na$V9P9bE0N?qJ_!3A2~nTX%OG- z;BOg~cL2eh`TFSKQJYlxS2r}&y_#sh=_D`5NB%QcpWG3e?8=kQWGRJ{5b*dF;*Nxl};dv zgytDB$sd1gF5~19n@s3qI{~UNE0PxpTU%vIk_xMlSq^?R){g+^e&z9E4p@!NA!eqZFF9eByHLFlEEQtT0GqRsU&Wc1Sb$`v4ybrI2j4#+ z#|iH~dWnn0PgmnikbLRnL`Bc{E8bGwPjRpX(lRT}(#fqXM7(p0&-^vdk0bZCaE15P zKKwI{gUJ@uS@E#LjD10m7G(+>Nz>!0Ok1>v{@81gVxq9 z1SCd1O)IbO{C#ppG-z2X{OGj*!^Kd7rvyk)ftHnIZXX!N9#aP7T7k@2%qoz} z2`p%RIMV-GIM0_>q#sFWTcgE*5Y@3@HzQg6W@R`l@}@x1h9dQMw(Taw=E4i zSe`Ko?QxR7%K_}si7vm;NS4VD8X(s>WUi2k_=6N6XZVkibhja~kfR?7ARK;bfCyYo zUiOdGD1(*CYa9_;&8C4VvAv`> z9s;6S=7@VbLYwDYBeuYRne9${Tc4P`w)oeRtgF%zUFFwoRx$c32&L$5iLj;hh_@#0 z^p*Td2psIn{f@s<0i^?%Tw6`CO_>qYiqFg3KMr4~oQQPUiR`@Hi+ho>ay0{|Sq1Io z85%sE|7D=EdJ}rVL*QI1DPaDRPZp()NqDy9`ybF^av{_h!#UB!02RhOzk!eG zRJtuD`a{X?7L88c9i@AT!OxId$=k`Ox+dKbed7xg*8oWgKK~5uCf7H}mIBt)gGJ1! z?XfOXz7-%+_z4S-)?4JlrFDH_1%#Jp9lkCq503E{UzcwA6(eLV~e6sl@F@K zCBtRdwQJ*Fi=^?fD+b))ZbDH#$958Xl}uO6-_$JhS22BWPs`y@k%M2T9B`H?d-sIX z)~;SM-}RBH)7-0MlGH?=*g_%T7)_g)BTfP#US&KR$?@7SwpX5frMOm|_BanliExys z$yh0~?w1HyL2z5{W;KUg26-9l_b}vuzYW)t!KYih!umc6k32FAyo55BJ9RYGW&H%D zKIYybHACx4TRt9M&?9fNO-$?kb#k#mAsPOZ2a4>H;7QF-)zf^h&RlV(PeAkod(!MbtWW4z@k--3sN zABjs!OkX%)n~PATkmfWnccwZFXPQ0CQPz;08+;s_Ci-qwaU-2{*f|5|%$zBsQ27 z5OZn+w)5R6YrLyBd%PaSLz_txZ$`}h`6+I#<;KjwjnV!}`OhnYIo@Iux z33J91rHgX9RbgMQp+O%ssA3nTUV476&Dc;UH_!17k*ndIC?}A-)^4^T?>74MPy%GM zv@3ezQ4|3-s7$T%iW~iV$BNe#+hVQfZ76>!Nua5Ufk)qktE~4_$h+UBE20BM(6Th4 zFJ-VV;oHoX#Nj^L6SUL{9S*|m_7WW1C?VIy*q5PO42Yd_!eXXYl@*IFWS=0M)&HSjff4eV*uV=p zo;cTR;U=o?e-!|Q2_Up)ku%9?hDOacH@WU-eLAw^7^GM7bLPTybn!8#qL8Le%=fAk#;i;Seeum-OpDD zQ_82o{!_WStqSXYSlMu=?{dm`1I2KRuy(odtLKz*>O?Zw2As+EIL~D1T)kWlliP@( zR6pLB4ZnABL{`b*Y8_IesZDOZjX|gEg@iq@LhY4+@nA8W^tl6VJyTg0&)-cDYmtgU zj=u|pDfazUb4=TyszR~bzf)m@Bxvx+tdP3Y=L`M(J!7|oQZ$r*{GYp!L6q)&|r!Fr~mB>zVnrugbV5LqWpWG5AZlWRSePta!oV6TsP-t)| z_^oVWX}ek$p|5w4oYYA@?Pqhha+p8R>JJ(zY`@AiN_RkppWk^G`Cz&#d zw3wC~a6M0CaK85~Z=rLI^pj-WI6H|$jhu<4oEsuJACj-i6I$8-ZA4MneS;I{8n-8+41haLLMl5N>te(Xd6YSerB>6t~7Juhah8`geP%|H1QCd&uf zrth%S8Wv0tv+rUIJa zyPe+;B4=knPG7-1ci4IA4%tQ-);m-olSrq3sLgQ9kzYGf)=t#T3!dc5 zVxN9)@v-p2`Dv`^z)X6G%xHmqO53vPhV{4Vrj*FaT?vtqWHp$#bn5##^x!{x3T={+ z%HS+;V$4WsfJRa?u-iq5!wYIZE?uDGPQOPiZ~RLk%X+C@Q~s);;`!mmIU`5)=xF^z zX2ge+>BOqAXNINqA~Roa-T~hG0|cQ^`(FU-JIt2;+xZO6@-T5LRYTqJybTDksE18C zw}f2;?FV1l)7-k1`L67G6M|bS9LdM)QycV{Q|mPBAkPp!3rv-v*g&lfBWsr zl-x>0fz$%3SJY1FepT20vM&pq>)yO!F!*OiAmtfsF0aCpJ0le!*uqH6lj3z(EliBIHq#cq)S$4*Z@2Kz84JtQ<@n zRGEm1%-TtOA@C5PkDZVo&tkElEmKY1RjzQnIJ`f7uoxjK2HBnocu~#wNAM4l;p4VH zJ^S(OD;1xj!ZQ^P-JmFs3>8z z+%_-aXz~O41MF2h_dy&R%<29r*|6)#c5Sza6QM6?QzVns`P)>G8P0ZSO(RLU(C%uu z4rj)vdNPje&4W@!Nn9y0cz$?sC`KbD>6?%8;NXM)zPIQX^{j)@x}PrpAm4g-B}d3T z7s{y@^c?Y8V&Bk^ZA?ZoWpGmT4>BNi;s^V^*o9ArnH<_u#45G9F!99}^DfM(3b8=l zCPavG;Z5LY%FpMH-N=A%>bs>m*wg_@aMzbv(iKE>_vC1ufY~>EG(W^7zb%erSMiL3 zvbf)qPJbXN5d9q5lE8jk)?&AwjvSb5CX_qjyb@MBA5Y&E&HBVORVeemOTwlXiSc0( zZ0BahCa#R#&(E(E8$qa&@wUJ4qM^|Hy*3-1{+hMoZSXxxHJ*c3vcAF(NpmPY(Y?S-n0m|vCc6ebdpc7 zg=%T$A1#&YJ})n=RGqIbfC83khX!RNM^l22)bDLB%n$Gp=8RW*O>QmO5c2XE9%G|T z|5mY%22q=M7e@Q;Q>E65dv?J7+hpB(RZ9n_#ey|vJAUS9X*c&Vt!u$l>M7ic-*KmQ z>V*psnQ9^h;VqQ~*_(#JqKyo3Y_7k_g6)lkA^BQZe-vbXSLY5vu1fMqn0R*Ir`d_B z5hZ@sOJ8vnPS0#4q%}poow;{X{}hp=lXCWQTK;~HnJ^fBu|7fP4Ff-nheo( zFMcI(?A8b;p~YALGt$@eE#QxI-NT!A2J?h#BFsP1@N^fg>rXfCig(_bCaAbFfQanp zsV0)1rCqz82%l1ub%m~Tx*%^|XVU?l!GmI?HXIvf4l^7*> zoOyU8bNpQC07+aVrk(foCx#SqDM3w_VOc z=X+fqfKzOg<+L2qlhOj8S`w;>Qb{_|>eUJn4?s?lI&5cBNz@kaRH~th$4?+OFOyZT zgH&?GrR~+iJn8IoO7&?*D*5o^7oF%A^RvAozH%1IHzY2&XTNv^*(WO?-rB6>j+&>o zyO_m)Pdj^eW3$4dsg4O>q@9IP z$0cseX(fe%O~AW~{Uo0&H(Zp@e6v<_Qf3*2wVZce4gc-?vD#bM%bcGev3g|T39mLs zf$2$+ZaY1K(0_=GA@!_gm(n}R2q85d5%yeBSM+^hSNuj-%``#Dn&yxA{#UFvdJeV{8-=z92qj;v+)_&kZxa%bNBwgH_T_kZ-tTp zNN2(aK5nh`N4UU+A%W&B6^@K3F#z#DjQzitqe;H6{z}yHnZnqK1V`5wR%=%iWY4Jza4tjc zm^WQ_%dV>aT-!}QBcdj~v-MT6mX%pQA)rFl1*fuO**AzyL)cM-2yZge8e+rm9-E1> zTZ6O(ehQ*v3l9tG#{c8bgpTG12{o%?vn7&ASua=^)71)eeIbAjyWcad6Nt%C1f{B& zStLMWo+gbgW{u_&G~X#M8Z4+3dtQzd81Dq%p*G0cvIKBwNT60Z>)MNjcNLr@#JSs> zsB!;>lPXiRt2+IJBY^M#o2xrHJcndeRe<+s(6vO@Zn5o!bCWsNiu?X!o!F)*jtEJdRDRWTZn5(^f~(OxU#gAcF{@htZ=$)leqQ0I5X2T zc#2rCD9o!ny?vJ*pGtNzi&iP|V&#XZ5O!=~`}EVo2W>p&uU74!hkvRK6-cgE^bP%n zDfa=n$wYE#!nh3CZ*g97EeN937GJ1eUcyIIvT4m(x39LU%JsG{Y%tAKEy^Pa<#fxN_N@Gn_ zoked9Vq!o37Pe`&yM{fy{2a;R5RN|{0qaZtdPz_5Uop59pbWJ)QejMJ5@>`qhw~gx zhI=rWE@WCnCXXJ#;FD8TGV36W78%aGAn>~q<+jGbGTG;>?+UpYT26B$O%Id$+H3eY z@cq>x))Nz(^(Lr3ZM5BD8_WSY!P#1dh>Q&c1i2`1)I5PuT@eGTzp1+xKSy-yYcI z?rWm=G|HC}dQv!@-h}-Uar&e-HPQlN1Z^=kk^pjjA0pltG*V_|VRewdO4u#Id>%Fmk$FmEZMaO>lq6|g~Kk7E97*FV3E!u@GfW>qLN4T+x* z51+qxMDf=X<`Z#hvj8o7wEUzoj>@-WRr|8!l-OK-t+o2>Vk6m9odrcCnPwj`m1Rpg zVOvAdk}2%7b0auXwwuE&9?@}J%;H=+X5*|QQ|%38fLK=>={F%$Nx$FiN4~-fe6ggG zhsSGayx!N6jF&x5^X&ox9J1AtH@8tI4o?bv{g;|NNz83&Au0e()%SdB%MfDDT>8)^Rh?ODD5$YPbznQIQCF}Ci1rFKhEAS_G(}4mC zJ)?2yj3S&Pw9TvfBVDC~6!k@DMy3 z3wwXx$v#^N2vxojm&IBVCTR8guCRG>ORSU=4ljaykNKrFvwupN1lHzfxM z`cmU4LydgZt^5rHNa_O@C!ERR zuMa)cVyWJ@6R3pJ-evq0c-zid-x}>7bgDNgqIfqj^27WWT>91JFE}`PZAuM3|K#vk zd`^>kQ{<7HvML!Jig41+QXqk!;!~VxQ?Jb^g2$+=Q0k86b?Ku{rhvn5AZpGi(QQAz zP3QFsLjMkD@OPOefLp(S8A_3&ADG-v)r`h0H( z?g+THqcqvjEXyc>;KD@4epUA)S&{KZv}FFfp$-R)c0^$pU92_pG5YHPqW#D6{rSPq z5M>QEG%&%vpPZlap31KW_i0?{yE#7)Q!$sBGQXC^r6~+Bx36m&ALI@V{r09R->Efh z=l((UKtlLTuPA%gKVd>0pBm zwz00{SuYB}CCgII4BcUZBMoI$>t9x7QrtIDx5Zb?8N?pnS{u5i`*mJkczyBB&(d7) z5KfT&Kn|Dwn5Pp`ozepi>(Sa*@K*x!Bwr$XmHT4eW|y(b*StL;+wi`mSPayV%p zo$#Q~@_n{4>s!E3w_H#BH8^Mft}ki$UK6ukO^cOfB(#s|t1+%DrQg;ow{}aa?#0$! z>V;c{U4NLx_bDZ)IVD3e%jbE9bwu=9o0=4+n>i-7sFJ%6i#x_C1^W&B^)*4|&2o9h zuVkE$BOr2PWxo0^&! zcft-W`r^Rv5S;a-htL4{jkf1+XjHxe4YEOW7P|8kga#i ze@Y?2g%24lV<%Xg<8M7>}+lmaZ?LVWy|`LjeL>Hg>`PyjJ)Z)!6} zf8^|V9h|mcYP~;`m84-RXtcd@#zlk*{Rm;_nl$!-H@4I*%iG=+fwfOn2x6?1z&^*& z_~5JKS2%ue)!hu(?h2YDj(82Fv=-b_mpq@HXU+Hy$ywvRN}2Hy5Cv`rF|K-OYkONQBl<-2P0uP~cvbcO;T(M8c1f^;l@ZZMKQ5>!f zz#?k4=!RAcKj1&rwaNE^3%IQe=o%p&8Pp_^(QQ7bK~rf^ zM9^xVh4>{|N243R0+Z1er^}`_I7-D`NO>2UW1NSF)=8S!nwIXu0xQEzYcr)EB$lN< zc~Q7VnIF>8yuOvq>$b)SCvQ=4d<6p+48K@Dhq!dQqIQ^T;#8Lz^KtOp1fiBvwy7&5 z0FV`jC%BHlXDo~@BoqDBK}ccWAzMz342v1V-wtL)E7l)3XffwwKV8!e zE>jeZ$=p$N!&pq*fU_*5V3ez_0UBA3qu+&3Vnr(=SbVbYhCK=J5+vFYzxK9YbzTYu ziGkD`_E#_8%qD97P_-DY>{U>dGXLaSWgD=wP0hu{_+Fk;mv#Sns!<&tDxlH zUo8n&B@GNLy|~VDVp0EXBVs#@MFT=5jm?(_=2}2pAbAVRTmQifAL^4~;u1SY97X|2 zVR1nfq6+M|Ox_|;B=a%5#c_x59-J$=R|+yf)1E8wXg{{ z%9L*j-EG!u-u|@on``Mbhc9pii}e|LD9{r>N|_)Axe}eZ5QM+CF#rZxRd<&w^OCoo z&OVE-$m4PnceK5g_0}k%+7zM|TLo3BaU-x4PERG^F#-*%(UTBYVfDrYw+d^V(KvRI zvzYs>(&60JiWId!?RQr{ib$rbaM?NY-t3lA|Bn5W-#sSTw+l_IY4}@1n=4l< zyJJsXNg2u?s4Lv`XNohF4WK%lk*n)ci_IoZ6XzdA+{C%+pIU&4{_0E9cjtAg1>i{n zVay#F`CLa1PuO7nhud;BUqX-H_IBo8OW!c+=<5W6#2n}c7^iQU*MTyC1r^N)!r$~4 zP`*O})+LqDiba&?2%M?^JYIdF!N^w{?dfbK4V4p*+So_aJS5)Bd(QXGswd|-|I5hi z?8m|IS8%QA1_$`tg~JA6|K^hfU6Paol?wGeZ|?96Zb^DzrvT7aL7b09Zu~cHUE~n^ zv`FTwJi?;Htwr$1Z_o&;MylQSJhRdzsN7OOOAXtL*~*d-ma&- zx%(o9x2}7XerK^~B6vP}VhhpmS5x3)u&B9uNDR>1>b$Tsq*gX0&jPS+_ zzN@+&rlwprg^%NBU{L+zuOBOFyV8=Jlu)eI$7|P%liPi+Vgq@7_6a_Tpz;V8X|1P4 zm~Xw-YO2(7yiOe1gOhg6H)lanUAypENs06?Brh2%el{{!r8adh1KH6#vzh>O{*8 z6~x)fgQMYv^+|@jv2y7%t7QJ@4Yu~Xu8%%t&H8Ocy4uHx^{v%^9K9N1o>RCt{rYc5 zYU^XLPb#pEMDj|h9NjOHZ~NJ>4Y!D<&)+EcHM-1LnR|B_0lu86)rQNf-HYvFyS%)62U2U2oh6P+QBz`-D3B zo@CoCRP*#eP2f!vPvmfe2h?TcX7TO&v*e;cbR&@HEsA6$x^ai9B&Mhv7q|ejQx8YK zD%|Dr!|+Ml=+|TE<8AUwq1-llreRLB_!)7o%ZKOb|Y9>Qz! zgboAFx5hxceH-*2oApeo9m^i zYh`3M-3j*ZjI1=F_eZj@w+;g;gX@izXbCH}(vS>mPc5_yf*hjQVq{@QL!erbzC$Pr zP<8^{V*&N{8es`r zaZ;L&ZJYnkf}S!_^0z03a!Bv)3&X%*(AEzVAC3iMB5gJH7bF>1BNoLYPGa)nAw6o} z(tgKL#AJ4VuovI?lGtY~IFYT+VDoB38_+^^jLcXV@=j*8K}Y9EKD7b(zD3n4eR%Tf z5GMCg)?t$1R;jXPpO2KAmlg{>`o&TF`qSZzBw!!2iJ&$jcc}vpxiR>$*2QoKu=CWVHi*3%Q7q zCSFIr;E*U}X3RUfzWsbo&Het7?Ba-#~0U~n!C)oFbsY6;8$T(95`Ew6) zN1?9+Ob=f{iNIA^j?u+_PGLK66u+Nu&-U!Kt-Y;9pJp;x6QXMyJijy@CSUeC5ONty21fJv=l-loZQg;Wmgo>=f^sIt^zliMm z*=3pd2PPtNZLoz8X?0|$?6+I43^nuItM>n`{9>GGI^ zNu!Ta;H`7aE5mw^RSr1F7nd7!x}j^Nh3{ll9t2%npd%pKClH^PCl~Ya1G|jHKMnj& z4>@OeL4|4kZ3S-1|BxP_A0S`eKk3!M6T*Et!rR}p{buY%{A_PH4?i7ss8Yx%-o>$M zWsj2iV3TdGg4AXhR1hHxaKFLkS(roAUKqv_vj2d75P#;ccqW(ZoAu6hc(zfqOfdZr z_6KnbE%tCLI=L}BBIs8+<-h2fr9~6(5Y%PlE8y!W(uT+f0%ClyQdav{dkv##{cy+V z`v!+Q4sfNS3B>L)s@Sh%{X9?_Bjv5$g1h49*R;81GU3NMhbwOMK9h#hqR5dW677(|vR#nRS*N<6cC&-w#YL~W zZ`Za8WIwhSgQhS@E}jR-Vv8<*znD$ty}X?;Cx^sq;48ClyB_q2wIEa;>c7tY|@{NtML;0K}Rib_#zc43rNW zxM z>VpGBEvU_Kb+t->;Jy!Dwp-b|2K6xJ@@;VT!ME+%%`CmKa*XHTbrZHDw8>iktoTCw z33UqsC;4gw5GV=SCP@m>q*tHusEIyzHR!X-ToGALR9!O(J{EY-H@vRb-=B79ap}!^ zAHEX3$2*dC1B0dOI}CF9)YyW7+-}Urq8bl;uzRJFvaw_MZ14GEWB@+Wq-+J$rlEq# zX z>kEy2w7$&EZiGwHbqk~MD}!Ds;N_l6Ue#kzxW$BLCjtq^cYv#cHP0E+Y^Gt4v&iI`jl6m7#wsrtil`ata-sp=(dId$TEYv4P=kb^b!7%}1IpeR}to*@X zO?*KWUTagk`(RU&Tyv#B;bo8?OS1*GAEJH! zg~0&cRf;<9LaBh=;h+J!F1B8Kc#au31)aA#yno|+%($-JmihvZjkSJN9XMiDBzJxT z4jNCE=u!;X#~@M%vQ+$ha26ei#AQzsycW&i z#R)(%$^~{j7WOZ^S?m__amfD+6r?92=x){ne~7x~Y{Ny7!mZOL;;=O{C6M1-gbE$D z)c}+o7~y?}G`7U<(pLJMC^*QRhjcj8_~4EV_$tkJ`d@&2RlqMChIUkaCYUFdP&+1I zzt4~(^^Ox!s*TW-^NmW}%nTzuj<9?@5u=l=1|cf+VOmFLKkY6<>g3TsJ1M|{}Y=l(0=c5_S!AKw35R|`72@26bRW;aO>xly0A z@mkyEB1SL}822V{B4P_~+rj5VjXviaX)H>83)bGAUoH>{i&M6`3G_$a){**y**R&m zoQUHVo~2u$oe4FYm=Nv9L-?|9QxTASfkRw8HFby06(Gk_ES%+;C}hjF>W>ZL?*(5W z#UTZIXcFKAV0TJwJAPBB4xC5?pkG}hCuORO%3G(y!4yZ!R{sa?=aOFpkaUDxTT*q8 zCYyt5_JwQnMG`OWte#;q#ereidI{C?8PbLrgK&M}Lizdo0lO;_18Wfgo#*f+;2g)U z3cpA&51CrjM46IjSBQ3|in*mUo<92Pzuxx@V68YV9OBXN*jIpMi?%VQ9>3nhd{=fu zGWxuan1_AwUnJ7yg=P9I-6Fs00RoKqO3PuuFcdn*W?<()M@QW!AAT^`bD%Ya{6Qk+Nr=npZ!jm0GAbSy( z-Z^Vv>;Y=y%gJH49+e6T8{cw@3ef+dp2Z)!qUA9d;ge=#N5ikxu}|1l%38K;1~ zLT5%0eVYZNMx_fluqy(PD1f9O6wfZ%7c3m2m&33N_yi-W9P3Ai-TFqa=WZ=>PISlV+D+l3)_tYkbuPz!8 zyp7zimH?GEF?)3ZS=H;z$N65yJfJK!0HDnL5Jc8!T!j;b8}s6OqJ80dtP818`iA$5o+$cIU{b} zm&aaCq6gn^fKD};c)-^mVk#!*n=;htFqrR8-oMI;e(>Mcc{K7Rt9>JM5<{ldWo0syW?|yy$h#bB+mDcdRgAzUDpoSL`!QqNUtXO)VlR86 zRekYA2Pm~_*m}otYzRsrN?!F6rZcf%K5^V!G7R$h0LYZ9L`iE>N`>PTb?^PSBLKU{ zRnveDEeUzM@Jqa$q8dMmNmzg)|bwd%hd6`qJE{B0jI@Gg%&`BhFG{%qz_9J&;zCtD9LY3aZBsx#(il$cHD5V$|Gv_&+mp> zRXReI%B!rttpQtLiD$~D9NDj3&Rkoqv@k{v43|KbHJq;5n^u$4cliehW^MiulJlm; z7xhwdznf)}uRht6%Qz`BeHI|TG5z}=WK7<6?aagfW=LQkN&eJ+jvMY?oelYE>w$tc zoc#E_z;vqSt^erX{6P4Ba=S$Q{8LJB-&l?(62u7?P>(~7^F~ytP9987Y4cslE9oi) za9p=KfWQDF@~zyF=p;u`P&wb0{q$Xi(edbp>x}zo()3>-O0E0g;QK=FZk^iAEOMU? zQmt5e8RrtECs7oJLqh)&(v%HDYO9wxGLJZaQXCo7(2d|kuFHE)ca3eSSJl|#oXGOE zr81oxiu9(}uA>=(n4Gq(V;O-6Y4%IhQ$oQWbk<9J-hpIiCAjf#xRs~j-_Yy-J+or{Ph!Jx$l?Wp;{WFQGC&LpD}W?LI*tqX2i@YIk_Wn87SH zYlN=IKQOF(#}@)~sH44`a{PQgV=-0E@F9vuk=q{>v-&nSp{#f}fcz2WG1Eh1t#|~o zV@x5lPGvUj2o5o^D*6T)0JdmaIi*=u#?o%H+zf$)W*?q{<=?T#;>sAG2N~bplB*Dz zP$$ZZ*f>V(bJ`2q4(QVU?x~-4E7K!A5dX7b&)&H9*$G%iSJT=?qkYYaXPa-qJQKa!iCp*J*8U_zH zbyMZ)?cx1CpGS=##ry2(&>OXqRa~*2&&g8g|NHDCprfkeGWpZ{4iqsvVGJVZt{T+% z)8G$g#r4h1gceHG_Okgg$2y(Blb2?K4U)AX6fxI^&puZ%>@^wtHea)BMUX9~VuU_U zsFy<~4efWFZ-UDwf;V;3K$5Mm)H}0|G!?%1bjK1K33vz;q{ytV`-HeM^n4ylAek`0 zinM<}h7vICp)+EDet1N?@E`BaLy<*c7jVzHzIq? zpF57d^bK!g7N7b9`>)7oNT|k%@o|kOyB_lOy#UWC5WS_hr|rL_H|S!+)2A;4qQNRQ zD_Rx8i<+@uBPd)Ty;j4?LEKM2W&t#vmy3H6OX0otRo3fZCN2(GBhkX&_)gLA?8hR? zYJf#!hI(Mf-YcyXaCj4m=oyA1FCv>W5hO@}3yalsM(jfcCv3Hh(e4`%3YS-Yynl+G z!Z#p~yW}4}vW+j9ZmQ^LrZKI)qWy>`PN&-v+>m<|FSxBebCA-znI&AcgE`~};_$oL zCNS~MH`uB+GL&e)8}~e#S6BYQ@(&=Z3msx8aMbvf@d2@dovom+!4F@?QyRyl+_O4@(;e~1oN`n z;r5KUu$uKZg)??AI*(Q&A?T`A+2EW>VDX4Ee+rS&?{Hj`BC)Q<<;rr!Gd5*Hoj#}D z-<_Ba2>l<2M1!YM_B3AQ$VI0^WHVqiZYuJgrx%9IX{FIyzz`;On;?hxBm#T|0m<9XeM+VS(u zEW3wYxOhQ7Z|q`E{7y9e6lP^Sa$s+2V8--9WLf}tFUm&)Y>h!KpJm`!r{qqZ_ISP< zdzl~~#cGWJz6#M_4N3 zMg&s;27t$mm9_9ZdWw<6n6~y12ww^;v_c1HT`Oh;;Q)KxWFlATVNLzSA;U)2}DX2oWCXVvhZKjXVZ3#rC> zV>S`2rMGpFm@|o4gu{3w*y-Z%n(o~?6`izv{c*(JY4lZKN%rUENFWLqAdhT^!*vXM zI~H&QJHHcURkm=Ta{wWPzknG&TMc{AG>IuT){q)Df;T9;H!LK55Ze{egY7dJ*ZX0G zZ^x@9*cT(~Ok#l8RJCiDdi|lH&Jau6j`sWE=)MOhEc#4>$LO2u;FonU%u*3#R)*|o zMXP3!Qu}Me$?Z8K)pOpR);H2>WCg2&+HtzY(!a{%clW1n7Nw|Ej`bm0{zj@Q3|P2r z;nt1HKN#^2z5fD%OP}tIK*04H4x;rwu>x+fYe4Uu9N)Xxf`Fy7u-a#ENhPNoId6h( z@1yN5sq2mSz2HmJUNpV*7&W+l?#)H0?UhSV1yF;-Yt`Q0A;i-bm18R@=7MXzf&Me> z%Z^-1p{l>p4^3~MN$DR-Rt3)LB?}(fAX0;TQwzm*)ca%+%6mh9(L%1X`WiEh0Acy> ztzsZvAkue|H(7YirdQ-@px0xXGzDL9G#93IJh+ZNxy}E9rsm}S`jtDM-~Ddz=Q<4` z+Gd>!XCoguGnV@Y8xy{5pzQ4lID;MJ54xP*g1c9g7(OdW^5{-Q?fpsE3iIhenVv89&~ioaTuFLQDUmbpCs{3c}LZ zv>lJ9`ps-Ao%DM<O9NPL(wA1H5E_|e zaQs!Jn5M<%Ndb$SCSrA;c1N*rVf_006)P4uo$%r3zjjI~h*@q2D8|}te4+gbT8`tD zyi=G74rE)~7nylb4@mc`9)MK_)w(L=A{c$m;*fkrg;)mFD}9Vsb(}>=m3ls}xmjE6 z@fkv)k)=$_CkN;=^=UnCHkTlQ?}LPp_0FK_CU!PyK==6z#k#ccTrx+bju7Uxjw8^G zYgFg=eUcJI%>sVp4W*AIhe9H=E?F)gfSLLw!lZMi=Ur(!Z`CeibF69T(}xS1Ce)Bx zF^WE-imK1=K}o|1-zR?`lWRt7-t+SIS*!c%=aAYve;f^b#WG`;>--_mlkKmJUZ7OL z#prBMs>8khjL{i{&qkTYGa9N(a}OGnL#tY|PKj$vGI3r97OtP?>0&+*lGM}0m(Bf_ z&NkMNQ!3UwV(|T=`V_kKPqo%!`fg1=5E+pPvD_{Wn8Ii1#mP;Cv7#u_1OdUWr}YXaHFhNvA{&@sVGqL|MFy48Z2V?ju3wj z0>Uy!X8o%B&ZM~{9h{urc|cf6_*tEd9abuOaZi}xS;v1! ztqD??@L0a(bCemI#QpuGPr@=?r-jY;XQ;Npj$h5@=t27*A{NrD)FMTm*~V?1kwLQn z;HMPUX!p&)?7Uh)R^;JMN}b;()gGF5cmlz%fpl3g(1@w=4pRM6^z^oVt*{`qv1<`}WYftGypSb@6PXoTXb3J@UHlj==z-YJD5k zqn@QKahrfj$i=Lp6y}JWJqiO19adpEvEz#Z-)X3EF{$Y1(t|;k&BV6v3*Ntc;&5%+ z->2qvt9nbSK9O7N6vc|1?!dDtJ;wxjk@7wEWD=?x3YK1Ahrc5#qdi&B*7`SbPwW9v zF(XGXW|&Y$)I>-ikYDWzHO6&&TYU4gFcam5}RJ;J`A z`4!DDM!vRtB|aD7Qg$;Ual3WF6D$M94vRdDXdfZB)UP#teXeuS)rmlJ+1yY>t&V|~ zt>Im}DI;JKA7uNGxu?j0W7+2KCVS6rQ{!KpD$ncW5|4C5#O4yp_wuyM?Qb|vbyR7-eM!rFm}50K(Hb-! zvz54+((-*4-p1)3Y#u`K%hjmc2+0ZkEsCYm9$HE1ol|*YnaKS*jaxIB&Tj41P-ukD zMAD$ihteEXIe5|HZDH**yO>2y3 zHot^AXT;)rWUhBYx8`u;%eq$n6pl~5=8O+Hymp%@d5lZPQPci!K9IJ*6Wc!@PK@!- zWM9?w$@*e%d{)3WpEh2$=!rk|{|=7oL_2k-PKE2Je+ zI#0vM<9)?~LEVurBKAuV#I|cN_Ek^d@W4a)$o#E4~V?(P?h&-Dw5-hH0!j zKKH7%yCZ^?(qghgznHo%!V}iszdot0Qur3_>96 zSZWWKq%-O}yM&HU9RU|w=fxw)$Tydv7!w7WC6FWxmt~w;uHH6Dr%SzxHt+=J>)IZO z0HJvoS_OL{a9NG^QG=e*Mx)+0X%H%`We zL^w&xZcGw*gzAM-3=&s;uk2Q_%G@@`eUGl?x>25j2FOjMB(#+f4 zh%O|q%6mdO1+jG~g@5F8vD}H8=&A5N;d&9m+>M&d!^%{h?}yl>Dde9>)i&TKZM~;@ zP@GIFFq8~VLwbb0-e4tDcN$&80~FCedzpvK7dkY32LgZ5*^NL zwELYqJSpw-Se1?93*K|H{RTeLJ8s&m4q`$cao^WpAbd3)9A;fG87gT>J&^;t(tWV{ z{LT$`*NZ}yBVIpJv~=N@+kQz)`L`YUgiiK>q9Z#sd6Q#k!AFYcBLn!OykMmLuTo3* z{Um{(Ng278hBkbVqjbLVeI4EN5rYKl^XS`t*xbfY-{T9?eY#cW@J2(Sw8kt&W*9SC zQC_hRzV*htJ_^}};bdBfSu(0CN}G7kJ*3XdNNuOFtXX=~NI=`5LOxlGw?L4&dZo3OUDMS;XkTPV;%y2`kEV;_yw$WO+%O_$X>mv0b#Evy?mJeL>3LSlLSrSQxY53` zfqg<;$Pez9-+c;y2aVBpaK~V^aK*W4X7+k_9rEgvdXkTI!ZSCD6wn1`HpPS8c*#ITVFzH6?*rbu}|QysJSW*}6)fS!M>&$+I`jnxFl z>QGnhRn_RH)c$9zekNTiO!DZ?i~IhtU)unT6}7K_TWZ5cpMHx+^j#CmpnOyUH9V8h zHV8M6d3`9Gl-lg_W80KPSYQ5o#k}5#ybjDG{1^)}1KZC0_qb;Dc&8UzqhulhYFP$vz!o zF}{FlU*xhJdp+8e|1&=#o{-CI|9-5f{e8m!6eQ*8e+u%S{QedMC_%qB4ME4ZfATdc zy3AKM9&tpr!_Kk}-h&o@e1M=42$Jq|*M{luR4jj(FcK17=;r;X3_OhyB<;Aa;YIZe zN7|bQmOjN8`B@eo+I^A9@+GK4USpRlLw^UO5Ve)&d7AtU`dFYQTzDXm-@C5Ot`${U zaa;_-Mz4;TDjFN@bREevXn=&;OK2m-oczW**CcCY6He>Z{$tvb?`H^_kjw1k(?EGU zzssU>xzv-_w^(giiECf_k!P^&ix`|9ls(o8LjBfBvd-YkqOBkvNl!g&=s_NCkRnf7U|l{lY&pznIpmW?^C z@(VqljW~E=_{#d+-3}7Rh^=1d#I0E_^|JFHgYo6dY3F6j`dE6qr*12BEkS?!AI6Vg z*j>c((HNhRquw$gt88%zf7B;5ui`u1EvtKv9S$P3?C{g>AGf`Vt-~9?BWV1UvhD|L z5u88#s`}jKj37m$Bz^PC>-ugHWuApp^csPzZ`*#^phvy~c<{SrJl&B`)8n>%EqaLH z6E|1i18W8~pgTMc+8^#)fNE3ZE%DAJJcUg-|9o#vo>y4Pe2<_Lp_W!*@m5N*)Gphn z;{Fu^3Hm&q*)QIIRQqjN*|i&S*Zeim-NWvVEJ7CgbOaVd-x9Z`q|LdQCl$#EoHr!I z{XAb0K4X?~FTLU~ zZb#lA@D}t-Td@NfeNt>cW1UWTGV8SDSqL=jX@Wchk+v* zpS0jqz62J75-A9|M_)od3&$cPg?z@pBW@;!F>ctU6=g|>i>a9<1al$089c^V$mt}v-sc*aI|KJ-q zC}J7yJTxpX3wDRquqgT*n(T{=@7k{*$)gpx@Aq9$`lEq5r&Z`JGIje3SS?4l44O4FoC=5nWa zU6=ZE`L4)oE9x$H5W$$9!I*lZq(_cUa`=+B_g&wR*7aAwm?9#>o^e75Uvu49{@RI& zj95ayXR1rC7~p|`_m|MdaxM(I_`s9$23W{;mwtyH)+fz5fQ}#;=za(9)B4RNnH>&9 zUM)ji?!51FO;hO0C@@d=efP<*Z@Akr8Ifxbj-P^A@9+@G(smqZwas|xqzQ1}FhQHM zY}sAak#pwsZ(wM8*slpgvO6zA_TwRTtUwP~eV?X~s%UbcMeP@2bB0y7{xt;;c~u$f zTQ5FHjP-y?riobyW4bg6bXTsI9{45M^1a0?PdCDCUh?hJ$wKcofYuE`TpN4uAKUrj zdmoP}67qceHMRp+(HzZvAxd2|OQyyYyc#bF$FTkJUh?8QP$uLF|8)SD3^;`l#;9IPG z2!h~c-r!@gS(le=%)me0R%}ImLP!0*z}I}DWRIN{I}RGw(##CYo8JGlqwjsRx;-#2@d7%(a9#F zW!=)dXE{^}W74RGo16vlLTsvph5_wr=5LO=QI70Fz$wE3GIcj!o9Dwh$PE`o;I%9i zWrgH5#6B~^A{{5@skjM>p8wLcXzkiu(1i|E^-HjNHQB+{M+|!p!dSo5LGxa?!_ZkJv81NK3N`DnM;rEu4W* zTQgUSXBKZA%q`diUs>2&xxQn2EG!|$1_F`)oBVxB5Tj9K){|WyKN1Iup`f<*Cyv^z zMVLY3at&=GK5c7U6Xy)2K9PjHeX`%|?SWfLAGHe0SlSQH(dL6LG0(xX7Ty=t4siE&`BQHW!kkR2Z8Xc2?DoDT0tcTLF(C?g^M*Z-0YUjh#DvPB-^mxdmWy^uE8(tZ!Z~7zD?dU zWv&Un_$)nwWcMSLicrC%*lOvti!!I9(p8n=@9v~62G9z=Ypmbpf4y>bYI3x{C2nc? z*#&vr)D#)x=|R^~#~t#|_urXqcvlVLpSJHvl5d2(1(7s`gn?wpHKq?>rdPPt`$#gh z>I$Sn&o79v-FItjBy08sT&0SnWZwtJ_tuuW zjB=ZDw8n4^K%j3N%)eREdmRYy5WHDAoF^QwObuA~)PYz(@4PL0&&m~{YhY$G!MYSzrnM7}Y zOwH7~rAeShGDAs{M@{s#YC#v5n8k%+J!EF5?=r3KUt4+&W}% zJjK%2xg$FGw3$=_0?8=CKezOLsbamVPF=D}v}r;7=$l|W-@P+&eT`QGBwwdlBWX@8 zQ%Zky4~^>*y*D;e-ir`EeKTj{eg)2P6meYDeX#sqQ^J-fA!0R)c`eGC(>{OGK?QGRC|ilA|BtVmal2w~RAX0~4ur7CWF zITtYT4P0MqOl$F)woIFjii&lG!pC$C_neiWyD~Z3-a6u#(i^H%%u^sL*DTfrVY)qW zy>_@(pG>a`Ow*UrPqpe^XPGL-cP;bzm)(rp?K5^dj1sQkD@}PN#*goEA=ZI?67EHD zclGR&hPHO}4c3xF*L*(G1l{_xwI|~Il?J?HmX*62)n9NDpT4J~`IIKe|4XGDc2#gk z*E;5kBF5cB!YOBzFJSKU&bT77$$ zFNyhRmp`?b1OKJf%=v4i@fphDi3$WyQnRc@ex&-j+!D?iJ+h<7r{5EPF+U;VqIari z%TRhNk7=qB-?7V6p;NN>Vn z!Uq?4Jbr6ytF5iAuC5M+LQPIio}ZuZ@9+2a_GV^gCMG7%&(CAA*wxk5 zq_eX#CMJfCj?Tr!<>SYXW@ctQJUr6U(rpjLi@6_vxO-ppI+f1NTTOgVu6x%|`PTA= zwJ-$KJ&A7rST|*c9FkA!V*At>*FKM0-Cx^3(a7v~E*(P-t~5+-flTY7#0z0?#G2eWbVNl8g@aBwg(GXDJeQ&v`XcXu~6HI;^jhL)DLv9Zz7(NRT3 zMNLhOmzVe3w{K2PPPw_cpFVw(lam`68DV2%v$V8KPEJN5ky%+;#l^*+KYtb!6jWAL zj*5yB<|YdGzqAwK|D&DA+1op~y096r35kjThc(!Y*aYPr>|HJFfusK(5>&A;hnhWg zcn@6m2>2D15ET#-d%`9z@>oDz;xdJrnKO`pP56oE-+KsZShzU2Ilr}V0d6b)&mk?C zBcMR2nORv}w!Qyo9G7|izi1pnPacW?k2afgdpu(4$+k~J=1e=~D~Y(B?n#yx?hIX2 zC1^?_^J6)?g4!_mae7uX+WUO}P5y*l)!Ln@AhbZT*=Fsur7K&f+<=)nqrVo8P>pS?1ARYlxg* z@PG97X@Ubxe=SURqFD$@_Nkewzfr2)Y3+RN+0ZIm2)w<2`W$lsFX@{zrDEQu5AgHD zZ0}NZolcJHPzuj=6Zty0`uRT~VGQ8_J-XYWc;$M8*$NpVW#FXPy@_&ebimy-4@y$v z)+dY06L~tdNc%C5cXw&EV&nFnDaG)(aOAsM<i_O}uq=%*Qe?pd&vkW}*joL*^THz|1eJs9h68KjL7zLYdQl{E@ z{t^6>eWT@%&7Iu)<_F|%#1y#)J|LviIllE3_9JIEtnb)$ zjp9WTj5TC9GFjd3l;8NxZs7^L0xgKHWj|j6M8 z-b&-@sV5(Z>I!*;(W<0on9lTF{_-Q=^zea%B15kjA&hi|*Y+2I`19x91OxVDF>cCP zM5Fw$nj3M@z|D>Hd`yX~V5nJ2`lJ%A>8dw%cB0CwglBuZi?berYcf$Cb8^&WwJCN- zQ^HYa6ol1ZuU0HNGLzji6*JWk&F!zcqceF;t&H*O{Ie>1zqVr(H7ku$UA!zI-Q9x? z?rsBw1TqAd1b25CAQ0T$3GNc$PWEq~eebC{_x|(Mt*`2sc+A zpd(zDJL0lYaWdefoAEOuBdN0|PA&(oZ^1tDMuJZhcz>oYMP`gX=kI+-bEl^FovcN* zU{B1W)mLj7bfmfdQ6l~lS+pLo#*jDOjGsltSV>>kn5V zpQ>1^2nFHm<%B8<>y`i%z2FqL8UCqbIs$&A-x}!Fx=1`1o{cEn`n^OR8d?=-vrOeJ zN`VcotAN5ttw)7iB|9!_&u-Jm$`PK~ibLima*XRPW#U(cDhu+!7Z(bAndHF=$lEf4 zTgr}aWsxdkWo5?kd|B}A9iPD&K8!wB#Z~`&9W_R#!4>8X(af{X>Z3Ybdt<_Y8X+!5 z)>KJGMlVjMDN-=8B%a9Mn5Rp_kgw1q|6-0xiZy0FvVr^GYeB9?J$zSF|!%N9?FFnFJ?6R69NrUug!_q*_O_Tw{?U@^qW7%? zuIu>-3qe)X3+-h^May~I;Fj&)52@Kgm4uy(G!Hx{>*+RN-cm~qnhz|_EGRrli*`uu z0@_&8a98|j*Vjg5&gCgy`a0g~*Vc{)(KDK@R^sUI?OZ1y=b%+l~XD#Za)Vo5La2J_f~ zpeX5pt6$~!>NVZ*j(>`5K#p~o@V!-~ujk_EHvYS; z_OJm-O@$(1H*n8d(yvkV8<)|!v@uoNPs|#%Y_^m&w$BY#f&+hdnjdO@&MFXajQXm+ z*LHBLlzdZY?P}hlC1RRw$bSl(UFQf&WF>c;g=X#e)5s2D@)58MXf9&Nsv>hFV6Rtp zr;RaWRh(~qYgt_MXiZ;dg!kZUMMavP5AWgaXp@I-z2lk4=QVJJHoJTYo>V=WKX^y4 zV^+-w*!1FGn#NDWaT|#ENY*a6VE^itm^id;l!-y{t3!LMPfSNcqmk~piqfRuQy`DU zN4nEXc=31*Lk(HDej|iitZc)xC3dCcERj}G(>$kw4_SlQVdwqUib--x%tW&5KFjSp z3H^$Lo3|J1{$JAL)HZU*GCa46fWLVt%FWC2eMLXrHhRnyO%jqOM5;qMywl=TMs_;O zTWG(UD6odIK{J)kPQrgj$;aEg+$A(9`w5g#Z9bpAaXg%Y*yp4cve%<@?}QHlPEq{8 z46qmn5?t@|$H0ptEHRi3e$^$rw_)dmV~h8o$rzR9(>E&la}A+%Tf(Gqw>Y5aFXxss zVE?ms%8z~C!z&fT#|(j31MZG|-gY~M(PmW9-a<)gndIBhB`dG$_}?wQP>X7a26 z-)esFT`WZf=KV33!q#;T#mXmkCj>HyR)x+{D3~U6RJ|H=IE0Wog zT5a~sqe)LHF1gPLj*jy9kmy@-h>&wTbUGL3FU61Qs54NoTSSy=1*pGMHqsg{ru}M) zj**>}o&vrRdfORpqZWha5BvHS-*^4`kqdSv5d6L0K}!F}WVGNn<=BpkWiYTlVLnnO zZ1odSaNyMmy4n-N3-%S|&)Kr)b#EYYFH8nIp*`^McBMx5$DuM=Rc#xXZbO#G#V1wGZQI`D)jMr7*Vh|kcF-{tx$!hTB_@c*U4{yzWu zRDYlU0Neitj`{!f)Bh4U=Kl-DRp~hYXK?(tfd3Nl|BH^};p6@9blg|+x#We0(*~pq)}fmpekM+o8n9G zSF5y9pz)j-K=xcc_L`URANnq0Asr-q zEMDT^*)_;p)uVk%$Jy0c8*%}_+VBDzUE-LG<#GQ8x zwINzh(>hMZW+Why&ruN+`5HzMT0J3Ml=@4)+rBx5;p+?9g(ZJ1Mx_oVq6QLl%hyFN zs;T{$N3*u*ICOafrz`dSS0n`%D$rt4a+6IpfoY) zqvil&x+3By-hXywvg0TF^mcPFv^|)9g{A@;WoB^Aoa%d4?u-Li@R$#+vxp(+f-d-r z(2^S5LE9g9eYK8cOEB?|o|`6A?r5mlmO%{Z#<&%<6?`K;)RDb;Ns z#-UHv`itnb+e>UAi)00e*Pi1FoRA(|w4mgpb<{wL!ft{TQPSFz_0+A<3Oqy9_y|JnkP&?ZG!wGiM%kIs0gL2aaPcjP9(7IHP(n`OW_dn-Ku=GTK<&K^k0>+sa zrBFzS&y*e5BS8;AIqX#SUm^Doc6f~w-gjkP0+eK6W@hYqshTd&9N%%V=-I!_kNxJm z+YettN)i#k0{q|y&-*}@2Q>mNvv%IyDOv9N<9 z!D4E)Nq?G*a-iB1AH9l;T(0{FY?!_R`y*?ccBVS_f>JV`h4-bs; z4sFTy0d^b~&JTjD!q<<lHIW^MYd7Rs!3{7;D2hfh*R*t5J_bz)rfr=|t=je^PT$mif z!%O1DNZvO)1Co7_Y6d`cW|_xSTyq zffWS_G&^WbUwy4sR3v=Q)!<)l9 z*h<4fgc=s`E(joJNX}ioeKlR!;-Ia<`0l_w+(kTv9ke!s?XiieO%5L2sK= zUX9#VcC;B7xl~|7ck9*^mE$ISq-hln_?aIXBrFx?on$Z=9ur7LD4!r?JVKs4qa_my zPk)u#Wg3X&_DCu`xTBoH5U$n^j5CmA={t15S))%#5<&h<+W=|Gp&uX7>Lq&Dn4YZX z>olm9ucq3uga^7nd8nZUc-%0gqsAUEfh`@*CEDM-*;i-Pp+%ZPD>O|FxK_u?RVYw) zR&@J<#E7eff;Pd>p_(Twfw{Xy7N6gHjk`zenk^1w;7qJ-EE{sg_FJlXD~+^gZo!U} z>A`;Hmg$3Ozy3^!c+px<*}{7QJ`+ahWI#&ks$^#M6v+00wZu{LNP|fzezTIXmsf!h zDHCxS)_AqN_{;MBZdx{4zSIPl6Z~9)I`t$gF)c$SZa$87qj##wzoHBk@Cywu1Pv)z zNJKmT7(2#zk8a(2UMxQ zW-FH_DA*IOFy7#Ei!FUsf^R05zIVYR`y-Y$?w5*kVR1RegtbFrGnz=^JyOGIzTQta z)mxtx`^n;*K?_^E>nW{%yPkl>C&J=@mJgoEgj4IkkRDz-6dNRT>5<$Kj_dt?-ok@5 zfXqrm`}-*9PJ+yBSH3D=6J9349#o;Xy}I!m+;hGznGoZ;>+UaQ>SWPQ9bSx2P~U78 zIqT-N#f5E&s)TWP(_Yzdvz=v%ggcC6HH@dIg-6kbZh)4Wk%~kf!xF7y7gd9X-i$5Z z5UfL@#Q{V;R@eR9OIJG>WflVi#gV3pgjgRKNiYWb@^BDb%hW<#{_ z`GWN7I+n5$)nM(Mu4B<#3*v8G+E&YBbQ+9gY20VvLx-6cSnN6G#gx;;a~yAmn?|^M zHDI~ToLyF&)5W;8WA%hs_LPsVDila~q$Ys(-3?stWFq7l&+c)^n&;gOnnJxby*LaP z=IbDsL~khFmaHS}Vx%9|+(>`E_jG@y$Fd!tO~Djk?Db7?sP~w)nkw+R%JW=DV(<9) zsB(ZT@3s?wsUX@phJtL-pH3?%0elnxwW9A#?upa8;+)x5?-wD{0hglfZb^TM?wj30 z5kop!)iYGH6j(J6CN}oxJ2a^iho67`6bNqo;NKWiUxAO^xTi3Ve>b3Fu=%m?lm;Nm z`bJ^5J6#R@SgA@nY3nz0V$DHbzF)0fdgxJ%5;jfnh5UNbo#(N8?|v)yJHvFrF1 z@BaNMZ=a%5Y2>v(mS;TxSgD!IF;CIY9EHycwO%<9xdcO`KQd=UTw?uWj26yF`4mn< zI&NQ?kVpKMljl^4p6y|JQV8;xm60LizKM+QmEKwXE|jFVWs@6|I>PbX7rUkRCEcS` z;L0s%l;kdb+s!wIG0T++rP^F0%xqfsjszE0A*#MR;pQe;+Y~^OREE=rhMxFbR~WX~ zp0*iNj;);&R+aZ@<)g=Xo>CieqT&YTFj&)Vb465lf(RvbP(2q_7p*YJpvlD9w8wCuK&g$AGF3~Elz*@hM|u{dW>eoAgA&{ zl~EywT}35XUc&A5Pygl&1YOL-r256W>*s+jL9Y%3knwd%(b7J_Y$)nb5I!t8H&^Rn zWfZUtb35wIHC!rsUZOJPC;Ff+m5oG1@$qzRvEGCWyZis7Po|+Fw|6Vkj}1_gPTLB> z)#+D^ZmvQSwTF!XIBoMdsLjph&x7UZ8c{QEA>o>mcS%!>VsF<+1E-*VtGm97d~AuD zk+)zUrD~#8xh`>Ud2;G1Qh$yOM$m=Z$D;Y`@AU+u#~OT-6T8llm$((op8}-!QI+ZA(;vw$W{Xd#0ge} zx3!<;ed~RZ@Vq{Z`tD$GB93}sK*3M3cUQhSc6vCMwOU{1f$5YgqfQ- z_?z^l5;b*?W%i=PXKl^MV)dIOHUY+B(jiTo&Z>(ygfEfhD6dDcMS_|`_oy#_&!t-h z(XmHrRLQM!zfRqz0!(j(B&u;t7||}K$yoyYaM^#@TzyXEG)jp{Ks@mm)h1&1XbLlN_6!_vkmMmJqkLx_z~k< z?xe8s>e7ZA&D23e3l4h9^6<9G>3S8(ky$e0y^%Fl5^j6Xke)&>E@&fX6BZq$&XdDK zKd&A@L+e^Y51zk+gT|m9`uT@lP@WVO^;Gi4Ue!JM#5`82L~$aCGAwCI1t5zJX-59d zW&(E*t$#One@MQWXsCbo{KlK>gGo!Jm{ zlw%oSlC%T~80a!inW1vbrHHA~sB$a!hv2X)#7?fy+oI&5H0C(yl>keXUS{i>csqX1 zV41KyJeN!;0136~P)&`eaKBrV|AcFJfOVU{mOCGWKpQoe{xn}x-suVR^av}(k{`Ti zr(g5QWO_Gv7E$KSlh~FK*9RSmh1C=|Mqe&D>Qd=JRIx3%s`i(>+Vr-hfxaL2Y>vOG zgPY=QC8X=MAz+!rH$55kX<;?IS#7}*{>TJ}?Cvh+K71QW|Mr*-s$M=%sqgw+_h1CIJ12hi$eMb9NDk-Q9R zzt;WZ>GJ@~vDH>GnMty`Gh0p?`_*TKHMNOER>>7^5pK&5zf^l5LiLG1%iFq@wo@6x`YN>qWQFx;{n6hc z{5kANQ0}4NT{3o_2)Go^nx6Ykp*%l3-k-x}y96EQT^sx6)&~W$yxxwtg(-erk5+Uf zl`361*k4ix%G=Dnx%!@(9lzC#^WzZTd~)70Wk%uBK^-AFWweeUKNC6pSqi+zJNV_4=16jn;5BSK#eVIgvyp&P6;9-qD?V^nv8+Wo z-*&r6x&9nW-%mwofhSU^zA1aL$HudRnxQV=)(v;%MctKtt2j*~ zHAN!^A-5h4t_EneE{(erTBo*oa#(;9OBQaD_RJ|5!0nb)=o#8ZA&d$*V~`n-Lx z5zDVd1^mTD6XY&zDi_TB93y8NU$mu@JW3%i;kG{4r=*4ps;8%qrTh8jqI<0IU5 zxDmbu?Npwizhdm>dV|8x`APnLNbg{h7eNfI*}{bPHU`Yyn)FTC*`zd6Tuf^tUyX}? zozB{wW4MVXb~#%}9_AMnJO*5pSVCY_tq`}rE?*?};1!gq)>KLULCbFAfEytiQbE}` zuJu8;37#q*(P%suDTrmI^dp%%@v{FMZQ)s-*rt4zY`7JfC1M(;Y$_>4y;|w>t(I<; zuBb*UD;#6gC=;T*qx$Xg=f`re>h%_fNW`j#VXb|s;}b%R^!UhlGG}Xxek@b6@ICbM zOs0N_|_e-9ILy*vQ8Zu2Iwu+4Cz0# z4GupuY#aix=IHa4t%6VHDR@Q7*YcakukjjqR*`S_Ykv<@={HA@ZngzLk;8f^58Bonu!67F<%X zm?5E{x#-S4mTx`T)z9%Fn9-kSHjGCRQe5{YC7G=r_;f|PP_)GYKaZvOUW$?)z&%^wjy<1kn;M;F=PH-hWPispAtK`AU}%rT9?ha!zp$dT0#3 z!hlp!7xqEPaXl?CL^@B^P{_tQQDjMAp#qg(%tyQU;)i8~PpSY5h|CH9$y^fD=B@~G zvalA^4$|-`Zy}GF~qP$aW1M@wP({iHKDi4%)zMm3UJ~%nPnV(rP1#{2} zL8^#vZBFyP12|7zGHn!IZ@}JKTWf#|O4=3_gR@zb3cSt^Q`7R+uNJ;OQkS>EVfy^8 zSLScdCf4N%t%T&Mc%g6oflJ7B9|XR5_Dnw%~~61g-GASBo9uZu8=7Y@XJWpQ2#CXtgJH$8Bw0 zE%$a|%l;1n{?&X>oAv&b@fUnoo5`Ip`~JPtJmU2WukfTh)$p8cxZ-dJNN0)#m zEs$%0vp@gNGz2u4A`c6N1e6{dRbV~pz@8jEVShfzsc&d3AHYRTz;%EBAp_HIZ?9}@ zoSJabF@soHc?M#IESbt5lsO!Aia|2I%x{y5Ty7f3sb9}R6?%!lu%(CX_tg-OG0)_1 zMDo|LMJ>W5ryl|hXAsIbzotr;n;pGZ5xQdECXn9X(yVqNzue*|6()=PP+WZIoC2T~ z^>NyLxK9u@2A2^Lg1p^Iho+4mDm;L>w%Z5r@V6(Mu#^M=0r3wBl=`=PjdLdg^VF{M zFKA+^Fx~x-N)|gfv-A15y|ArNTo+#yGobN$pGBRz?><`Pk1`nhCEK*8Br5)n#~-y)P5zfJ7|94N&W7Zzt%f;$``W@dJF=X%B^ z{T5_`v-%5@x0|I8any@6SEM0)iyx8ypgI}XFa4yJTN0tP69)JNI1t7+)IP%uby{3l z(3D+36>@Y6LEHxrbH`e|%w%b^Qr~R#Q}Ub}~xwm|OJ|kBiFd zhv@9&XM0S#H*`O!55~0YS^c2Yv_w{(TtyBdb5QW!vH$4-{lopm(W|>_!q&&NYVc_m z-b&Uk{PcF(pL0}zW2Bpy2DKH0Fcq$id@tYpTqXH~pY@S~RLxfy72=xCYgPEcOIMcnKtY001VQD;GIEB)mYXj!;p)Y=AW zFLU2L)HaK}Azmcc>`?Z5lW7^cQaFq@06a~mqGh22fk!=JH+^|$S#!62w6V+M6iOj{9BWKjX%F{o zqfc9MnrHj7($w~)Dvo+XAH1VU&_pQJf61kS8f>=UaaBrN+^MujCN=fqgZh+bjE+@p zGW~Png(ZvbYjEKO?a|h9vBvVc#V+1lE>~!Zo|$VKWu|q@%}s6>)RWf#&+ZtOzB``LzVX&wd=4YovcmmEwNOP9@ z>E^3H<_rdq@rLB~Oi!(Fgb)V}2|Y_IU$yOrU~G-fH~E6|Q0=(tMvjUvK3x0qT$A&G z``vHABo?6yO@kI$_QD;&b6DC&_|>Mz8r<(sG!AeC$!PkN8M2=n7f1aOXs_B<_W{zG zJ$<4#*6V7gg_4{h{c&W?=CD`7+D2>%P!0O9; z%Cpn?U-Zpao3x6){uKZP4r6V&y#mBJFo`a{jWi4)pd~XnP3q_tv-p~Tk zRq{?RFbu5(ZY~x3ME^n_XuamUJN)mcT z%s+d4%xFT^5Mi~@S(T#NgYSSN>?mkO{rqRQ+k0WaOt*-Y{tttInc|K0ko%BR zpUhfhbmHPi-QOsLUrD&_amP~DMKH0*g@{jCra90I0LY@)Z9Cg(nnpGJV@^968 zh!as97~6IYW+2Yc4e@j5f|1j>=jEKYXK44GKjTmTb3&*cTr}==9Fh=6dc5?2q#wn} zDH{0VCi`@KUD1$>{%ydj>6)442MkFwGubm{W z#Nar=%N4@7B_7M=Uerk=fwMc<@{-lp%E+o|b34fXmuyZS;MG^SD5!;(9CC&(e8QL? zYNL}ZSgv@ZLFJ} zE-&5%seh>n`c3=2topv@uv6G0<=qhOHB)Z%&yvzU5*FX;NX273Ej^{vP1y@8u_itD z*WEIXeG#<8U*Sh>Pb`~JFrXE9WS9!pb2{7(YKNtTIsNuH4;U9uK&>(N|ELc=fE(Iq zi{2U&y3x*l!iq`6^(eOJ74C@$ad`WB8&cV>W5H_MUm4D+j@GF3bFJcV{*L3LCG*1L zk&}aySm1{8HF_*DcY;yfBiUJAH0}4g_KYyV^<*PXLO)+GR68D*)%T97=Vq6MxIoO? z#MkF~jZoX`j_UHZlDoJU6`|_wlTE%%+MR~*4m~of4dBypbEe^S%&9Kbl{sl^@L3Cr(B15#NGtNofl{GWh32AlM6NS8r#+J zoofa2@9nz{q4STT1)XR`^(gb6!%(#A1ey#a;LYih)v=jo21Tvk#pW1zy2p3b;&4l%|cUExD>ZW2_BQyPS4?IuRvkF42%lJ#I7dBDkJg zTAZQg!@XpzyL!05;L}n23WtgL((2i_6oPK)J(6!yDBLOlR%SF{!{cF&hv0y@jN{l# zI4qF;O3d`UvUIGDBBWm$*S961=TR<8FL^OV zlpqB87Ae2p#Vc#UkJwiewwSvMy)(wXDoQI9ot+{An-b!5d!1ICZ>7E&e^5Yf2d-LOVe!MrJ$1U)y${3l{Ai zu0LbMbqTvYDzpIJ?)7|~h05||0m@hI?`H0%^+npQE^X-PAg-Sql8j&hZxjC%`B43+ zS#E59Jv8`f5PI#B?*9X}JU@+azM3e1BH2N%RN~*hrn~afF0X$GBhFYz15*LvK>WeDs(!rz1! zPP(nnE$x6;AS1BMR3Q-jEy6({0Eh`ZjmY}A8hC!}WIKvPOuKP-9tkWwi_IGM@>6Iy zF|-<>UmK;_h*l3N;hf{I{=GaKZH5b$x14X#uS_dEdrE`B;g64m!)W z3kBp!)oe(zmHqjJq}O)+C+w7d%Cp@|qLpbD%G(9gXFh*?*szG>y-XqMX}Q?AG6S?^)5=w;tfWJR%@v=qGK zHrcIDgazy-V47zT*X#;_UKPT;GEWQwvivSC{D|4dktRl$`j@Ah*)glBM5SRPIbXr<{D-2n^QH|j;m2v0l%GU5gH z<~m_)|1PBIDsMK9bR6$0J<8MQ_~JOSzl;##ivCY^^4!4D8FmJk1+>$S5=ZyVOVr2B zPz458r63eH$k}{rs^$2%rUUp^E(DC};&DAakLhNorPYXSc>EghbXRkxdu0yKg!$f| zAJJGooZK!Pz=@6VVft^q{i`FK43LBhJAxa5x7$%X3KU$51KKfk&l_~!8G zL>d849oxHM`bY*J1GFQZBoK(FgxYzUkR<_pN0h1*OC zD!AT%4S0~HcDKIya4_Z!k(kav41g>11O!alK4DzE&$@iT^61Qx;JG<0LnXYy5uDYy zGT*5HAea~(#4rZ;%&LndVhf|c<_i$4v_OJXG5u41rYYDk)VYfH!}7ySV$m%0Yxlp3 zmM4WRF3-)*Hm>}2zC9fRVqW7SPbpTddYbQz>z==$l+}IE z<2B#_AB+rd4%(0NpB%z_Zes-auV#8j`bMtiLuwB@AJ8a?3>`~B{?4>rjfZh@rT3I8 z^MZ*90+?E*VerCv4U(tFyDQ6w*0?>HJ69kUF124Dx=C|u+pOcF& z&yqkO3wPFZ{SKK-{t!y5h<=^*nfi-yalQoKxLm{`n2`XZ3P1wwKU$fGxDs0AeG=G2 zKFRQ{$aU+uW~qj}69+^dW=$;obQO~qH%f9@$;-c|6ZAIP)#tGfd^#w~1lc!-(MtYm zD6XFF*0I5+gBO@0EfiPlq6utVI~_VW;N=IyVZM*>h`yKvv8MaP$HziXF|V`i)4hou zAI#eb&#cz#;?qqb$XU9!G`R1!8RYx>xiL7c=9)1Li^kqQIfQFqK|<~59fubVF;hMN zSh}|Pjqy`JXu$MU$^hN|!Ym~4eIC>7@598e^!cu}Os;>vuVwhLjcVBmFg#ni~1 zA8^vR2YQ{V7(|_KEPi@K;V*`HCEiLoW)4P}Ytoa50A;T;$-8U$HTceclkYGLNTWFh zwFBh(ofcng&b=W8oawZ2--fJj{4r`1#=bhDDd}%~N;hprgKRcBq!2S>x-}yY5^pSk zG%^@U4$8-ux3~S&=Y?BW`W`&@nD0dTT{E^NDt+ z{ko6K>4Uvh{N-y1T|I(*a5UztzS_if)Px_p?7@*$nJwY9|G2Q1$OCibYiE!2F#Yd# zXMz0PK3_vh)Lla;u!t2$Jk|W~djX@E;I^k=jy1I{xK%Hc-yjS~qB#yVP=Z(d5M1%e zZ#ME45;{MbxoLk`#&rU03TW;CQu=l{C39~3WFdD$4Hr+CUp z?Bcj~#$i!d&o4034{X%1buCOWV^N$n%ZO%8hz1-lKkS;lHA^~vL^@jn)26~&?z?VI zSk7o5XWH8GV9e9Q+L=3&xvoav;^r)GmWJdVs{+62c_{KQ-f`(M%|J+J5kOq+{ZlaG{#gK#NvGQ zB^9k~CCebaD|N`*zpi=3o80TO(dRpz`@5qhWF4m&wd+m(+U?G7j^99yI<;7;r9tn? zBxsFgCqa#+3nenc-R3%$Dm-Gjj{6x zT8acNci+>K+lX%ig`5?xXbeNLcv-DhWMI+2o8%4nhRH{e_wxa~=DYHiVa}`{KRjXJ zp^u*9PA(PUgL;xEanl?2qN0JlwQ+G(#;#^&xkcZW7d|C;GHbQODEu}ZfSM9YN|$zi z?MKryt-$NYU$8?%v(p|F^s1<=H1KvUui1ETwW&VaGxdj5I zti0p7DJ^?@8@IA{I{Ysi5`VHOukei;a&`zzxPL@xrt6b2ZXb(#{j?(%WY*dXJ3x3a z|5(hw3^u^{U5clM-JIBM$cpVKt;Aa)mP~VST^K^j19-9!(EGs+ow1j&yGgZwq0|KP9x|6gPw z$u@8a|N03DJunX<48w|0trdOyf(=5yoCoqKJI$n+JI#7sw?}^g4#K=+{s(RRZ+RKs zhTB~)8^^CMBZ9%62uNfu4kMcO72C<#LmW}wCfN3P{e75pW)^CIh!Z8XV1aebG*gcL zi0v`#4M49Qui3w8tX+Yw%w-Wt8IQZ5Bk9E8IzV~S>#s4x*@BFNb_Z}rMCfBc5mpmg zVbiH_I`tOkO$adqdKkST7VmL32xf2Qt)#i~VH#MZh-dzoTg$0%DE05YOvD| zNv%tqeB-(EW0nU#RXM<*-heM{E3C}cB=P;)`>xM-7W-~X3`45y4`K6$T?yu)71epP zd5wSxWys8=4l=L&uPI3-QS2*otG|6C?e2)~y(D=MCv{REUH3RtoYCF~3jcMX{xhCf zkfg<^if7R5GB1%Q_ZPHqq>_lEHs`q){;RAUNc5jZ60ps0zLyQFdO$|C8c|l=|4>&yjR~KOjQUluqi=B zigK?)3a-$89rXf?67*a8TlOF{2-?IG^pcxMCdbSf{9BG)ZytIRo!?f`9)%mL>;c;# zT_D~k2m`!glg&Gmcm7VecLwhf{E`Z|<)P)k17IT`K@7sb z^QRind*i_S;WXCMm&oh|hGP^}EIkOzVS{N^0BlkD2D~ou5>M7z`usU#tg~c)FHD)l zA-vJ#Bu~epaqo?Vii^6BD)JD`_ODmNydp#auW>LF=n3LcH0D(d2vDIs%FW(9AYY?k z&>Z-IlYFv7@8dTb1-8-mB_N`Q`rIf#92Y3S(Ym zSyEvVFOBo(+-b*3Oj40)YLgo&A0lv{UQx*kPZqzs=B=OtL>37$*%By~RO%fU&SLC?aAua?zKfAX)*c|7oyf&iob=goG*YrfYR zR&!87@6Sg57ULXDPafeS%gMNgD=#y{Zyoj0Q;zGx@_nNYFUFvcZ^61vFeWUi@bE9Y z^24Rw;va9#*?Tg!<&!fdY4=@ahS=NH8@k8Q{TAqc%38~a@$i(q!i!!m#?kfx%K%Ij zJ5WWmU{s6y_FiMqpQQ*28jXB_*aM|MstHa`8$taa5L3i65b-0|218J2Wm z?9>^eBdY=Q5x~#8s4wK0bBF8n$rqXy{xE{Wd1?-%{LE**n8ZQGyP7;==Cy>i`*u-- zmQ^)(e&7Zc8e>pW(WHBzOI)m3V@TzYPyc`r$=_`mMpUuEY6t;xzYqs|o8-4{bmXId z08OWE$acv|l0*2t$1z{^8&wswfAw}f(G{E45jUi)005k?Tt!9y91Y~(|Jna4l8#D!1BnkZU#m87Dd0Kfqh&7+VTGY>W_pb|SPUFDJQJH+Z97v`Mx zk?$wuVm|j32K<WMFQFznl&gEt;g};05zfxeR9e)!`(q0G>!uaMQO>D3PzPb zNQa0lyM9#3?%0*y^@J&WoUQw$QZO|FyvwX=hDCrX3}y>}k)InIvcn<*aiqQNW9n2J z%|+Z|G)sF)nzZPBMJL-AuJlJ$3$xplXdT#A;<6^Z7m9!DZh4k`h{oOg*;UGP$~c`Z zE@$JT9g#Nf)~Eiesi?BdT3rMA&8YPUBrxBCUe$CvwYMuNiIEbsk*SQ=7L$Il!PTbJ zh!L4zS*+aIp@5cY%Qp)XdEnl@jHbG7AWAP0uHBmw*Ciw~n*`m5?roJS^D%QPSg7+E zPXcT{^!(HJzg+SKqL<<_HZp9KuwyB#!I`X~G4?@C5X^(ec03%YRVdG*a8{wnE} zK=)0!;3(%uPgTGd1#g;a0OfJc&Gj3;$IYq=Mwq&TSXdlBBiwlyir5^mu4KSM!lBpd zDGLMc$6LMU=%{Ui!|a$Do{%AO}86m(z z6ROj+`P;qAlL1@waV$ODxMdT6N=iGVzlJpei+wn%06U0kMlr<;N@P+G33gGIUgW)^ zhAyLP(<+z7$4K&psZ^up^!M-kjGwRiARk>+{-KKVDFhYwEon)fLrjQPZ*&ge8^-Zs zh1M!?SZ0L9X`TsF_7_DV#a{vHOPu;8NA>PY0s9+lL*Z|nnIF3y_x%Me!Iny{7cw6Y z*1m8i^#qlpmc;vVWg&y(+UumxualZhGIj;h) z!ZUrz4&ZYp;F0ceFV{;UOR$VDBlriK!IPG1UNSTZ!#B+p^uWp!6* zf_M@$w-Kg7Y5o%RR>Mma+r3Qp$e$Rd6@d5w+ttK^OO?~ZKpF7I%NtEeSYA?v{T7@I zA|g1!s8krZBaM8jV1%O_nLj#tDVgxAq~BxjpyX@C3&cv;s9W3vmW|M7xHj=%Sqh6} zVMbg}h9GlY(ad`UHYV@?Eid*9Io4;Dhf0X{l2~u{oG;O(M5Iqb*WH4`q>vpgPAgtn z8Cx|P%A&GG_8AY&7Q>ln`rT>|Hwo3i)ldT;+yBMfTL;DUMeBmZAc7=>;BJk((?EdW z(!m{qySpbL!M$;5g1fuBH0}g|4cWzD9OwGKSc~tQShwioI>~r>7-}kMx zC)R^q(K9S(4YZ!<7^w}8Prh_`?GmP1b&|288&udhd{}y6fZ^;mA*=e7j~XUT?i*Q^ z-Q7DZ!V%-3L}581HW%$#{loy6m{K?NbY^^S1Tn5k;+t~Tw@Os{;;!)|X*CCM)nQ@; zD$e{ZbmgH5#DJ3w$)eB-lHY7LU$JkVwvXMamMN-i!|iY>c_Zp}3wDfo8>1p+1ZbAbtvVEo!Ze zjUC)dHa;ciAg`RT5a;44FQKOKNpdd0ef^sq;)WO!vNDdIsD&qxAo@bFt(^px{I$#7 zHup4#{VaN2+%prT-)&2JN124(nSK8=5XHb}MI=*I=^z7iN<$j>OD>)9PamM5KCxoL zY?b>Pr={K2uR;7P;UK&DlA*Y=^!$yrO&)OWgaHF&rG-Idu>U|J9J(vYrWmCyXQ1|( zDZJMVhLKlMd?1m|agAv|`mdtPjp%5m>#pGRri?I_K(ImZ5tikA+ls z0?&C8IP37P+cd_9BaV?W1P8f3h#;x#BVJ0tW}z9q zIDGLj+zVyh+2|<=$8hL&4ydyPq)$(pnq6E}p?qqfI&?Sbmqd7)kt@%IT9mmWp}|3| z!?s5?9G|xmdc56%JFwpYJlG@<*(8#cxL>BW4%_{o!8rQJZ>LhC!gao9jBb+e#Gc-T zpn_cyo%r|DES4o!+*w`ZH~rJa2LhvhU|w8R+;{vc{k)7aP!}(Io{^s*37mf7vkW=Q zz=bQSEE-h0%65TG^G{?8&N0yk3PE2u(7W?d!5CylTn;1~C)b0Be)Y=}AYJ=;D!L*i{5HD3+LZPd4e zMl)H2@w?QU?w#UE9JjfSKd_|)jZAX6t`3JPR z*il}cnWc$f%zsF9p?k4&85Gul6v(|d9NYGU`P;XTfxj7goLaw*TVa6>CizS!W?$fN zpuE{n6>#E$x4>y8z z4!rh?;o2%ytl2|K9>&UjH+)ux+kAmO(Hg3Nc)s*qQAzO5$2tO6$Ezgt)FF1DBQlZK9OGTMaCc^W9V>5rdzvD7 z%_&D@taj9S9tt*HBJRzO2S1j_U%FO5D6kDVvj+Ydr6XiTW|6nqWTQES?urd{Gh~;* z?Zm-8>6{BW0%*sm2Re1A=~+p1T!3Dz-Dsc8H~pb|n!%qWL8tP)lN|3UIV&wd%i){z z+9Lux4k{oE{pZhSk^k~%!GX&L?HhMHr{90Hqg87^Tt?9cfbwvx2gS4W|9Sb73rj#o zl-wB3Ot0>Q+n-eo$WsBT%?=%m(@Xpgw&*}3g<}VvezON(_+#d|%P8$l$ZgCrH)(6G zNdI&y6ns4oZoZRr zHfDbx0Hcw{fYBL6e;%8{_GLbhAhTl9|1IRQZU^&@<>Ll0v_I1}8UboX31W1|HJnMq zd5^+M2bOrY@p?)g>S+k$Ta!S`wko;lbxv`8rLqGMa5y-}YnATSOky^Nxb9`VJSXIc zQAY}z+*3%L8F#bIx9-&5$3#Q-pa9wj<%jvp^~DFVtEI!ofyF*=w*!H`$LHp{->!b% z-8SE9T&LV}jnQHqvwTJ1KS0k&Gzcl(Cy5Bue3h62Pq`mp)ZLEN z84c8V*eiZm#yUELcs-1z+~e~5~c!VUTz*cFL=dR;A9^K+ClK+3iJL&_=8 zK$>1)g`~qpzYG;u|JTcH1dnBXP#$k1Gq+bXT0Gq2;XI1c!C|zCX$uhCev?E523RrN0N+Z!tn ze_7e6=xLfsmiu1S9+Ds-WLC8-O@&xlHe4=AP2`CH04)xagC2#}PYRLE=LS8DjG9+} zj?X{fy+?~j>cEu1`IQp+mGo1eeFhS0g-m$tFgnNB3_m~hTkmN(h&oFdpumB+%Co`U z#8_V1(0vp%)?4|ASn@Vjp8w`0fM{&>LaT=n=B_TOa?TIwFV+hBy}JDb!G_{g?jF5p zn)+xVi};eDOx?`S)=h&FZ*W@WF*}?npM7gzU+s|gDuv`>_SKYaz=J1;MH>2Jl{0q4-sin{YsLaXWqi=-J>F@bsipK*nVni5a*m{oVjG&boN~e}GF?5j=E> z?=klEvDq|p9md3OVt&0H7qoj6iSM;j#5RpD4HR5iY~)oa-;(;ai95W?$VO^b>5I9@kh1sx5l)6l z$-^Wx?Ha0Mq4GQ z;Lpgdk``#^lg9%#UWbj%CgB+?C7#3|UQtc1hKr(hg~NXCoS+{iW&@%WkS&S7-=>VD z!FnoF8wvr|Q#q!rU!L^%nL`C-bAS_fN0tdPREyji8HcMr?ti|E?-5QwjgAv3NXYp- zQ9{;??N`^@@)c;3>&Yp90XElR`;wyDiJh0}q}I~w2pZ$YRRs*>CRH9L>B?A5^e;=} z-~bZx2E1bfC4u)p>UPKnOUiKgTRnBFEpk4M<@Zx`oy_O{csXJh=$2HrJ-qDljo$z} zr<`*Y+he-p`g!DR2H&g2Vie4B!2w zuY1PS<@D#fM{@oGD8^|l^Zx)S7{biSI=PN>P!dyh@jyg{n~n5U2^HRj&}Y#-W5f)z zJccNr`hYe*oMzBl40X;(Koh#TW!aWX6MSXmD_+UY@0^Y&CvecyiT5g+Rq*|8mMAij zl`RAzm17N#Cn(&{;vBe0tsvWx{^oCHAW%Uq3$G_ekq zQ(|QufKmreq@p=qXDG4zV5H}=j?+|<7Q%%VgoYE-p;Yc=tfB4DD%MI*E7sBH9b$#t znx+b`%Y9gg*f%7Qj1MQnR-~147r`0HB@B|UkEHZ)xKTFrrSYFOi(T;yxbY`vu3s;o z4dP`_Lb<*UgiKQ+jtkNsL(VA4)F12q-Qvqq91U8| zW(yj}=%p&BSLv#Hk2ePFuft{U&m**?G*@92B}MaT7tyG)3M&90Q&v##bpGTBgHCQB zT{AjblqaFXS4i2DV*|)g=3V6i$HPT`PO|&1A;C4fzS+gC4nyPQ`BV9*rJwa}I&O4v z6d)MyQR>IQf}=syC~hL8QWNoVy&S?7>Af;QzQ`jLL`e2^6XG~cP62;gK&#-2Et_VS z&gPlh30TIRS;~DZg7PLsr*Uj6G|Yj$l+5zV@o7?%)~6%JyN5419|yw8(`yJJxJNdC zABW?V!*Wn1SeLLT!8$&REgJobk;XbH^?@soxFy@ZjVGCELJaTJV1$8++U@GO+vIQs zS5b)hcf`W2X=t)7KJ3R)fyd;G@T01}jF)Lhj#O``Pe+>vB3MRAB=f7H$`62qMUV6_ z84U^Na(UTr7r-T*KZgOnq^1yJir9*2sS46!K+pF_Abv7aM>%ReS&y9m!b7}_G*GF3 zY1F{zDH_v4lA5g>pDA`M!_b&dE}`PXzeo>>EF}`-PI5NSx0>_P| zv#=))N)5a8|M?;ECdb!o3ja2bQG-RPB6}L@YrC;W_r5sf4^ng;n(_qLckq2c_btkW ztSc=)>1s-z?R9>oZIyqAU2&3u{KD5hBQ*_f-54N>{wrHZtPl#|Es&G_)SWj|VuTKJplPmo_xJtvghDr$yFff8~q zC|O`J`!Jgc?bWJX}cIbAU)_ZtjUZRPOWk%?{&RpuPV`%s70^=$1@%}B@jUK znBdVrh6M+j)h#o;Q*HJye#;*TYEKjE$N^~;s?27=suaVZlJglB-$9n@5g3*O<0xAg zmEl0HQmRXtGJR-WzVlJC@6Jby=XpZo@|6$~yqs;60KcM{lxD>zV?XkpAJzksnP_p# zR}>+6upnTvpXpQ%s@8xM;+GIr@AFURzw7Z%^=D+B&Z}ml%baEm3s-*}#Bra=!>kJ! zw}f}`<*FZH&VQ&t$UR|-dN*ku1EcE&=>r+1%lBH<{zlz1Pkf{%5GGu_BoMw)SRqVi z@C$7yj>M?!8x@{ewoTkB!_czu^+ZYlKzPZS1&UA%*2I33Nbz|L=PLRBCCnu?m^rxn zn4rDqSgfe@U}3=dPV-1!j^+a^|q-#cnZJ5kGAG^FL$g=Lc`pckkA}+X+m>WZzWc zoJsT47_mxssCeToCN$4#V6^hNpa~hgo8u(Nxp+?}&<{0c0Hlqi9CzZS9f%6w62Axw zA~^(nYidb#%?S3ea9-ke*`LP^{UGC#_I1W{brz$11*hxF zw+`w2m*l8!O0MXqJC&5pO@u^0-Db=ndVWcEU`*#64;DJHrQ(D;bbVL{4W7h1NaGl; zr`E5J;$W+haGo=F}QSsKQT*iBt;pccw1k8gRK zC-Y+yU+Zf*Rm@6WGBW1AgvQnn>lN{9A@<|Us&IcRYjgLuk{=70=>k&zd2ev`66FI&(;#7nJhp$eL4>U^s)_Mip2&T;4gR)3fpk zVvi7+en@ln*fAmg9>wR1{sltFdy|Kfe?qR!hnt8bWNjuN$bx@L9YQ z7vhF4g>U#E#bT!(W#^Fm%{mSH5a;^Q|CFYcU z_8s@cK&LUP2U<7Vq;_dQB|LR5#)Ao%T7Gp0aIWuvL%Rnv@;SKJ32HafPu3b6sy8n4 zJmjZ`3Zo%2Za;clOm-jmxW7s{hW$f)>-!bY>?y(;obaCZdf`6Hi7Dr2ryaY0ghSn4 z`x>~2e_h~nMQnr50!o5p8&Ys?WJb#q?-jROJL!%QaVIJUjnvD|GR;b*w3D@S=Mt_< z0MqFnx}<2h`~0xP>wTRq|6pr5f#&t2uQ_tD_NehNU&i}vLS->R;9*Cl`DTaqy1lsR zX5=_!Z<^L6d7&0?RDVEM;nKZ5=hT<0bwxfRq70K#q2Qs3xzi9tTAjCjb`#1037}%{ zkzWxHLRa!DyFwS#p4Pl;1R@##*K*(;d2R0qS zVCPa%P%aR<6Gw42`e0_kggX3PEhfK8a-1)K)3f-F^hRRHcsQK1s2s$*(&17Tx2KB6 zs2Kc-`n}ZUH5HG=W&Ap2%z9oSIuLk!ZSLgXzc%^ca=w$iy9Y1gVusOW$D& zmQssNf79TxS~=V4HLNwu?r-*5IZeZr;R*#Tkvd)QlFj`%%keP zx?ZElXhAFlbBr(8$u}r-1Zy)HtfLPZ1cK&2z!AXu%r^|_8fH&8@5+7nR2a&eSq3MD zxg_Z?-J#UT*8@1k-xO5<4+(f;=v5m#+1%nCuCp9;w;t9^wvLvsk!d=0)Xw)p*!PbZMVvT)gxPON0yHhLHblZXKR@T*~2wy+M>qa`<@6+N1k8Auy?Y ze^xx6*c{Uwobj-PrSqWpuovr@WGLtX1#$xZ1y_J#C}u8OD>by3E)4Yl0$&-z5SDU4s12xc{tOn-JOIhsfaK^8LIntt{s0Gm zt^XA{DFEM6#erP#tSpoK{cO}bh<5!YqW$yBBKl^~K&jg54bh-E%Rj6(hamvfx#8tH zS6;2ml)2k^EHPY=vx*MFEX3#kLrc?0ahzc@@hL%hWyh6MgsQ}z*?;t0T9aA`4MZpe zc|G+WnhiQY1EgAOK;G>**foT0ThjowlSEEi<2A&HC7h}Sd(-}sBskbpRUBDNG?avl z`X>%t714~)S*0y60zT~S_m74v3y22e4<39q)d);Fq8Vdap+dmBOPuz_tC?4!Ng<=b zKx+ASK})jM2#X~D$xq*ySh{&{YP$a_sQ$%ZF1HI1sd{;(mf*o%2W209IV4%1LE64E zR)Uxvf^Gd(RT63_qn69o>i}sAFsYL3@am;BTefNcQ=8lc^`{VDdBe2ympUY?`&6_v zkQF?31X3X1T$S0Np?qP`>EB7qJRzSuX1wK3R9ZHK>1aKL7)8?9Qho1;zwhEReSWn9 zSDbLxP}A&}Eus7O7LY(LY`fh`YFt}`Ls?qc!%%yKkG%tQkb{Z>NoL6XPR-|9I;v=k%+Kj)GLgxl0IhgTJb z&78b4=n!fK;7qA%n+$1=0|}DS)*!Psz1y+`2kHpB9oHQ0#1a%_nFpMnD=InlqVEZW zb!O(giln7w!-;uo03W%JIND9cjQqVL&vn#i_mg$-c!Zphg6!N6S`2!PJ>YEzj6nei zDI=0>H^`jDy zo1kf)qYhW-09{KRikQ6qZhBdq(2%b&t~U8IHadS$WazK=q21YVT2)L)+pAsUR+6wE zH)0z?5F^5WM0^&K?Yx9#)^@#o90%y?tK)pza?<+p6yIqr&oXc@62@T;hW}tl7Ds-S z6_iEJE5mfg;nhBI$S>W$SgieeLL3#zqGe<2B! z?JN!Kmp;RJi2*hhQxc3n!Rd$%Kwin%^H0Jkca4FaJpnC^^I8oI!cH}flJr6C+i0fzd_K72|Q0MPO;b~te0Vqw3cZ=3p(lo8SMqsObP zjI2J=A86*VU@&7KlaP;x!w4YZ=KYC+_X?+*J%E}(_Y6})cgOh^zJy=iPY`Q7?hF(= zPQJ!?)K=32k~q!W)kqr7pR`e7!I~UfWY{er!(PBls*@ZzY-y~?U06y2gh>AmyquTt zwj*==<%_4Byw3?lu?gIAF#GYQ_~KWTH$JcT4}%YnaH8KJW_G@Y$g`<$v<0cdMxjP; zaesn*^aNtROUh@FX-&me@OD&u9L;E(ebxIJ&-oTliB9b0@v8mZk#T| z+BNOz;Q-765L8kRfN?r*I$w>ywiJX0KgBF`9sLs>?ZNYYF}})qAV5S~u2oyI~;!6q}Cq?Z6D&@K2d6?mIhj;T=QVoT|ngk5A} zkks`$raPd>X$`2N4gqgRpSMK}el$PMeJZY!uqL6AXw?s`LhdyT{z$SIg0n{2le8xB zjG|ySF&gwU7{B|KLDD#1{AWV7ZfK`-#?Be3tHa0mVdt6(!=?O#VWDcivhOCn+QKUP zI$Cu(q8h8@oV<)0A2j~#1^=}7N)YcWJNfVOcBY^2^qHuBoMaMxRR@o6V?c0A^XNFA zO|_xqYK7xqXl-?Yw{zJ?!a*|K@k{V1>Eva(Wc5>$K=Nl3KzTC5kP#PJ#~a~1Js+m5 z^y#+NGzsqnll=S(?@7_jHF8c?l@pI)J!fDu;Tqw{3;;PQRlh^33V*d`Oojp7Z#NS_ z_w^T=>9E^@b*T0;i2nQ#PExhUhANFVuTsG}B@(rIY(UQ1CmA^BM$vNYQB6XIrXesR zoVe{#J+oLCRj83W=K8Aq#!5r9EqJ+I`lbr&3p>W11>zXX!A;)0>#aGryPenIoC)`* z55VS@WRf`A0ZkqBb9-C)^S36x2G>e6CYOAhw@?U1A`s|GZpZ9@52pK-2V{?OD#O@H z{6|OB+_={yQaLzt`NdM}mxEndLNW+nWN*L~&o||82`>#M7dB`W zQKC$)XT|)_f^AsKHSq_W$6QBdc98kz5qk#5aarxNFMs&vU+6T)uv*r7nC?(meFFAe z5#aY__46d8Iy37gzO>#&f$sjc=}DB_e>?#WKtO@kspNjT|CqlaA#3+1iRRCw0a;;w zslY8Q2i*c{HB{LOnLjFyBPE5xer`B{0N@+DSC2Jv$aIvx^45)@`DRgq?#ZXhk4RD2qmP58GrYJt3jnOj>UK4%SR zGfo%{rpoU{@lII$zIU@#}GaoG|TyB&>xn( z^uK&iyB_699w!l!T$-v49C8a8x( zw8o710*kRnC&Jf0hj;4$Bimi6ByjbP;Zf3Sv+c5}nB#s#MaNU@;VNI}ekZ?p4Gjo4 z#Jau909Vz~ZIkCe4gTSK`vsUBd7GlHZtVN@9?y#Nm72pJe=XeYWnT+OR$}KSUB&9; zd8hNsax$9R{)XNIDs~Nk!^M-oBwsjdJPFzY@udg~FVqaeG!g&Q#{qtYeF3fg;DpMp z^6<&&&IIq&G*n9P-{sr$Hyrq<)DLi9{&8;qDdq#PWPhD-&_CWPuxkIj#UcN5W&gQF zDSutzzm6{d-%tN_bUpum`mdvV3;4f(Zs{okk|mK8X!bz>`js|G*;O0|`Mkcz#b z+<{X_dvI>-leI)}kSdwBCzP)iW6crLgm;p2! z%&oc$oKJ&n{tTeQ#=+N=rYEHK&t0Oent>FgrzZemc4TaOBa0^$<`cV(>29ZN2J4W% zj6U^D89uRpkkr;<111wFyg@(@zq}jKv@t`&0_F=?wt_Mjo;>+a0#5+S-8)a?q2AT& zI=TsBOz|HqaP)tZoeM;RbXNU56qcwTaoz1iX&@&Ai%CI%w!B#VQ4zMr+r$h6cqmtS z16{9OMp5sYAi7bsecltYFWwwwY-jDGhSv$vlYd*Tv!Xl$3XITuD7kcQz|42%m(ulK zJ;F8XxyXjhoF&_nHnaQo9G2kHU8j3SQq1?lD#}*KnT9W^4d1%O+0ltf5@9Y8b>un) zQe=U6U(%_+c~ip?Nh4EN8r&9&KKB}|1vFT*DvZ-#<+F|492Q89bL}gc_Kxx+R_t?% zwNwMz@w8W*5wvnq%5P^YgfcZ~+Xe<|A7QV6H1TX7UVhXy@Xb3vS9EkguLRr}WZTtY z6f$WsCpsuL{m!!fbSv5$X-T^PX_8LExD^HUT=XW==)>@cRTK_htO(6y2f)%>RiPzbMfkUK?%mFvtQ2Aj8qtV2uX9D; zQPPTw#y<>q7&8Wrl%#*8&)u}gR~4ctViKpCmsj2H$EKC`;j6`W@b0c3eZ5s{<|q3V zK68?cprG-(?R$oF0QUW+B=4J*sL@jMtsfSj?Ubs0kl?a>X~N=t{QQ?eVgh;0orT0s ziqxFxo(05Zj&0Q>OvJi%araK5dXs=i;7_kp#Aly)w=&WS>!gi)Y=2}RYtKOc#&S;r z5tZFYFI(~%o)F>Ihao>Bn~ZmjW{L)Rin|?YDIYUcts+3t#ozIxOU7LJ3Q0+OeSE8K zNLuA%0&BLxzgV*yz9&Ev#OG5{s-o}(*@izSW{!?Zt^@fn1!Y)v$pb|zmhPw66{(G{ zgvZ<#JpB9`C>{x@t}MTdGgGIiHJz`*YXr0U4Dd&jKO=o*!{|t5IBpfrCrxURP!j5t z4tve6m5Umdjfv&tVB9Y+^YhQldUa=q3rPp>GqDScn+jokC86N2WhT#YXAw-){ir5@ zfcTA&qMVq`?Ai)Pq*T##Oi{if{kH-wx_G6?JlYFf-(H^UZrl_Jo6znkk(D=@ zT7`0-Q7L`cKA)1)L`H`3HhQ41XW296N=gcK$$r}L=`hNE7tcr=h&NWIImfsYC9ic6 zk~et9IiR-82EcuG!`B3mY5icN`4i?s{$Ck;5^|>od68!&pwiDHT_G}eniJE{D-48! zC9fH@5CW8VXeMUl)T|D+x_LcAvaK@;^1JJSdZ@gGhb~Oe)#u?2y=U?!68WeyDvT*? zp%(^p1l@Ayp}qcV5=!$jv^n9Ubd|xmhr>f_KH?r5k%CH}oI1F_rwxG}PS;Jd_Bl(DtYvj%zE$c%P z(OQeg3^DQb3>gr#_em5MbnI;v1<*2ySN#b)5@IV4uT&=lyOjpKsTPY^)5sY&|o&ipk{6Ihd z6)93HdiWKcWSha8_+Mo%z4VdQ7vvKj3WhZd;+(lj+G5Zwbmv=vNIq^POTOGs8D?pQ z7~;|<40pnvKBSRe9}8)o;)pGmfGh(_3HSL{B$Cxhp2RR4uS>YJ33Dv|WDidll{Q1j z(0KA{UJ@H}g#w%$pG{C+xsA+1M;Bb4+|EmG?iy10& zKt~*!UxqXs6(3i`YaW^#+?dvsn2>`*)#OZVs090AfQMu-Ax@!Tm+>H!-0wMqXJNWi z-|Js`?<-p!3a%(HL;MXb9~*^M9eg#^JEWzR6Y=-mzm9in$!b#9HzZkWS{BQS`Dg}W zJ$5821xiy&6@MsN_gk;aqptr@SBd(iXk8A8abmVFZS~Cr7M)}DxfRSDLj%n-Wpi*! zP)w)Nxrv{xj2Tp`pLPJhD|fbba_r6)v1@s5_LC%2_#Gt;`*ogH*yfw|QzplqwV2i* ztEHIjABMF8PJyc!IR?8Q;L4eDl|I9!D(f!Nm-%Uj88(G1^Fp|jctBnvH?O8WFPh7Q zDETx+EF+9}>@vm0BZ=Gj_{3srvwY<8aH0P?)LI%4oZ(!ofm@Vri*+1UJ4};yZ>_-$ zg9M)RqB!RU54fR5gU%kpb{A{?fB@)Q(M)A^6Lu)oJuPAe?iVHaJo<&*7Abjs<*H$IBhQ3Y25RRTK`5&LcG}lYPaAt0 zTYjkMaze3qeA=R7=>#Bk<8dGqgSTDd(S45dpLvR;=-s++aVf_Ox+4V9UnHY`nMsPs zcM`1pwZ{e*{N?z1!`;=es3iVR1`jPj0lv_woL0kx%tUlxe#%N$j|wOgOxQ6of0IAM z6FD9+(&1%rpLBes)K17fPg$!FaqOGjitnD>=h!XMw7U5XfcfcyKz#GiR>k?cHxR@o zT&+BpumKwaT$~BuMDb*{`edH~m3`^z@{&d{iqgX72HXj+7(>O4`@m()F^wsa+8lZ< zJE}0F1pwyifT=!PS2DE%7Da1DT&-RjN&@D{78_}S2|paEW#$#52z58$J2sjz)2aYwZuX}yBo6wfct1fh zxEz_oSRBq2a<>W;cIu5n1I_sGLX{i2Pi43}2sxM0HP5r*3l$kOdG zo_y=E%Xx*keJgOiGh(U9lX*9crWupLB59i%>i(a8o=Pi#h7nNfz>v-C8MwI!Fl68T zIi$78;YYf!#j!;{Q*@?SD)MN_7`L^NE>6)*UMY}E^HixReUqFFvZI^buRgb>Ti*Lp zK0U&L&utr6b-a4#e7PGRtB&w3*mX%|gP%#6jp8RoBl{8MO?<*-%c|WwWNv=0Vz~~0 zcPl?QLN`TOa=Ieu5Vu2~X|Rh-eQBDFVSX4+9>g03vVX-2nm{P*QNI$B6T9|M&f>Om z2T=s|WW~TZ&*R1G63AVRV*U&dNGq@~LA`RSq?u$r_{!)fkK;Cq7tiqEQX99aV+?U> zd39tUXH72&5j9(?h`N!iDWd3AgRq&6X4j-kL>jL@)yz-y)TvYgSfyE49lrHIvyVLu z$b~d%A}$K%##X}(6)`ud?tvi2%|B&FP`CP_wlJNYoeZP)iKo&dP}R?$6hxNZ!+L}E z?8=6Fp)~2^u^`5ES32O`CFgpgy`Ukl!EV#^&He9p0aC+ZcCeY+i8#H#U$3B@65=*m zJ^C_DTHt8!(@iv}&n=0Hr8WPaZ3@Wkzy9lXYd_*Y?Nu07D&l+g5+u+Jz^h*e!L^A) ztVf?gs-ZMb%aEfFtLFW)EHaz~O@>CHhSKr6I0|!8y!QA3G>e9iLGb}7_U8?(AxC!q z6^Zq^&W6`OcIG}X65wiVane481ai~Ou}Z}e?fKBp=DQuSv%|2aOInXkXMr2DkB{bF z=Z&qubwj_EtJv58&XK`CqRCwq`z#U_pd3y8FJ8z(@U857TH$~A4o8T#x4SNDQxct3 zvnL?`ef399skzImR`Ak1lX4mwf&;|5K%(@@X_I%C;pQphg3Boox8m`fWxTDgR*e=b zbuzE6`vTA-$nKHxAAq=%=lmbh@ZX5i0!RT=`HzV5^@Tw(0G9ua5kCOcxBy53$O;Ey zM4&qIAC&)ZM5zp5@xbN35oIBOn*x{rrA~lEVxWz`5oHwsq5yo&|Ko;KrlFRAaX5gX z{Ao&i;FLD#+7PJD1i&txKv~|Kcv}5+t~aqe>WgJ+T1Bnvy!CN9zI?81varRSKc#yM z!H1@Lo6)O})`ts|xKpL<$lbiIhZ#8uA5~aWrXfQuFJzsq9X`%@0@Cmox0TJ`WGqNFfpyMBJ|sbl1oc zendbK-ipdT{rDTnZZs-IEj;X1>`#Dbe`373_L-o$Oj}l49n%iI1t}>RIv+%?&In?p zf5ZK1=~<{f3sIm^k8{0&Ngd1VejsVSOyXW}C9BAMX1%BR4b7BA?@UpS4%-2LUv~6A z7R9*ZFSGV#n){>`P&q=Jeum_Y&o&(`3u1LB>2j1FCP`qLqOjp3v0Gj_?=Lt&x946EVW6;EZd!62J(ZlHq^vkfW>u_EF+}@!zBXS(XPI04UTfUu#Sw><bqPhAa3Ku7B+aJ46fu@7MRk z3!}IrJvmj^il;BfeRY=S+U{;z9t-FV2{c{~%vd6x9BJ(M=CG&X! z@KY?e8lC!ur#f2)mov?Fzta}qB_Td(a1VhaEj`7Js-Sv@l6wMao@97YwLS&Cv(>7{ zXu-NBVXk!|Dd9tpLf#-ocdn`%OX%qInhtEok^Hm*ng=!XJtKJcY1P-Rj0*9QiaOA2 zBCTU-+sO>|$X905Kq)2&%$9W&Ca>R%Mg*o6*-5G3_-TJhA6p#O*|Qfr*JMFNc@Vv( zb{$!k(|6Zycq7Z9W&btEqPA+YE6&L42F`7YmWFy^JJFNgg{ZZxqebX_2%M**Q^|W? zXAW?!g$HAcil41&HxOc{?JSGQJuYsT_}2JAr=IKfEE4Z;`>VH3gjX(mFBJ5dxTT9J zx66L!_*Hb9yUWzgbs5ZW3Hr5-o=H1~fh!j~o5FiVwVLqO3J2My%RJ)m)#HX<9$Fjp zu_M*=$C$fY?ksF^OU!ETYUVRk!<7|rB_g#W6))~R=_N8Fc5r{_yVZ)OxnFN>F<9(J z%j8l@Xp&^QH&wU-*2|i`?cGkEoe9j5V-k zduhp{{2-1y(0O{28<_N*!>qls(T+R1remh|7t821JzJzjovDAwy9o&+(_2Prw0JAC zOB${2Mw&2TX?vE+?F9Jo8nS+|gsDbwQF#hGI^1oPdFrFnz`#uRR+`6y8g$R9$JZRy zCKYAsVrD~|VStaDC}*Idjq_>W@uJt4b3Ddg5ShUJf0}bj6g5;s9WAw_=th0GGZ28KNVCs>%4~I{QV@WcF!CDSG+dzc zstiJS>O2>IzZ|@!#xeA%yY$?n22rH#$H+9%>7*(6ik_}rRnY0|UwFIE7IL>_a%jxj zFFr|e{6CLpfgL5`-yFqxe zQzbiWRQ8$F!m!op@8LI_29((>iB5B3WJBjgQUae>FAwKa_sbts{5&JSCv`YSWv{M( zIH4LErErZIvL-xamK+GuAt?4ZPgdy(-tfFQ;jO`{V+T!IR#h24q?hZk*3MB*?OGQ& zFbYgd3yjv5ClXvdNJM8@3D3TQD0m~DbewZtpTP(x28a^ON3XW88R0IDvOAYDSnE<* z$#aBbnSy=jRs%-nsFe0y@N@^O7bY5db>9n)V)ez{Kh0wLLA$w}Y-M|cH?Z6(8og6- zL6HUDW_LS?;4W&E7F}SRJffx>TLPXUgzw)5Sa~L z5Ud-}(CThad#0)=VjPgZ*5Ve_D!R|)I+5r4Ew1(gL+DRpOU9L2=zp7R} zbGT=nqo6k?5em5+-Gn=?BtG1{n=YgAE_bw4`19xk!xzUdMGW@aI+0pr_omtobq- zK{-`ub%6<#$puYDM4JiFkZsSp0V&O-sL55L=1B+3Vo!wI)=SImltwA|`s-az`m_Z5 za#@k#@}yD3%tXBg{OD=Mr+ozaM`KV51ck*Dy0hfAO0o9?@KTZAA!M^bi=3#Vfr8B$}xr^J1;>IN*t zMG5wa8!vlhH`f}>`hi+)c5B=OV>TJo2{K|k^JPrDe6sA;%Ge0^bDE6_G@%D;w_4?&E?-(%vFh&MGewsWvtiBN?`wKrC!q8QpISZy|;96fRe`j;e zjvaHjh8yBujvYV(YR=z&y*uYQ5@yj4m*&46WF(8v%$^iXv>%=PHhA7|DD-KWbMP(? zm)SpmV=l*(sXpFHtFDKdQD54 z1XvEKun!$dv-fBXIL+WbiG4A&*7u#;cIZCMPP7puU~jjwWZKq&Aiy-0R<8GN^Wtf= z+}X=KP1Q+fUaM}U{n0}b-l;OII$>kiZ&2Td3>}xje1Znvv-V<5 ztu{nLk&3#naUbltd(t*tcNGRU4R+n;y!3!qe;_yon(5W=em%7h-p3oDlC@ypbfPev zjtQFGhU;P9{7S-FNFmHp;*J`E%p0#>z*7khZBh>XbW?^76$38f=SP3s+S!=n%PzvP zI@Ze=x|R*=uWj=bf@_*?ck<+|dOz1`n)?pU%R2?v*`gY3JQy_MAI3l$*?;1 z5)w}+Z+)(O7}C_Os!v+$B+cW#Lb!ET09l#c;58F;?sDeK4AK7r?r1=EYW$ra}b!skw+?b7+448?z@1@PzT8_3s?ql-V>F7@v$4&Ag?4i z{4^j4{^uo*x*}*PKoM{nwJMUs?T=J>AGOl|ZP%jmw0AdsgP8E$loP=Z+Fk`YtU-8& zt#P8?LY!5jLLY5V%?2?K@XxVm!}(-u&81SiH9xf``QvRbKiup^BG)KuYlL-4g^3QOswYU>s+a(VmK z4cvD4_j9S|9p~KQ%`u0bZitZ2r7^Md3H3r3a zaoU`c7VT$6tW&Pvt!b-7jyq1etxi7kbSzfK!cMl%!7#UH*+}r&`lLBKFOqF_O`MJW zzRa5)gmyp~G?v_*z{#lIsPu2ot@KAO>L@nV$9B-2{W$Ge%x~CaH0+P0lrKiQ4Eq1} zTI#fPbb06AgBQt}s8r>4er(08Opu#?05jd+95wB|t>u($k`O7&)cHW48>1AjQXO%Q z)v+BuXlfR(_F`=T<6Zavv}7)8G;`{-o7h*|)f-o5qUn5h*6=G?K*018|8C_>&MmMS znC#Nc3X^U{y9vRX&tQ~fS39vgU4*CK;X|i4c-gnaZt@Hj`88^XdA$oPYF+qIo=f&ou_bA)a@h z%}(<#n);IwDQw~wlafD49}rDGM7LjnhZ8;-c+K(gAsD;Y>Ayrm_+Ru>W^%q%2l5%=K5Ds%1tEX7{C#v3>R%Q#KzSz3Vr@#^ldm zA`AIHY3j~)L?n4dlA$lU*&sstzi5{KzcBNay&kzuZ?-}XEu#`6n zenjuBJaYK%JjQ?W@OKB++s7Ln#TU0fGduL;uf0>{#!~_)HLCsd0ulBff0~&86uhOh zB*G1G%99?p?ytHMz|}I*d4+)R)ms_Y_I`Ro?c(uHo>X@rvK^YQOd6q@l3IA6C&oq>#XGB&+;p42yjEM#w11a zQOV=cE1QBQj8r}j}*A7nZ&GEVzTdNdg6DE7Wek5MY?Ir@%DoiQt3#PX)3 z8bqD?x+FfH52_@TXPS_{lM;<&ZbbL|Xh+SA_XGif2|+60I%|qqsSHM83Q{uhh6UZu zG_9TcD=by#^tOb!Lo?i7$ECua(R7RFk$bPaZk%25UbrURpWA<|{qez;U&-(1ikTMB zH!q0_jEqW`^g1U_9=xCdTXoum)q_D{pQx)93n{~ba*2u&A(Pa1#Q{5helKpSJ0Cr$ z><^Hhotx(0EV^_I@~O8g16FP__#WDeqw8}i;{vz>LpiKJ*?PpkU?Y60nb?6IbRqAR z^!d|%!B>aHmB$>O@0gDoH)DFek0H^(SFem^v5G9`9#Uk;W0ccIt{EP}$TxGjL*ECF zBz8nS(ogB}Zl63#B0UbV-+Ib<&#>H~At1Ce7k@wN=>H$Qy?HoQ-TyaEl1fp8qNs!r zGND&Mui93L4(crY~bq9a~>ExxstX|pSatp zTnxlhH4CSc~q>8Z-X9uzi;9}uRNp%o4svg%J`^9|EtKIXk}{2 znv0j4{{1dNzeFifEOJQpkp|9PLF%-=%2V%qtsoA0ziWv{emhuK`sS3X*hh-+j#+R=A}KfuS^T;jonWTi$&(osQ_@RuIk2ca6qEb^~3T?mEFy*W^-Om5BpeYW=!Rv&& zc_BtgQXysZp^v97-wb5=NN`J$^%yFtX=?qPTP%xkv)-IZ^Y3-=#(t)3P>7a}>_KY) zsEK!G*mq5Mz`8Hctvzl!!E;FTj<)eh8kNQ5Zj)m=lBdf_ALb}^&3j{B+A4i6oHMX$ z&}V%S`zl6F%-uc?>Qi>^cvj52Pr*V-{H3&d`QRejlp7TldiqY4m19yNE!RFsF^(>@ zJ5a~Qk1;J|Dn3S@rl^2(iduWC_`D+#{l(Ji5kEIqUcQCkm_P!IN70<2L*uPr>tghCH%q1J-_k+T+ z^M{bUz+{StND8WY0}5k&JY#TX$cTKr^j8vgc;|)J*;XCK{wF&4Ut`ZSQ4AitSP8l+ z*|tMFYemc*4%?7ZscR)Q(oy3-D;7P?^L`}-(L+%a*NYL*qxaI}^IY&K6D^H!uoNprJezVPJt-riL_0$e6`a-T zKa&~+W|etE6XUPk+J(-2W4k{2)t;|%({_1AQ%?&^Q}NpOVeOnOlV22x5wM zYi{w>lZNuUCpGP|6vw8nmTosbyQT z&k9qK`A@FD2Nl^#tmGUk$;XsX^n)ymRxhv6;)))-=g;xn9R6T9A#WXQ8f-LC5fl;t z$jL4mvu;6;`xm- zZ`4W^TmOv-(89GV79ma;`>S55-)rzTeYAaaFPADNSpF;7%oW_GcXFm23~)r?_o;k@!w!S2yB@9HH~ zoP~uq+=M|t<*W1mbuEX=)MIIvj z-oe`-hkgw`AZ$^v7!&u~#QQ<1z_lFrd2;EKxfukI6Hw7d#0rOoeXKAfIndiFCmcuW zr1xZ&k8<(5MJn^#&x~61&7XYUd(YZ0DaI6W>xC`%W|!24GroV1vPPw%=jWSYb&;~_ zDC4dzim({Vgr>0%u1&)qtp7Ab79p6H%f!fL79wwx;L(f6u*D}xuOoaZpl1O z*yx`zD{4OV;mlu~XIRO+`n^LY3Mmh+ujK3Hmj}2GQlRQz|B*%afAUx7fvl-WWt&t7 z{&)WWPg*+o2uV@Uq3cQ4es)CcpE|F4GxoF)s_N7VRd^5BZO@F-e=5bS7QTP=Q&M36 z%Z4}TkJE)$I9XN&s+lbruM2?$7gE4=je*+IYN17nc*{qNdauLxZ@lhkrmKyT&A<^9 z`q%Z3a+wJ8{Mj@3W*q1_?+16keUoc;(f$tWC{AC-1%LGkp_X^M;%J`nZRWprd}i>v zIWFhAk*G7NPt|kf?=>H}>%E}yVd_r{S*`iXo<7CmHDN(oh zGb_SkKPAYa?QLTDQlaWcFiRmccJ5)Izrqw0osYWC!x-D|T(_P@`*>JCWu)`%hw_zX zp%|o!=B7BB{p|MfzfOHR>J48Y3-0jY((3COoBbsHPrblczU=0^-m#{uf6k{Im6jCx z`tYk@rB36q2n%Hro59NV??Ll}SbiRoT;~6H;}k3Pq&ySrY@~U-E=bsYPx$i z;=IZP45pdPh}i^Ybf~~{(vN#Cr4M|b%U(Iy`S4W=eYqp2=s3rqhXmk!sez5np#Crr zVA*7$3{x6lyMD;#^mXyY7w;KWE5Y||fNn%L&Y28cuLqnY1!>_H?8)8dOJtm46V_*u zCN2>G?NsMFDh6II)?SQ&c7J+0%nJKmN8TN?jpFrMU_%jz5cr;r@hQ7(M(KXdau+&` zL#b85{^x#PJV4PaX>mjq(m?NIokdyMylRxNd zzRqwE{USg;JFm!yt2m<1G*?lpH-D4dFK;nuVPQi3<~Z`!*;5gl=jZ8n+5C@elKC%O zl&M3`rVXG=FtK7ry>*+1SPuj0e(ER7+vv@0rm16@;7%vG+3lWZC1yxB8SBqeoH~9m z;`>10d%$HBKPZ?lA>GWt!d3Sm8bI~>VBmu+4*Sb|LmE~EsM8SqW{-^qUqwXk+ostJ z;GkQKn{tg{65P4Iuut*(RO46wj}LlCOsPPRIciR-&K>}h#%=405dfWfP6!~i>nNT- zdobFn>+Td3UtTiadH82{yZB5O-~17PK8D{x<@?;*s<#Kd&rU;keYYtyCxQR_nbjjl z9*CA0M0{dK2ILe8h$H5oM%+FqZvms-Do2HUqCs}^DmrlSG#Q|3xB`h^C;NIG3B31w zG61`cOkv-=lYQ`>i=hHv+dJ9%{JYQx{gjCjFpPfW6!a}j7HlHVW}!fq#IKP| zO;cGB504*Qhu%c>7sxvNtoV6wz;~pRY2h7L)20tfu>AwF)HUcVGFIO}ZHLOU6cX2U zO4Sn=4tjMBQ?NmIehqc~h^LC2qVI|52&El1;_6cMVJaf+8*-SIB6Q{ef)V zm2%Z`Y9Dl5p=BlHOa>wtqeq3t_}6@qeprCp$%!aKRj0OTetood|Gm<^eRE*3&0feXpj1|>tb;bb5vSRJ57{KWiA%gfo!<~V^j@OY@OJrGnWhF zx4bGxTUT}m^(as2X>d@giUK_wab~0tpn%G?k%TO;<1< z(VnZI`8w8a#>md#5D|6c{Y>noU1(|kMseXiiz0f*#FmZJX?E|@FjWOUqjF#}0C%P* zQL-c`@>pXBSQHa%q?3<(88x$XG}}wCScHoccn*ID<1T9;Tcpbx3wO@WuP*tXE&|0h zH%703=p7aq+Ec){i*M?^hPqH{Mm~GAw^e>$j(;xF}@qOG{xsm*Cfr_iO<*H^I$j4aqrsjT_jY$ z5rv6pdZx>Bg~Ym%9xuF z#{@oQkb7vQ_j=lO|7~%Jac0B`GI*zH1W-M4uv33xhU&y|qfor9*r%((suyx7(>>#F z*U%9ADw67g1n~|wfBIF`m$u^m|f^-w6S+t_Ym;p zF*)P5o-=GNPz zm4p^;3i2ZJLwO~&rM65;xAS?~V2ERUa~3$5-3|oJ^wFbqCBVJm*zBQOsc*|qLYFrV z(TOZnUCe5-Q+d3BaBjk$xfaLM*RNqAqeP}P-=yD3Ep`ze?Iy1DbJi_11?;_CQ>vUB zRYZdta^O9U19MXnK)oooCvLIBB>%#)b4VX{2JjZTUy^gQBgiaY$VrI|0tF5IlQE|{ zXIQOKghyy1rn##65irAf_er>HV|$Fr6(?wu zp>(+8s$+Fa$TOXU;b7CZ7=KoFZy@a_`%M09OhTM>y!sE`XR`K6^0W~r>dc69OL0>P zenhazO+!vv;mf|t2$P4rEy% zQU9dNzP4bs7=+s1OqgE;ZS|qXDcye->Vu2f}_LkFmDEA;Z0R zh~9TBak=D(?IvYOeScl^oWXI{A!IEqF5xDCyC#l{kmZZZYEd%&FxbDfuo1hB7MK7n z=FdqOdqug<^PtU0{=B%;tJ^xbkfbuZjm1~D(-f(s`J`E9Ay2*JHp(G4a7!J#UU4~1 zdJhQt?1K1HdJ?f)%!{WfcyD7ekzNE<8RjTV8%~YYAimIsrQX#BY4usTFvBeM&HaOJ;Af6~LCbmfB;%Z2j2`sD9>!`gX$;%f*Gqfpz;m&OtSa4F zhgySyvyxde+w6V2Gb+#9n9mDexQFzrNkiA)3Sev~fVSl1Q z%~@zJ_2Oy=9|NoAPLgf)4I6;&a9FmF!L0koRb-bN5FD$ zZd+-uuMOvwov$@+_qB1*c6mjhHGuVSkQg^7Mt*kVwxrVUUhQ`%&4{OD>K)`u|4Mw|g4gu{BCay~M70zZw zb&qcqK8`XO`!Z!I$JN_On3-ZvX?Z`lg}@t`w;!sMgUkzwc0W!$C~g5Po6^tO8nd~c zP0D$Q3v3-h5?MXa%hA+bm%F*=r2cwT%HmibjQLt{eEm#26G5*Xj%(bj86CFf=Mp}$ zHy3~F6OemdBk354RG=x6t#MA&H5*9EncD_jIkpq|H(GjPt_YNw8$`Y3K|agp`mv=z z04Dv{)ff#s8izC#Vk8>)U6lovD@mO-EEN}qkC=R}qAbYtCntifHd7MlPY`#gO?!B$ zHV8C_wQOP};f+t#(j6T!uiT3b4BjZC&$x+aFI|c0?ogje`k`@AZx7=2PL6Y*lb~`~ zZ?+meEzGAkm|l2xBcbXtugZ?1lY^1h1Ex|(n5de#@Xf!+z_XZjCm-6yP~c!l!NR4H zoMB!dW1}GX{us zEDG*iy?@MK_BM-w=f|h_SI5~sLxW-SwV++0krF0*!v z&Tj*+WUoUTl#1N7pKJ1YF)*~Bss}J%)E5$dxlcg7NHrR90jX{2Z^6*2jx0q09!Tp= zKeqpu1M?=^mIG2%pN$?pbWp;ZBZac|1k}aw z@9k57+(fX2?*Lc`{i*}92;1|&+NL{i`veSeeKL#wKd-j`mnHg}IKXudi{O%9s+*|y zPb-O=YoIFtsD0b{3(LH`7l&qr*>0|3xc>`8kil$xoE4OK1kL<6r12O2IcLkcR}~=r z{{gW44Wl-Oq379@e*r7Z0}@)v;mF0`VJ=?ptI81;^~s@szF-_`)@!va-xY}Lm>JRg zaa6Ew#rp_Mm2&J49y)>t3T34?#-mdLf2^6Qxuv;M?m}PRyO7AE|HSBU3a|zLx}jzU zqdFc7HCM@;DKpgd2SK3+c=^8?S%ZEXCt3}T#kZR?G=-h?%ecgTrosnbK7oDzuEPyN)E zv7`rh>Ap_dtmtxzi^4`;#y;5r`!oXf+Zf}dB3gszolFfY_7KRs|-~MF3MTu}G zYJb45_*X!wViKHum@iQ668Zve{PT@W*WJc^zq3!afdc!&E*eeg_O%Q1ZSVUzzMe^r z@FleKyb|OQ0C!g@vCZKgD@Z;&ivy>xBXrh@Lw^7{1p!j25-T7<`6C;Txeu|oL}iwK z>P?2R>ucbXVbTb>MR@N*l1x2VGD@&MzH${f3@Kjj-D{$8+pRa+IRWUSiDPva|Bmkq zxPa6AD9LwRh5>LB9mLlh&a_LCFhi%x(^mON1@B1l<6$^Jv^U4Nsc77cnpVi|ezP&O zhN1dbBTO%WcnJ{CZZN%Zx@xg~?9HR4(_r=4OUw{Bmn3*UDd0xuj0v7CN3-MU4LsZ2 z-S7`YOg3sX&0CNdv4{DT$d8gFqFfNHUI%wBDTo>Iz|K)v&2EAT&A4sl9+Z1W^e`Vh zFqul9b3VmRjCmG3_o};Ly#-?ZZ0K@tjMw_9-orUgFjU(qBIi%XiJ3Q|C}KpZ!qXNaK)*iet-?m0I}x^JUN2cN8KePJnOzNOs|D z0@Ek|-*YRy{h+f9O*y&NHUPVu?~5M$hjr;~2XTZ)*z&I&1?mf{*5S;47xqVk76z{T zL&d0x1GKUOdVfb4fxJzH0U*A1d@fW^YxW@OtXfY)-UI%>BT6=?8VNi zJ(O+dF=<)9{aiBco(iHc`o=S(AI?2`R!p9+C?8P38gj#$E+r;-R>4S(YJSu_T>07RMF!Z3M`}?zk7y^QroFh3>JZi zS*yg2qa{ls4Sg%eXqBs6FEee-mn*)zm6+|B?Y#j693XmB4QVz`U52=sa0*qn3#{-X z$cFNxIR-yV0EkLH`zA!yT#_Pb8mab}{xv+9=HDobU@b?}$#j0#kWqwyp)T#i0ct<( zXU-QJ{P3Gm8xi?Q6q}+gmg5tGkHkHQDC=$FIVH(X_JBF}ei`PtwZze}DZtKLAx6!hpj(J_%)j=IWNVwO3&!-7}7W6iHq~m=a zReqhXch2AHA9$bMaQ<{g0*9 zVC<7@fes$uT)esXa#GGNtrcA&byjz4ugH;#VZV*52rEDMkPT+ap__;%W+H42Q7s=& zFUkDO15H%t1?lUr)a}9~CxIh5EPiMgn-C6TPI*f_ijWbP8SF2%%jV5LesRIfivWgn zf;!Ab-$hnQYw)po-I>uIR=Df%0Kur)Z7UIs86CIK307lzDpZl{qx>X* zz6c-1L4MbE`|G#Xz*jPm@O%}K8K$QJSD#q)M=yU_$I==%rI^aFKIeNELL}oa+_zhi z&Tj;ryT>L=x;K_4x?+jKHlpc8FZUJ<Cyof^4NWZJlKe&4rbq7^#9yVZ)^W*dWD2BoQkZF#fHQ|o0_B=B)`dn$zO)C|pR ztoQi-P6)_!C8D6zgz4KW-~z)rCjvGcIAlHd`Lzus9Nt^wF*G}wy+&T)Hf%6>+ze26 z7qrp=>Us1%;+&r8zD6U!;$N|4pMI<8ejSPFtN8nVz?G{NW#vJbZUL^f9Wxs?C@|E3i z>Xv8w;LNviozxOHS1c0E{`y?<~?v8SrX4{3H{*$~98XQCbd%(Ynhy#rNKVtTOZBOXS5;~<2q3h)z zoR7r&w=NX`!VoeVIsBj^r2Ny7%}3Nk{WZ*PnkXT{7YibMxm3_jK*i^_GJ0bUBUKhT zV3Cd^kip^!|HDq7hQX)5YqfvW#yUU}O0^1CN^Q#y1VQ2dkr%N7>~3>cx@P;nBgOPT za-|@!|8F06oXOK!4d^EBM>&TJG^0zAcH!E>=6mVRUQ{tEeG=KMdoBn~_;l%d|7!wH> zWIfIW0Zsq(@n2nXWE-mBv6olN_;Zlt3Q%g=@jPeyi6BnT?;WDb~nk<94Dv?-Ry5E?!9mkg=kQr%xF`R8xI_Yj~B z`$k05eSZ{UOfgyrR=4tc6`%6_GiTmpZ-KC@i`rqtaSLJ)i^diZH1C|*M@5gHxbu@` zVe`7X143Q&E`k?0+{6rNdF$IW@3G0468tn^5~$S<7U0IuQYQ$ov@i)6itn#Nm{-6% z^V-+#xCyB`Qy8On62&`u?}=f&G02qP#>W&5@xdzT!h72cLNX`55Rwr`vh@~p@3qy7 zv*0b9oZN#AmAur@A6-kt#_sLnF{cD#+RTFWHk*Izuyf1xGMf1kl8iT-6lt#K!O$t4 zTRCQ_%nt;BnO-BQ-o&C(G4TBvL?JN>ot8Xi`1%Cse=KgOhcHGe5R7_@>24&0QIF$8 z6Nwvg%OP3f>~A)G!dS6rzsP>3ojZk0kY& zmA%EVIo3}vmGB_)Nmwr;8cwTnI#=_`JR}lq+ z-wXm?6yQY)GO;Lj&Ey@@t*PH#J%8(Y2RgWz=mjV0-RRuNQM3~Bjk4cCS&$j{;clzm zMIc_;dDELxlbtO$sye&!8-@x^qoqi1ieqorXiSVPnzz;gR-~u3980$iVfDN0W@j2< zVZBAo-xN$eSUo-%JA#F3xwZ#r()Vd;%bg#s-e;PbWmNw_guV#y(^!v*?nysd-Gim} z%q-6nI(HhS2%z=C^K~ZRxvxpgr3JjT3VUpa!)yrcrF zz(FN6HJ>~8-UaUUFgH-Jx;AAA+WNT(Z#i~-q?cJ&&osnOLluOQpJ$GH*8JY{luo>_ za5)b5BhSra&%lrsed9S8S!e?iJcL!plV5%wr@2d#*IT^5+|swrYCAj&ZEwYRj!>A{lKioCwLom@d-kFO~A;r_&B`iO3sJ{`nZ*N7f&Vrnq;cl zf0!}^Si;h$AwR~!Nf~ftj@qi^ZcyBfe5m6i7ip4mUvZVwH?chW+*Tbq5buouI+Mn; zha~XBo>#wU>G8<>IfR3(j64|iV|Kg2RK*v+yu_ zVmZ)>?H*0kW?bEIs^G0?Dq9B`>zHETkLc|z_;p(xaBz()D5%;6W>ai_n+L(DzWd*2 zDpk|eX^Gf-Y%q#}ATbrff&7!rbxE_N!&ActE4Ln?OQ$ zpQGqM_j*HhoB@2~nf>{S9yo^2WVL{V{d&ntrg~6A0Lr%u(G<&BKzikS3=fYuV!q=p zr<-~mRt{)&wCB%>Z#j0kQhJxXih}8fA4gEA6vTjpn`o96GwAe^Bw zjCm%r)tQB`Ldss~+~+LZHUxn{HFa|N_%nn&Jm7Nb7B)!4c-=ecoy84c3#~vh2hQXl zRQ^^4JKVnVFlunR21mIFG6lT1fOyAIX+-d|NV!lbG9s+cFe~N73TQdzRl-CS| zylO8NDUKp;^cTRB7$jVkpjRgN{?yLZ!4%j$A;-G2>0W?qK|qP;ug+W!~eUXe}Mxt+ptMXvy-*6YHMhRb8#r}xIa@psm<@VZOpG-b?ygn7|(*t zsy#Qt-rXWudzI&wa+H%!tSzsjTEV1H*KTL?&@zp+$*@?JY|hxsz*77*22#0OXTwkh|ETj5 z(;6Hr@D%q=XTb3s7~J-fg!hi#5m-+!h?MMTvnw{TA*7i&a;ogak1c;PjxHaZ4BMDn zr*Qqjl@t?yztU)z3SK2Uu-jqMdG_@^TVK6MJ_{nmk!usFnhM56)&!Sd)Sn?>5|s;E z3YJ9Zs|_^=*!_E!)IuL6WrWURcXv1iT0nQHLfV^$9>uGRt3^fOlqJ zH%6LN%p}u`zoR(nXp&)#$q&6vQI}LKUutR_45%Fyy|W}w5Ch*dTq!@O``YvoQ(p{H z*5zf5OO5I_+NJxk%LQhVF_tQ;tv!tp;&y(1H=8Gi!BF9xe+h;|FRyG5b2Y?CQ6!Xj z_|d#{!%Y|c)(%^MaONBhl5@krfiFQ zzMo+{Kp*F9C%{LcMp$4t+Ls$(LsR`^85X(u-u0=-7`N?I#B`Zd0ndKIu_TW1{~j;~ zDLdG-^YYeF?T5}!LVQs-C8^&9e$75LKi&{1+8-Vm zjnJ6u{<9zOmo)oU%L%C2r(ywr2X!o5v;-{E??O*bjKal!W*N$+IA~;5 z{3I|NnFY!m78tWvK=H^y%ZHnpiCBbc?mC(Z;yC1nf`PtQcMZGiWKLf{{^J=UO6ZSS z^w$KCLZW$fdy@gn61SM62I=&b0tfjR?87;adgI@#c4>aWS=h|v7We#{H=&_Hqv z{l`eEFWe0tTt5IEmV%M5_r`Y(Mb|!u+8F39#J>EZ8Tn3L{pud`H^DJXa|IgPcs&;M^zD%aZsuoFx>1%AAEJDiir3yCWCK%mkZuxeB17ljdWdHa04;9B7SsQlOBc=92?)Y zy&p=&@MOn)zPq>bO$s-wJ=@`j`P?*G<@a^N^IBxE0QJ7qAD^xM-3Nz$O!ng7D%X=< z+G&D9n%{G@u4fIN>6lAqJYy9NV_aVi@@{GXI49xykF%FXCAeW7 zaT-q{F)Z+Rt0pmPWXR02y-oGi)F!FcIXC->DH`;WshEX+>} zX6E!SuK_us13cPbd|5EwHJ`H^2j^D&#;A6mRpMs7p8#9G{AC}gGxbZy^*CMk5!$|} zGHr_u=V3g?STHqq$M@RlZIG3qMSBu)kz4B09VI)NWWR&9kzK038@X$(WbpNTK9^Gd zfXWQed|6Dj9|Y?Sy+S-SPaO*g#+#nkPVYjO|AP7E#|E0Z7FNKk-)+OdVoQNXQ~9)o z`v@Gu`bdY5r=K@gr*BbR!h5Ob?$Q64r>{TqAUk{0w*gv?Kl84Wca-m9j8o%=U1{+O zuUlupE5NpNm;5g`MEilC`>fJ!vJ*)wTbPqNh%M_CSYmWEvEc#YL@4u9zv?$2iP)aI zj!TmL4Bx-VnP9(zebI&!?Ln*`VmgvR_bP@!c}`BsA+YoE9IQxCe{e?ka-oPYa!bRL zO5|Rj?#=k0CkLjz_JHZL<|iQx6{Lb(&(JkU{p>V&a_tw$;&o!jG>RZhj-~E6Q>YRc z**SQcnP?48wQ3wX(@>!nQ?S(6gqp&Ecg*4uulk({n0tAWOR-ru>+__Ln>nxlWsAWs z&FnbTP7cthn^;@r9Ra=@zjMhVUS4kkh53p-0pv7mk=XO9;?BVV3gnA+a?D1yy?1wv z#C3XOzUt7dd+eFHg4tML58`tBuqu7LGJRfKP_=guVs`*CtQ(NddYDIs>Bw!@jK+l6 zlNeZ+-{cD|ruc1za}?(%*fA3C?W021y%INyEn-Bb2f#q;##PGbM)PSD zYE(bfqacV_$oB3-^G1PDKQrw|E0i66BttpRjdvrUH7|qlw$$5k_EO1j1TZ_0NHiq? zGXW9xy;al!N>$MSxp7knDTm(D;@pwV1$x!5CX#6TK-MJ1Sc=#kKOz69vkky?7v=M$ zE;EpSl?n%->N7lL8_EQX{321mtBDs+8bEF!DWvZWeC*=an13h1Al~FHb!yMJaQD^K z`?dF1JAQU>8j(=+CNbs7h7UQJjSTJ|Gq{{EKy9^kSgk|;opJo?>K&?Gn+H7l`s-R$ z_c5nSLvkWjbyjfppWR~!BVO5_jf5cE5s)3SRcFx`!twd|mM%}fgZ&Dp*IA7hL=5q+ zpg7{4+$%U`{B^Yr;WT#^df$@NvBd6+!M0aED#S}R74(k@H@7grR|t9oyv^6V97Kng z!TaL!_#2s@8Fs!~)MzveU9dP=a&?G^R}BhXE<}b^QlpjZvlR8Q+q>x(fwM=Y!bdC7 z%Nbdfj|N=B9k5@3icNkrvpOxOM;*b4f!uF?lbhaO0*;W>=F!N?Y*C$0iB`WfCg=$%(0`8r>wPBOMf%``#9MxSM2mU!}}W{in5H5Wta{i_chpwhzqND-(CNnwOB5zUvJ7kV_iYaRkx zu0;IYIaiJJi;B+#b2Dy9ojD9 z&o78m`QN9_FFGYs-ZP@*kAr4?W&sbaf!5OoXP4;B%5{jOTWjP>z!+D=g?fD;xETx9 z0ba)om;GkqP7VVZm=to8{Jj}G5K*^&e#=Jh^7v8AEz=0mJyeGRx_p{24rl((935|- z;zF#*TxF}fs7KhejR-cw0_1mxJUMvq+6P4ynV3)8=qp~i8g;!(=_R1zXJ=`>PVW3V zlw|WVRF?r}+rD(g>)7EF^*|lNB!Cf*1q6?*>NFdd08W0@T}$ zS=l>lWN6q}^fO$Zfm+$J?xLcf zH9}WCiXW(VPgcIR{B1%-23|~@9R#VR9GGz6Oz89$m7G+o2LsO&PR5)9=lIj!fZM+N zW|v^=TEG?oJW4>ko;-f9A9-Q8B-hqcJXd5-T>m}uQDv6^J^iOUsM1+uO}l+_3(3}hMFJm?+2axj-gJ1Vd4BWY|v=Z#blRZaIMKw&jgRoPl1^>Rk2%` zp6xB|jW^n{*E-|!$6gG#x#03O8F*l=8s0J8TpdRhb^~3lfyfWW82jMVEK_%4q9fON zkf|JzC-{6DJq*nJ2I7E8S_9<|c6et1)^bhi3*4oQ`E|iwN8x(rBGiAYxMaDc1#Ap= z?f+J}7Bwi5`I=+P`G&h%FH?7_Y2E<&SQkvcsQ_>&PyJR)umodPl-E@S@U^ypz-0{N~ojT~vSlGv$Yfy=*Z|^2?mK!{%-$AA1e{OPAeOgXfwGcd8=#&ClwNh}px|z{X11Ir0|z05xvt31 zc1$D;$krR_=Fg67POZS7?upiwsO88&Dhyt6ZaN{VS3mB8k8zWmGOXa+wMqge4$tOw zWf&JNg9g;oD1Sw~FibIj8Vw8dJA^id91o4*jkOrd5!`;FJHZljZOl-#LyBEjt?xT$5Fwke4>ZSIAN2krrJtXz3K%13+nf+Os;OleH!nvJ>2X@f` zl=6CjN&>=}v-eZ~vO~ukN2N30U95NJ9}R)bJd1SW@t<(KXSf0%2(xldbpc z_M0h)$a+X+4{P(m>)VU_bC7sw7ZDqCdY5ej^Me1x4RFij1lnH7K-Bw}yZsH@{)+qR z)Ol3OVhTo1M0Dx|Xg8Tll5)C+Acen5;nr)9fNT?%IvZkoZ~cUAtasO& zCYR#_kc zN)Zbc6$J$p1wjR*djJIl1f)cA=!T&iMo>Yzr39oqBqc|s8%dEE>Fykunf2S?InO!g zd7tOK-s}2({bz9Rz4DHIueI*aXG<@xN>pH?m-=V)xU$94S?t~&y5?xx$DP`7``2tp zJZ}W9Bl8^TZ4Kw=2N{JAkt!-7aH{L_*uPm*S})UIWY9_ z1noWg%7|;lFQ^TTE$}2KNN<&)&wRr19dFX1j8-Z|7=pJw?rM`|p_1UsDcOd!i*wY)vg5ceoU1`-bK5 z)j%N#qZx7tD}78x4K0`$UXW5@B%LI4GA%$fGmmnI>ejdWV99~T`J(=w`s4%AtQkQ{ zY=hp>i6aDQe7!&~+%ww4$((+EDUE6el^w}0cnC{(yB$R(6uzu*W*^Q~>*p?gD(&je z=f~Jj#4jY9$Ak0JNSY|cfiW`>y*dyY6%5v>`doj=UR^21LwgdWp3LjWr^on7orBPd zhBkuurQ~~S79i8WM@NNu?;LdasTKMyF`_&pmx#FyFfj^!I-bVy7zo>ays$du=jDcs zT2eVZaUY;_th+3gu$c}lwnAPi(@-8aA+%%kC&>Hg)H5VYp(PTSOHVcWfI?~t)#1^_ zoL^Mu6p4ZFS?pSn6iT7z2;KXdEflOdk3Lc<%UyI?a~XYPhKBbND=I!Ld?rbg)Ai24 zwZBc^1q@5e{*U@~W{?3sDS7KU5r%5pg^`OXt`Je`&L&ELi|+0oadkHOGxffPvZ=6^ggQJiYf#bQo0#%aL1%wf)ZX?w zbol(wPMTm*A9DIvXb1$K8CH5W7s?EEy^0J|t{qn-)vU@*lXksd=9*LX-Z}gjY+EaO zD9`3Wq5#g&)E}SuLTTfDq<=zpdDdYu!hfP{p)7!}+k}6fbwdV`LH;M)_E@aX%0QuM z6FYv&bwzxP%EI0(;s^~4Y1K1YrFl?wq3S++h}s0r=PHl$`i&oJDgIIjh>{>cQ0Oip zsDL)qpaR$Gw=qCnIl%QPKa^*^k0d%?kn0{`k@Qx}mG^3~NjWdC2q||zGCRh8>rFd^ zQVfy!TP1?u| zgUvCsnXbv7Q;}JxbG2Fh^`NghuR@zl`zWX9f2JJ}ZKLkyRktJ{9;PJGQFp##;Iagd zxo_-$^m!-TMsBqF=&nXkcq4ekw7ngE{NhpEvtv`*jT}p9JpStTY%=&M7 zM=}Q#wN#KVf_6brxcysV9vZy-@Y?wB)?ma~E4V8lE!$PWlOmXWJLdz-ZM;6O(LU`8 z%k;m$FIz z!lN$oXq!`gdtATBlZYSc6sp9+9l4hj@$$)77&io6=e$@7WCqNJ?Nm6j$b>@W6U<%- zVY?MPZUV%!mw8iQ)Vw1YY*Dv?4=iW)(bfcjiyo~JRPwE}Q~6(p3ea-!6E?d=L3F~(@Uwx-r`T{04ULe zWr~XgdI|r}^O6LHWI$t1|>nFJv#TQFBnVL~|{@$0k)}576{yS!TOc_6E5fc=y+; z+#i2`PtEmn;h@#3NoSRVn}qLObWe?sX&?+Y%j@td+_E?VXtm#3g{!(;H#j5ATvwU-e6=JA<`H&6?O zZ=4sFZ+%WZ(q$uW=u~}0`nzCom}@7OU`hHEY}+StkGT8n3+VHo#n;v>w9;n`19lZC zC;1g;nWmUhvj$B4Mq@HgP2K!nYJ5fYe4jtmN(-J6ZripCP}(Mmp5jQ<74W<;&Uv7P zhoJ`oe;rXSylLG-C2mzL_m)h7;@ZKWESuGymrUYa(eY#HX<)zt&S@xUnn*={WuSx9 z74MX||I1Nv7Mzp&ELL-o`IY`5s&iX=BSCdCJpu6rh#mt~zD*yZdu?LXQ>%t{VTV<6 z3>8b>5BH>1_T078m2DQy(-cu24NP$(Q%fUZKaPV!b8l{|dVy|DP$KS1Q06H~OBF!j4G-o!K%aft*REiVxznyTQZd`y4If>s&Zt?a+|;1}{&r@&CO;cXb+sr$rLgCGRQ?_|fv zcQUpS&(|6CvH<+^^`8*E=TWc8FYcos9KFb56-wN=Js8#ITN5)OAV7G zxl_ZE>!7qt*K=3M)8vgLndSAHrOSCw*CN;W&*Nc@Q?P3gIf@8{(l2D(XPI{?IWzfv z&+%7gK>xXiC@3FdMuFB)1h}Ukw*KaZDGpj#HkENtZ_ZWlw+c|i7U)BW)0tz5q#^0 zc@LOQ=QdOl9Kv4?2`(MJvEf(G%y2gXS97?oXIfos}q%NyAp>k!#X+$cV^5lP~%+GU&st|+z4R`$o$nKOTvFlu-SVQ{n-pgVZ zVfv|vpR*UQPVD6g5^Y&#nh4k_#!0Mvbvc!_aPkQxk;sVMrnI@W1xK&rm;D}s=43K1 zk}x918OW4TDrK`%<0bA_WnkfhYXYkU@65y>v$m7(sU$yx7bx|Tow@=Y+%kR#uxHF# zYf49v2()1i=eXX7GdtLD(A~tr(;S85V&HFA9I(D+mRuNA**SSND=XG2Rm*q%5-%Vk zUgWdi3CZ=_Q%lgB0#5mhFKz4NH$f&X(7xhe#sbi$QE+q=eL86Y&HLPRX@@9_()BR% z(?JRKK%eM0s4RmPPRW1AOcKoK^K=9Ke!4}*XIg&QGvrtp!*7xx-QPo}t*oXj zi#Jz$Sz$#VHjQunuMTNN5j(wi z?^EPDb(QB_zD7mZ`M(a~DMpaN>Kj^*#tM%Hn*nhV{kr67`fBW17=YmqS4Qf%_t$s# zyo8IOZ0$cs1Fa>$Ud8~PTTkHBHCNVLA#W(Z=DF=4!t&2&w)cV4Ezbj|B#rG!0NgLt z&QOd&LRshoBO|1bFL{tc-)>!K9y$Rn4>Otpq7mU?wUJC&2<|l?)=>ze9pH7L5q}eJ z@k+4X9u?>5t_7ixb=0w7qh5Y;j-2)$20~52+|wFZX~(zRO84n;E?{kM_kh+Dh+~pe z57xnwN`mE$1_Z5ZAcX@lelG(C;HPdKL|5`IyHSw-)+LDe>9y$wAmwrlKRtA6!_Umo z649rJ!Mo+q?Z@W2!)j8ek@Fsv;SVMO{1$Kf{)F-OOG{uwzi@}-cr5J@aB%XQ((KJm zlCu5lSi~I&sr)PeAYBgSu)Dht=ZImrI{-UA3lYc3!#pn~O?xBT&x#cQDJTK*45}8~ z`Mmn8_5!MOg&Myn9}1Ncmm%ppjA5OR0@z02=~jA#ATOV_rfSQq-z>OCXLm1 zBv}XQ0iLWEs7`VLRu{*+yR5s7cG<|UOp3?|Q20bH2eke)m76|aF@c;qn&~zyI75l8 zeAL4#i;qTF>&)?NyzkXiSTEUy&P4;5_W^@o70I(eASv<+k7U?gxc)J#*n2Ko`6kxF zGDI=D+aVb>fs{sFRW&#FeFv_Q9qkrW-X#G_F-h7rjEzv1?`ucAz{a530^59zAd?-lqm%9XsyZ8;)iDEsD4>iQ+<(AaDih$>?VldN`P?F zMo<>W;}DFIlBvs>H$=7sVS!ehg{!dOQv~3fU2DNb?01u+{Pq%d1))qL9*=$CcY&`J z%A$x2*lS3ZTj9f_t=@S5LcaC_xbM@4iV9xLc(`sZ%9S=$^Lo2g7epF|Hspp(f!o(lD%K5am$lVfVLHlG({@D%$o%l*;U zmo!rFrWaVclGx`ryYW<|YV4B-A&|cbozWN2ucIXVu&Jf{jHcM6*6GNrlg-=^!lwa& z?O#SxiFD}~a^r#?jzMl#wi}O1D^K)Ku|M3c`_WC-b}0*oRKTM;gI?_xJb~a_(GcHM zrRV8iFOq%bW<+D~70#y_6Hk;+#&w#C`~umjT;ovEu%~J&C(`{;?wynLAT1KfIF38? zby^z-AMx1r`jEAI4O{rJO!+lD^dn$gLhET=b)s~6!02Nol-Y%Fg~nvoR>+%9gyYD@ zOfvD{Iuy=-iLGBs`BDAZVgvkK(mapnA>T*Su7l8dB*FJ_C`tb7K6riPkO}d7q*&Mu z;l-S(2mVTQ(Y9buFuR=)_+ym0w8Y7f}C-`JC|2?2{{3i10@w z84!e;`N#?XzWJ+GsTT>pifgz%Px{OM|8CCbf4|^+f#=Ez2j)CwGi+7g&%a}XVve0C z?t9jUv|=RvO3|y-mofGe%C-bwhZQF_g=-H@iwFk60QA z|G~RgPj?)U9Bmd%Uu`(%6!~AN{f?P3{$CMp#0~G;I@22cMIUioJ6YVzn56%C(GfKJ zI5Eck#iDUcqUfD526Ca)R_Z_ZM&Wbm@T(~t+w$yG>98|l)6y1(5-1)4)USP{5qCL6 z4w&EI&MBo)&@f9}$9TjT3IVD9MSO_6B;PQfbkDuATe#KB3Nhq#bhg4a$wct_olO*reR&Ow%gcJV!vdeo z%yl;!&9lAGFOl&}kChbuNc-&Ho9&$hpZi_e`CUeEwZg zPc9?k{ZB!<|5VJS?17x=`IQHi!j{2(?u-TVj|1=K5s){f{d)%=;zM#m-U)bz*B(*Mhi)G6x8C`4+Zke&@q{pvxQlXM6GuQt!_M|C7C^2qeerMn8^>Ig zsM39;gvXmkmshT^E{CtVtr`3B4?bNUAaQ2<9~Ju92^I9#ZiCacF-jZAt~0!|C6OAO8L`Zn9Wtwzrl=MRQg>RuXQVbCn$~u(pw<6uxbjr!jRXj9_lQ*xrPvm%8pg@a) zx>cNLM(Zb157&aEy_1h*-vpD`Q6cSl#=Xy;+Jzt}Wz49OGJOS@3j|eZ4XGAyhd?SnV7dl=^XD5eT``MbsD$%=1D)nb4kV|{O;q%_4dZlvV z2o~{TaV4?#)W`n$Mw@&MD6<&FvdQi9_^uXKiWR-Ii6)g= zN(#iXK2g{M4^SrhU3Z_VIGLa^{0%@?Bh$M=pOqs5?SA6vHxsMEzqP+)_cvcmbkmcoaL2TAemZ}y` z&N}=(?5P<3kj@lG4;?E+OEF;SX<<3Fi09@5@m|vZ90)rV3l=v6+TscR**lq>?|#k5 z@AIsnli_3EOGoB^R!V7p8|yKLy2@Hf7W%IlL-%1&o$pyFIV1#y%3K}8`)D7nITY|b zn}wd+La`mya48JX{4w0d`N5wNN{8rK-02{DHiN7#@24d`nsBKnc(*@C z(J;+Gw-*xUX4yUq!YAP2WmwVhci24^0wxg$9Q6j-y${d1a|5DhKW3y%sYYEiAd=x zt1iU*nB2=4@@IdPNFAbM-9sc`3i||A4`48W z7_)B$=@x%!jCluW50Tc=j!Ubn!I&hW;ab|CMQ77pKG$6zAlE|HSYr^9Rr^Wp1}!@? z%2&b_;RB>2;&@iWqp|e#@6h8)%b7xwvHLF}H|9x&s; z9z+c11Cvdl=uxMz2zr%Bllr3<7PJ}aA@x1#$?3K;s$?}6q?XWBTVOe&Yqw;{{O0l; zt<}m&9VlIXhoIKxbNLn6;&Q<7vmdL4i@UQWwwW%7zMuF=nz?`j3z!!c-o%aM$@?gC zJh>VO97@Wq_DYW~a_6h^Px%?tSOCZouH*5tDkp;XVTV|)`tz@IxwQ36X^#DzMsH)g zJ#cI7M;dvdR;ScI(U$;Hw!tJ&Fx$*|vg$(@@^CUB8!aVq5IK!Tn@A=|u}}2|q>SzriCIAtST=`}vx7qWlJiR?typ=v$;9f{ulJ-5yGt+5zxBh% zPv5-mxc+unFBHfed7Dtj%MZ7ZDJ_z{2Nk#rDeW|SsuXjx5rUCnr zgP{*jQU9xyM7I2pDlLkE`Zc+#s&PfgCVUNI;HnZ-rNAKKi0?9z7x#XJhX=I17snIp zXB-%p!LBxz{GNX9OovHy+#R4(jdD-yf>@c{g4Uy3u|vLRl4#|*?VLsMtdF6AJz7)- z`?pMS8cR4>cf`o{2XxMsd;twWu`X^65BP4Kv7H#!;mw+t1^t+6Yo7>JhI`a0}Cg>+Rbi@OZp);4GaBYDyg8k{fq>f zdFX!knB}kWk!rEP+EHkK9lYwZSSU+Y-`4!&Hmk%#SRpG1R2D0CW(!3>&*N$esmZ&Z z0F%SDAgFCCeBszPY@wvWT;myyQ%AlxYr!G8u@x>4y+Q{Xk(dh>c*NGkIt7YPOn)+| z95(*64KU(2IiN2bEF#6m7Fm63EXI)WC%#cjVGx%*Ma3nvFzDe$t?5P-pLg#&SuCaP zExnIVW>9=v9H5z;6Lgk^(%{KbKQ5sX_d73!W(@cFsW0Q)?l1#cLlHq9pKl$&XgSj- zE$gy2HlF@kr}RhzGQsdGqXGso%iupZ^E?y-4;IooqxM64{~P*-mx;Z_ffD6>Y#x?J z_T~;do0}8Q7cAljy&fyoBUQ(KjwB4TRc1Q--O^hx8F9cjiPU8bUi$@@zqD^wX`Gi6~+?2 zS9~_vo!p=t&v(tc%<8)5wu=aUsG7Zebzt+_-DC_o@b5wrjE8}u79<_-G>qVlAC~kL zTNog?z_3Y6@a+knSR|$eNpOk+Lr$Q38xYbxn}$6o07Tx8@%6WX*RRk&OFr17J#`*K z9)KnNueXpB#L&I}P~ksYeNj7p&-E(7zBs;q@&JC+tN%mYzne|L!7kkRul@d4GevDP zM&C;azOZi6UL68NUvB~3Fd$;xf_yoBT>dJCoWvLF3t94iyVbY@KYIS3^Fr`O$^g%k zQ!U;t_Q^3fD8-oY%V0z_2+~gLGzq+9S+P*~Q=fuBC%<6^*_b{N*fcNhQ$iYxPspQ@7fM6rGi<@l?Uzq} zc^noZ9gQU=qQ4JhXXFK0eZAX&V)hM5;oMh8;!N2@=}sc85+rpnaI?5`uPP$G9E}gs zXmxytd~(kwI`QOc{-@8Gzbk<(VGMjr7H{7E+0g+MjUCs@=pYG0hSxNC5DXo0`4PD& z98~~qkZILaQ)}bn3pKTrbYb{=kn97~ut+^^?K=Q|j=Z;PV!a5-)-k_!PQKde$H;^= z+OdZ3dd^UN?bi;!n~CS)`NA?yAFze2c^BLiqS}Hp<%#H?m|#$uKBk$9ukp_fxA#IK zNBHN1DYgWi6V3}P2qz9wk0B8|YV5PqNXec;Vx19^MBq!j^5kYbV{HhK&aN;D9iQWI zfjwWG@BE0q`GI-I)m3^dnV(FMW!Tzm){dmkkqQyN1ABg%pEGY+G25S z{F$uj$KXBRY1pfvyG*(y)5yItey%bY_h4Tt;p4SsdD#W)?(MsP(1KZtjGhi0`npOY zV`_w-H>cuXfB&HdmFtAcK|z;Lw%fFshtI*wk1(1;OK@?M_RDN|B-`yxG$)y~7|wxv z%s6rJs3I1qqT7Ic2M<1(FT31O#P{K8PsurBk_H!?jAxO1FB39U37-uB3nv`xNI}V1 zfr{Q+^?J zMBpqfoM4aM6C85L<##28dfmj<$R#W6 zRuj*!%qAbsZoj;Fj@;-8c7O0YhuqmY$nw@%zF?!@LDk>Hu!?P9$mw{)FG;xK*9=!+ zLZ0U#PqlXEZXgu#;8lOfeAw=!1BA|uOuA`vfNtpom50$$ixH7*y<5m2$V|tjq_1tl zjQt3{oW67SEGDVs34zXu@Jl|}ZnfJ4MMP3$kMVO4!lD~~TlK}G5@F!>Q62O^{HSV4 ze1HhlC##Z8Wc)*g+pLh6gj|`-rzd_jX+)c->t!CuJFm`e!u{_`Pv5-~3I?*~4(SP@ z&qd)WwPaD;jdRG#(d}(1`ZANDJxQV#Iv{>e7@WBvDInfWbb<4C`xm=&qBgs%3dc?7 zR}-Ym)K-)ohOF|n*X+ljw^4fWQZPMLlxyvK`)C29%Okb=uGL)+fbi6%*a`QXa5j36nY7>j~~#M4=IG@zPFI>7**ztI42m8_U0C_d;iXOCyOGU zKnwdDo>Rs7$0(xT&PK;Ew zlJeuVi-G8V=AbS`<&MkSuW>b1@lV9}5apv;{r3sGZ!zh%fDd;kWBm@)AJ5rZ5UF>^ z317;J#XelRr9wSpQ<;3oDJ{U=RBcJ|vr1#FdTG@vJ6pd>jk&_|<(_?rqAChCnkBiC z5o@41mOWf(!GOLW?Y4U%`KH5m&->x4&t{SR1)LpCw+gsNV-7m2JB>oh^S+ck{ViYT z7fzKwxd`EocI6Sv=1$MBj-wq-{A1<{7CGi|M*aR|PD)xzgNU+(ApdMu|C9`&4C{#O zMY%&qAqO5X4);ldmti~ z)8U~ZWtkyG_1(Tm4)*%{QwmzfGO)ELsk~N;#NMT`3d1kvV^Y1}Bru zV+M8Y3^Az|?<*F4@)xpWt5USwya)RS`^Wf3gRhrHSiq#Y_q6h5M`VRDE&jOBtQolz z@&h15;*q?HU79Ye46>x|u%lJ1&exMVjo8BK*Lar};E*#!Egu}-@yz2!Pn1D~&Nnwk zr4`}2JlVAap4|LxEF#;in{p_Aw&$ZJ)r`BT`@OIP_e-k-+6Nip7`UALNQl8-9Xw3s4(mL0T0IEXG6=Qg z#>?Zg!P*OnIa`jne49eo%b7gLr{&iNr1|neMf{ruENkqn*osk=mT6}fD5&TqDi?!z z43o!WGvNg+^YC7IH>c>}ot4akFh_j(6b_$JjY4rGY}Cd%>3!a6=(2i+f%{)o^{f3j zH-j2}T*z?F{#l{XNEf_hj)-skQ|&X^n%eRT(}MQJvK7x-za?!8jWa8YSSa{?9^l$} zXUlw*6XCeYJ$nDsx&5405I1JVnKFz)MOe@yjOgdK7Ng8KEUOrS9o75ASl(Tf|5s*Fce0i$LB5HnN zw`wPAie=r>NN%*M-G0Q;cSP$Qb^Mrz6H`(A-p|w}qz3jUD!gOG+Ne0liHC$w>;V<_VR zz{#Il{jG!20AGD`ysJvye30F8Z!QP+$?Ig1+GZlaW%O4lF09GBu?)?ka)+dv6&;;7 zebB8L6XUa}cHF)K-YG)k-9XY0%QGCHk2-H4scSAhHh#4tx!WS(Uz=^b zblrhr8djwBz6FrlUC?26T#fX@`2HNcA+2&wkW^Ni0(a`gpssA{(o zDQgX~u~_ZXA4$j1W1y7hT=5W*V22f8UBIqQSkKdt??kw1qEfm6(W&RFhbWMnyG`K?4m`C+q1FN2ByhutJ7xw|if7&lEbRJaa(neN+G z2NqTBgdeLMLVGr%?6W{E3H#*;80*k0AKqH5Pt@CtG5YX&A8-&Pdu-nOKbXxpKVlMVb(SPoPeZx3)V6Ikg5g1 z0nG(C;Cb zZf|}R7C#NY)Z_*&9NhHx797YmChSsz!*ytHWJgFUxq76H-%)~Ex1fVo7tZ*l#OAS8 za|g33Xyu@fP#)$;?6qd)V}>F~i#yN*?s%t={;yuHmio9T#Z>7eE8C}`3B5(gW$w#I zi;p`@y8hkJVMI~`CXp)mkTxXbMDImkqiNA3ENM|P6z+y#VbTJ|b5M|;u7az#z>|*^ zcsfcy<|yV<{-cR0dLS7qEC8w{+qm!xd-9B1$VHN(gm4W|P;BOI*@K6e zc{gFuvN@i?T4#DF93q#u$%8X;krKw2cKg3Sf*z+hdK?1<3J$isyb99k6$t7%AZ05W zJ)X@YNj9sw-uiLm=5l8ZsGrvs^@m2|cQhl1u%xsKdx58iftyg!9S(w)sGy~XJwLt~ z13Q`%1}UVlEJLTw27+efr73(E z^u_HZf*;(|s8e>EC>rqut}EQHeyPmek-wN26HTxMwOEi{L`YJYOrN2!{p=2OaeWis z8$zse_{2Ns+SP6uXQ&E$>ytW%+xAV70f~MMlP+W|puGx#2x>e>XPpsz%j&8SWfyey zA&7r803#U8(Gyc`x%lOq3)utE&Vavf&SFiVn=6?yuGJJgo8m&o45%|!;c|VN1S8p| zk5zqTE9Uvs1X(Ahq1~txw{~m^%2gX1gWgGh#B4#E6&*YetA&;E1TRrOrY;n%KSn+X zur`X9Q1-#g7*i$Af7vxxb_z&*8#cV9XfINzwwt^9f(-dzzQp)- zd3orBg-`!c+WA9*icCm9?}fU(!XnIPkliJ*~-lz0*s~0cU)Qt7C5gZ*o{g^k^=ek_5)04=+O?3(t=I5%@ z&bMicHIUj8(UgX*92h~?w9CUVkMGkdZL5}D9BALiVZ#~M-wRVZaLZ#dr{WoP!@Z;9 z*vXvJQhdzqt!qe^6xZ{vAGFGsEKwI75E~|K5uL5#i^0)o@(=k^ysw?fdbIqBBsqbB z^xlh-i~YQ%`2zVyqT!kylt9!O!ODHmSLWNPpk#5|-K8e&CmS=f>>HNs9OsLL|Qbrft;fwg|v?V356O3 ziM5f^Y2z>Cafg8$j5sfE#CS>*XQqai{nJ_9ZQOP71R2vsTt99n={qG;xY((-Abjfj zr<-XVa#oJ|bFWn|zv)R=4xw5@Pwv!*hn$PbMx5>#KYiR4?F((|z_lqbr!h^;{o)sr!kCh-K(D?QZ*2R}dFsL&LhR3|T`YVu>~zryKRY3M)|e>V4v z?BMx1k&zdez)9LW~iI|4WK={CcH=54keXN;cvm-(=c6OG|67-$HS5UW=X)ESiR;L#$3&JHhc`dsTx2nb;8ZehKxMjKV!t9I?g#WQ(MFPV2tCR&D%TsI4-O8-#>O@_HgejM>Sp#dQ%*;$k ze<0m}!{KjYQv<(LM0VAOHrGb?Hd`Zoq4|O4FfT9f?c2BF&*dEABQqQNql@Zf6kpU$ zY(+*!LNa<`X6#j%DW|2Os%z{T_+CUz+|JIfsHh0ie`tn{-XH};Mc~f%uIY)Eq5fbb zyCMncYN@%}nUodbG}9P&_#?AE$0yF$$`r0RQX9G3mm1(|p!)o2cWID>s4!$`zpV_i zFUYJQ-7G6F&sKj$!Tc`jX2RGO60*Z!q2nSnzLp!M2Kk86+v4%p1 z=eov*N80gcjB#}H{}N-cbF=aNL#y7Z$wZ8BU#dG)&9Ws^x$>QatZsKUEj+TKI6mLG zO}N4BEugMo`)wc_4bShyptrJx7waEzc+k?r*(FS$Il(HcTw!;VG9t00kVybA&P+fA>peRi8FazQ9dP2dCy~(D8+8Ix9znA&I z8+J0zaJtII#5KdLxxJ1@;4!CF)uxFZZy;sz&0viyILqoj@e{sl=XqVdlbdLN`RUfq z%*>tiGbqG4`Z6K_Zrv%=HnW&_h^u{)p^vwZNc6pU&*|Q7KPbbBhMhX=mIQo_ zwG7M6-xgdqpf@V^mut9%una2kyoxg29&yaP-MC`JzBQan+IMox>r0|vt)S_3Mu)~t z!4FS6Dp1od&VHs>jj2rhj8L7TRrN|RtF1fy?6{S5W0enAx4bEsC0+~X^YP@(uF^f8 zqDP{rC7Sc^n~i_2u$mS&qdi%qB;HL?B;4z9=6^#hjiRcX3?ou^mX zx(rgeDb(+AgqhU+`k+=ZXCwwe^fYe8^!4Ak!KQ17 z;C81AQoBfXIa5?a+~1#I$EfH2liItQvC`r5NpxcGpX7f^S+Px3)|{(^M=pNu_f*KU zR*RFQt>Aj;h%O7FX8e)dkxJ;K_?hBqLjB-cdCPs~xkR0nl=ZATT}y!>2bH?jukZ4i z#N0?H)NNJR^haEx4mzbV`q`Bxw{)|@iuI82nbpkmga+pOf;ZI(tT6a``B9PJ37v~f zD&I3Lqml_P$jhSb0_r8T**(NB^}aD4Ob%%;4vp2w=qr5}k+wa`nZlocIhO?&x9HFO zq72^DMUuPtl5&w-0(&aBK$q6wrnAy7_WrdS$g%8t;)!tW=MzB zfj7l_FMqR}iWB-7$|WeGaGtsaortMt$)T6wprT3Q`?fb^hWJ2MmKEtnr@wGiDfjyWm!S_{Ug zR=yDB_@zVSXVF1Tmj)rt-{d5WiJAo*@X)=p&a`K6qSsUeCB1;~)tpRAPQ2IiAg+_73A z7N;adHp@Cnpzm%72fUQlXK43Oyy%|582aO>rM<8`8&P9}EW2}0Hf~~|U+<#Yg~~=t z8_#h4Z-qdvOn1yPUenGH8Qf_jvuO zL63bt@lpCbKk-WF@Yl%_)06k_Gucn-e2F|CsH)1-lN1BC&i8pmwoL!b(NXk z%H=1S2|5iqE*%s3&G(VXEZ5OX8&eElR&bVEe$ z6x!$)>sw1(gZbxQ#Zp7CS`GB9EU8X`Cn8j<)*Hq@+fev038c%s8XVTTKG(@{foIF` zO6&^B#kY^6H)&R6D0b(+T=^EtfG;wOpna6|P%{&gFQbPn$8oaWmcM-V+v$$p;1QBA zY44{s-$wZ5E){)gsz%n%os7HfA@4&y^_H1hjfGDCgKHk8!p!OCRZ|H9!&k0w7u*&h zQfIn`8JkJd+Z%uWN&bV#Cw2iY#}4?1DhcK->on>IO~Wrv#UNg;3Wb+{=0*BckGV6D zJ`$Ih?_i%K_G%MUk(*z*KWx(KvN$-mni?hKkb&?x^`ywPPIk>&|9tpua$&hCwFf3& zGp?y8nBTh~l;6yKnv7o-@qz1#u`Ka^*M@O%A{E`5mo@34rg)4zmxzJ%$JaB#$_nP9 za+x+-Dl%!;2wZ=*n{l?t++&|3C2UY@A&g!bH8Kd$gpabHz8yMbM5dgrQZ-w4fdYnq zje13Pp0aiCnl(XCvP=(7^Su3I5iV8=o#0M_Gm``_gssaSR?MB~{1Pnt=%iB|fq;nV z_l<}bV(YD*OT&bIp0~yGGgQB8pIW^jl~1&czW#dQ_PtsEWd`q_8$N6w<^|sA5DPo@ z@J5|kznRtc$_1YBD^5*r`0|aj=gvG#o(ZdESZJbjEsq&4br#w^Z=uh9;}L zu5(MogV1|Khe&j5Ao(#dp-Sr!nq93 z>wI~X6q4LxeCEcv*r6}jM(u0ZDTDPqLZPa`H`@90`LFVX)O1+OTYJ~crHd@cS%| zHnn+{U!yXukQ?W(ceQ#hc5T|0y+3L2bvRBtN4~@RieVX-2C2ucZ937E03f+YL?1n_Nm0RUlslXf)#>H^Zd2GSE^p<+W1_K1iwbsmjh=i+Y5U=sW`-& zH56M2ycyd9R1?z=F6uEg_}%!NmXl{doV}6anoK{HvtdL2EY$~#$)*?BN_9LTH~Qhj z3x2&+(O0T76Roc%Pb4W9>Z+ta#(WA;`7|?I!~9h3-TcR=&g)7tM45JccJIUJp5CVW zQe?K^{9=lQ;#O4~i1rGavSF9>)c-0RM_tii-{kUvIw|5A#r9XZ_05(i)&zC(woby4 z)z{=Dy^%fF15I0TreisL-Md*eH;M29JfRGXG^Mj_*L|OQ7r)Z?FS@O|8Jeu<5?C$$ zwu929vB=A{%T}!GDZ16qD3mftCxpVQ851TQW^?;12h5at<5ASx(=Bw|Z-4Ljqk;QX7Jb=!NSsrqZax`j2ZgFA*vW@``Sq-!_& zqwBMC{k(R&$}42~-V3d*9Gv23tMj9%;Hv=JW}xS6RQ#r@Zp8SFM~Y$bo1YsS_nGp- zu1^eV-$p;-2tj&V>+OAt$G!S8##viNZNS+sfY!TsXv*KczlHzU`$H+ds@*-IbHr0P z%A>Mu=XFj z-IZ?Hwrv}`Y}>YN+qP}nwyj;ZZCCB;o#am^ee$0?>8Eek&3C!pF~=BlipmL&ca>I* zHY8_o*UlRgF=2AK^4Mc}e=*sC^@5t7fZIc^26U*ql9}`t$Sshlf4)wO{48=9q`z zs;Pj$t=Fe|3phtuh)lh$iIWbFKZhzD@dRi@D;QAlaO69@pb6IoZs9b%v@e(^G6wD6~<3{3~JvacJ+c+|2mmy}Hu4%;hE#0a-P;p;k9az4P_1 z{#c|UN^YAFfbe%IIG>J)gx;qxH-yiK3Dt)5=+W|VH4Aqu)@lf?mU1v7A{OxvKM~uC zdle+ElYI54-@lYnTO0B?AHNoDA+bUa?CSX{oB84}R5OzcHPv$f-!Nz&-|7#zB#|H$6^=?vON72(jf^D622W>QHy zY62?~wE=}z7_0L9oHBp_c3X!@kV)+fot!bfc6$-9?S1df_Zf1J3hC8i)^_7+ybh)u zOb;q@2VYCT+_whQ-$6M`f$g{+r20ui(~OOT5_`fY@3b|BxFO8f3D+lTnoOW_qR zN6kwp*-XWVef+9{$oXy&b2P*l0oie*$O+W(+VZX~G1%WNYF|YmBBuAm}^GndP zuT1ITPMkFnA(m~iv63Q_G!-zwo`p~x#3B)_07S<4lnxv+cv%~sK$blg)pX?q3SaXB zqX;-Hovp6VNN{(L7J?i}+?V49G6y!~8HyS?x3{XfQWN~Dxn@1Zf-3$PG|$8VNo+0F zb?B7^GfUp#*K{k_eu4)~2Y(M@P>un*BV5$409ykMzLn|~ueYBpq!`|dW6OItATX5u zLbyNzeS7-Gac5HmtA+ZaSW-Lljm3tjCU-p(gun^H@adZHMzhw<3!#u2AGIZA*l|Rk z_N*LZ)teF8KUk9X0n8)rL4nUCX)&;|sv5bA_MA3N67Ydnhc=@V9?1W!1vbOfw_sDh z=gCKSAq$kQkkU%#A&n9cH)P#Q9x5?0y6i%8W9+c|(+-|T+d-H5p3z*+}vn~@ag9OJY3MJZIp%qrNrNAAfCeRWm+D%D{?z8jZX0z1mdY| zP34PPiV{1Hr5L*|o;d~)b13dRVO3xN;lrx}$3`3x4PxqJ4XMpNMV|XnyAPS3bH6(& zOr1BH*rdNWFXKa(m;Sm?q&h~s^(p*ZsvCw3bp}-@G6>;pSTJLG6tSxE*od|d;>IUq zqNlJ8h3j}MFXT>x9X&zA{intQN&|-NcN$mY*294q*KFV-k$w&WLckhB_cjwwqT!@s zv{0%>HTsrCEe$c7{L+kkMlZN($g_05y-~eG_b-h89kv6B#CLh>Mb+R?N>7 zd+}SWzCIM&eX31FRTn4IP4_7u39pVE2>Ot6ZT0yriZo!z=89isU}3?@LW3;wHxNpa zu>e3&H#|xT)%U~KfaP`h^Bq8!ck^MO4M+m0LmQyi4E8!u z+4mThh>eu0tuf#1FcU+6Q9zw^4K!HlW1|^2>2w57;S%DB+nONpK`vb$&Zec;XD!p{ zQ^y!b@n^&0Rh;%3p2_(`Lp-vgx-zKdTGI=GKq^sU)hEdL^l5Vzn}XTSbFc4{;EQq# zCUs^#N5S?*bE<(||JZi(ieG*E0loCyC%UQpkX&GK3H0S@(gD-F*419d*Go=v%Xr+( zhEsw#$1hFhq4{D@#rbI10*#mg%0rf6GJu0CCAp9kJM=;hma2ER;}$ASL2^r&vZ+Lc z#@J??*4;^G`zpe5KolUSeHfs4`>MY*?*pt({?S@ZO>;}dRVthOOf&=-RgDFd_JKdc z_Q$qE`FK4Zhm}s!J9v71t<&KMjR5iyo5~p|#I)Cnb#}(pR_L&Tu-r!|ME^Z7aNn*7 zN`xKEN)~Q6ADvHvOtRB8Wv6PJwUH>X8$W{BKXe1^%2n=Ay+os^#uo4;a7L_UB3pn= z4{@k$$?^4vczX62cy(k?ah9!oe!AZja*Xvf;Z`moG?0cYgZ~6d+}eeTYNZN?+JCsq zUPVj^VvbO$4Y*j*BN-FW{~==3*IA8h?HIYRxKt({iU8wl+I9unV?FNoJ~vk^P7fcP zABpDhk5aQfcXe}@U0`cB28CN6Kn%SD*X_Rf-;@wH%nwk8gXP!{XfGkFN>qU(Mpd?M zjyXuCdk-g+RM)YTLFyYBgj-(RxaSt0i}EwQ7<+gE|#E! zpuL?g;1=RrFU2INAA7PEhpG}Ve`=v__3%t$( z3Db7tkq|WS?OoN-nV1zcy9#f|+oSMMC``X6S>l^*+Vyv7*%JLgtv})$NKY2;Qa4!T z%JQ5djLh@RpP9ZlMjocF@wr42(Z`v)SslQ-dHDVkH9G|c#(cN3HTi&pvVc+a^5yO1 zt;Zq4H`QiOY?^d_JO8zOc7BhaA>P%fZj#%9zw<8_vC?j%_JEn!?_+M)AyArnOl=Y0 z&+^t!NJmVtbcFnIcf8*AuBxh+BEIbVlBTQgZmXN(;D~RCNanvQ=b*84I{GC8q}&{J z9-YCHlo3eWgb*l@aRGXVbpbA53@xmZa3ChE@X<}`&m{jIB&EL-MR>0WyiV_zBTDd0 z-@f?dlX=T4`zMm=UmSve*Cqd968uBT{J)q49RH@a{(t1qzdZ2o&;ECE=&vWi`hUow zmVcN8r)tv)l~@bj{_w{qB!{$iq**~`Ni~|cfIJ9K8fvm2 zSo}o`x3*wzV_kbUcDo>IySI3K9?xVFw}bt=pj~%2_xwZSbFL?J%%gIKK-af_u6yDJ z^&j)b`sBd%dLmpem3(ur%_G|Qc+;|MvPX83a3f`sz2=x~;2*9hcSjrXJu_6kV!B&5 z({wt}_j++AZ@CxE~BnI8hbVu*dB1VOpKgL4^^*zJJ%GuMd zXidLn%B~>F@vzoKZk`UA(7)&!oVZib6oiwB8K|)`jvi)<@WUG}V`SxNkX_3mt#rcR z14+1jm@e%v*|#bkiG0h?a-V7Qbe`_LMG|3lX=w-Ew$q$N+he8IdF_RXkfS59ib$kG zWxdoqM0=12A#!7&B`M7Mlxj?q6&NCkF!seU)165Qa&~8pjj8ee#n!s*o@n!RmmlQ_ysp>SSnPg!x^FCL3?!e*5!wB)G;fnQ-;{I*@s@xR0MfG_np@b#G|lkv zNaB3911@p5G(`Ud`3xze*YL~GFl^xAllKYeYz!!~damW0Hn2?r>D{6g?JVHkh55G*dMyc zzQKu-i7RMhPaGTaRF>qD!AUt1mKOsS%xtiiRAINpiN$z}q%#91k5DfTmP6Q;2vhHy z>QO>dajmh`?J68jy0h+U zQ}!Ux1zhQCn6@eLP=(xak!i#Sk-d7p4|WsJX2HE_mGrlDCck6*+tnDK8@C2rxn@}a zd@I0KAgTRJy%XN4D#aN5nZp`d+n)94oAFaS(7)hz==IDZ>(d+bUsFvWV7e1%l3|I1n^wam`T7sQjRq-)yVJGUPhS3prxIO0C{gcGH+ zNmR31*YRkk*N)TfuN3S&VGY527ZERImbq|3L!l(+Es2i=ac8NcYAbz7TbxJdB| zuRkM!f%ucmk|-@G6(AqnGG2v5cDPEvW=rV$$+&D6y{T-ROrUpld{^DYJEHyJgfZ0} z>O$|dX;-#0qBKV;F7ndhkD1BU@T*!sFJtx$9RH9_nhH#yDBhY-DE8}@uz-|O&*IX1J~v&Xz~T0(Y$+Gl8238koiU?^6nLIV@01CW zfT6_I4~?%eK?i~ZR6h0H@TDYs^P_|SC#ztY8W4U;CkgW_?+u~AKY)}r8&_Y27`w*1 zcr?C*T(%0LUGEeXz+p}-RGX&j0Rn&l*uP~!n{r%BIE#dUd^3&dqUHCEy7h$MUC(q` z+k|p@T#zCUfb%ndXv@Plqwu_B;yVuX%$2GO0i62%W)E?F*EvWBC<lgx%NYu^2e4LJ+Y`R@S zwQX$@$juIAL)7L&42dss#>Fy#st!T|8R0__jVW!Zu+Yi_L%k{nD=Z9)QIs?VrWP3{ z_HD;+F=9@TUQk0R>rUh_c%XJzWJ6WvK`L%R)C4dquY8&Ig6!4cG9g#G~hLy6RBAW^0Dq>kY=wxCvBZcM$&6Ptk*&MEvMC)Bot}HrByHlo@ zw%YX&Sqk{uH>A@Ujv$DQe8S4|y~r?@IE3dGa^$llL}|nZE-0#3q?ka$nV3PfO%HXl zC|e9VPDd18#R%geSySs7XVKgO5JSI6E}XXvff) zk7mcv1M#*^wfA5PtjG};hh56$G%SPYG#tHqTZ#1QN#Ob+md@Jt8Fy1)la-!mXk==G zA6xR;UPQuPfh!&v)HAZB%MXI@=yeau&&;k0Uax7T@@*{TdX6c_H4xFp2(qrydOj#-lu;>9(F%ghhybM3r*RtlpNQ@CMEI4OZAu(=5A~D z@!%}W2qn8;cQ4zoK!`5Q)jtw+7Kg??nl1IDwdlqdKLY~@1`QXim7bQOIae|NJ z^OLWZO>9lc1G5!<$z;Z!P^}kZ2?N{GVlq7$Y<8>(9%Z$)T{cV-49CSE4aMC{`{tDn z3y~v?ZwWi89tObK=u9o_M(^K?&Cae`V)3xgY1O zY1c8rSF_YZnrP1Mz6ccF`U)G`ccww5Cw^Ksj;)eBrh`J_gNKc!9RG&pOdS6f$zl2%)cF@f<3Af2?EjVk`oAzT{^5N5 zr+5#?KR*3aBjaBm_#crw3oGOQLGCpgQchd{8t<8w$)+1&`OKxtN5CI0-hIKx?L`SiP%hG>*%;NX`dpYg#rmTD|I6x0X zq`jkS_b4OJS~>B}0%rI5#O=0p>n4%m3G92f39roNY}*@hF`oQ0!0$G!_gG>5c?mJR zxjNd0Q<}T_!xsB^hb4LC$j(gz&ppqa@@~@fDy00%y?*zG=-A>9Lw`lL-T02*NMGkk zh{W1t<>KM^U}=$kj1uShHNM*qkd2$cRhh)Vujf~O1QS8XASe?&sipg}Z(L`M+mBk0 zgE=%d;7-l-ei%SZfKm3{XkQFFeg_sf^D_O1rE73q)Mt6&i7|W=0k%cGK#rRUd3PE@ zx>sUMso6F7s>!XqE=wjKaH2!O1lu>M&i%bd`mZUsW_2vN;`myat2|{jq-hf5QXbaM z6>l%n>yTIU)14YJ2~Kl}%AiDhUVpWENOoXD81SF>_n8wnq7PxDBQzPecp(HqRTQWD zKx{IJBcHQPWWXZ)sUC~z;P$`lj=9o*uH}&M5F|MKJvsS;D^-bDTvkdBsLH8J|=hZ!GSI(Xc3KDj@UsJjQ0Cn`P)N!OU#abro&t-_g-iga%k*K9~= z8kGd?i|8S-zdae?FwsIJml9OZ>LX!V{;t%GA=eL)E9<_-OwN-Hmdv7| z;nj|vIG~d*396|j{^7w97qR;8PbprM$Y>qxcYHZrff4fPrt}A7#`B5{iZ-L z=!h?hj|~*ceg}j`lst~J`Y}OozjJpk*X2`BRqb%j4^7r6k$jo zTHe_Q9re>7SAD0gJOQMVgGwDuTK;Zmz#UA29FS&*L^0+A8%qU#&zfam&&+S0*eP*c zU*;x+sKICzIzT_O^|}jJ2L?m-ooc35ew2|S*6^0)DXhR+K^cT2USk26L9tb{RGQl9 z%%l9x!{!a3}N zX^wzcie*NMB9l3;i3hp*4T^|#5*0LwA`Hdh?8AX6#rqnQ@id~Mdd2|;tcHwCYcEvo zT|0v(EfW}1_7`t0<8K4oJ_ZAjv2xb&QrrH0Oi|eR=AypRvNOz~>azoK3ei4Ivkrw9}4AUwGJWjlmD~Lo9Vrk5}1#%BdIU=0$ z&CXTh%qc?xN^By>VC#mEk_?X3;W{DI((zm+Q^Z) zYcKtx>sNOI+Na8-(|VwcZ8-8iaI&Wv?r>Ta=y<|{LmFqK`rf?LTVMi`61nhOM!G?J zh$7A1KI*Mz0ePpH($ITKTc&kLGM1QDvfotxFtV)au$F9SAFpT^x2{OE?;V3=!j?EJ zgfV704LaX>cs84yt7G08TCgV?>?J&wq-`!VFtjyH#7u0BpcHHXM=fc88V`21FL#xZ z8Q~SLKs2m5pB4`h9BE3M9a(@LWpmYg@hcGqs}2VGkq6?Gh4H+a6B2nApn$usrDwLc zL}#M>jt`dPn;tgUPeG_Dy~oY&NRuZos zK|+wKp7?0Z;nY|%yYH!J8r$P^LLa1s2kx=2G$yA98kG;l&_1uG=S!%t_{yNk(3UOPbe|3Kcb64q!{Oa;YI?Ff*Dz2iX%z zhd%(Bsq+>@NHd@~2`p)&#zTm+D?9H75O7UyEDxtN4_(q_bgVfl?o}Doce3MCzD=CJ z3te0T;;9McW@s5`^YE`jOXdJrqvC_hRHDSx1K<^hh64uwh@7s<)y>Gb5?BUxs$X-k zPa2ZXZZstVshu!Z;j;75dWLuh9k#Li?rlC*X)P4m($K9@k!zok0%<_YK{c!;_Bl>o zjs3PT?<7;F<#VhwXosk7ob;7-ih7h~yM#0(ge3hm+JOcY%)HLgiW#b4*f}7fuWN8K zvC+(;isHp|aU972X9^{$fX^Ml=pa%&>_;u!^LIWEhm(y`t{qlBgYAR#ppS>hirK4! zBg<{`nEEWjdlk`F(tTe}hT%iu@^#iUp#n4TNFChb@^b<-z+F)s7g$x;xG8J?Ctl`7 zM+C~lH0$NaUKQkH7=d1;1gv>H1%cv#QidAew`g+OCk|P^a@Nz=FJrOTN%BWW&+&#$b8}M&PK#BNZ!2j z)O!xR5stEf3qm`#Sh)oomNHdQJ>_G`jUm4zEQ0mTvl4rh(m3Xff5elrPv+D}=8p@w z3Pnm=_V5Mn;B$r@81KD2j1(=3GB@3R;}sPA?CrzD#wLSZFxkHhr4x7&SuQ+*(r-{rPgVQ@f1FnJ75-VH#@`qdkGd<8PL2?#@yNh;mS&D_&Y z-siZ|U6KeK+}deX)^2EEq~MEc(J^$9Fe@DdacXG9_S82v>#Jipi7(i2x=B7VL(n-z zwXuAVDRYhkWmue%CyYlAfi8@7vHJl^n@HUKSN{Ch-1xu4-T$5j|06&1|HPD>|KQSp z&XoVt9s(27Uj+Woy|fl}iKMN+;h0Ocrvx3=Vu%}O*;X1(NfS=1_$Mg6>(+#B**KT6$P(Y{1aOOUEaklZ`Z41Zm(~gs%5B98Y<~Te|ZR9bOa;Ti|N7 zhgAyD#W?lK(kn;N%2bC01dqAdig2gZZuU3_83+Jb_)mRlGIzR^?`Iim&(>gp=v60V zhJ+_lm=khrWbp6ktA#i z7y;t9Zi9h6wh%MuYFaHxYB@S!1#HjfpwfMdALbc@ko5 zdCAl;JbqX3q&6qAKYd|_Lv;_UBi1V{z)tXj$5BT0+B+57enhz!v6p;;RI-}dzJ}ut z%*5zehc7G%Gq|9Ro5L;xFX`rv1zr@(^e_Op81Lyv-|Qb>P@xLX$s7OBH-Hjkd>(gv z(Y*?S*o}I$N8G1GK?)%dmQ7AD7%N>2jpor++6&3|>UN6zRMQuUqRl z)kC>sfH1Q%pyrY6tAEJLClN8h^a+DQPS9GyA%3{-URXmNeVB9Xf79YtDAvcAkKpaT zci+jIV4kRjP^1j5wSHv4$o+a$j*gMK-@7FasAbJ4turu9HZacCvU%RfsxFTb}U8zIVm|$vt{N4 z9)bS?m+}juP$VX|5^2jQ9foEwAI^INn>=SG@(6Q;5hk;uEIvI57|17=XSwuD^oEwp zfxDls9$S>j2V4Pr5_*^ zH{Di5fIkrJ^B4Cf2o~XmF^IBQ&s>-{;xKiB#mM#kuoy^2>&K1Aok|2cki)yG?-uYN zo)@JiKcNEHx@qGU#hVdJ`4tpfNq^d)b*epBUs%)#zaInXD8HYoiVh%2u@;pc9Dr@& zXT+m!tLfrW9IgBOxKQ+oD%?81X%fD*woSX*+)!u^e96vSvPelnTG;tc<6x9L0A{4q zIMiz+DsXSd9s~LfgVzN9h=Xqe?2@!~x~cIH3WcG=3GYVe-#&Z8OhU9M!jt{02c9lO zpEIE~KrFFy#G6fSw@@I;oWA`zEk9uoPWpiKxO|B|&?$>bx=Wn`Ayy zvGFtmTo1@{JM&4F&w=Va+&KUy+0x%00vy&LSU#xvI`9FZaY)4Dixi{>KZ5-zB$5K7 zoWE;XlNZ4_~w{nSN_QjU|m7yEelz?C&_*)72i(rjmA}Gv*6dc4`i36QMqTp2=V}|g~ zKZ`44g~+WV(&>ePYnxt#$~yNEv3$UV_VmAm6p7f6&ai}GIt@3o8J6kmQ65KdlE{OJ zPyITZVa>)<&7Wwy***dwWzL|fCyZ3t**Jnu6G(ozcg_I3Vxk={<`(EhuVaA}Nq0!7 z-s6(>85`~YY^ybT#@nRHq;@Ey=nFYwp@6~?Uo|~diRh4nHS_G(fZwM^QxVaG)e^2b zY4v<75+q^0N=VBB^U{vsUjd9#jy|*hMpkEB@W9mgY|Nqh?lNvmtL*C|rW&PexZ(n- z1>xX^gA5t+!&zBXQc1Ti@p&@J<7S@gH!zb0%}H_LFQbqmnK|vi3MDk8y9-f%cLs?w zt_ul3B%YI1zfa1RD7GSKtAU`erskBEZHj9MoPLTJraNZ03E#+*-6J!s*Nw9WejZ!h zDt8G+TKL7b@ZNW32~Knof|5_PE0tJsV?>{c{QQUoOG`|Noi>Nx~gvm zNI5}F;2;~IhT3+ANd&BWST8)mn80eR@Pr#b95R!*CV^OhZ z^7Z6^E0fuDAsizv*K9 z(ea$y7}=?kAKA(pN?5_mLC6{>Wb0xTF-{_LUEwejO|#2{ZhLVc43}Vn*jySWkCin% z&`|>B$_i3l0@VXk8t9`CEKBEm!i`1&CgJL6L)e6@=xLZ2IGV&&Frvgh{j1okmq12kU)v9HVN1-EFi5qx*!B!=-a(G)fw+y@Q-g;$| zN|iIINWBS2^uFxLc>HeCFh%(KEnwVcLDOqTrgT{M(9RqF;GDqd33~9(#-$^Xa1Sj? zfh%-8J8F@y^+YjH@{ZaP#G3U>$N-z2;p`Di(^{*zkp>em^ZC?8gYWT@k&hwpR z8)Bnus~0L4=~Z2Sw3Ap)w`==fkAX@Hk79t-$4wS7wZWciUG*I!$at?*PES_Z^0SD? z#fP&aEE8GN8js5k=93bsFXPKrmj|%-k^*NV3bSfV&xgFRIfKhHkmz7=ar7=K>8;53 zg2yN_Bafs^f7cTX2_ZdHEYvq9mEeD`@wHHF5X)ZFT3Dc+0oF0l+TDbjx_m@;nMQ6& z5gtZkc)bu&{r#IBMtyC-j~qXA&k2Gjqncz;P)8z{ow4{9&(@Sv{}H@*sI-+?V1~4v zDh?eJ34+P-|5$**6nFsPUHct5%7w*W!0D+)D|MS`= zWfKgtwHBsDhOzY+%qQ4ye%5CS2vdE+Rb50MjYJRY)Q+`%?vNL3t-lt4cLFx6HqIj> z@jHgX`5F;=4p(P%Yd_1&0!yp)8jl-dtC?6=!#+;!z{`LIN@_!;P)A?nqM@KL8$0a0 zgf7pcHx=Tn#b6K+^{w0SXrUT2s|Dp(*o9A=8}RNc5GpNhUa(UBvdG>6Yl8U67`*-k zkx)UAf(jBNJqe1*I@}RjsF{4`af5YzZW*KG8G#r7x^7)Q&dDqKre4vaqFKEA_PB(z zb23*vL)PT=Mi6O!+n!%Z%uTI}lF%$|hV$jKe2cA^fTDq+Dxv^AxP2)Tu0)w6-oTS zy^*Osj$-M6UssdeHWCehhas_hAk8b0-Z}^WrlCLtBW+_*ezg{0vYBossnHrMb?sqG zKdd3D!8u8ZV2-eY`AongT}SsM6a9Fj%0eR|e54-4HK~TVM&5>4HTQOEe7u~u-z2Qt zp>3sE&u_Lui7IqeZc}+V6o^LQcy1&SPU;B$bQq^JbTY#h9Kx_$uG>u>Oui>GNCFA< zcoI|rfB6F>q$4WOE+KYbbUMD>aNxfOYAp}d*|P0 zUvKMrn0NZ5O`%kh#5fR!{ESr>alROXWOV3_JB~>sCWKY{!KGnBtwcW+Y^Sb&HNMO< z`o5Hc3TpsXIB`^YX8}9LYD8cs%>(k{qBp;u_VLuRTBv;fT_EXUOEs(dKslJ4S(TK8 zFyj#e?6K@13e!AZQqTFtkUmG?Z#6(WUJD6ucUnpqZKizppvgkTNeCQo5dct)YtRi# zY;6xLe|GIYJyYQQ=WqOxXIBGrjBqaM@p>$xZhR?puA6A5dRJ$(VM)ZTlt48h(Qf~F zp^`q)0#Oh+gN|v^2=o*6=45p6gBpC5y*f799Bkeu=jtINK;9V!Mo{)Nou$jEg-$9EUpi=SEAUg?b89+s2P?r(eZ<`8d) zSiTxGqT(vGl}D-Y?wBreA$0Yx(J^dd-x z?RfZ%5DJUN-UY&x>4HUAlJh`(it(ZdWFkph?O(jiI+ZB0w3R4=(F7Q6u<1|^-}{Sr z>C3y3igl@w<+tq6%4L4|{7hBUqYlj7@KmNyYrp|#izI1SivFx)yUUMhBOh@?D!|dD z93b`dFSZwnQRdB(?~JS@Ye|NPX?<}|!KZfej_|gu*47RF0ctU&`nn(RI&e2&wrn8t zn71Xll0(Ni#}3#WX#Uurl|Y(|0LEt*bDGOFAUaiyQ!M1`wpX0=QyGaQE$Xb)vG$g< zJqT~YTQEg7XD|dqQOcII1nP8Siz4rMGJf!BrBL#(Ah}&NkAz&5^w2|T@##A)heB?b zUmOq07~5XksW#*Q?kq-kK(8@(>T(&vF{WaWOEfFHL`?u`r z6nmi7qKuiU?SMZq)r8`|vn!nP8-w$9mz=`2lh2g-^$ov=L6O?6xzVt_KXAvGt%cyi zfYCX<6<-?b6NWm(gm#;tq|@@5B?UV9b6>DY9rL=f#Tg*>O&qs9>X8!sQ*!g4 zzEu18XS-0g*Tj_@YAy^c<%F;1wiOCx$sf|Szzqh|#3Z+)Z#H$+jZo?LF&{$he>)5V zy1kVr(SRr64jCt!u^gy19)to6kv+|n4gT;iYKhzIT(`j1$_jBC2qv@V)#|=f3LV0`^nE}1y)N5zf|@rDFPy5S;PyrO9m0IbNwEAj8WUj3wIv*)y(p!` zAT5xo5*B%OW_qA?MtDg!vbAYw~WTN3X`SF0Nt}?Nb10I2c2ytH?U|#pSPEIcuL>VnRQ>v~Q?`9lz*!bYm{jK~nE@yPi*&>LIdqJuHCT*@N+J z@Oa1KD2&Px+TejO+Tdf|v1rc9(xUDM=cv4^e!EJ#sUmTO^P5D+>+Y%*HC2Rv^2q)gr z`{gb(x>=8B0^o8@^pd`{cJ@Sg793AugUZlX?N)uq&Bs za)AmhE%kQPydlDXKU35}n$>-L!(WL7AMMFm z$FjDOk(TpdR}A>}Q*3!`Sew$W^t$@yGo-7G-=ZHI`a~n5kUt^UV6Dn${zOx~)(#f% zj&X^~M{q_y`(J`=?t4G)4fXLUqe4lEUSu@I)25AV{D!2IP7f^;Ko@%+X&I@>^7VA~VKZtV; z#Gyd3L#=aRuGgT!U|Rh6N9)JtwH!w6l$G7p?AnJFR_6e~OtoM5l9vSRgXww&Dw_s(0l*Y#WaR!+%23%~2(rrqmR zi(!a!d@ihignqi*_E0+imNQfFW4N>{3%H+xd)DRx8>OD?%&#`tZ^}qAc zraS6Ria}Gz5xqcr+d%l1PV<_!7w-0O(k|#fv+D~%3e*qS|N7gI&clXcsaS=sL^si8 zB&CmhVGoFKDDyR)R%Ddf>^WY( z`^*r^Oi{u3tr&atCMUogl)l_<4!hh9UUzL5`jYTl-X4Idqu}0{@)!3XbXrn?<;+3> zxv?+|oCzmT^i8rlD$WvA-5WFVReev+ybo7k)EegMDED*j7fE5qjYaCJ^i7ilcIgBV zHGTciKTHia;hXYu+P0b3dBYEKUXip)ohz>FMc1E+c>W^;MTC+-&FJm=5Ih|O0HXp{ zCEaq#(B7M2`WA87ilh_iv?Qjvv@pfPERQ>FtdpRrPwze&0f`2qkEtnx6$8#x#?m=M zGqasA03AC{XraX9&}sx>L9>&gW^^-9H}|K_aJ)*hAJ?$~DDDy|`YIVf#O%WZ zmOQmifpkKuNe~7=`!|~6f2|)bDvc{2fvI(2?WlNcy@LhP3aGb4KWEKt_T|-Zk9s(H zGsLNbC>W8h}!jYlF#=XX8@BU(ims= zp)e^@cyL*7SGGB6_YP)K>+I3|vO;!(8ss?|-rq?^?Bu*LEXWNOMq1p#caI*f^NNS%-H$Mk%YdSmY50jt^-^uZl?WR%#lO-FNz4KL#>%yTjgr}Tk( z+p%Lb2I9l;!Ek)*q=|fJ%o^%L|4Lx?cP-x{m949iXgWHe$|Bootm8(qm*zm zt|`9lD>yeX2D0{Wr6fVQkyVSXoWR5r+&>I(6N9CF5X^z( zblZchpgsHHR*L?z>Omn8=f(6GkJI+Z54dD39h%Hky8tzR_Z!}fQoyPjF;!7H_c&B~ zudo4g7ie3(c9eqD-)75NVq*1$DNcq$g(<${^iY6>5s_A0fT`aUTPsvQOlE zT}oy|i>HdJt3C*3@DLj`yH~wCg>^Xm?<{qG6vNN{r5X=Rr-Qcr*7cqt`kNsp)qYB@ zJiK6cpjuk{!cI7N(pJL>q?G#r%0dHC(}p{GAR&?UDs70YU$~;KtXm$)i8Hl({0XTR zeV=b+blM%>@FBt*bO3FG3s!ax>`I4IHqefT>XoL|xPtgxx#jiFb^oF~l-x7B1}Tvc ze>_acSBa{O`yE6$^mD48c|6}B-^O@ianC&-KWo1HTt?jF_+dZ8;<%oh`jk$9i%3fh z)dudqU1X>K@N&*et@G>(ctxvS9-iO-poGMBC`uw6ak{gfF4lf2m(m^aD~(beKgc+v z&&Q%Cm3iifD8Z4mr0DVQ8v@MBW;j9wSmbqb0Sh_-KR1YIOq8>aEF8=;@BH0BbjR{pla>nfPt- z9!8%Hb7RIh?|eHc?yS9!Rg-PU>M>{(7V?isbS2)G{TKYi+hHl=f+-3&>#JS{QM~H- z^&70F0kl-rm*Z{uTaHnD0yF4sw<-5ps-VgZ)p6ypgl;Z;YAEMX)f!XD$??xGS^#B~ zDV0>o80VbN;e-!jNPC>mNs>o$TVoUp9!aLJwITBrgPZg?IW`Q>%)nGHojplM0t{V1 zfVSv8ZdrT1R#PaJO`7m>H#7?{E5mm@3S=fwZzQEC5QH$29GV2l-2xcAgE9-}aDq6@0{GA~qdEQL zIes?peYPR|3I-RR`g>#`MqPb?p9yb-Hp5m5!#-_DB-|Omsj$<8SOls%Tm{?XT*_S(xyY+g9G@j_H!Z11vbPo*q1cDS;iU2Wb1O}wAQ#&YH0O<8}i&IRlZvyFp z&#k*YuYqmOtk}?_&v-pdODJgpAK~_u$3e{D6(V7Bz@5ziB-JmWPP&l%;N}b`X#z`4 zp@4&PnvN$HM>q7uKsq&9_uuejC)q*#Dpa@Ij39hYJ;nhrlmSOXph8ef*9oEpy#0j>2k>4EE2>lZhYWz1 z6NfNVHGmShO&imRs|AuCoWi&vQEZD@pl;iZzJ{!uW*p;kn?54?6Zs z!O=7wT0^i>fGsP+{pCRSl&miMzn+tp%zi#L09n*Lo}g2WGZ{=P>e&eAvq{Sl+HWnf z`8AJBU=7kyc|NWpPL(6}smGqUi{oOsl^!_X7fige@$DxfM!S%P8u}Z1qt_@ZU;g z9?nku@h2AuUi}PSIOVFr9>VjHuD)I4J99t9Z$qbH6L07tF;c%KII~omATX@H^9M+^ z^;?@cUC%XeH8dPUdE_S|@B}&(D=SZpg@C7Ko_=Apm#Q!mA7PvOHP_$;D&o4?(n8l5 z&k4QeZx1~o*Y+bJy}9nyxUSY6E^Hvts|BW7IH}MN&Pi3T1~q*+KxpeDN$ALbgN-&F z65~au<((?Yt019a%A%D~qnCLRyMkB0R$Wuoj1z|60?(~V`lBfLe{?k;1R-IA2~M$8 z1MY;g^q{xNKn|t=tmV=?GBumLbF!X@1QMGY0D~lSDNmtX9;t4kt#D^kqi{C+rOdrh zS`yL~0bp>kQLhN6H`;O-&h__SBqf-FAO;Cyn>zCcy3qDDZhPP$pjXW!06ADPCJ3^* zGs76O{=O2;tp26vN?Y*?v<3!yul@IOVhgul-@|L%>K=j%wQ4w$J|EXcBSrjKF}JBf zEsLvDa$xeCqF_8>rV`@CjnZ#`f~xbg1`X$;Zq@qL@1(_90OIRYw&-RV>*)gYoOl<; zB1(!V;>m+n!@21}7Od)fr1#_7{YVpN=9F7m-_z6I)ph$7;4Qc9^qfz;}?aAjhY z?8P%usLM+5^Zl4YiD1ZPod&R6c}DFf+TcV{)B*a_MufF$`72S#b*sIk5rFY#$aQ#G zxfX#z@V4()Xv*p!fQDE>Ofmh^#}tf5#mmw6Ty2ejfi!h*j_JN@W=-e*Put+W;rFzX z2Ww-&nxDqi2;|Q?+5p^dpqn?Q0nl3E^6~t$ATMAP^ih%EAw~_ zWY=xq=A)kE52WgpM&l9EMYii(ptyOP`3!cWYF4KCH3d8(SmmKe|$ zEP*y$lz^}al$pk#pbWnETyceT;g4k+#3)Gq?XT!yzX)Ydnj$5X_4-4nz>a>aBdZwO zxK`%$7S3Mk^3$b_&Jzz8H`t<~RGRKYiO{@v2e^4?J#KzsuxIegyuYcIa5=$2_`NF0N!sW0u+0_aSsLCRtE>#l!rw{WwTx!)zzv#~=)Bc>=w4F0Uds}hcQ9O2KmQ8U`(M35RK3NHt zsDC@+Yvp#Y1*hFrFwza?Jl{)_O+B<%PUbsHz}h0a8n|ri_T1Vgu{x-j3a<7ECJ;qT z@qFdUW|J>697{4VCYB2Z(eptO@EyD!e`uK==Auh(Js=%ERth;^0C?Y`$=!cM{hR{p zfyHC|R`(?yUb(%A@Ts)8soe#x4sLmJQt3FLu2*N}t$QeH;ef6UJtrMw@z7>_a~ZR4 zgt>1h1g}cQY&0CX`@UYu>(Z+8{}*!XU-Bqy%>U$0*jWC#BW7dyCy(+UITVinC9VEH zUNG5M{wsp~9|Qhd@{H~O$ihz1kd8ZQMeMz)JJnkD*FwYhys|O!ih)IA*prC|aD}sG zH4|I6wIHf=bNjqd8lh5Djx){47D1aJ(uk|8EH`|qr*`Gtf&STU(Js@z82E zbaU&os?@%*ta(rr{AvE64HC?V`VxewY1Dfr!iF>R@~mI_&c{lSedbrYFm3yJ+1~B- zqu)%{Xy6_vqSq45-hr(zPTfeiFGqC(7-fF)5?_LG;dbIfHo%Ku;@2cXZPT=C}0)eb#rh{MC;`zY25B-Ho;*T;9D*yB(x@ zjzteN7V8EGB@N7tssj=p%4gp?uzx4A8YjFbup0;Dx+a^m4Z72mfk(s4RJLS{>x6w1 zfg!&?x9e}|O>fO5zq+St{}w}ykzFEUYVQY{_MOn1%Q+vx$u`KSUq57nC(C~nP*VL+ zXp(xPAlq0`#DnW1c>aB%F=}fJCCAlS*p=v6%DOFk_+;r>*lJbTRSKLSAI9{u(n#)c(8{S7Q zn=J3bRBGIf*Uqm!FB0;?*(DHV1Z(i;aYJqi|ESi=wZ)Gf3TQLhS%7XzS3`EfQ~krW zyxmLRht((GGw>KI6AYVkLrAlu$lM9k;A@yDS5*7p^eDtumWF9HYUWw=Pe(NQ;` z9|pb2RX3JY%e*uZVavPAUKN$^iO;?^;Qy^NF%s~#+OqqO?HCwQK??xvN4qD%E(|Km za|fm7*R=?&e)3zqQo9A~Il+UHsui3vGE0;_R^><*m-f+iHx)BnB8toj4fkCHx49}w zbQhr6@hcikfOuyJx7A7&SaH7@xuy5=4(+6A`&qtXQoD7b$pL><=fWIWh0-xnYHVJ~ z;k1JD(ZAmu2w{RV{c4hv2!t!xN2L)h*k5=soS)>0+n)j^Mt6Ij{m}za+TH@5OuT5g zW_io5)4Rw(K4lREHmg$9#Lf$*ie{v_qA)>HN$?&7qfu6~HdyuT+rW?Fqht z4q5{RejWsu(!W5-l|%`0AbREm;vXpxWiZzP3Sau+m}to`Oxg z4Spe_D+j~27*Dfu=SJI76=p@UMCsOo;xWz}i1BF_E~qI=vu9V+jq=@7k_&?g4|~x;%~!>x`I6zsrUc6*K4^B+04HMfn1&NzlZnDtui=Gf!Iag{ zfT~7Ql+4wQ_lbJ}Cm%3~&WGNqP)o_PcSBG$iHXBAJh%h$@F$1d9sm%EIarhC$?8@y zN%CDZPV&Jt8<=I6DD9=(VSBUuebbdqp9|IohYU7ych7zWrRPB!@O{RUOdS+m7GyEe zUB$L2+`p}iGDn_&1Y2(U639ExMX0l{#g$WbL#5U^4Ris7HTKh9A8TP8OoxO`LuPI0 zkQ|pRNK1ATMPtjtB)0v<9q0n}Sf3&fh+GWEs;*Em*ASW;xK@Lz|Gat>BN62^G4jU! z!h=vNcgUdYgB7RXDEQ&u#p!f8r|&uM`;9;O#7(uX`qcRs54=4f7{#2H{75P>5PmFj z=pml`;y{d%78oxqt;(89C$SERYMj_)QM&w<*ZU=iM?ObXXgwz(wMZr{Bx>gglq~0Zn}J%2K2&21Wx^ zYpmj)k*`~>;4_xJ{pwj0$-Dy_^!1Lm2vpv(%jwp`gUhy^ON^wNnOqvpwel>eLF zr+#5$gI^$jnN3?FyJxE~Ba^d1umigH6(+u|Y-;}TA-~lSBASii0 zd+3K}X*(O(Vi7?o^uUPwN}Hpf5S!nCkbN+~>!y@XNlyhg8ALF#{U&qEK*5H#giZN) z{EpFTNSMdR`g%kkAK``6RCZ(>4kc>n=|VEjO}L$Ae3IeK*lGvUwX_(*4qf2|HVM7j z0`O)@6$gQYz7}ae0@N8+i24)=nFTvIwS9OtSGH{2V=7A9Xf;wA5;y7NJaT*2aqy57 zmKTRG=|2wgKF5z5X~_qeyE^VOQh5pHImfOKI>aX?{HSr&EE9 zs)Gn@T}^NdK1IdaJVO^o-dmZvI-fbw^KMxbw-4|OUnBG)z;?UgXyO!)YdU8Pyh8vu zqk%KZi0+1oCoDs~E&3tW3<@7DK7I*CbyEy0qW;<$UPhG(UW*B;?Vs$$Lcs9^#7MO@ z(647nRFy%^&&3RnO<_&&)Z-C6EYn-)^!1OzSU)pdGLds z<5oRh_bQ?BfK0qY$2qBQh#xTylHi38;kTb62Km!XS;sK8al1=bjW+~SS&AxPVHO0M z^TAJZW7@|wwLegsM5K|d@L|pp-A!fLnNX>kpqCAlNcext<9`In{+kB<-^=^| zMQi^*yiESHrGft65o|V={|dqW$AEtu`(IvPvN8VWh6SI$;Yo-8kiO}gmX$P_Boe>beGA_a71XKc94} zclr7IKEB7CU*d-s=ypiq=f=XW$R_b3X`&p3zlMhT)cVFeKKBpp9wiIMTsmXa=1#_p z{}gYxJXJM^=9a7ROVnB7FI}BK7-?2_zBB*6W{9m`GHk<|O@XJjk+$lg4XdjEOM8q&Ur^wfV?9=}TI_7#8tpMc#k6+El$dbI3srxfKo? z{z__|#Z~nSz>q6G?eo$;iO3*J^EvtQ{4E-;v!uV!QX?hZ7@?05pg+B#OUJP{DGLta zB(}4|W_z~Y!kzs}LMF@DVc))WwfAN17$~x~ z#p~34MF-r3-c|p(#`}e6jGT5zXsZYhpCOO@^?_zZ3b?Ov6w8guF31VTMUhxYHPACc#mKaCL|gsj<1o3h^9+J zPmPthwIyx`GBtWd@1x;r;5Kg*G(|GYkSrUo1nZPdL4aDxfI-gonp~&X6x>r`P>$~$ z*VfZYh2_=!{;)=-JTd+cC3F2 z&G{+Y1Y6aPr1FMfa;20^a*Gv+h+yVK_+#?Ce{1NRP~sQdJp zt;N>H8Bl<)_vCxMtgxkJCh%*i1bM?30-uynhn9l1R(R%kD~Ob(CZ#WX81|R?9~x^^ zuO*aj>4^V9jg9s-(!(?J%B?~sKqC;Pne%bu%~_KM(hl4wFgDt>_lj^#RfoEGyw1-Z zaf<}Y^ZOQstm)LO`eqcu1o@Q)*}K5rhF1{w>Kw+l3E5QM2CdLUtg=t0n!T^k&pU1` z7_K7_zFp}MGYrfqqUMz`9#(cY7v~|DuY?P5%*66m^LT;*GFvT(*(mMFqm1H+6%0O8 zio_LCSy@1N#a(gezkGDbJ0k2y6-6JTGG_xeNkBf)(WBO7zlMAuCF0rj|C@@ zv>hf@DkF*eFs8b*BF21U?4HJosRK0P?!=u2SGh48tHR%B@yse)H7p`S>7??%DQB889o{zv8Hu| zzGA-$x!NYost!dAMg}l4R71kS%Yv9$;B^1F@QXt0thVsN?nq1GDU#^-sFvYiR8{Mx zjxZ&lA(tAo)~kS4XNfUg#FBYdM*X_wQE#*XuYVhaOz@75C3hDmy0L}aUJGeWR9a1v z4UWyd@x+GXkfu_KiH8`47>(5VL94$4E=!p~1z^28>37hZ0{JzeMvO?_>-PmdlOTX# z|KkYt+#yn$Zn#;M7eTMld}>sK9SaO3K5<|TYODjd7NKuNXj8Lx6`}ucFD)&M0B*(A zg8l51cWND8+z^t?*rX0@2!mXbVZy3mHa%*5xaD2O4X48BoU}!q(Q2BA5Ol2lagD+< z5X7?KD;CYEAlI`$ETq;aJShbeymG2j8|iy3B*T7iAWCCs+Tj#}Jnn<0LvgCwv$nwgKuhlR^V50s=n#x%!^1{U5UQ4L(c6Dw z(#Nj*B2e?t2W0Rjg{X*Ju~DTh_S}S))l#Dy^gahHQ4JOmFapT~juQNHG-oe441=L9 z6DwBp#!#ZvIn`muKRw&ht9bw+VMbnb{j)Mjj)ndf1tF>|5LW7VD$?5&2_{UVG;!S_ zM!@oO7r+layo|atJzTLTBrjXG8e#mAA=75!A_*gX-w6VSMj-ojw?{SM>4+0FWUfiF zK)12&-zsz~({LJXn^U|LT?T*u2Ykwc0CEB|;Zq+xCq_oHxTxlMafD1tLO;b;{tek= zK!20_R3iC$*wS41+6Q3;wBr||w32duDOT}pg!=?YN zDlNmj0FoYMcLAz$01Hf6Xgm#$)JGG|e-1(QV4h_RpG+mHQCoLY+Me-v_qP25_>I z(7=n)xImx2xyn;f3V`iimt$+s;Mi91e&V_(;a#k`!+nFFzAnEZCHRWSsO|*toam6M zBMaPE|Lt5rVLNw(SYiS^vprdr#2LFmP_C#jRS5HM?PhF~2Vg((9pw<_A3|)o-+Atj zUWz36yIWXnnrm|P_F}rXchh#-s-Hxh7ro48p$A@w>l;nD8HJH@t8qb1HP`Nl zwE)KOTJV@S4!o$N0h%ter$qq!6pLaA4dMq7U5JKgXS%AvCjy6f%ayEFgW}9sZmqmq zGp&tBv7-~I5A*!@3d)ua8-X`ao^A>r#AEeJgzo8+7bQ%<&c0yzQ_={Z zq&;wVmEjb81)3~Wo_%#q;nnaAIEwSWr(gHoWcTRXnQi7^RGwrDjGr5U-}B}8Vt71o z-l9{3xUI!N-HT}KRLj2LqW}`S-Sm|@nWM75j8D1s3v21-ZZ}7PPy^a`)taJKT=T}(w>i)WV0`jJ~(rp%j0ru=i(C#DDt5xS=hAz?*eWxyn=O^69KjE(OnQBE#sbHCj z;$8ztC7{<=JP^F#klZgP`FUJ>RPy@WWnj}wC6UZNyonM^v1;ixM&o7kWtnMXY%M+K z+;h~JQJubb7d#MfkajtrFbM7Mo#6j{3onB1x$t^8;SW(VL0og`IbPjH>C78$dU8zJpJ?VCGVc+|@GZ&Y^ z5B;t&S6mpD)vV0`a{Tj}vkS#4KLTP9@dbPkKeU#d3L#eodS0hCR&-d3?nF0Bc9+rorE#E0#<}h$=zs@WcRLi?`?>vZKNZG8j^{ z=F=61vwTVDAzHEKyj@pm3w0*1VFo;%k|?hAVuQC7@;YcdkZ5S$tau)#eZ z;{~a4ke(3ib)bg7*h#3@Z8+tpAP!Rn76x@hL2?Ik00a8>r|M11B-zIfK^BWD23d;>~Yr zuBrlMf#iT8kZO(SU@9zTNvJcSDWX@gm=bvy^$GrnLX@yFcAjBJ_WQsZDa zQW#fW295y=6rr`k67FDV8ACf4w7mTC1Z!$ zNzRFxNpEQ!(QGphfqR*RYe2nmH30&B`7orTpQ+;k7NOV~{S8tWAb(|_br6g&=(yoQ z_0e|7gZ%h1BLYkd%1e(qrO9KkIgQbR@`HD=X|;uVSY8>Ln9^KY=hop3gZ-s@7$g?^ z^7q$N<{V5}JP2YBAtgOrMmZM0RlGve?|l!7F)F4&8@oC|U2(S@O!i5y2y+V#Y?$-& zR0cYxvE)}fm?*iI+?MnM4B@pmiO>PiEQv-4HwVHl#Ih*S2_nQvf*?S6xwl0emNQBu z8$EfwMy&49GVV)^?!ygM$RW%XzSuF}&hS573(V#`8ht4j#qq{fR*3F#5pd){kebBD z);y&s;ST}D-1pHfVZjf?ZdvV8lsL*!fsQ7Gpjq`cVax88A*aim{A2?sFwSoNM|GiP+pZD| zM=9lFee)E^s%F;57IVNf4)c2J%xx;8RnTt$Cw}z4A=MB~6Mt*UUrZ6F`}h3K*jd~t zS$~Tl8*;KQ>jypQ;k`HhDdFC1f|S(cl7geIuyQ2^U~!UEU~bU1P$^3IWdp16>cHIe zHrz8pr8k_^MuC48dk6)BiMOUr`_D?1oGPr# zg5=OIr+|m*4*!0_tQHqbt12EjA(Mh7D=AbJmY{LsxQ1v4dLRgeT4p7B zPrrkN@^HZeau`JLgkIkx-e=Z4abgsIgLBw!2&uGp%?}Yg>Erx72~{1WjBB1mWEzQ1 zFLfoM4nluHe1b~rfEpB!sBJ)0D@UVf1a}^Mx|?%fk(OBh)xC)z%!d?e!Jf!qDAOol z%-Ic%3a&CxPlNhYbjBx7XAB9;0Y6TO{7~Vak))4yDM!5;r$IYXX7|V`JfNYh6DwYp zZaHVyQ9^*DYdk{_c$}UIP-_>e$b3{?e3fu2?u=_2JxQCJ)p;8{SCHP zxzVIZCBxw-VDMoPR*NO!^l%?(WTV`lgjK3> z@Nf0JVLQ)^XZ#CG@E=*Wf42mz|LaQRZ-?~%v;=Id|CIG?tpE2>@4qFF{`ap&{%?!G z`d@Kx{}}M!u?T;23;uKOz=-Cy-Cyp_??sO=A6^`gu|?aLR%dI7RkoH-d(QkIADrZ+ zo=lAmF+x#-O76Pu#+z1jviVRq>UrdMPR>{QM#k~i=>q4c)}8fK?k_mMqP>-@ z61IUUr1=Pa3o`9oat%c7XP$~{_btb^Et|HX!LGRWaI5p(tGD~M zi#&nO2MV~QVtvf_O!Y&G_03*4S{LVA!L#Iv3!N#Fml4~v{#FP2^!eS5Tn|^P(rzG5 zO}F(>U-F!=N`~$wRGONY@k&_~?OvaWWTd!o$AQ64fEC>I!J^a-N!-yYVDRgUnb5Io z8aSU({>D}r&7lCduu{uDM?bgI7x0YUA>M23J^K_HODfKIwJ+Nyhkk-X_V$44V8!U= zjK=7t50xb0qE#f=vg?~8TYZyWHx!S)UGEgO-KI@VJDlnhAUOM2qTj7v?Ls=7J5|?r zmwFyx+tUmEVr(R2K}5vF*gMeyGEcc8`nEnNY*zIHFv?H1@Me<}@eb84d2qGD8cFFX zAjW@YusHE*$6mr~Y-WtMthRXB$HN7$kAtLC!2O6ym-fR@_b#i}B-vayL@F4j6cHjs zHuBLe6#zfq#y^$N`CpL9u*`MFggP7R_>;H`a!SQd&fDY0oODiZ25fJ|ToOQ0%Zs-Y zo|b25m+0zt?y6gRdx{{5FyWAHe1t#HCI5N52Ojw(A(gFuU*2wL$tpSGi|6XFg1*Tojz|}d|eJOabFjO448uG z@hIN)3tAgGHTt)?&#}{R0MkJ{NCukVpl&bZs(yoj~{?)qX)4y!Kw>bQoN3 zGmK0LCW)B-PG1?MHW4(M=!O(-up3DBvaQuR`J8UFof;Y)9Nw9Tpc&5E?3k)oSt%6H z55iznID|#Px~cUWQPOs>JFL`NbHu(f8B>7$d?x;YZ5A~sH%|g@rNKPVNIyGw#twxw zZ->oh?Pb$&;(Ew14`-YUlkZg|fYJZur{JK-++O-C4STV>s&o5k{pf1tU2K@YsQQz`td@RI?7nRc~U%Qeg_V;Zit6gdhLa z+w$Qv!{!ckZh=-=ew$rlTGlqGxIi@`cETs&qWeBF&gYb~=fafEc0U zvsrJYWj8G0s^{4b#E10!OZoGO6RTC+9$fm~f#F0{+RB?x%1Bl9>|_Ri(c8Xz7@IYs zLQ)2l(F+pmyR%GtY=L$FN@1g1wAs9&dtfvRzo0+hVs0P?r6walhy0ERE=swYNXnRO zO#~jQuztKBUJMyy3xG9}VWN<7^p|e}FhxN+IEyQhIg_+hg*{4kC=9}BF^9AT^YJmR z6755P$rF;58@54!mDfPgoW5yUF|dYf|LojTD=Ap)#VzJS_i=VuJU$LgVz+Qad$f*& zLvbCvETxMo6{K7yPT5<%cn~bSB8_~CLCb)^NJF$-#wZNkxI`H_P7y7)^5r;tyerRV z{f)P=Fbt=&B5dR=!VLRCvm*Av#;BkS+G`f^fJ*4EK>1>ZW}%}EM=G2u6s7&f8t_|D zG*ysj8;_w$8+U(}62&W#T+Kp_=X&Q9^?}xu7YqZER_X$FuYP z)klcf3I^H(BV9&x9^!UZUS(0fi$RLT&7B$AY*Gbu6JZ2UtqShwD@}1EOumL6=bmZ8BvGVgtY@`VBslF~5j!)uL{bL~liy);ZFfx>ZNA*VcTi&$h90}gSW`bWjX zXNN%0c;g0XW``w?S0(qlJsA()nb#3TMmk7|anFhJsw?odm~%BA4h{k}H|jmvGv(`Dgdt-$5w*90nEd4yOf*m9{_)Jzg_OL z0V?2$`PtxQzs?9WTI74Z@@kq+=7lAOy^i_np5bNJ@z`+4V#VKD#2Rllup;fnM1@JI z5sG6khM^P!sFdwD-(#YJ_^LW;bnAhK%_y3VTEtUuV{d^S?h(CkGeMZ_){L@0mXEwCMO$_T%i z1)*914MYh=79`6keM6a(3}8XF=x6`QL&66UA4)zV)Cx)usnAB60{j&5R0` z8Ge{Cl!JMi(LZ0?(|17h&JfMziH?=K<0VfbHum;6MsNy#bM%1g?i0vOaJTCvV)h2d zEf><)A|}o#V|_hIQJmdPnyXPv(`-c~*t3D-M;=2xa#AW;jDl+)kAM7Pxnrm5V z$lz?}Lc*W-eolzCQBjLpAF(}tbmt;7_^~U(nsC^9H*m_LhlDxdu1%W|{5HyL&Lh-Ildgx`+Kn; zafCCHVD09u+@2pr1k# zS>W@#xsr(GgUH;I#^8j}at!?QXg@9Y2hWPAJ<{>q{+m2Qr+~Q_bqeWwoC1`!agh>9 zL3nuqEzOC>4v-3+Vw9 ziLMGg!qI8t9|gG+c?W0BVI-TnzF&CJ6FbvgFIgnN_6j5-d3e%pv?&~1+(>J`pF?i@ zcDKCmR@_3m5{cXfC#teGsVP-#t2-MtPf7x7kI&04o$<;pbPA%Z{rGZbd0SOl>&Bkn z`Puz`&be*Uq&X6x_w|82U$&p*pwgbi-6f4rzQBD=da4>b6sfuwW4bq-%{|IWyDm!K z$9s(2*4CCx%>B?xF!u9~z8`4iuirnWoN1d9@GpAr4$~mPM%izTMV{|E>ovHY`JqcL zUc|Y^SLDzH!s+r0?iIQJrV+B^*1AbeRNH12;EuTti|-(IS&T8Bkm`p3y|z&s>y{^~ zwR3`qW&Ej#B2p`XDdTIM(cvcPFmlvVk-nxdX~goQkvMX%zavV)MyG%Azr`l|f{Ezq<6R<`_ah5>n~=JWWGBp##xj(#EokX{`i~*;ar% zd5Z5rL;*01o7$Z+XQ~k7*O3@zF0InV+18*}l!jjbYs^eJ<=8 z>B~<7mwF0%petn4wPK=X4sGAg*<#|YB$#eLNsdEhS@GSTIh|~W>Hxmd0f0)%FY0-W z#Vx>XKh;XMwf z&BxXnk#CK7{15OXtgBi`)VlLR0HOG6uqzakselTaqs zZT5P&^6-Pe$JhLmTW;qWkNl%!LcVk+s8X$@Q2IBB(7ga(%)r@WISTSTB(&FVeKM4* zGvG~D=~H-|myy~dv3NX|O-L!F%JYoyq%lhNdS^=7^2MLj&7Da^+t-;s80ROqXZp|6Q!5D%4c6A|S3 z@QjFVX&{3HY3zjRsZE{=CZs(@n{Jg&dC92|eU-k`0J>}^rm_CYu zSfYrN@7I3MI>75le{j6`F5{zP0_DcKP|-K4+HM&1ZM(QA(BLeh#_wkycWH8eU>|KU z*4y=`EDpoiYZ5I3u4y(C-4sh;vpAzu4Fyq0%mnJYFv?lv$^n(3hvK`11N{_C-V z1-UBAQ5qFqSKM_;h^UxWaE;3azdfZ}{B_+Bfc3k(P8vadhc%!r0yLS znq(H&N{wMj9z3n2FE~KE)lkb641|nqeZ!-Qjy<~|IEiEl83%9Jw)!pPJp?sW;*rzp z?1QdTB)AIKo*7*H~81e zRld)=7ORc$_TqKbMEvNA*SjAn1}mz)77%T0&6Ll(nep(wX8_vU#c!N=`0Bf2!zS`d zuw=;C z=L`^erU8Fo_&RrsCQ(vmf6qZ^9}cHroaXnhE9z@2M=Gja9v4Eh7&?IemM<*>rLuhD z7Hy8B@zPNd!=ct5Zh#%4*;DVJq31^j8Oym#9iV)kN$#1^He?0{wcl%4Ef_0QjCA<3 zR|T$3`LqHC;y{-wBu-Pd_vm})4-sgnxk`I+IKLXhu8UBVM#vXJSrIt0gm#efl}2;K zIpllpYEBAVBFKJ;Zws8V5h&Foh;ZHWD1Kw`3jlxTRhkg(>wb``8Yxozfs5$_R8=cO zORChD7vl?K5R@|vx|ak@=S4u5`?h9%Tu0p%6tytl;iumR#XBqh8LI_+1OEm>wRy)xDrng@+-m4k|q>TAZL37!|$^m9XYL#4^M+!B~nkxq)wgD3yLy zD2j>Oy8EOW6`$a9SdnAL$Ju8y*dY&BFv|$lT1O23Q?qtRcqc&oM5E1MbCun2Pbf3R z(VH}TzIVK?Zu(IcVxBRqad(bif1E)j=jGn_2VmRt#5;l!IR@b@>bE5j_5lChQek>~*E&$`o|wUTK%S3FjVZGjjm8W$Ru^6V34cDSfdA?PM>4Z{aH1G|EG}@6*zES%;Y%Y2G zUD?2GxXrS;z$Gk)K%_9z*YGMXO!E|wU0Kciks594F+8xd0fCor^4ejpB1cg zRb}}fDN=SbljbTQWgncmt;~|5p%c7de9yZIz}T&|q2-n2@4s%roFLauD8i!slAH$H zai(7R7pV(HgFz4_hBtdfVqFO-%Pqp24Gsq92llh{Y}Yq5(ByEeSuQZz5Y8WuBP&a) z=EJ?A+^Kd_1P^3Of~Y!enU=mbPHpd`V(W&;AA@)ev`Y*wI`K{%o;Qx#;rtp4M5+aA@V+CP zb>hwk5Kx{fn8@7tgZqyHqKG`|tD3C?yhX&ZJGYT>St0-%qgK?V6>@<%C)R{-5x{!m zjKaH+LN9H)zgf6~0#xGt2VO@|rzuH)yi-vh^}(57{5H9KzxRf-=MKt@P>myPi-4*+ zw~FWsZmFug4Yn|2Q>h|1w!$qZ{P}r*87G~u*|a4}C8#--exDfM2dh9|rJ`)>oEJRr z6AzR%VSBrMZ?a;To0XlT?aFp^^x7$>d|hC5%Uq-pnO)THIeqrm_~#$R-EB-sVn{)% zI!0DPcTnsKJ4CZO=N=o6?EZ0_<>-?qW9*>RbN+dobmUNcA5Jj~kkKR6ltd9ulJs2; z!ns`$oP z$$LMVHA6^#C#%|UURAfAv&FMT!tUppF#ZzfMz8Cq@Fbf#?4nr4?lzWH8U7?&;gW5p zz`ym$Yk9Rl0N16ZbCiJXW??M$;gnc*cip;3^}g<~=H942zYug)ZIzt|P*exTvMrag zK;P9JK0S|78M8>b1XnLy%I&px{w1ffuvB-&3|H!8%FpKWV)_!-#ozaxKUJbWF=LZC z(ow5X8pk81GR5ejeMA{uj7VV6*b*O`GW(g2w+uvXh3DF)0qE!hq$0=|C!mLojl#e= zhsIsZ(G&h%-||ay#6{zM;G-9K`ysRHL(%@+-n<UISaKcrcs^|=; zD`jCITK1)1wpf~`8SOfy4zo&kSDh_P7{l&XNhHT7`K@VHZ+~B4!v2zJ$;u|HRTLDJ zVx#~QdmVaspKO^Kk{zQtiV6#t8jSmc*zYY{;kGq>AO)Oxav)lNVk6Q1NPiBD{k;8L zz%q=@1U|o5`(zid zM(H+e&aF#I^rjsx8@#mM+fkp(M${Ev$BdrGJ7>4wF`&5#>#B6B#OHvi^7O6M=m*us zz@Q-ngHyV}zLrM%PW@J8CvV4E!!~EQgQ`2Dg4S!s2o`%hyiF_Ww0$uJ|5xf$=?c1o z>M6b+*&JKXV;fyj<)vSPOyXzm((+uYMi&=t(oCx4mqNxZZOq>x=AWGcJ?b7zH{jgbW1g0Gh)d25d_pE!B z8wPCueda?*euMZNj#+froXII>#3h5_12TIOA@u+W%^swF$ecEGY;Y7e|8lfi5`cK= z7so&;aEr1o2MrNkw9|saouNI8ezHxLUxt_eAnY7FuBWsdH|+EJ;kmj?@!Tp=d9lmm z&gI=SIc8U|ct55fTKCqKd@ z$C_L^6HB7sa>NTe3)pw4BQdoeTv+QQPoY1+EMOEW_5vxHTwGJ=@)k%cj>2iX6SozH zFlT?M0fR-M2UD5hikihA#oVL*C!R1!0#v*Kdeb_;kK3uo=AdeY==2%xi4rfYA8fWU`ixsO7@S)LiXF0LFomW{ z@T|;tBGiW4MHqP%1E)-Ci;PGEqSg-!qLFM7FM(DFD7NL;&I{JJ5Mg{no(}q@=b#zt z-o=X>S7J22$KD{CBrL}x5hM&X7r`(PF=Q84yBuZ;2(?oN4TkvwEK-1xNS|7l!+?Z& zPKAXDX+JDvr2$SZcDHn;{rG7_~o>W&k21 z#g8vRsPOHXyjGHG;DA_V=PLKK>CIeg>Ie?CfTcgTOb)Igs%+aPu>fSETG|fUUFWX~ zBbG`1D&;~^`_4;l#zQcJg|@}M7#Z|_dGye{;D^4SUfjk+4g{xd=Iwi9y-lt~JFsXX z1imbDv(h4tUhb3yRFLzX+@mDsQ%Xcw43GWErinuUePfSZpmh%+P2w)?Ni+Zb2?FNH zmAqb}+^oC)8F>tH=uVS+XIfNiX_?{Z4MdgHA99I%?3?OXlzY>&gIZVvxL;KHqjV)8 z;eq<`6sD@RZK_5NEi7ZTk2OP@bU@Z1e92&WK(B+7M z1ufy9cCXP#9B&Sx&pPWw4fmg_0Rg+|`nS9z`6h0CeQ->=b!HP4xPG^yfrlYd@fc$? z^klZv0^sd=0g+Fm?Q~J`yM!27%FLN9JXpqr>YY~hP~n}UTDrt#BT~~twIkK(Hcs*6 z$I~x#cPkv!(^J0)`o)c1={$9wD5)9(M}F`sX8-BANtdFd3*EFJz^yhy1Z^lGoU?Ovm2>T{Cw3tlC z2H9qitkBb>q>0jq7HPF=#r7cjd59aMZR)USHv0w!(-A3t9;og)Wu$;4kuEWPaXbpa1{L1tK@SC4jZX#Satr1GFU-Hf1OghV0`P{lss zSZmV4n5WAAkreab+S}b~=o;vKn}h~(<(gZ08$#8g0F)0JveIA+UtF1{!?FAUv3hS7 zT>B-djKDs&Dk=Wsk3grRn3;&c+om*KehN>kl%V=@Qy@s0S!e^XK2r#lgQh z2%^FX@LS-lhdO#y!hDmQ$6Ek})p!X3;;#|YEh$5bjgV%*{I_T_b=~H+D#f*9QM4M6 za=*Lsj8i>yQV3-+_-efChW_9-m4J$g-1>x~>JCvBJy2JIG3i-`HjVXH_+biDP4hDv zYBGW1MJQEF9433rUKa#V8|Ap9&CM`4rv$O z(R-H3IWWCxGO%16T%c0uMuq#vl`_GTnuqxA;h`zVkPq9C?|)F(p6o*OTz^Lh&d!Tn z{AdD_{TZkJXLq3W{?7pz+vDfxSY0jvc-1^p$siz(TNrt45V6pohX_aN)tnOBn-s1I zK0bB4;CDz$Oq3%`YO%UnZduPv&2(PTKD{Z2jtN(+4FC>g#0zucb#W=jAy!MsjMY&N z*mTN#+!Q%(Q7(GJQFQ|FFzyuMWC65e=gJ@R&>TWkdSeG0`Q22LeTt@$Qcqk1;*v-g z8nMyA1BLVj?F>M^nL-V8RT~z`66f%MeB0)6=!$7!x8wqq7L3a=iBZ0NEQiW z`>4wH`sYs-jtaO?r9w1eK96p+XBw2b^7co6igQ$xIm< zzjM+Vvfb;Bsygw0CJ|Zuy62Qqog6r}C9sN-*6-Wz&i#Ub1eL;6CAIrbcp5|h0yNEo zCf*5*$5)*j9x0MxVx_;>Yu=pC^T*Xpl3%&lIN1(|RI=K`b8DJ$2^gVN8!qQHE z;hN5Fw3k0{kZ2>^J77N(gcIewly4q zaMn6coa8(oUD?Pa+ZBoc2S~!7z9b3aVdmj8tA+WB)jm;l(_O!PIkzC2&od>wV3xQi z3eyk?T6cBLajn$B@#4#8xEmyJWPM+&qfDsA# z(nht!W+_o&*lEC1f1Hu97P(K7T3Hr-aLn4x1a6T|y59qu3 z?ApF@`(htz(Fbm}7G6%g3W1z#DGZ_Mn0AJVo1t85JwT6>tcXGM4%8|VosN<8k3(M7 z3a9POpf6_p7BttB2p@-e^R**mf?WP7_SLm)40s3Dg}x}1P_B#OoyQ5gFR6AP;}8!+ zu>;U?J$Vn(8Y7{y^+?RL7m2&pAsh!R+J>0hJJiN7G}IkeqYyFZUI3r+dLhsdBnc!k zN906pfP+G1x{d8xP#T(7tm9;cZw_e^*E?@B01pUT%MufMhEWbVMr-rzvP8>d>!^?; z0Ydbedo>ZhL;|JD1^DMpb9C#gR7nhjidV|<$!)7@J914Hmhqi$FOo4St_c5}1~MHr zIk}`uP{~j$66Tr!sM4cP%^K?N)#e)PSLP+=&tgSytqjbkTrm{o_#fi9HEWmWc_KGb zY4&LElN36#>+?Be=01;v)o}MXD(Yx@b)x&K`bZL)dnH`GqxXaR32VgEM9~GtYzU*^ zar3X4xf~<Yv5~-dBWR3 zXYqG)?F*dK>vSn5x*$EZ2`uVTFr#Ly<%>5Iw53gJlo8m7ts1J5TC_ zgGC-MaoBpK_nmDbV=QF04&iB5h0y;5iZxWF!DoyyVZ5)RK|w37)%vjA*oRbCdo@x- zjNgMoBotvoY~MWA3K=ZaaKoBRR6&wpXmz6K$#M!~55W{Fh3cx9N)-fxZAJ}~m2NPa z*%ym}(kKs{hn9OZf#D4%p&3Y#K0B9EU`K==?M2s*1v8NC*Ih$ILU5h1JZwODOM^9Z zZ17T2b%1jGFqVoGYHWJ|H3vg6;(=!56;wJZ5$H*9jFR5h6<>W&ZR6=krK@$~#&wa5 z)By%N*3bLJocuHk59pBua26#~ZKLaC&yO?J9C@B=jb)pj4syul2o!F>ZmVjSfo1Ra z>5$h;+;9}q5;2XNoHX>kX}YylZvu&0{8j2V1*l=I1wmT9HMgi4@9PmIInc|c%G!hb zSeP_l)-oy{`*_P}98>~%nnoKCLH8Ah=&hH+V<91$>r6Ujs5H{L1M9*)>h1kD1{)b3 zrz_+HO`s3lW7gaez1cY2LsNr?Z)*Tg$yGij;%#}=5{4~DG?w-XgSvxTi?0ZMEheqX zf4)Hl!FHKPcmOO=87w-8ZON5v>B5{7y&CKNxGSy>ndxlQfJa8)po}{KAe;R^#?iE* z2>>*WYxnl_=}f2XLPyjr!!jy$6Q~3*;DyH#3B3+vvD5_+8!je`lZj2>)VPj4YU`l= z4%1Nyy@*=@KTMqAP1)M}ONZgB*D26Wf}Q~>aDLK{5aK<-wOPkJWF7E2Y+E4?=zuDy zU{!I6CnCqjGpJ+9i&6z)M7R7g$iI78&lqen41D+ev>s^aIa(0oh=YB+x*v_CB$fFU zPO0!VK{Gor3AZutD!T#={e{_)xT-bha~qxlaTz8y<`)CZC&gpDo&<(sP*bs0k=2vp zDSxZgG{{s6_M`;L)|{;=$4gyxvFvF0-p^W3R&v*7UvaCvFnY&c81~w6*?hllH+R`H z-|iuGo^zK!DQUY88*WEM$@2Mj;V?3Ym@zr4-_@5%~ybFtF>UITk^-bRWMQ5Wjb@gx&P5!S09zaKy@k zNW3|G4%HcWu;3X%{R*a=BHimguhn#K_$Pk)%UnI5*Rb32vF{&+%07x}bc^vl#nH0B zP7t&um5?9X1W7f&DyQubf8>k3zs<(#TNKP@D062}M=~oH66vVfSz#4pc_<_cr9NXV zeU99XF-6~dd!4hAi1&IFi<{6=6{jogqC~nz0CVFS6TXSy4u5h@UGpaXE|)HDB}ayXMcv51y}I`&hsDxv&U)_q}WrMM#vwEY|rtGp90%APR#B@i|^WpjMum-YkqYdD0RPsQsfaG zSITYG8<0e3(l6|+|MB$UV(Ktq_o2`;mS9w!51{%M1o5Q@sDo6iq0{RCVJttm#^jhX zNqZiHL~V@!wxGi63JDd3Y?Xp^iP7gO;g|k;lsI-~KU@5*vQ%7EAx-ls!zi!) zSdQ62`;?Tb_EBC^H{gKZQNIvTFGl?aAzS+)Da6ZAk$zsN3F!#zhtdt#Kp}d|Z2TU3 zTcbP4GrJ!qG}d!XWDG;b)n>u33Pm2ed&$`t!i@%^JR+FOwZZlVld*Z`AG>>&=g*pw z8DGcz?(MJMXyG3h;WruC*BqkAOaA+%HfATaKv*cJWQF?|Y7aiEm(?vq9N zUHK8PkNI|0^N3a3epup7*X@Z$34`yJN{a6_|CPrec(k5J$jl2C=k~3ex;q%hmd;5h z74Pf~M1poyimODLCF$qk`Rq3!p#=Rekl~+w^Z#>p^8f6O|MwlVf69zv`>!&iIR9~i z|0_J;U}XGH-uN6%X}g2JvyAE(L4JeobRLSJnzr1o14>nU5yQ}uY#MXoul1TGN?k~ zOi^}C+@Fcz5{r}Fo$r1hF3oZM6Ir320_D~+t*|_oF7xggVwXHFyx9F3v5j@j!@B8S z)4FzR^R%;xJzhR+1c8S-X_Zy>7gOfUb9clJK`gFsK1*owvd=BspU1o8T%)SXdses-DSBi}x{YItz@bh(b#Pz+%}|4~b%Mo*M0gRbVN?GI~Fvd>{M!g3igJ zhirk;(LIlqot+!bAY{zur%iMg2%qb8-LN&*#kkg$o~2InC3+}4Ua%VB9svOp7vLauu7z%B(%5MI2&srVj+a4@EH#ETv zi|4Wa85%~SKz zxC)M0>+_r|&H1k=Th1G$Wg)X(Li&pjPb4~u?9b}v$tdCM;;Aa&rk)RAJVpKVg#C2p zk2JO4tclJxGS0dKX)i_5B#Nf?Zi-^*;Y=eBgLW-Z?`;a?&&l75(bJeb$mYwwkAN4J z$3x;Jb5nB4bwkzI&`I6YL(x|5_{Sl^z0Gro1LF>utmSii(i!n})a!6kCnrM zXI>Nu=uKE2jvJ06M)_4Wiw4r4qu%v&Q@)IFk0su?P$9*eb^MEf#2w9MOhNZaj*h#X zT5CbStdWJP$tB6+&)o{O){z9Z`T9cqD4b;FByarBfV#1VxgGr^jTw5 z)fuqqS)Tih3bDC4gdL(n*uSa8-M7IRu)*uzpz34Xs3coN7eO=l5oz3;mjFj5K_ptY zmj2bQ>zyxi_mhqciyv48^9@yqJyo_-B{Ft%&)UGxv){~#E7)$)oE4lbWGG^#jpFK( zfi^Uh5KWIqQ8i7T(3!<|Xcotf%DAjof1K!#?9qd&M7FPrPAK32<`4ShCI=nav@$#P zu}4cJjUQsI>c8kyNlJM`r?;MZq$-p`77g`Xhsnj5@7{M-)m4kJWL@k<1hO=&Tn-sNjm?rV`) z9qyuvAR6a*=iI&OLO#@7qo^J4OcRCEAMk>*z)!5 zCZkkXj4FF*Y)Dlh3W3-f9YUZwNUPN0_JC^(;rj#wiCtB%#n~sTGhE4tW>ld3dp;(S z2AGgEfJKC7Ht2+at(*5Y+`N&7TExaoAwaa5M@bQG9_y=O6_BFbl7wEV2+5FzV@)y^ z;6IGc03~)!Gj+s!qZtT0d;%aw_!Y_=LQkLuz~!N5_uP* zd#^jqC|jIz39A+Ph?yV9Wl0%T+An!4gD!a@|Ewl#aZq`fGoP~%3SNidH1UBmtT9o- zD83|@Z-!rj0_9qa@F&W#WLEK}Pgapvo-0pt%2EV;oJ491JM(>(ieKS7pZ^`Lb(e5?knqF*-T8sM;IBqJjfAR0V z#Rj1Pa%|8jhp$_vaCY<2BR<<>0aH%yBZxDr_(HQggGiN(UL6Bc z4xW;t#5T8qcc;DVl}#EhDzBd=8^GP112SGZa9{vf@Xkp&hFHr>BvrtMYI6E%x z$anP_WFVR#R;M`BRd*u{@JQK^qlo!ZvBoYU* zJRZC?F8ebpU462}Cq^_z%_WL%-}CZ;jxr`1k@ZOr#4>2;+v@ew-@^>>aA*U`m9&tJ z;7(W~DxftvDnBA~-QkBn$%QaYW*CH@3Pjz3&kbo@0iemFs3t0?>#h%uD>i#o9d3g2 z0^F(P?57^Pp`RFo_OR&jFmRz~5J{m1jZCemM}DIVpNoJ>ADQsuw|{5p!pd-PAjMz5 z&SoQibpWGf2`n!hAsd74iD}wP)X$W?Vo=RLc&I|E9k;C`-DRvLCD0%b*FN_oUxiFK zfx^zC4QcKg82ZkATVjjx)UZPoS5Ch?DKa8Nz5WPVFDLh$Y*IPl&lbSYD!p~GUx7j2ZpN;7@d*Ic-C6bHD-s|!DYxVoUt5NREb{S4?&%kn z(b~AAR0GuW#E{&G>?UVwM!YrFLR<^pffUjc{sODJJ?>?FIQ@OH)Ewpg`gCN%R!RH( z!D@kfNQhE#zZWLFaZ z@&iJ5QlEIVoau%;?36MN9y7V?>)w7bWWT8=$psL8%M>>k3|{P}X7K3WGN2LGoAJLr z-(X3>uRPjklveaY6B<@1`p@c`#hIQ_f3m@hSehK$8Rc2K(<|7&%xO2Y}Eu9f~-r&vkXWxckV(#Kvm{q7tlBgi0w?iHP>?&I+u9gDc>X zE5L8M6@`1?3Bt8LR7tQy-_7hgyY+d4xqi*PAec>1BS;u^b}#-8Pu3mzMqCS1mIK=` zdpIFjvWAd)#0ocuz*Zc;)1LbwbzOAVv7H3Bxn7FHHjFJ-KaBq;UMvZSUS%a3VLt!4 z$bsupRQftNl2bc{l5LpNl@7NrwAU%i_ih671ye3}LmadmCw255`jjDRf=vg*&<(&J zW%^UZFns$2S&W3w0N99iI<`=mJ!epbIa+b|~(zb|~KS_lIP_3`Gbn4TrO3 zUOCiKh`wY9#-nw<8Y7X8)E}>5NIVU1?Vljd4dztrP7Xn2QpoaMwqD#Q?qw|29K;H{f(1jMBg)1wD;oj%w8R ztEUrdKRRJ+zz)Q*ww1RmGBjo2IRxXJV3nAo$3n- z*x^eEwfg%_TZDd=)HlGtL@g@Bofx0Lt5$|Pb%`9y|Gew>QhV`|MCjkz1}t*4K0tr6 zs|-A@fex3^W=GM>9Sg&aGQ)9=r{*)(y5TYEBSZ`MdO)} z!SusbPvO?R)Vo89!Rq*eL7mYB?joHUf%GU`x6NDB&URYi%l%*kg`Q6bg@fJN)cM)l z-=?0XPK_@eR8ucCw!<@>rOEcfibzclO}ewFI!*L?&o-K|@%ueOPqe{m7iMalmi)VJ z_CohW`kqYhTNzaM`6$P=BN1pN#$hahD#7OT_xSPTsg}O4!?T7-+fTmgt?d>KRTpk| zxQh~Wb_5|PBB!+G z{Tg;zG`o(4Kd)gm#S=F0RLX+&turez{%f1dB9D((u*!m!U@}>J0~s@u?cu37mgV)) zteYRa|1*43^f6(&Zm!W&=j6yNJwd4|INo9(SM34$Km{AYU3SMtW8;;NyD3pi~=eSalwQPQU z*l`s6Ys{3>vevgo zBz`$x3V-LD`a$`6MjlV_&rGoEqqsPMB`Z;)MkiT`dKKsBz30eSI4dT4hSJZrJAGYU z!q_#*;_K$evP{{PGqSSSD!?he3c{Qi+9UK+BWII|wzAPmPcVIndzf z>w)g8i4V{2bLZFogT8AlHxH+H#hWaKTcu$)(_pgVuz)bN$_UIu!uR|JG)fI3EK!tgHJkDo1$#7&9Gtdcf2rBr^7S-(t`%#Z?oIz1vYo~I%HhL z@E=VjDFm}wG7X5l9lRgB#r6yupG)##kWu=@cU2t|dEoByBh0Q^iDwypVJ4NmJ@9|$ z0fC;Vc7s5)$h`=1o?jB6PtWmTY93e@1Y2kAoROKzxOz{?W@^hAKssmX71406hw{8rifJhHP z#BjHFNeEWQ^&PJTGi)v7AB43scT8GeE9m#xwqpg*@j9+844+~F-;1i~MGrCAo#*T0 z>USThrMo}$J0c9Kq1%_K#^c}&aDaLJAe#)OGu)@w>coNkKmcD8|4Lr_hY0o`I@kZ< z70u4_fAfm|TMqfp5s{Oc>$V$gh(6cqH?NT(GX#&wq@oxiHx4mIj<|J;ZsvlND!+nSf`bUKi|7!d6WkTE07zQo&`>?dudcv8FT z7?5cI$4gok1|fwAep#2S%6;3g%!>9CdZsmshA zk7QI#C$Nj&;KK~Pdj{lVo}*b{<{;z~2~P_I3U;RCv#23b827m2q3uWY6ByZ&zo@4y zsg|NEhPXV^ykIyaic}lS71GBTjfkSjVVdNS?V;+?C@shk)*=-~ z!b3<__qgM#kl`SyvZAFc3yw@lIB3W{VFE<}sV1r`8#P8O=+$`jWilGTiByM67DgU| zvCpUiRU{{F1sbD*7xXY^2P*LBh{!4gjxI97dZz{IMPRC6v2h+fOajD3*M_oCBO zgq48R0kwpYkeaW$lu~7tNfBj9^Usbf^?!4Tu%r3&Yr!uf%r+24+BeR+Oto186&Q@V z5Y~`JDm0S1Y7*GIMKVN#vtJQQ8TtHyEt0LNa!I9?jO~5f02f#bWF@7ZD?KZwNK7Q{ zrhFU7=D)c-UG4g6f{YsVHtVdP*$uGN%QzZ-J?9*dz3=}xsNwD1sQT()om9?#SsZnm zzsNiyH7fyzg4+dWjBr8F9Igeg8ZlZ$Pw{nW>V7$HVV#suS{0w~sM;s5U-hp2z4ksj zyDIt1BbWHsscyyZ}<}kRA~WJ zr6xi#egRr!IGW11QU&p3rgbBW$4gK?)#IF%IiI%5psT`xWlE%Lp&CjvPp_&FuU2jk z{+>E{39GYj;aE3E#?KBb)yAX2dc2P6Pp{g9lx5>Y)|vQU5nfzv8a@0&wegj|(Z`_p zA>T)kjx(_rXC3(mtj6@Dg9va^sq<>~*p!zr7(4~hC#}GmG+QAnE>r&MikSHOk;X#k zgPVa40oI)7$wp`|M3Jn7+~`-QQTiiiJMlGaJgVbdCG-Udl+2QHF1V9BB|ob>~fEw9IPpL##m+7VCnS_*PaRA$rZo($89j z**DMlu5iC_@HQlQ+<)f1n@2sFF#VFl@QQlcJU!Tc+H|&Sa$BGpY6ed0b)Tu{sMS1e zqJBK_X~OEdPw6YeR)2@%sM4W86O;qvU7rEVYgE-RyE?D;S;)p$Cx4S^DL{CT`8=OE zeOuTT*H`j^q^hRfrLwuU(5ApRlzlZj)!E;<8|qwYp*%~`GqJhqbkVl{`bPZOhKT`R z=S_FAPq}P;okE_vE3@y}pP2X{M_rBMT0~r|C)W0Ep%;iLESLxuDWuj+!qTz1GuL^r z$|CghHzK|>zvzR#-a20$a05laSc`j@Stp;!yNE_TcgQxMF20*;B|HE1cfqfj=PNnr z3DL6f#=$yw}C7##AlhbR{g1sGnYHewt>G*&SJq-lwwN_lBX!{!zD`T z;y~GkB7Nm&4X#<3s2)v7J%+-An5Qf-$MxRnk z7y`Dc$_n?+X~;lBf!HTIuBX&%CeOK_O=S*X)i za?bF5#nBIZ7j4VS7dxpq2mtMiyt`SQgt29!zysROSsUV6@jes+>K$pq4F&XrCrZC` zu1mNJGFa#-4}V}N7jf?Im^@_w(SCf#uA~0l~74jFrJuL2|#L3+!rz{RUKjYZ42L1MEc$) zOtPydarn|@hiaMhC7bWe8i0Q(DA#NQa?PrzPO8JYd}&WIYI<|j`{jm&0+1+VD+)HM z%#){clR++%jNt9Yjh^@^ysn6~7P|$m5R5*3PVOgIJvSQ~~Fd0fJ;+i0l0ej{bNuJZ}_niyt& zXLHm+YqPMbDC>O8Pc1T~`(M!YKZh;+ON9P6$Y%UY*?;q!{~fuR2pE}|82*y=za9L? zbnSn@I5RW*f1YK!TWtFgp7Yy{W zcMBuv&5?fEIyTAs?kw{vFF$#N|LGK48(B=Iu4atN2$>Z~(u;s7hE8Ut=bs)J2nWmT zpOFz0k&%HGk*T$bZ3OuihZ~`Va&Tb;@4EAu7Lv|90(M7)!XD6pN#&0RR9EE+gw6&8 zOHL1qLC?(WpOTSr%pYoCuIJwpk=4j45CBa8>k8CLpcoZ^$D310TS-9g@pTWC&k6vo zxw)}t{5V8FtcB#%&dT5bLX{y;7Fa^?xbeh=7PuwEY;N%^ftMH?@iKGJUwl z<-dv7@hyzLgm8r3z0Tm~0%pab!QC2YGVopNfkgP3pczO2gkWY%$7YKFGy)BD$50RQ zC6|A73iT#EdZ+y{7gXI$ynhyF*`H;(w~z*`>I*CF-30Wib|!c+TJ zTF{&Pr0q8x@FhQv5ai3YLF7)_EI6>mw@e!!Gi3eh_|Meu>HDv=@$YWNZ@j~Am$`2{ z(ZniOSHDxsZ?>23*{l`qb&oIOTc)hIs>DFNvn z6@MZ5a9o19u7;Vh{+qVhHKE}ND1%yCc%tG9Kdbu?yBlL_Y7Mvu&b9XIGt%SM$n1;1 zEsd7B-p3=RrDNh~n+hc@EhXr~C7~PZp-$ynJ1jT|Yvtqlsn*dRL?$~&mM1}v?mL77 zXp4samleX@%da+I0WwI2gF*0{xqA8@kc;St_d?EAAc5NL!tMwhAk=Sqhgx8NCcp4| z(}%B_sJy@--wVvCAVREOcq~h?s`n=9|dV}#eOHG zL92cd`|O<^q+c4}e46>M-SOZ+V4tv>zyeWzyV4=4-+gI?72hHBE-PQK`Y^TcLG;p~ z&Mz2UBp~0g`pBGLrT2r2x27mP-(}HIYA_ine|HbFe(2%M!ag!K@HwKB?vr!uL~ z!Bh+H*blcvPr&3Dhn7J&&}l+CgI1jS_(ubQIu+;kB$1`Xd=>OAGa%ermC z-X=BU(i_Bk8biAz7cr>GCP=e{Fx@W^vBpi%k{6G2E%P-%hpVKWWz{iBQ`PZB&_# zQU|y@m@Ra`Tq)f)(vwJJO}O4TaQ0!5{HdTGDb(ygsaY?n&)S!Vnn+kL8G zU8*`dSMu(r*4IQV(X*+D@d|4TJC>}{yysvYujMrSL0!x&7Zr{4uAa`-`BL!DA?|#h zc7(QJs@1$=0gajy=@bm~{xs+Jf?gu_EPTq+9HN7JX3t^LbB-r*M+&5ooThFV!0yDI zJ8BecB+ZHbCGEo1!@?)d{zQq!IT$*nOmuliBJHH+`g%W@8g~9Bz0&ulqLTV)x_TiU z?TV{5g=Uy}X8T?@xp}zLYHRSMpA#-stsBEcXiN2-sC7lJL^Uv$1aMG&3clagDpnHx z!kAo5a86njQ5L7DBn1J6lHtj7M$bZXfWa6dE%(3amQi`);Bmh>9CZCVdocEV&oYIFDBPFdn<&~F5WKBBO zG9W2<$x}sr(g^TQI#LG)-<31iQ2Cl#|N zaSSQ4YZ+RAmazmre0Cmv>ORW;K)_%$Vb6i@5L9W{NbIJx)3^7u;G=hC&Hx2AiH@f9 zkITa(+_WOo$%PSS8I1X~R6^`B^!l?tHgud{S^Wl>rr3GDXRHg+27x@NeYPYp-5&n% zVU5n)+@8aZcedWZPIqW;@|ADcOM>DzdAGo+c1y$m%(4r)8f= z*8$g83C&G62tcQ$nB%S++Inl!x3R1kt5_Lx2bs&#z(?>0@L%3X7ap%?At(2^9dKE0 zwj9Z3jL-zW=#8r(v3f4fjP)lU0+Mb~@IUX||ZR@93;Ki_{-6)XU{ z2&v?H%x?9)sV(z*JK&;M!nA}ac?E-Z55?T76BpWuh&%T1TL?bF$wq-#)ts4vwJO-T z<97-KtJd6jbv3w*CZAIcaqKTEm9rxE=<413K2RFAN-8p0X~SO#6x<9zE>BoRt~;XT zK!cy4tp1=e`=PgKhX0%HdD2D4+qmo8CS;fnGXU*&ZAQ1_LrY8M^ZGWUkWd?SG+WE?E&42m&3 zJlv)S`pdL3mr=j+Z_8-pEY#QK7jwswnzOpwJ##kX$NO`M7_a&bo-E5TM3r9qIc!d9 zg^gfgp^4AWpj2tJAHtgO6BV*c)hp9^;BpdT+4Eg(9&~D2SaWVt-RquIPNnlEk44w$lHwtpI^`}LBHTFb56?iG=8vG*sXMZX(vXjV4-3aa~w20 z>NV|Al@%j)t?@PZWCa#q$!H(YiUv|YMM}Cqtv5t1uKhO0L3)ET9*{3nATDF+z^@l~*LH4_6R2+2*;bf9GmgJ`iAyk;F#?CFyQZv6ymZ#=$ z%v|xBdQpnd-n374-<v1Ai;$`7u^T!Xlu@ND|A z$~$Hb9NwEjm~YrCfg7YbcXneFUgzyLQVvP9XGOACum*9r7-;>6z;At z7bF0x^bZ+klN8^4JHN+>2KzHd4=>eVfB6>OcAyAWq#0JHD>3IhFh!;Q^ITGeqw4N+ z;a2w0Cm;}j+oZvNTMe$Vai5&qa>Ieor+|D*Hpz5giMcyU4Li8_4Bw@Q`d$Ypwr92R zVTx%ZNDmHO<#zov#4&xx!1=6z|E;E8`~v)}N3ytDG_8s50WcXj+p!m!N7?-f^ajaG z_?g%$RaXJ0DlF}oCdYq?%a_|(Hjn@0(p7=)`{5OZ1&4_rdcZWb7Q-$^eOc#&zl9s(p?D#%%?hV_!_e(LUPUk8b_AnS|;_z zDRr0N@r*?Fbr>2!o|f|`{ddIuWU_Kz2*k)a2#(_YC!%Zsz23bwEZ!M&-LzuLFU{M4Ul0Ze2IE5rpMc;?tVVx#lEgn%7Gkmj2ne>thy)!FR6 z4SuR~&e1<5jQ3HCffL!enQ=R7lX2G|VwR`~hCeCqc`~5Q;?2fhhskwkhZ6Vyq9+aK zaa@mbpVYtd4P>=bJ^-vpdBy$U$Jd`bYFYD430xN;AX5!K%FBNtZl@~tS`7O^@cfpJ z0uVNN^emfRaW9_?#R!M{gpg`xTl#*L1cYaP#U@GkU3CaLoAVkH#`@hDXmdu6Aq^Gx zbpzbCJ7JOUrrJyf-=qVqPgT_R`%!nY#0;lrO2>2Mq>E+4?eG)7+`=1Hde4)3wdYs} z5?|ifcFqY3n^{Y|P)Om6v-z77OD+vAW{LLrWWFHRj5@&i8G{$xhKUDc z2kzTsTBK>{C ztDW&Ot8hH5m0Kwz09^}jpeX@k2PEMNF12SBF$IN}9) z#>)Cs{F*XRF?)ULez}%Qf$ffPIb6*l)3Df=7^8&!`8n(gD@5soBH{x*ty*sumC)BNrAS9wTbBeT+|8Ba{uQwe_%$Bh5dC?CXf3 z<(m>JC;OF<)s$Jhgjxg%{k<<5=|zSlGqU=45)MiYd<gOz}KtF*(>kJJ-?8VTg)G_c}huXeBf=2B_X*{p4 zPFA!5ej20FKyCgRifz4;B6sSdoJO8?Y-EpWI&FKIAe+V}pRO<~RJ!UWElfm`6vK@x zLrT|S1K}g$Jy)SG)U^n;+PJ)!zH4B^D@ciK zaLH@G?uF*-$Ags3m>GnJ%RL8M|5_if9f{4n;n3i+Q`4-ti*ao-m(#!RM#aqfElh-P zH}_J3epD151HOxRcM$rly%(O8yx~pZ+iLDIeN0zFvKk7h3X*E{$HTz|cwDI2E396x z`n50y4p}Q_yZa+HO|AqEQs{5|-PAM3AfJ<@<`B!DEd<2d!tF?y8wK62uSK_T`4qwJ z5iB>4WxK;@UrGF62?(m=bsVAlyqPmYDn>s)+Q$K!gf_lNsQ<>;IRpu#L`%AD+qP}n zwr#urwr$(CZQHhO``yipn2DIhENfG{ia3>dzD(76qUpvJ1&kX*UDN{2%U~q-Z57Q_ zjR3}@c5BW2_sN|l16Q%Xr9|keq@RZ*1+*od0-d29)V#Nol7Gxz1Y#EAuW#!{Bi%`q z(X8)mTSF~&PpolrnADH~z4?dmAz%++vj8veaQe%s#u@!zMKG(Tf%M7cA%^vq^5DGx z!c{3HmLAM%<8o)PDgj%q8SwRgi7W77$f>X)E#P5aEmzcXCl|g~g}d%rn0yWHZeD3i zr4fblc)zK4V1T7~YW}4&;BAD%8*#S`rYCsz%L(b~Yy*&MI(a3E`8zdvs|deCiHT5V zy-Jr)`HQl$-YoVUmA@CVfKtQiP!$=2G;U9PRXQxqK(jdksz*4d{0yUjYzjO2_G)ES z-VTg*t$1eKXse;)BzA|ccqMR6DO3a_injDZH0iBYgr#bl)0EDi$ktjmUq8uw#Qhr#qTh2XSrBFO1W=Lj_iqg|W># zf_eY<(X5r2-@m=N0`x0(cM&A)6-}Y&Zfv4uLv>T|bmyBc!$LoaN5!ALxAT*eQ|1kCjLvf4rJ|lt3~Zb6VPLk#kspMC<|OQ@>XsHbb>i>VXq|g^AyCYc zTRAcz_5CB3X#*!3<5&t*g(MYOlsm*n%!IlIOugumSX(4oM?$xU*c*AY2fIc ziA1j55+dSh=>wiL4+F)72MveZhc||PPh%tPb0KUa0|0y_y;iP;yvU*D785dMHf9V? zh2WvW%BE}@jp3B!IwUAGDk$G5&S?uSQS0nx;3;dD%xBWhH>5cu=I;QPG7rECta`aH zFAtp^EG@H%Sk?kowf*K~HT<4T$VbttI3n;b>~6x|fdbrGfbXpWy)*^8*m9f#;e+A! z!Rj=50G`h{3EWny*riI2zm<_Bi6DGJYGeKb2#+;{me(Nxy4+b*jGGr|4iY2oPKk;< z*`rlh)I03K`6XeE7j^*?geSU?Yl>yRchs%=)QO5Pcq5$7#tAwE0`$%kX`8b;~a8IVTIIEugyeOgky%+Q(SY z9L^E1M)tYsf{i!VAD$#Ke87e%0JAD=qxPY=(r!3Jzi9-wvOCU{=z%LOI+sQ*k>H#r zq@mcl;T3IZ4tg4KS-)LH%~}sGi0~lIfnQ=N1epVTPg}>~h{ z2zC4fL`j~$pZb)YR>aLEc$uYEMn!PBB{^C+f?RGRBble1=aAQp(Qjnif*tWV8D7(A zO7Z{$mw7D_eA=JBJF+=YE-b9t^J~9FYcFS@bbO_?m4CW?sPoR(%@InO-o6Ry*hPjek;cqM1ryT);LQ|2%0D#=&)`) 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%0A`d?*oH){rVUhr@*UOt$BT8@LZp z{8by0A##pI@hPRp@@Pr!<0Hr;sgHAI7{wLBYvIG(9xoG*bd+Avz9Lw123}Ri@;(o^ zFHSpI8)c96Z)5T62O5UJ<@xy2Sr10;RgSuY%5$sShX%VU&IQ~hPRzZIfxF;z*~yF{@D*Gp77IKh$CnaHNo!bYR1fcLESs?&691NhvPE4m_{zU$eOZ7C z+-I1py1Wdxh~nCMjy_A8ri1Y5C<&Od$%TqJ(5N5>B)t=Tb7_-t?n8L!I>v^Z^Je9y z{&t=hIOnJd8rB`3;TqE{NHtvRPNX>Lxwk*_0tSDA3&i~9#D}GME?4jnvDHJ~j~+6S zipVF%rABZahdIkv;a!Cj*0zd@{TT$ z-v6NBMPvMJF2BuMcxHXO@G2 zbP!%2E|Y#FCS^y8xMsxH&>XaWRaqTP)6$B&#I*}-+WO&p8U+NEkhVoMcYIjU?b8+= zU+t{C+@M~zIOkYeC1i3x^XqzQVJHnq{ml~XA0!Pj17E>w1r~+n@bIQn_PX*g)aM#OW*@LS)v581SDo!cI98%v4a6GXr<-=gL-FZUb{s~2cU8`+-q7JOt7>|TyT%iN`hk4q?4n}H_{!Tv|{<6X8=UoIrTx7i{Hxfp!;=Gu@BPsZ8idn9Hm zEASM)G<+nw_wYYM4#?Ub;|nL6#F@zNAr!z?mG8WLj3HW4DMOqLv!(qLf*%vTZj^ts z@tBd~!}iAP>@gyV#>^A!v{F_}trj&0aXs&?)AmZYOm!m6Nyy$Sa=yN%4&w=AM_H-a zv)JB#N-Yt=Sk~})d$H2LzJ}8BMX!V~g)r*Pm?%v>xj-gQ`6j2eNl(-L!PrdX&=`mK z$=7+<@SgO`o#IdBpP-NZ1^;gBsj-zL4pIOz%}r(YvDPRB zd(7~7`c|+eJENvx(4$#JsMYqjFD}x!hdfJd)5}!>?#|R}u|wWGCZ%^BM-aDk-%mOl z2{PpeV=9;AIrFRP0@Q572D83rt!}J($}yK#^dF;ium?oY0Ny(&K9WJ3Y zYWf5s=5s{&OW*Uyt-`fFd@Tt?N?%8z!PNefGDIGKRkrE~qWmWtHaqSqLXhWN4Ni87 zwI+8~)62cK)-0sRA1kDIVhHrcx*|*}x!e$&>|2v$n62x5zu6@37VS4e8?ZT1!Jx}Y z`?^4B$mgNS0-8y(MZJv5-PuXf?<@(p zLI#4(HwQyK-m1+6FbZv!!(S-^iS>!+@C9!#)nZ)cfue!bM-p-dzf2+5sx^>t75xm} z!kHa-aD4UlABK)0 z1Qh8yJ2_)*Sz>dk=Q6N+*$)Z{Uku+#fn`vQdC{yV8T3URBa3I{FXB)P50K)93inHF zgDO-=6x)UQcl${OspZSPyxlOJQCd^fXi2Fe8_fSJO`wyhv0Tq8=VscM%l|z@JG#FJ z+We7!iR(xyf`*;*QX~c@ny&)TR0$|1#PUH4tG1?P`uNzIhECc7iV|8Am-J%oR@-BQ2nYwiG~v<{Rd7JUFs0XQ$z*wmO-Yj6F^))N&G-YfwyS$u z8J6EKf0GnPA?}SntS2HW1Rsox=ym};!aQkUk25_jn{cVRapbnLjGX}1!KY_y{%-OJ zY-Pt|1S38dA2E^Q=%&m(pY4$;xVw6WyNAbs+kgr zn5MGOArCj*(dJDkZtc=SkG@Fc=LF@=3(w-2Xxp#AspCRai2><`zsD7OPaiz z)!T(*Ia(C`<@-!=CM5X^yc<>O&`%~FikAn^#7)!VEvoQ{x$qMj@oWDto;rYEoq??c zddxjy!UW|^*w(3QM$BUN=t>q>4epqwk!bjW{J5~D0p0uWafIO!UDAq-_&U?PBMAr} zN#)<-a>v}}ZmeGMZ3K5HBnn9>V4(7@f+1rT?~#e+g#pt&pEFZ~OpWf^d*?*&%gpR` z(?jz*fPScd znqI1O!}E$LtF5k@xe!+)rVxv(?}zR+u24*woQamO!$ zU;s+0km+tNh zS5Wt{%^CO&hUBA4=KW`2OVz>)1bsw>0N83&g_MphMnUNb2XI)Iv%Hd7llr{E6@G(Sk!JdZ(|HSTf^CLf}V6XlT}8OW%wk zd%DQ1O883Pa$ih?MkDXAXDX1s%=6G0G>9 zzpo1j%%Cgd$p;r<(b|A-lbm0KhjD|M7{cD>wT3q_ zD&~8A*(4ik_cQAa1`MLXC09MrB@Hy{GW%)wh0)}7zbixPDx^F8_+fT7EozGwF&^V{ zh2v^NY1pYTC9krOlV}`aEw>2bq+d0hyyh1~*Nd7~4B6d;QPTl!Nqm=`}m)#s?b#j~<_F7mHIY47~-emeXymjHQ6;sjs zbU;tJf)UPsI55*_x$fmI)A;&J%>d}%!wwz%6!hQUnsev$H-ys1%)-iBSJ+wjryN*i zz8GTW2GM`yVDBEfRN`!eqDpst0me>lu#AxB4a2;|hNNbryMTM}3!kz8A^*4`#E})~ z_uO7Cu~MIBJZdUqSR8Kfk~4TX6sw$F#jM8XFn|}u*~+kV=@MPH+IGw!3m^BY^UcWY zOiq?ejbF$bR2d@E?r{pHg1r?oQokeVK-aMvtg$g!s&SPdZ>Tw!h{F+k8Ul(*pO*4c zZPr91DkF-?!Ply!4y3^>va!{~_j>k#Y35GsPEl5ZRiu{>_j1B=sW-|idS){2Rj_1z z$S?TJo3WP?xxHM~Srv79$@IncsylMwbqYE1>NQEAa(F?n(j5%pyQRs7*_AO?X=sUg z%CbR2hl1Iehwg9zfxMLE6`uE}_i=l{T_6WW!{d~R`sisVisx=lS*QzY*he=Y$uFKftq^uW*t zUmPhifZ&oF|5WOu;Db+^%`Gs)qC{8NhV~y zgFlJfS2(5IHVX1O_@J0&UXBvo{@dHTr`vJ#d6I3_kK%+`G(h2?|p&cdtXz+D&-rp4-u?yQCXms}{dz z3D$2a|Mk%064Fyjmx{Ou+$o<_IgwT0XGfw-_PL#LRgv7Z^#^aM}${T4@yqrLfU#6dd>mYUNnj=~0a%0hj97`z{ ziq^GN1(bN95$KjVHI2pWwFU*QB6Cn348Ym-4B{AH7)0Q7*+kzkCLCCvzH+9D3taYi zK4)=o2c@3A_c0sw7TT}U>iecG3c}VniyD(^O03Bh#?eO21w2~pqk=*7MleNMXO}AB+U_8k$o$d zgrh;EJ&~$>&HKCYN$Zzjf44AHhu2|C$ye6sdwZwMzIq^IO0$-7uJR%@ZOhobZ(A8j zGh@!^$a3A|WuHCyQ^FAMvw=I}Q$NM*MGtyK7j%LgKulx(mKlFq!o&45x#-CVn~J9f zS>?+ty(FiFPkVZwx(OK8Hmh08uZi!v3hslo`3W~Y$M=i`(V;NZmQUI(M7o$_A=#_+ zwq2PBKA?+g1!_5O2~a+pZ~Yx>Zpcs+%Yc(8W4ca-SMWO6r7Anhwr~0`0%DTz8rogmu2U#CcAX*m^Nmig+mJ&7yS={K!Gb=EEeFgIotL zZ!L@1P!KAsDAsg$>6QS+l-=ow zowDbfhHvKN*Ue_B)E8Om4myVA{552%1v0Cy)#fb8f|e@(xr@v@3(!)vJwUGM6uWLyJ5EXsnkKF>1LraaVbIC$Q60r#&NueHfkh z#h4gtw_M~P|J#VRc1C{AemcLT0i~-ssa7hbBXfOOLtMSAJqRZ#QwkwgVHdEbfaBoA zkqE9dVxoi!0b@RjX<<*aH&KKQ>(*Q8HkuQ|EsC3tq@%_URTgax9P)EBt5?bh1lrMW z|EVCeXa&~~j~qV@pGh2GYlEK1=Rk7=iOEn-JnfNE@=D6sDps>Y<2@U#iT>boNLa|-{FHo*u+ zJq@*BGHGwJ^`=98$q%g=egz6cuAhpzDHr?cBhrpS#wQs;Vj@6JIU*=ZL@!|?&We7P z3f-Y-c@aTUSdxv0Qm}o)r+O}=m_IGXDwr$(CZQHhO+rIP9Vj{X@ zUUc-f_O+-}c{0l;{}JEGVts~LD&3iAogb$3F;l2MzwNFs@&)zcBs--E-0w4xlK*Lv zld-SS{bPL4uFn-Y9_~+yN4bbZfc|se$%ZMjJW^Oi?lf0?C_S;I zQH~VXVwWy$PXwFbo1;rcrx6j~6&=vuns;4j2;Qg8vQs?-qD4o9_d|H{!TC2f;58D{ z*Q#}c>E2jzLQr&QrPtrx6LSnBw@NWH<&LPq!u24#Xz$j6dHSBR3f}uHwRX()B)=jl zI!qkQ2dt+rdQ)7VkQGTEGbA_yK17c{pcD5<7i~9HtD$X&$PygmeH);9b2tOLHa@O_ zVGu-y;wEN*KW1$<(|Esuk!7bdP1G9(;2zXbQCz;TRy7jQLlnTGbo5y2&|87Xbr9R8*GrG`XrcM|k8E&-TGVH&nIEWe& zoQAlS`a=Y}8nXTKMYLNur*R{gL2K2=H2~4QF z*fS1X^yI9BJ9=pK+TB{IZx8Yo6We2cY|$dg#?m#?Q2hyxCJg)$yUML2T>cFJ1)ZjkqJ*Qj1w^<=p)b6J7rO?C ztOO^c@%Vz0-1hf;CM4RXWS6(|{A(K-ELk)#vq_ z1ZY)38{k!{J||RG4bNr8W-dECT(cN@V=o3Oqy+6qm}BHF54ffdi8y}H1ymx$t!{S{ zGeDma>*hxZw&rR7>Z55bd7#OXUm={BILV2-ea{@TgdTNF+% z3u(jglz3?Np@g_2NFxjiD7#&_IaK%E$k`W}I{HAJYtlbDO-q@lc?or8=%dv!I7;>- zhsbiU_vp2Avis06A}@GnpFFM+;6;@a;xv~?vt2bhDXX+H4qzQ>HFejEIM2~^rk6>+ zn)no*)PQ>sY_?2!#&|$NaRc+NWgoVNnM?JW=>WV39l!}CT?@jm#aBc9+ zqp$KXNZk@Q>m?h$q~a>EO_-GcRw)EIC5?d^hW33q$5(dp_In-pN;`K!bi7!uzexkw1l`1s{<#Imv@~rPq z+p>jP0t<>JHE78R>T}zvI=LJ> ze42Z84|SGCik+Yc6doaB6~+~<9FVR`i$Goe?soob$Geq4JwGK}e|fLd8Z%&YlkPp~ zgliWb44Vi!s@bCK;h61t`CWX-<38y;EfjPN;E-trsAf!)pseyd3>PA@*?SPifWL=xX3CEVadfmLWl)BX$FHvOB3cv9b5+)9WK7 zTv0ngWME(hme>*`puwTO0Sc%{Wyi4&czvy1eSMux!NQ`+CeLtAj}amUetd3h1djNf z7LZH~0pT-R958Rjjmixnuz(4(zYk=859N3d+1Lckv9SUAYh->#0TB<@xvmbNtPU9I ziV%+s6_cFP(^V9c!urfP;};9y=>!H4<`01XgntVFsTE%o!-)VS4=7Y4*gA(f6QJ*3 zn$rObarvu9cpg$yAnzr}#-^sGrkY=aT$NLlLIKR&zXE0n>kjM)#M$Xj1JH*JRt{t% z=;t~bDFi&<*y`|!yw=^3J`jx7!E2A@FMtmYKD+u?b9g%Z5PhUjmB(BA=vU8qz740VohYVkbj$D-l`|cKH-8aM|rvYY2Xkums z9Vn0^@4H5Ba|FTUhu6iumB;>tXLttn@GVu}9H6fLYdbi&kt>63c(f0r82>wUj4AX1 z-UK8F$a8&t?G2<25DyG+Y-&66%H5sX#d{7@I16xrgSOK>zJO$920N8|ptw857=8e(ql_a!QLcuzTYJQ}BBG$9iB6-=yffkNuxL zgXI7=zmx}hJ<#wHT!H;L%e=AYyhxp2B7h&gsR4lZJM~J}xoS|r^FP84LT>o3k0)*5iW{aGHIp}=Dw{Ecb|Mb?N zKON0f1kl)KTYoE50s(VT1b_`df4pMY z_kfSz$?x@!SlwK`=>R{+fOzJ9`5*D;Fd>e?n8Y)(TA9(IJl|-`KTfNLsnt?z3=$wS zX?IA#(B?SD(9XDFhCxCjoBdJ8s3U@V;i^YqF+ZgqJR-s8fFW&q7HUPeK63C_oGVq0Y!QVz(q-JX>yNnGO zj6J1{x&qZ8UwVzRNj14A=lkpv$+l>GBEz8oCxt?X!<{ZeIXygB1Clr&MG7#cf)9N# zW>W4d`X)aPTqlh#qR`5euo+n!_z*Xyq_PJXHRUFDL_`NM=L)|^@SAL52R~3U&ZqOx zHR{#fIF+cacSVFQxu|u(&NMmMnvehlo$Gw}ZAaD6)($c_6e|wYSTaNog{V7rgT`I8 zXi3vD>zp@f_k755&@t*ffuswsH1OY7+Pr=%UDYqI{stUzA3GjO>uUXqcC^~$tF@w+ zCsTqHMmGrz9RwLtu9>|dozF$H=p+E)qday=1OD*vFleqZ?a4gE2ODz7W^3o*_aM0? zJg1XRTwVvds!x?$TwIX6z^)^WP~K6-t3Hiif1WNZ@ETatqAfHbd|WG~z1&~_lM;r` zv&+vI>qBl`SYiTJIX7^JIBs*zU2DL*@U;bMpRG!J=mi`2e|2dEXs;UOFx`~K@pND% zXN4uu2zRmm_9O-j=m4pqbzP~Ilq8P6d%1G8m6_BUB>Ld5Hopfp4r%SZo3wIPkWT#* z>7{7jO}`Xj^YSSsy%4g{LJz8_B6VzITvoNeo765OkP%MfFI%i>CdavCHDjU9+57js zB9~3@-8dWfq!qOZ%L}84wYmtN*?bd{RwtwRdFech_m4!+!gA-h`&B*UA{!HbGampT8=c7x)2* z9&xLE!%+kr{v_~YvMP>F5= z8uZexINnb0nantjThi33|8sJ$WCX!(b47l}Z?YgKb7Gq^YobBwXE_mh|BUwzdmhhV>)?+JK}r*Y(Pn0wj#+G?eOlN3ES=4qOqyz5~Owntl`(xV@ z0^Tm>Z*(M=>7^2Nw(RVH?sZ7=H_3lIiI<{|8+TUgwwX_7HfpnC>sgqx($kAor8<5? z#X6_nAs}Gogg#ogpwJa(Usfjr`xweb2ZZyn7@jE}vQ9XAN5Srv!bFBq+?85nD+)}v z43uCCPxJNGdhlBcH{!>0Q5+{{%t7Q(M4o}s5nCHp8+3_aRkg#VB9FQ%AO%U`{61x7FRP6t5J|L8Tz} z!T^bRIsId47)XS=g?(sh(&%N9Mu_-%%OQaSQ&Uq;+$8!e9Z{UgS^IJI{6F2%WU^79 z=Ucev#Rl?#yCG3(L!A!EJcwz`a4@mjH5j=XrUH{@!x3zJu}(T)L4;;FZLPz$tcoTY zW!RESrKixdmD*DA;U^c)9SYYET#6Lh(J6M_4cvEY$Mbs87s<$QHQjAog~qX#E0Zmc zZAJW@Slzex1?LnW{Hq~19WC7>mPYCeZNTI#o^VQaczv!rQ>jh7DIx@@ReODc88S@* z)VIzjUGU}^df;*6g{Z*rWWxW<`#Kg;8gOL2s>b6U+bEFN$Pv$rBQ}fhd@R)4T2;F$ za$dHT2LKF-9J*9p>2e!~LtD!z%?q!J6*#wBt`Tb&vLVTcCn+0rnG5xEqyx;m8KpP` zt|nu3!%Z5xuBAa*=F27=O`sDlBp58DDI2XJQV_8o_EN=6B#vseO9MhDxxhB%&vn>l zdxOHph==9zLcF}{W|WCVc`UM z1%0KGtexkk6473qS9j1%+8O!Vu-k!%kb@4|xD3{VdC$tX^1Qkl9_2rO?t>Q;tp2d+Jq=a*{4H&(exHnMAOnD!+aYPo##`(F&Gp4?nKnI4%eNF~2? zkt#(f0f$<_w+Yz7!VT61@%bwTxPa$;e+~|K3uGrfd==r4N5NMhz{IV)k_$iBCcj{;4B$=#w@!z}d{r%I>MfyyEOM#L)Rvq!rL?!+HHH=`U{hjlza) zoYmoAX50jm2uF$Xn@a}|`SD#LO{b3Hwwec~VGDaDB@YLA)|lwb;uV3Y3Vf?Qqan+@ zCMSIgVD7NnKouT5o~i74zlCJUuEIpxF=twVfSlK3kXwb#7`xkv6ZwD?C;c&hXv@O~ zXHhy~C|syL^Rju7i_hBug4GV^cAY-toUoVivYm0^ZWMcYtF3&Vys=hP=NSz)Qd?n2 zI(1`0@0F+o@ajy@7)uvcy*2)De0zrKzfxpl?HrR8`(-l2^Qz93vS0;|UpN=?O2@yo zurwiLm{e!l6{U_#3OZQvK=|URXrhSYrZbNO{jjzs`pr;ury@*FoYFgJDg$xSdLuU) z^kZ^&jwo+dq&!Cqr5~cY_DGA@=lsnT7(+eOsb^pvi}0%upHsgOgB`5(xL8pmAkZ#G z2c{!A%A#&YKjzs|QWpiLN9?Q4wkO+DV&wzFJ)hQjYy`c6fv)z{(%B!~U*OxEBtSuv zb0LPw`B`w(eOr@%S@u1oTNW{uE9Zi82$33KZZT@yDK*fXyMx%Lwh$Cv3 zRTWfQBmKBC9qcs3e9>H`f{p57M45oG=U*-#i~Y1*&)rJb^(gP6(|_ALYO{%jC*rzu zmm!sVI{7eDgO*drIJx{{IkFU>tuh9a;tM`ih#@O$2>7GQ=~^L+$F_W=r7f5!jQ1`J zt-EF#@WP7=R1t5_=Va*qxGkDFX3loFKICeN8w6zW!D*3`8zAKp&k=_dd#;UOVoLIp zmdX=6DaKZ+XtFVTWtp^Y0zhqnCIH z)$9*Pk7K)@UG2#pC=KNpEU~-O8B4KMD0W=K{%6$4o+xnt2HZxKRE^o=JYdH|6@qF{ zy)_2yPL3Gfj-NTnV5R$k_G9RkhTgr&nC`p4y|Tug%5={*U3S!ttJTpnH{j`-6I{ab5*k1eE_dBi<1 zkEWRAtCjSZM5_s*kdzKL(|(|6j|^3&{vqp)KUdRCB_EorQ>$m*j_4;ibTATjm@9YJ za*id-Tp!F7%+J*wIBm=IB|I>xi1T3A1;8UrlBa-UXx51{`t&oxMl8lRH=tIxK87AK$iHfXp`W1xK|7?cLx-4-Vlg}4J%ckX}f=9}yz5^~Fj4pgOc+JEh z#MfZ0(q~W@xW%ct_2uQZCVM7|2$ajFAMHq>K!0G5f12uuqzY)EXjf%Ul%yVEy2hhd zTKF6PtyUR+yqzDoK+P`$5^L3e^%NmyZ51sD9D`tTg~Xd$1As3xChkT6FCeNTSL<%6 z9Ig#Om$?j4>mDr+A4r&j1S#qEb_zSt1WDEn<20$=ru04x(1e&W zc5%wOO9yeI4}M)lutf=dsPhTCe#=E_X4}CR{bt9=3!>f{DBqf1;-Hb6euUTC7oZc z(LSDR0a#;cp?~d_`Qe?Z(D@i;Kh2UKt=kwoC4x|F#H zfp^Xgx>Q?tADzzlq%_7EYQGwMZ$)yl=JG$D74jwaS9ng26M_l#A34#`Yrl?>@}I^P zaLXIL%+gh?68p8??fm3>&JKD7t{)j)4mn4Wx@Q)*Gt)zJ*OxpW4W>-VUQee5_wc+a zU64(PDWmlk#N^+!r3&<|W!o+1WA6GOHLb$KPuFj2N0y2yi_thiBG=yx* z8hdfX0-s}sO%S0t{>wT8nI>+0v}@Ue(u!tX-3byQm7iBV)v9$=8HSs1KhprJvy5pI zBQbsN`@)_h$^C)P5B6%%@)S5aS0A31Do!WiObpyb=>TW_7cVHH9*-bg=I%+evWiCA zjc$yCO-MF#T!c2&q09`9_yD~$h1N33<&ov{{wL)mm76=MI3~$|piXmn8!ymOt4TzP zKP&5ojskmi!h6JI%|-Qtdr&E5fjVZE6GUeV3W&bgffc0rjE#xL1wyB_jAu&g-G>+N&ZDx z!+{Tn5zg;(kl3GQLS=>t!;+BGm7{zpE~?|Rb^)7X)7W~)O79AS{nL>6ndQcRq3Q$K z?KZbtsTWc`F}-a@w!ZV0PR~O$uPKY=hlDN(J`)OZms7Jyhp+M=rtw=X&BWJ*4){$M zU+ry*ymP{#xb7!okMXf+^cYbSByVM}+(kmW;0=xfc&Z&<^fp;7P~W~?Xo~Kh@TO^6 zS!}P4UzW%FC`h;3{hDb510q%Wt6waWEpu|zqQgKke6g)=JP%N$3%c)#E>LHt%?Hj1 z9Z{Cj#hdy&SQ!b9Ck~>th{_GEIKP0BJ>CFHM$YI zI?7UoVd(!l9P*ZXLiUNv$ud)F$#mhzEKODn#&!2FZ{vBivE@elNQgZmsFI_%Ph0-L z2yE6-{ps#_CccUnei$-E(rO1*tjLaEJAZ*e*EmB?^YtgVnXijLGd;@=jHwv0q!p90IdXkT#Hu9;S7BOIb z8gv}nKe5Zy)kOt##XghzzwL9!?|#vipbY>vKVyxq#VdznkBmTkJ+{<8h#&F`rNEnzLeOa* z=PvgXKypsv@R#HhZMVu(D9ET!{&3=KYL{!9+TUygN2b`s2bQ_aN9tl}emxu9lz1 z(P!ZcNS(iFNDK-HUM7=ir}wZ!PH+KI*M{r?zLA~o35jGPvVtAP^&&#tP5-g$IZ5$4 zmTMP^#M0GA}Gz%bx~2xhm`C)aBF%eoNRXwZ)xeT}$WzT#B#3l*J(gQ#5Ew zhl9`j^jc4Y2hH7|MU;+p=~5md9w0h!{@`L5<)UA@il{KF^BnKJDaii>Bp`|&leC7c zdQp;lIn|0u+4Z0o0nsHfJx2Snl}j>2h2ET_Dr@hAqz%p%MaNUR8QaXhMZwiirU|B4s!KA!Zw>_?vAVQni*FNH#vQ&eQt1 zi_Fg5lR$m3(xQE`C*ygjtRTNmF$HPvjIg!mRvPJklLdLwVHueAss27ulIyL0PU-DHFJyb1$Z7;=_X59U=txten-iD|Cp4K00eK;hq`$#9nW-j=5``l|yJ}_j3;vQjD9;uUyx3P@TaExyR zjM+JX@z6)UVXjcR&^}0Ihlyuaj#2M|&x%J#I?yLl_E54$qL|f}(!M)%$1$0w)q1%4BcG!;^^HO5JfoFn<;H-yn@VJk-7u7R6^i!7_My*ORv*1vi6+Fm zZ0Vo!7+wRk^fbx3T)#diU$St$GivmLxpU6P{&ot~Vs|vnBrH|`%$BD?Xy=n4s^~e> zQzL&_k6O#&S~W_Cvtl9>lT+h)lrG|LRIV5MbvcgfL()&x242?pR>jmfGcKO?FR+2@vpvd|Pa;B3USTTCQ6;{Em^?-^V{ z`Jb(Ii2mnJ2RC19RC*iim?(rtdQFD=);04|j|N)WrZ;L{k$19)oJk zoB@Zs3r8?NNi-Rax`%4?uMNc^s~oMaF5eDDpT78qK2F?0)N~4i3uuU zTb2{jPkZA~RgTk_o20}!v?t9%#kiPo3LHdf&X*A47jveWNT;IIG>B22+ETC^G>h z&W4rTCI!b1OD1bHL7WoL_B&nTLg-LiHc-YsgQhh%c9!%q4>aw%fr29F_QLjWr2Ucb z;)`iQCZM=5bYG#nx|7W7COK|FvFb$XHMV(i7(}+c(omnz{*RE5D%LuS%|C&LGub<} z+5iP@^`8AD}t%oNv;F1g1bpfZu!5qVW47* zdN0TuQ?N}9uf9-Nb{F{Zt>0JlkO>SO>PQKfY2gZty znq27r{0hH#!f7`vCN3iL3~^wsIz zI>?4muu8e5%Nh~~vNEWMy_N-bN_ES_M$vWk&STR0xeL~nI^9JN-{NgvB`h=3kY)UkY%pdQIx7l@6s&GSHe{et z0DTGVi)VnMnTh1T?i;EXF#RURxI$Y~L_Mt>P=gXFP^8+inkwM8MZK|eV39ynZWUN{ zO}qMgJ_zkK$giInixBBldKUaFVMA~sS(a!m*SQGzCt%~Q>S^1JJ3?iqkGs6 zw)+>->4{_T0U#O*P7V#_ON5*ZAUegTIHl=&?smBduq+uw7np2oq~%s@NKYNmT+9!0 z2BaTjt$GFwUM?8&MX9gx+y;JDyN%NH_yuWMi?d{qF4@X761+>Ky$q?qDa@nmtPk~y z5G^Y>}IM6!pGV%-KZAdV-lDQR_*QyBRkY`z2WVaUbaS`o`2xsAXmsk}wGZwu^IBs;OHY5+gS;GkLGAy58?a}I; zu`aDESU)^DJXuIEMCP7$DK}LG;po~g1`iuNyu_sno8+UT8lRl=WbIG3=XL>4r+Q$J zKwK`7ZLkd8WmV7Spn&T#1x8h>Sfzi~3qiR1?_h61u(c=9Go6o^YhnV>?a^pKN49^}C^ z^6GOE-b4)uKtUGJ>&Shj#SD3~y*&#zW6Y2QUW<22;QDwC5W97@6A4&3g=lll2yenCqc}Vy|;rc6VB;4DMl{+=d3%niwvUr!km+711|No$f&S@hw>| zDEX+8{o6SY?L?C!Aj*`rtx7NAHs1-(3=U`w&Ov(~943vp%nOvmNOSa2Cc25QSST{C zWC*+T@?C&jDPXd`Rz_WeuWR7jO7N#sk+Vb>{5^92Uh6F;C|>rnYc z=CF4Q*D#M!nmtw?CL$L;?h_a{xRpQ;sMp4}HJf7rdfewj)byPz!Cz+XTDs$A?vNi5 zan5idkpeF>jp_JMc3kmKgSR869%-N9yyu~Oa->y_vh`Jp03@e1LAw)dBy@VJbmQ6( z&JKvU6(;{$vTmlf1J0Ia?bMP>#cf^XM+>z1*TZ}vZ9U^cgrcK-0V%MS$7fEDrT+s@ zdUyI`n^UiHj$T{HM=PX27E&kkorAFpn3+VYRQjD7^H|CRymnQRx3oTM=WMFk)Xt$lZ*ib5DWIrcXNMd7=~SO=CPp4! zX)EpaJQ)r_tvha@P9$MWA$LbjiIh_Z&*NYY5TZla>9kwOvI-8$>(ST?qg^F4Hv;uCA~q2bX=i!7 z08O^7KZLYQa>;=oFF#NOk$CVv*PiQ)FUPtslTV*|qb8g0iSlJE$W!txMMi6rh`hy`WX#Uz(v$wueSECEQqQYkdqAEZ9(8P>SYw2vd>j@iuhYbvN0Jfatq`$!m zI=s6?Z-08_anyl%?1MtP2f|R10gvUqaDryV$oi85w6@ z?AL>!qsEYSLuh0{u!|zb9sTRZ3&H5IGw6di@S3qOcej{Ydh?Iw@UWb(%-?Gyv^z`L z^ogWQf8k`Ess` zCp876+)QpNk}titTYS<#9=l%sNLjZFj0CrjNnm%`kr$=_e829qK_<5|Nbcx_n?`SH`;wHV zm(5yRSCU1j3J@D4ZLypa%48%M9+%6i%&~*#&^Xl*CS8oiIBG6!WdTijULqhayJ7Ht zSVz~bbZ~Ib()+hgad>M0 zm=IHSJIkQpsd$M3=pqHWrIw7lV}kn+1bg*EePU$6>pu1dRE=`1n zn{L=Jb`Oc~f{WqF#O*N^zsRQh^Dg%^^k_v49nqtq^B%pOmKfYC7setUMw06qzwY3;LK2@EFCsEGHN>&EzInrLc@#Wgp*u!PY5 z`Tk;Vt}a{bl5liy?u)Qls0iekFY5f1eTSf+k|7-G=h2ei8Z`qjH zSpO&TmYtc2?SBVvok5kCwZ71`d7)1`4@bTZ`#~fINeb7%>A5@b)v5AOAH{4+^qDkdzt+33OTv$#| z07U)+8X*M*1r!PlMEY|G9v}sjWYg96@@L~000sl~*l(a5-1a`u7bgdKO#Y(*%y!iV z$PW(YxVy9W@1}-;Yi$YuYPLa;B~Uw#aAiaAC!B_Z5qkfn1}$qw209?4B-p>XnXx;% z9Donv<~u$Fbq_+61ptl*hqwi81pl@~&o?@P`rN_b$HVR)hrE6OXA9;e=(gD>06_Bh zzY&m!H})rA#sdK-m;=M8v;uVA5t!$n)%3%02lUf{1sI3_=HAg;=tBx9=nJyBzSgg` zWs}!qSVr6j2=xc(q|*F`zz3o42ebT}S^zr)6dv7j-|#17Yn2Gw3)uotK7IjY8~^>i zoE?ILa}{>K_wpy~<3f2)0rQxcl=l)%ucC&Cyzl=~$wR_`YZTt?tn0sP=oB#6mH*?n z0%us>Jy3&w&9wy@m9Ot2m(aPOhbIYsgFl530uTWO1sx&v2Z-keI5s*Xxu@<(sKY*Q zdti^Q=AYk#Jq5EDXa#@*;r5UBbN|I-(F0QPadFndolYxR_ z!1w3RtH1OBao8t^k*DS%_}AI>vOXnW2J?D@^)JJTE7 z2m0ntgM*n+NAQ2b57dH)gxVzJ@Bg#Q{Db@GYxq)2{R1EP>%v2ogE($Wc}n~EtKV!7 zB<%IuNbr6UA?T=s6{Z6C+^dZf@H?)AZ3Oq~{B2XgH3(Yv=UGO4d?O9yRqp2_@Zx0{ zoV|co`Q0Dw0|5gR7W8C*zpn!a?FUCe`KHHKRB@#n7aszi7~3O5P-OYzQ^d3cZ~7~t zBUE7YhsCiyiVDMFbR>tm2PZNyhkyK-(f0@7M+p@O1&F@^1;Wv{@78-lNdSN#$Scv? z&+B0j=!ZSLcwqPEQ3p7H{Te#}6zGQs`2+s0LgALEV;O^eA zNY7bjKD#udMOS%r-u2EJVnVjgiqmy`_?R2i;;jp>Uuvgn%A*^aJ6`(aPoSx$cFLWc zVch-nv#B15wU%74>xFA?kY&QyvL5|nl3Za{d{^l$%>qozos+Po-e2YICs_vVL3}9! z)5`5S119S6euTcGQ_0J`UHljbzmWN~!2VeEtnm94LnFZ(^<&v>sO2%@cc0_tY zorqH$8f%L0l7AT6hS%LCX~3-$;lYyVs@7<%Av3K8&rngzBJX)o*m2Pcn+gcgn6IV# z=291HVNfSd!SRhhO~de~zbjRP1A?l?XgYs;RzWLBxOmx~6r9s1@fqa#vrg%*nd#j3 z8Eynqx7^8noo;~@eHsL`Y{>xh+(*Pss%Wucsl?h{jgVj2+w)VmV6xb(Cn;lUoU+1v zSTZ4b9sC9qwrrr&4$H0!96fH+F?zX^dXn7Ma^oh^HuKTmLWQ75hF5Gzkr%UnxR;imrS_sUh z4*D61O(mzOHN)0&_n}ZVAfLQQ;cQyt>l`bcB%)Jj5dIWtK;2)RPs(Mb%oV!^?hreP zP&9}?*fjK(bOsd!3ozW*_6?!;CYgKGVE!uH)Z=qB**;j+Q*ljY4 z7(!UA?Lj1JboN2W?&c>~EpgZ@C4i=nT9PfXtOUJyP5`iN&SeRd%o=`(%7S>SSNrZJ zV?Q;-5~-F{i1eE4@Wt8!Ag}N_%S0F^foyF0ja?tfRp-`-Ei6xJ42?8V)+vC~Y2$%vlP%r0qEFJDsmD+6dC2lYVsL(#GW`%AV)v@JEbJpA>CXnK5vxAmxa)JBzx!YGg})etIeSbpS|rQW0$4)v^M*&xKCT}KV&4zjaEeLH;R9;+ogtsnaeXk^)P{Eh8k&>G^)pOJNwlU zyM+~`Xv4s^@n;@$_`(6XA-1olVZh)BX>ihH;RC;+YjN=y3F=mP_Km5yS6|g{_0rRQ zIz}bs89S%BR;s!~wB2%gZ6x4cjkua>W|at<2kZq?DAxHTH}b_Yr_Z7kVjRuA#z$Eh zb${wc_w^>Un)tXj=@^7=O!Hf$I~WxZbv*?doX^zjn-U6G(0&vDe8Hfqx08wo6z~KS zRNx@(xLt~g;t6?g)3*%jd6A9b@M|2|7e!l^2OA+QhKl0xr#msI$FS}e@gzA{V&$O2 zQW$$57c4EKBCy~eulwvUSFL&3*xF>mB?%cP_w=aP75w;<=t|W9Tmv?fs%9n4a{KPn z)o6(_uVu8_KDUJnrZs?S>pa+H?DiD=yp^_akI|2isb3o?)>%ojp|+l-M@YC{q!l#Q z#EB1~<}^lH&NGnFYb^YzKdnA17RJ-TT?~3)7@fN4zt?yhxFL-OZ=l-QOC-Sr8l76R zrg|t4k{i3gjl78jo# zft7ur;@F-tS&l$6P-4XO$Ds~03TW|oE>&rVJD)qV!j==kZ}48H`RbU^L##x>I*%}L zJvz9kW$jWoEZq|Rah=xUIXjEx9=K+l`<4K}+u4*&ry%Xs=|f^Xx$vGLV;&yizURi= zA=EmaKAlHW)V5T=2xn)B2T>|zr*rEKGTRu&3O{bG?LazBP51BO?H-ZA=l#N8hJs#T zXy|O986KE_nTvCh3e>KGgKz4=XLOPuPZG`^i>YPt+5 z*cXl-AX4uAyJs04Ijg1H64XlRc9iiTCY|X&eR$?Y#^23q`2{c45azMHCNi7FOvY|@ zG3!*N?SHe2-tIn39;{hJrtIvj$24L-gOu}D*YoArcks`)ekUPc=-oxSD^J!a0>z5t zE#?kX(zRF;{R9+IO$DXBgII$8&$v5?8kGu$hB5KRWglW5#ORe-&3h}tn=)Bb%VE5h z=3tj2c&m)gy^gC^Hj)maLYsZO%u$nuOxg4~nG0vlm*@K5?y7^l0_r`d&B1Nljs>p* zZP?T@29B3mm%KUD&hV4sBQ?q1)%4|*(q>UBj)=4juk07zr_5dmv%lkW(u+sEL4d$s z{|9guO41Y`8{B#}dQ*cukJ5*419VVQd9U^0!Ys^}8So8==F<}yLH+9d` zY-s9#F1Ua%s@tNVZ6B}gr=QY{?FYzxMTuj0VelN~M`u4bX3uR&IOmRCRIg}gir|8Q zzf_GTsS6VPms)OQH%$;myJwDobWNhCSr++W$YMEwi+Z#)DN@!V_FK;_vU{=J+6b>? zoRb>wun>r#go!pk5U9#m{qj1r9?jUYk^T2wa${h@ZUHFHGToiM2+lr09M)7BS7hDO?Brvy><%$O?&s zE!T-02w$%Q{vXE9Ax0M_;L>l~wr$(CZQHi{_HEm?ZQFg@wr$(<&0;2*rT)On8Z>wX_EtTS|6;f#+Ni5?|xlQX|kI!7=vu}HaR&Nx|xQ=MleIO?rXKCK|ZvIy0B(2rfW!nVyFs_O)?zVCg<{a z&LW~CPRvf=1VO(P4~fHS;42nbIby5sK3lR%)*D##UzTtbY@bwmUhj-$SPaJ-Qkx%~ zv`g79RBf(h9`epq&xwDE-Br=I2>eh9`q#x2yfr<8GduNFLlKuoQSp%}Fu7Y3iYo%s zxur3=iLz4x?@xnDuutbvBd()Czhi@#tN>aM)s$NxdkAirX2 zELaw}Dt9|YX$Hmo1-(1Kq#^xnap^3PY0K|2+C4b@6r6Z#$@XWZ_eF&FSZv20sjKij zHc+qI=Z}==Yy=~RS#4_-MV8>@VfLw}C?IE%LN>*6Gd``l4%F6jcm^*H`GP@RZXiqT7)+zVM zrm*Tzu?{I40w*Dgz6!>nkLB5~*z5V7a1Mfy#QueZF}j+g%bjC&;YMs;qtxm&e}VHq zO&%IqXK^qM?uNzi7}Lnw)j5xJb#p&>(uSp>g7_Ha{tJ6V4qs}zc)X`P`L!x7N{IRe zlRLIV5O;aMl&+QK$uzkjV=i$C;q#G1250-xNN~3W`=UgynmO|HZ^2GYB;wTHnuUkg zj=wj8De!(_yo96D9xk$(!D1V2d>smOTAR_9E?L>zv*(x9#w_P4Sd8K}_UqU?F36mg zZ(?w@I@@EjmB*4*6{A8tl@zRiC1^M@(KTM1f(y7w0bf~hRy?DXyN{!lXntGcDWAL;;^8p!*Yf6;_|jUI<0(S|()w&gBv-o-xO|rHu+!IT z4yAPQL3VxfZohYL@}?R&VqCV{r>+w-{+~^&!k&8^N(MJ@9NyK1Uc}sO4sPBNsbnf4 zJLD$dbkpuHt$*4vXg;R$c~|l6OumdgzX#GYTP7P|WN*5|Vny$g@_RW2_UDjK4WVF7 zHoHC3A_4(>m)NqM?Mny(Oidge^Gta*TbB4UH5?<>oh6}y_s z<6@bwl(<70d)w(aY_?W>)UtWp2p5(nmV#hdgwy0Cz2Sx?|5uG3URvpRKVT~|uVt+X zG<2E~{5`Y+Inl*nzxkaE8>dtmQ_JuoUBO~79_RJ_KEEBd(j*y-G5S}~6w@t67WD&E zRYphc&jTMd(cLvkST%3GOg(q?JK}aWj6Mu$N934|(2W)Ee^dQ_A5Ea!aX~6!EFSHT zov3_=<3{8ZRO&A0?T=Amk@M$*_9H)2iDqt%*`m16I>T(d3s}?i-w8gOT*RU)x_DER z*YD1Tn^`t28O(1Ds>Z9 zAdVvD@1Q^;T+K3_3OQJmwNsMO{j;8&ZmZtdcyFP>dR7tpv&N-8DcS7^z( zw}$%JJl;=!Nw4Pnr)3w(iE`56J|$tvX_dt0*$v7)nJ0lv!T%&1z#blWl|ET6vo)fP1kb*79hCwCeIUZoDIxXEqx zs{H5mgewZ&8;*0w>7V};ufb~c;uCb3G)KJ8Lg62t5QHdd7do1_ouQyw*co&mQ2`vl zI4q7IpT_i)r-h{WKs227M|yc8`CLPr6^l!${o>Et#AipKqBHGu_rS$rCTpd-ufw8Z z3Dim@aX$R(>)CENBz7S#Tb|QfE+gJYR&h>Zs_epU0!>nNV89f7cfd%obKK_T>tSD~ z$7U`9O6!taz&))|YiNEbtr1=LydOkRnZTvniQ6ReO)5V%-F6-xi@`Jmu3{6_F_eG4 z-p$kO3Oel#$llM0S1~Z+o1*f&-}wG*i^{9$x>pto5}dkM zVO@$(=esjh6r+(rg@I`{StLqwFS&VKMbCpZWAZ=}N~} zuDwJ3>WqFg^UcUaT!ggX_~@1%s0vjC2V(%AlEXVbA5!#+cnZ^S)&+piH%`JWUl0}#8bA8$|I0_v z*e4*H${Fl+_w}7psa$8tL(4?0Sy+#Oe7!_2e`Rrmg6eI4I-Cx1m4*y3t{Z8Kq@XMc z?|SUHF?OJA>-WLax*Sp2GwYPtd0JLcI)m2x*2ACYSD&j&@`*LV8pmhGn98=#`k))J z@R|buxb7MWy%EeSA0Xbj*2@?9b#YlPvrFZ_iWadd9-yz&XOE!XO?E`wdK;-~FEudJ zR2RjgYsYr`h~sse0DyaBh*9($U3C~pxnHKl%-QvM7(BF0TJpo$rAjhJzm$vI(pxg; z<=dWq(}XW+PrVyYAIt(7?j~iT7`Syzoq3Xn6?xZ$CmEYH1Ys$k*Bj-IxZPfL%K}}_ zaqyOMk0Fr{X?I5dsC;8I@F;i{wz_maii4j@$8he8Tn8nuo)1LadwzPy zMJujaCq+Vq)`-;tsjpAwG%(G=Ljd$ifGbC5268p#$JZGbFY#`}#wLA=KLXs0Ys@V| zBzJxKT~l#>1pR~FXCZpJl7ROe3y&gQ^NqQ)VN0k5r)+_&#`f7Kupf30-?0jd2~pXa zF#arI81qF`lsRyVOxn2g&jN7*i2Y$}mBc>hbW!yZ{l&p_!>faG$gL-L6rzy4$HmBM zuu_Mw4eOYSxb z5BE2p{%&Z+f^7LU`x!P*c&To&Y&U3V0T*==)$>U%vUd6jR%gWYyoKOUnmR}2y9lAXKhpaX1GU{-3nlOo@s z(v>?dL-T#=;GdE6+D9IRo}@ZV_^1imNdsk7;jD?MD(Oy$m-5VHc7hlgp@`(Sx%#k| zHh5L&_d(NiAf8;Z4%25oU9M-)L=2_Ipt+><)U?H8S=rB3u2(ZJlf{DP_;cPmhsg&S zx?2Zi*V7OP%gsKVf?2c#Qi#@110}OIM@qP-(W*mwhE!b5Po#fRA)Ku$uPesICp#Xq zngx&~HrTc>1Y8Ew&N6FiGh83tL+Uw`L}C8cs)03`c8rD7XjDDgqq%&H+e#SrGKOoP;p2s|^eN|m>g4qZW`AuJu`_GEZhHBr((%xQ_fks&8uX%L z=kY}M>h0SerejZR=g%E`vT^8fmw?f=^k#bB3*3NMyi4RrO8 zZgWjLVgvyhf@NZraLu*L1u4atP2Br;&YQPARp5I>IDX=><7m9!(Fij&cD=m#6EJBJPC@|<})F~ZS zsMa2lQ}(M5^P!f|1{7JPUYsxj+YxiGf(Nyq0NJ0_5#T2pW9%qXD@>@d6p##EB4BRz}g*l7z#twJaYQgR%!DvI?eh8sMDy@ci}12^ji^{pFXlKLcQFgpC&fg%$SSd+XHl z2?RiDc*OVJ2H^bk4DKI-tO*A~2EzS=2OfH-;6?`j^Q%oVyNh-J#&{?;5r@$KdHI}2 z;Zi(kyU$quD)6)`F;!GsR8UqteqVOFXM5)u=G-u-&u z+S&ZePFDw@ApxH8`i`@Gu`pJjaF6#7AfC3mHGc>x zA-{I(`w8B5T}|D2B~R-9gV~{o7|YKHVUq%U&UT+?E^v!;Rk% zwT9<9=;MBB1B&435J5t;Fh%(hIRUwAANn!>u96V+(9ke7?;DA>-P^s~Z9{=P0s}sv zW$6EdTmb)EfVbMxsG6(GbC`aKqo)K#4w4`Yc`~BW`*NYFHNisftlp}2RCK-}W46Bt z+Kx0vY`5aNEr#D<6NfuKD0aIb0yf^>L}eMmGD$fSC}M`$8eaL(jge)EELlA$U(lxT+o0P1FlwA{?!sv-Ih;~F=?Sl$ zlZa6&N@p^IjGSRUr8BgJzDOIg)+fIX<615!>E4cM85O~k;N`n!lMjflr4VzQ$943E zGmp+M4g&srRxzc|%!aEtS1Gnm@?=7E5;l;fJ^?rt9iXYe=D2K>w!8RgLKN@X&xLm7 z5fLa#LFH&wouLu={cT!>te{YYz+e)}M#L&dVnF=XA+H!XoGK%{MQxt#9FKiVg22T& zz>g15!B{F2s(01nwaT=B;{M7PI~R z0Ea$rJtcV0J-%r~Kj|dm@zoiF3#?xRIJJb4=}!%HjG#G_0qmCK5CE*Zt`OnAx-2v3 z9m8;o@@3CF+pfHM!)GA~gk?0HV_p=FV`8Q(&2On{*v@TcWw7j3x-@m$FQ|DgwJ2qf4vF}+( z%?3-CY#AdgZptR~VE&F@#v_a;#DE9)_TynxGAUM^Lx$`Eh$k;W6^fHET_ExbJO-;MR)OpRc8Wp*WCm+ZGv=4l9-$%Zsx zo$rOr<_8Zh@{>4LKgz0*Q{%oJ745SDOKG?Mj& zol3a~@Q>F}8x?`OqfPPuQip>$3mUu|&In1xJ~+x}q{_}0q!I#>PNDGjDXOk~CgpD{ z*_mSOH9oGhA{zW|6_6wn5(D^Qzya!`i7X!BuB>7Ci}yt5FgT2^8tTv5o4_^QM2jw5 zQSEE$Zki)w322^VhzHMnf7rb_&lDYo1$A10uBzCT*l)zKLVbAcl@}8NhF#9)Q3R|~ zcR&0hUShbD)O)9dN~I+|ABHGwHfWs`4B~1*JxOO=;F;N(*Km?8B@I|{B^^k4nizs3 zJ@*(ArD`o7JKi0rP)H|Ht;wOZvZ0H`&u>}7gEj|&l6SaAkceuuZ3|*NQ@V+p^32ok zhHk>B57Bo>&p*1!`2`>XUSiT436<-A9q&!M`Z-u!ROsDY0|tIiuJ@d4aRk!Eeztt< znpT|4y<4?MaV2Robs>sSos6Ig-hwO9y=czL$)wz$iiFJv0P(6HKocF6a2nBCB%ep& z>}lh%3_;gH_Aj~kk9QZPX8#c*U$DCQ){GMxLb%*dzoxP!Q8TgowhvY&aIrUrlIlCG z22#c9`W6W+V?1J8mAtxnm+OVFmnz2M8IbzYyf5wl6k>#s(72{j(Nah?EAIj6j4$mD z)=os%WnCFUX7y5&u%8a#oyPlM$*)7x93CxScNs$%!<=3+vhx6)5C_pK%6o(_xga5o7Zi6pUH zL4}|MSc`c-X{Q=q_~Y9k%FKai=Gzd=Uve63-%90oTDzh3UYsRRS~JRRUgB@PXcnTm z3_p`clGrIrJ-Dalt77VJ0h975;@%(2M&wawnF<|=Ne<*!YX_7w5t1;TGHrHmK9mmg7u0g0FAH=2t1d`4j6XkP`g@y zVAd_0ug6~0nfL*A^PL}W!a;B{X z$aSkgjBZ9fG%7iT)3J>j-&VJqV%K{TU>ol!HRvA6uE^=75g`!56qL`1}6$i2MW%uzMtk+}!$ zu`JC}f%1Re)XT;TTa?8VQ?u@Vk~J7OfB7JEhEd?oqCh`deyX5m1voRk-a_pz`w)U}vWJ znJ<0HihOGqp(80W3+*{QnHTzr~&=I&4Q#42_Sez?+f`d*=Wa4>8iX46% zPAX}$(<(RSf8FqSA~{|K_WVGa-9(099=uKIw_1x^7%_&>qc~MFdDw?%1DCK)8`g(^ zx7&KOFZlR*n{!OS$=6n^zEP>QTmnkooN-`)IIxtcuir|X3-0cS5jmKzuo$gc@AWODpPLmBrs{1zR+*%6 ztS-lla@T|_r|d5cy8nnzq0v~ho$C;7879z7!#ejhe}Kv%3((%}G}V>VnxhF+d_K9p z^`4Gl`sB3kr+s%Kk_#U+8R^&~wK&Bldx>1AbF;z1r>NC#YDHm0TKg+ph~-+Z3F!m3 zT+r~gTB}!45KHUya?j?5&A9OflgQsdYJN!y0R@k3km$Y>{%QMP?|jnLhxPK>>)+^Q z?|F6DEG^$ux!EyOtDUCpFgyc!e#`XLTS=meNm)&$Jk7BHZ%5~sbzvZ7Zwqx_>YJCN z<1mh|o+ktR8Z6PRH?yK*zR@poQ%r9_E_?Wn$A1W?zRsNcq%W+jkT1SPn&RWK?XZs1 zRI-WHuwfs|9|E zGIiztiqcLHYq0%{xDG2e2S^JA2n}Y!q)?jlJ zr2x|8zTCT*qUuU7P@IfWHX*?#{eiMPa;wRD@`*i+^z@AT$ElJlbSGAk2--G5EYu*m z2c45tqdtmD6p)Z}4ZY^YWQi7pfE$K1mtw$u6>wJGk-)3D6Su2RqSYOjV{0$CE?*5I9* zJRutOdBhW(PQ}&~*@-0))Bb8hh1i+i4;Kp$4{I6>!CI10{?8uAI|p0v^#i836|+Ur z=`NVQeksqQkejtW*`@D9^kDruCE30czl0rkfLKl5)j|m?U8K>wiGC_&1&+I5HA~oY zQ@<45Oxn7{!MLvny?OlNdMcKvscmBOJ>lsy2DlOC)1^R4BDd4t~2!@@&`QL1}?t7d7E3^3d~)tE||n|x6M?< z!AAs^@kdWiD)uu>&T2GA^mAeyr2sg?iRA6(1SDV`avE%cYVq#%wBl4LeU0r)t^AXc zMF8Vi`rl^n&cAk!tBWlurODTS`}7JC;feJ;$e1VMe^``TB?rB$saLtkC&e*4x_UKwP0C zv1xkU;%*NMu{v4V==(SQiMyl@e02l%+8Skl9~TXeg;~-H&&@YQlND7%n^3uW&_4$=vEGm}T09S&s%Z6}&Q~U= zpoSd?UK%*kjinWXR7!sf@1nn(Jgn0(IskSPS zMAEXDq5$4@8Dwi;9K18^@;~tpsnt*xyU>jZ61U#=e^w(f^Ap`_Cc_$84G>Vvc5;jO zyV|uUa7xt?gn1yxSLMyog$N<%=(kh+NSCfack>kb@>49GEKJ_E2%R2<7}#o7i(Hp zY0C&6yU|v(k6+@(;Y4wx!6A`y&@t^}Q`sCKZt!qQ<`DM@s`f*LL=P?q@3E{91BP?o57e~7ep2qs&X}EbCtX47WTdC6(C!%wvJrd5(&7+NDcwzTHst z{s+VbjM~Lj>=YIfNs>`uj4@iXp{&B#74=yu-F2|g6P{cGD$55_1GPuk3)0t}q%}VV zO@~xLC{ctnRv6SM->h_qof`jPl4-nv3!Jz^0Z#TDl}S^0;iwaa)+Xi)GzdwxH8rN1 zY_L#@L_1p1N@|Q7N$ggZxtYF}(b`bh3vy!7AYa4aMNEkg>rXUgXAn(7)mZYBAI>BM zGsY^_^(Ax)?NWWdVzByFM_9gVk1?xeDJdFAUw{ zA-?#J9TYw3fn?(k$vcw@AXR#S1$9Qc4yq5P4V$B`h&W}7LfTqXXA?>0bu{iu2EREI zS|K56ry(A2wpG&hG&gms7L9Y|Xm7k@wm%mU=!sOHH%R z)Y1tYnfi8egx1!{1I88~SvivkOgr552ZU9@EPs#UkQf~kcs7;RuPyccp9n2!K6+Q$ z7$DRUBlg7&`w#SPeJy&{Ny@S>6jYJ({8?;Y(uA93*#0I<$aFpv{ zXFmzLBCQ6KcdE^HO-6lY5IbwqY1!~^R%wkwgct)a?{m&GZ~S6<*O4577QaX_gVCq+ zv+V`X?~HqZS(bP{Q1|!Q7;fyVk|ZzeFYMmS^>QC2G z>z#UdjoN~+YtYff6hJw%mgPqmadmCexi)NC3GTiKQx(oPEwo{PwSeL#K1H&$*YR1{ zmZrbT@!L81Ie0!CR_w*S(liLxd3&eC*(P7^b7eCvh5`3#wVX3BC7Tx$_}UHd!Q*e_ zk~@#=i5L7aTdAE=)$7lx@2q!C%Z7*GpRWece$>b!g1gO&6g$rB#Ab@#=5=qai$2U| zNG=o=Yr3uPm^3*zo1e3a-edFpOs1f^4ebPRZwYfUHITlicD_O@tM?nmz1$($|Is-n z+r(&kThwj#L-Q2dn%ffkFSmDq*!7BM052hB+1siI=3_ZKdOr5-L&jXJn-X_&pC+RP#gy05h?PAYN$$pqS=jGo=yW-8SU+rS?H(@yf_lrm zvDr}XW_bNg_#1Wk18DX#Oz?A1#`1LU*`0uRwY~WOChM(N?RERL3lT+b`A8rs7+Otr zqn!-bR~BHMADQVRnOp2xazYCSW3jETb7`Y1H|_j_W`dsurNALlEg!k^VkY`8Nas{k zZck#OGe0&Q+g3WNE<=e9>=A#cgw9l%r$vx`A^C6dY|JnO{f{$sX7pG>NIm#X-V}}@-s&; z7W!C^HP?Ls*bX4M6psoXu`R>UN#}03y2>?r~YpvQD1A2M{U+!4yX(>b?FhV+ONo z%-=a0Y(qdUD+#3%UKKo`Z$E}Xu?guvYf3~y=`f0SNF=z>U^0MsP?n0S(H7^;SgnBP z_>$Oa)u@JP!$af38cBkp`i{#qP)-SlTyB(ZCbVv$+qLv!C!bU*-ZN6$Ztq>kZRITj z=%QjXT#GtH{W#T2Ni86bcK1#~T!X8R_tZzORWF~NWmtpoTL#vPGS^4=#ZR50FP8d1 z8HP!BbfpnQqC*YLOxj(Z4~^BCm>3Mn-h-V+Fstymk6Vp8Vk?I2cCW$PkNE98sQTUO zeNyb!_)Ey5?{?RT5(R<-$=b1*Mc*#D=M1Qjx}y!Ils{!tkqHiChhSDH5N8YbfLcsx zyL4(^KlWbVR;$E%FhOnk=OXy-(!#0-3!XE`8O$9<<&9$6bG_L z#RySI%G-7_1mJCt(74XL+h(z9Li(o7>|v5@y%D~r_TEUgA5zFISLnDkt9=}PN2=P@M8dJ4eT zX>?1pW~bf3_p%;SZ5ER6GWxgOlF^xkX$uE(i22mC7em0+nm-QJ=ECv;&t zQv_R-4pB+-Go7psMM?6PB+|F7bOSsl5xSQivEws02Pv8doWjtH7a2VL#+WeWH>yMo zGNw7+)1CAPoXUh{y`TSEF343Ien`-V^l~vY>7SYsbz|E@2rd?g7R&BH+1z z03ja0bRL@2g($`&#Q`w~I#q1RMVWiUwigR8E`?KQ>Bm4~+C^a4kRL$0&FVsomb`P& zTl7g4r9C8~`cU=VMC{lEmVuui`L!mk^YSP|egSAEdo*3d-#pj0$JX!U<7EjD{)xniKEfxy`uhaHAdD8)PYoA6h~pvKT{fQdVUJ z9!Jd!O~H&Cz=ZDQ|DF}K_-mkpL3s=&>1UHcK(5RW>oRFKCXL(zw`p)%MG%wmxJjA# z+g>jR|F4iC$m+f;cy$(9vHgk_sWqnmbkX90ct> zbE3^gYkpOj*Fow1vifSpL?FtAD||^wPBC;Qtiws*N0V_o+W8dEIml4J7oVbM@+U+H znZ+o@b4>UUGVVw`2F?h{?>YFoW}J6C>M#Lx8At`^_RZQtmo@c5Y7!zfo)TPA!Rb%F zl!(83`&9p+BZLw)Inq$HZEdQdA5R6<2M8>)SIg==fr*#bq$Ke11(#yf#J9u8NLyjX zd{FXjkkkq^6*(V<2&0uBj}~53m-o=gcztDJc=(rqgrQ1U5hkdhs z2!ianOh-dAR=kI0wQK{mfScj12GXgOZJ#eX)_&we^Zcm>eLItkNaZJCBOmQw|MOgwcU+7;VY zpBz9qGyQfTBEaEOH;SkvVX=M^=A-fT;kx@Xalr8-92>w-1Doqp9KXODdX zEp5Ty%iw&xq=}}`_sM5sfkrx_EKT|s;%2e3@qdbYF#rF?Jvdmn{!hMxnUI;0k@J82 z{?5$E&dT-w^9v?>^58f8%kE2tufM@k8ZDgey3BJXaVdd z0yqN1#$Z$h={Yq`jbS}dBy=QrAQ*yDvXY4jf0EGp1;=1Tq^YkgjrVMgENK3l2f-9s zn7}DB)<7^b0J5;K(Tv3aBOV_F2^ba^3qT0cabE~P%?88-1_wqWurjA5rz#|YD{yRi zS*?G0JY;4*B<_ZQf(!*Eu&D#8e`#<7l#rI9j);l|J|8hn4JiD-z30T%1Ub@!t)Yts z^wCAj+UCeo0+qVQ0xo|U0VF&+CQ$)K&V`>G038h!iPM0<4DO9}fT?H-*vOG-3Q*zT z)5IVEM8~AxAtGSQE+?n`r-7Y`x%o}QofUBUtGojKTLSwl^R01t_CpW}ADVzcxUn_1`BFemoB{tmdKZufXGdSb|LwE?9Xk*>32HU} zMNLdi2#Ni3EZ_`7!35)hV&VmJ8ZhBtZTPLQ{zIq1@~%+#gZ3n#^M!(brw|u&ZCk_l zqp%c!{OKX<4Mrr#=4Ey98#~;$T-Yk^K8oII4j?-XsI=L${4yBmTYdmX|IMHP4E=83 z?D8J|9-F~t{?w(!$LDlm(2=0P1g2(0Aoc$n9fjR9J-T~0 zaE#H##gntm`P~i*aDFHF*)1|NKCm|iZR$0)7{;^BSi#obr_pBBfRg9?Pq!298HDWS z-gYSpv1Kx~ul8^a@vDo@xdjj7z%l&S_3EMV&>QlPa0c|o)R{VyQP%?Ovn9BFVXDpj zQ?FpJhDi4nTNZ6{R1*D){9uO5#Dq^V*E*7n=Cx3Lq97VWE1OBXue*o<*NVd5?tWf9 zTR9AuOyv=0<|wce+-iom_--Tq*DU~#lvcnJ;U*MSX12SYxc`Sz_V7=Na<@)$pMMXS z`!*3$&{AG%E1_;AHLDn8)7XWM#1i+n8%=56goHMVtQUMcBLiN|6t%eGHVW<#zGGf- z7pseV!Ith?NKz^r#W4-}^*b_U1>Vd10a{TP3aJRIKa>&LNTmi;K@_$^>_ZcwkG-M) z7pfwPo~)T~(4)@s9otCcdRS<^H6{KWh}vNupzqQG6HZ0qJ{@s34hEe2kDqrJIS>*O z6#fwoI)2w_HW3@ zod`@B-|H<-&qRU0>qw|9piuX{pM+gM?K~Q6_g?;%3eoHNugCaxh3=>_(=o9m<7~a* z#qhjwG~@duSPW9*Vba>2HA>+fp*zh#HG^Ge$$U0S`&ilOg?mUE&|u>qE%2}5i-xWD zx7yY7PjNjAFzK08Uphj>%GbcP*;XJD*@<-HDBo-i#uxc+tFO=cRsys52Jqs8J%`Iz zN0CPLRv-X&wWOkoqK4{Xtk4yZ4h-T*ZXLKwBW>5Frilq z=c^J@o9m~+s#UnbBhN%DB2y08MolE;SA#{>4UWUvf!kRl5yApYxFcki9in2lrtz$h zyAUu70ZW_`3*Y|Fto`?2_79>_{Q80e@M8XD+7k5JXqgz*96j2Px7>|vRGg`in%S`1B z{&Y;Ng&h>xHUfY=)c`3??Znf*9V{PX( zb3KDi0pC3K<0IvL7LY1gHYj3diK-{OhKV^Ei6L_Ar3vC1P@A;&04^`Nyg=kD3y*(F z(~z*O8Lx}v(oCWVSCb~B(8UzuwHOMIiJZ<)*l=(JrlNrs`-bY<1kF($Q-jf#{_Dek zajz895o%+ChYg-@Vj}{402;Dhg5W8B#jAQlbmxq7^@-?GvxxtGNr&#?(bdjIm4h;s z!6EmRsbXT49eK^PKqm{RKI!lUUZ3W}%piSQsT13hG{n-4jmlfFm?|^yF;$j+Nhk@< zsRA!O#-w&*`9Bz`G5rhkJ1+kwMr&9*0r;7-QGOLIz%%fWOqbE>$dAp1}I?noh4azTB=9JsiH`trT?KN zB)`EigFt7@9mT>!a&ob(3=es)Tif~@e@fJQ4_Z5&n8qov=@yn#*r_>{Al+F0`&M6+GfSu@^9yfJ(;IiScOe2%{e&HrKOOa7v9 zazCVNyB?=NQ1RyiXb`y!2a*96zs&au>Qo86a>5%rlgF!VH6B?=+L}CJP#9q#F^omwSV%xZNK%5u?SYmz*S z5p;gD^3Dab5`4^2%^fK}YoB=24PU7j2pk$NcNLd9ZSr@cZ~TO648|-zn+W{}+Q;8w zeID*~{#8%$J{Q%peA_sh;5J62oj$^I^Ul>aJpP=pvEj!PBeBK=6*_|D3Cby`a205` z2);D2TY81j&F7-Yq`K@XTS+U{jPy9j0|U#gMMHeOjkRfe`CNvw-A-SAupwOnsaldS zyDE@{Ma8TsRV%2kbXCkl^MVTZnJBdekz8K2OY`(!GP=tm` zNG^eLA^YO2PMm1fuq%DI{i>3o6KrkQYwl51#K3xwPctujkMSng1hNHpf7~0iunOZ# zVnQYyHEPE(ei^gm*}m5KHZY2H=igflvD3hPQK5_|^P@uCND~_K?<|YMVq}^5Ll#w2 zy5zfolKKa^lce0C3JqF55aN*q@9iWV=R8G9c~<=Bz>$$7;Gx&k= z=@c&@+~e=VnuKd1lU?ntZ|b+k7B8#*72V~G;Y8$$+BJ;fXD{e*)d67?*+A%he{#|} z!1j}m6dbdD`E}2Vm6`9(DzU!Bp8C<*2QQqB+Xri*80vss@}%2P?Wk+Z!|=njpQza3 zvb+Q5&xSlkYx%EWx}o7jvf|z_v;ZZCromW}FBYja-3&RDjS{v1jqxorTIgy9Zj3T) zUfGeQRs;k*u(kg?@N!dOa$P0+x=DFLa$l4_h!7noNNK7OjGA9?fV(0*m@B=pFHA7 z?>&qle^(KQHaxy8iqR`|);=1wM|zWa*>C*e@J3Al=H)_xGLd{tAz3?CmJp@crnQO0He#BF zImx&R`E0#LK9x%Fgj)pgcpr(v4=%|tP@WDW-6EfXTE&Di?@#`56L#{2sOuCJ!ns3z zOO5wQ?gStPo2)C+qmeA`)CgpLB_yrX6s|N>?w25V1WcQWy&0d0#h#MTaMgQDt6wgy z#BAr&Y;q3W`Y*7lV0QS*?cl7~y;rV;Z4wGliyhb*>#{gL53cKJ+gt+k2#s=lW(Om& z*b||hfXcrZ1uDsw552racuD7;ax?iHtCZHjdiPbPG<3^}5!FlAQbo|b^vQpx&WMh( zPcRyo2|1x+IiuE#HR{|#>xwT~<|lz<)|p+*FuHIJ2rRnaTg509^83oLr%1Z)~o7my=(% z&g-g3!DS6nPv)U0`CcJYXO$)dXVBtP-usJq8J$OvC?2hRfzF=Z%ob{sA+}MQRY|x< z8C>=W6#fx)U_R(5Llh0QcRk`>>k0fkcR1tEnZUZlslzXtjA-m>Po2wPF4gQ9WmC9E zy4kD0#Uc)OJ&Z~v<08gd#hEOd<7e+*6Ge!9RD+$=;b9Y%IVd6VnQfK4Y2+8~t(6ma zHte{l1s8T7_zMVE5JO{`5xPYCw1hnPJ;=C%#%I-u%OZzkx(D9OW3zFwK4`lP*5Y_~ zGnJ0>Ovj_AG=$0GHwHk~lPs8K`+^IlT8`=8rJ6&7q8yx+h->_a2mnM5Y%dWR!3i$cWjErLQeVhaqo<0Fi@{BOW)pBy&jXD7O9&T*W`k#!KaLz@fV3t zHk*#?+n^w1xKOX6^HK!wyy^cHNF?8-$1BRqJ)z7Bu(@897cdQBgc#Ic!~B^eRx+-J zwyf+*IS*nlnJQ>@vl1~GlpD)rI-d~FKbGd;uNPLUPn_ii?}R$BJcis}VFT`kTGBG+ z+mtvEU3e^jP%=O%J*sv=BmSB=%XZeOu)j>g_IC*WLb{_R{!>=|zW`T2sJ}*_oD6&L zUrpYN=-j?kDuNGfC9Zz`wd^zIX81G8w#jky)z}XaFf2hS&j6p!;YjCIx%cOQRFG@S z?|O9HFv3RCn{n0eB0Y09FTK`T>HJ|zjR6jeLu(tiiBe&(gKtx{tJf&ES1o{D&-v9d z5TWQ6SPLn-3f;Ajuc0MYMueG!5SpayI(k2Uhx&%)r4#Q%gDH5|QI$VXcYe9!1A8`^ zpzxElSCBd>Fdj2mmvA#=_~_==t8j1@#vhU=Y=LeZf2c*|m>-k|j^J_ydKFOjNV93)esT_q498m6S) z0U%s@^#nj(nzlc9oWw>Jw-BcezZyAb(|`PXJJJhw*ie7Kg7u$EK};rybW5rMh8Vr6Y)zl!u19t8Y=#EL4=Q?v(-Nu-Fxvz*SWo!8 zVGcUq9klSZ4LG|i?#5Ihj((3?>)YW{jIW7!j}ASpc5vC?;1PLshs->OZdDSNb)pm_FLu9EAW*bu!N3zWOt_MFA5+|YH>N0bN2vHUpL6v};Hc}b-ns`E!!)CW;*( zRwa_@YiK)CbiVdaD5v_cW?7Fet9>Wy=E-YAqD}Fl7cM6x=7U(6yCuizWj2B11s#{O zep%*Qgle(|XR{b|-m^)6JF_Hn5(L|#sw%O6r`nn00J$HNn^xKDrkn@>%BTpZntaWj z@0NNTok3=c?aWW4`-gw;a^pjCg>fr(5zHnuHqkkSJi$F0<8cw>GxP-{gTYq4iE?CF zzw-=+4<$i>tgJhO62K5pdvObe(;eF<^(YOw#%-_iwK)-O(Yo(1GZE-q<5-?_l5Rmu z`hRokC0HGe+opB8X^zA$b&nocn*l#m9-9j^oYUjio^*xH< zd_yo~c`Q0H)^h)iDrDTDh0xl%lD_COeElZNCu91%JJ%cU1VFb}7;?Mt){$_0uBVO+ zmbjae;cFD{3dgGM|l z0&8plRAyE1S2gfi44OZP=L05Ow5FcKL)~(T&C+G#kJMO?@liY0aEVKr-_=~h(p0aC z(kt>d`okRKJRH=oA*~rOzy)_ImmJM7Blqivth_jK8KKNUhHbbdkq4F^5dJmOfMICM zTx2)3Wi&q}!6)e1`IRsLQzaWxe8aBy38}&CaNBH7V};(_qqKb0-iC}6n>uhJ4QK)5 zRx~Sh&x+osYC+sy(T`+hU_pIH8Z@Ro+#z-rJLtC9-UnYweGiNPpbQz5eb@z@T!!W$ zz?pWoA#RtCW>_fP25R7X0u%nH@weafwDe&GCx#s|zT}y15X}OeHQd#otq>Wrlk@f% zJ{qz=8o3Oh#GtF$mh1$J*8ZP8L9Mh?eU$;s2s*O%gN2UMIzJr6s^UxLPl1;7q$)Mi zf1SOoYbgI}lAobXU#oHB-VEfIVZ8nNOBj_5@Zmu5gf%7S(%uuFZY5Wr!r_yWpA5g) zBhY$R!S$@Ig6EBUM`4TF-7+P<(;ik(#fmmVbvGR|c|6O1I~H+mo?r!1E(pqUqxji{ zS7>~7F5FMC)zHirFrtoP)2JfZeeUw)F_c*`o;g_eaP~Lb&D^bZGI8Zq?HykuDokMkmBRuZ-AXNnw)qXSC=u6q$%Q&MA@h9Vc$tL(5_5PKUH z8nEN_c@Njx_==CpC>%aAMF*njP7TOa*KkgtCI>>^75&2TZzh{ck%e5==|;{g770E z`eUMF$ql$!QqYCu!zfcit1W^#`I81l-V?DDi0R3=z*`p3-?=x^hPESih=>1FVE~2tWO^5 zcjt-dImn7)DW8%&s4_)Pbn&xk15A`)VPJ-STwOB1;Gfpf`$V*}&s!1UM9|HB%wQ|= zAR8gQh3&5*Um`v~8in@~_>=w~S9!njDmT! z{!>if{%h$ouZl_}b>jMveUAi|P+yu8_BF1StkktbGaA!(DCQUH=TQly3z%1BD?bsZ z-kO_ra@4xO;858Qp|~tkd?bDSa~&h!(#X8GM18-PXgi}k1rsR{#U>hYjFR5Xpt=YR zZcHPF>Uvk~-z=uvXfM{DQzxa}#&sLwS_**-`LoKm9qy5X0l7AjadQDow3iv0{9F^8 z)kNjW`hbrWsA`m6BhpzaB+9rcUc&?O3+{TH5atuyqpP0Ms$gKQBufbF$@=K78}@WE zgL&2{;bFPIvKdT{(u3SeP9vLHUoEYd;e}WT%_;}rE0}tV-#y7v z*T!8;yxkRJ{7D}?Wo2+rqop`19vrQDH(5ZP>_Bd%B-J*wzfMd!SS0+X>_SS9R35!Q z$GG>+P}Pdn)m=-zHLwPU#E)imMOYZNDNACo^xk8c0Rplv3@i%KnRsa2`FK81XFv6F zV;-eqIIo%_u<6F9;`zf3Ge%$MOOaKnLSt+VKaWen(xRmR^m;LK({I9pR5)Bk5uo}C z@?v%Yf#c?GUgxJgiJ!a6LH-o zY78S7d1~%kWTBtHEKSc!2{GIl_@AhH92z@O1zxRAxOnt4xwRal?7~7D^*4c3hrf2llbw+_mij>zM z)NnW=-hN;p?m*o(!f87LE{??=coDryP;$!f9h`t`+<>C6fU>wEM-^huL)Z>>rC`j- zfVsxx&P~8QBl<(+rrEH930xG}2!8uq>q84^C`Y@t?1n6qxw6Hl+e3KZam5s2j@PXD zPK#sWDpDd@i0UHe{{-`RPrj~lqe6Kvp=arH7fx~Nht`riE_@8H zYWfXlL4LiM0`%-$T-qd5QB53A23tk&L<1_zvG@01$OmE3Iape_M2W9XGd_BZ^E;Fy zvVu}(%V~Gz#PYB7D^Y2)5q%=Nta8tT%iEu#bOSn!?(qve(AI@RPTElDR*3_?$|Kq;i!mI6B9Hu;fO>X60x^BL7gz4dyc$%XplWHp zh8+D&mV3TiPyU#>ikIAtuBqixrT)eHa)es@2~z0&dhh<+zkh~F8pO?7>MhPPgB0QS zi&*N`QmXJ(UqYPJlpjGWniUh23UpelM5jPqYeC3bwvCoCN3pF7A2PO*7Nk1qqg|JN z+PR7lATf!b@r0?UC}7I*_gs*v9K#E&B9#39%t!3y!NP9hoolRQYDQ-z(^e7fz!dblt+&@bhan+( zv29NG>PM<-LFvad@5<%s6*)@wU;d9PKY~I6eJM1Up(0_R-phU=SxZ8n6Wu?Z*Kiu- zXDBwLWT!&<0hD8;>#=p=>A%saIGwk%w;a{V8P~I}a)pJnES7$PdoH#LYvr(UX4Z*VRlCpkdJ_=g&s6_Z>l8cfMhO{*pG+qsL3 zme-aAcz$a>5piU08sxygdd;*A+m0u@^PXnyDPQk*VEwK(3z}qovI78(NysqGt^Z=~ zkXToMb8Ay!`6x!R|!L!sK3)&hl?8u=?+-yK4dC)Z%#-1>wRs}S<*$7|w!n04HN(|hEXy3~=hrqyD8 znSnxuIM_j0dUI#^vkSKa%jv*7{OX*DHe3nl)=^-U80wQjp~af{GUo+dQ-m=zoZoDc zlHDBnZ=I47bZ|3*)*!SN3DAT3{N$2g{#?$ZGaZUV_q~^82In5g!^mI$Q+bu@r4pYe z8x{2o;DRMDS%}muJxLC4gbY6r%gKs_;Xq{6#)qDq*8BPwm@3G{4*Sk?tn$lvdXsVD zNh=BJHr1^Z4M|w>Hj4u}Iucu?r-mH%Quvj1 zwmD)6;GF)bNrNBwCyM;xcXmYe3_Of!L_E2gv);)o+W0`cdSTQx2hwo7~FJk45ix!?PwpCwBoUKM|hu#VJ~;oo3GPC(XCgjF6lg1 z6u%?FXg9g+##a;apiJ;X_-N95YPxfAK#11kdpm@XZo@a3F=5Ji29pN~ot%?}Z|>8U9^S5_Y{(8|JJ0TCx#r!o?N3=_6rVJCC|3CX_n5=Ww#L4$bh%H6!ryj#I%(VGA@~g+8diE{qfAP=ln29rg1r!;byM8oU)&GK^;{ z%V#eyI5BQaKH+d_tFJ}}t=Y%D^dZ8T!yNHHOmh@G)LE!$VVvDMs}GhJ6&@Azo?9HN z6H}%l(|6o6>@-e2g3gyJ?7Y>vEllL+nYG0(suUc62rj4w{FZ675+X zRu$BB&SekPTk!p{Lb~3CR^&Hstb>xLhR~ZNXM8Em6&ID$_rO2Vd6#{asw6Sb+7)lY ztj%67w8Rs@Nca0olu7dV1+ghJR}>1LFi!HgJ9uHHpPiWZ zU*7br2$wVrTJ+b1dgONqzz2CTTpLud)}U_(p&mi17!$)O3uWp?0mofQI!bg8kQ$~3710l^1D$3bKTy(r0#q?+J zwM-$Vua|JIhc=s;8(g{|o zBn2K8kyvn)9CR9+uR`oeNISV`#e}iE;t7XLYB2w5$E6Bhf7bwctRbb~D zpc!e54P%)wzRWL{jav_}6UuE<-5fPeI3Yj*?WCGsGsWI9aq4HXR4eq0PBe-nN?{ww z-+sO-K**qRk%PsHPvTWYorhJPNJu{G3DPf#@SwBYONg!nQ2FtNK?N(2>wYirttEr5 zxH)Z-4Ap^cg>T9WvLHAvHVC?20#8ES>U2SPdF6YSo=8!A$QDBloSGtuE)%aj6k_h> zQ{n4`W%{%rDl+g?b1=k~Io-m1sj{F}UxGcOYewaqhy)#E`R5&QS=pzB>|Mc zS1&(QBlIkdNZ>vC7DlO>mZeN|C0w|c&agrz)kV2xDUW+f@sBsCS|H-W9z2~hH4jAU z^y9M{ftA6f{8GTAMgx?a)lgk*YaFr8g>241cDU?m3cEp|cB;FabtxIC1cIII?u=s9Clu2!}l`k-H- z4~Js9FJ-~C6~1@$QN0IaL1NCTvow3D&6n%ln68zmQ68*V9md=6z+Iq56Vh+gWoQ<` zTr`D-FX+k^EW>aqdgNqoC(ipu_i-94zGf))QK>vXq7Kgsk5WW~jQTF)>|Y<4n=XgNa8k zh}?A0BIB{YvC#FRAMNa&kk!y25H!uq&6f9>xF6y#~d|6gY%*2+|2m1f)+zDY^F*Fl}vcZvqflh<(wlcprT`4RQ z<}S}!gUP5S@X?Pg*OR}8Rq&vL; zZD>+0mM$1G=-J*8{EbRnY#F|-wHbEfd!kMf6YS=Z@s1JEjm#mX> zO^;V{5L~H@{J2*VYk4x&i4&@sxK_c@kIuS_Sr7_PNmQ@TMgj>0KM-zX+}O)aTp`qE zejdtRnlR*4+S9UX9<$5W$N$7GlJc18$1PhTnp7V%tESI?<6Y1V1Zsrd;M>my;hqIGt(qBjLkAX`i#}wH6!gq z!2}!z+ty{qNY;r)IhkqfE6;(WT_m|B`Ds*}SijKfv|*^{6s?RrpZ(hdtDduvbqcj4 z04?Dd`7xV(ydA3$$W zCVz-K!7+M`P=mLN7ApBksmBp=luK?&>++?RsA)Vdx4gQQ`l*v?IPSyhTrHhT5@8iR zEwG|gpK5$3rglcBFm^kMCm^g-HPj?pCB9(Iy4?ie2OZ(!vE|JddPjaf6-D~}A)r0| zrPC60%LRs44ECcmFb+SYM=tZ5+BhW}reX{IHQhX)(+C2IT&t6JUG!)e+jGVO+1CWS z<(Yp`dJnZ0f$!g>yW(1Bq6taZ20L!^n)oZ*}wEi8=^I2y`7!8o!qKg#y5x=gHO7tRNuq( z_kiYXB~BFI*vGc^G-b>Uf1BZ3O%57Icm27?aANO?3^L3IQ=FBK#rz$oc@pbI6P?z( z*H<3SV-0AF`eU`QZ(y>YdJ+7n#VGL8NYzyzt?Yq|qO#S{18yl|+~|&}wlXK_;{`rM z0PfwCc1X|pEHC!4Od0;=Pqi_uc++8 zPa?ilIthNADS)OHBdb@>B-L9&+VwElrH7lxb_|{@ID_g5V4rjL1 zoI}Xmp$$wjPNTQf{&noIh(oY}icy>0Tk=qT-M<(GX_C)32iJ_;o~LjD!&LY-e*EXM z)3zI%*`MiS<>SL|m8EHz@}Na|ua50C)HC(G4`Vy5FGDvo90EVJJEv(mFKQOQn<_Qd zek5=y`FsXEf3d_VIhiL>Z3mCMDvJxJqlu0S+czJMpk!|mjwX9x(Iw2SKg&>2L1tsv zfI^kpUe(NpH;mWeJS8JCjJw?g-ffZ;H&ZqAEoG#5B(qmWN1lHx0F=Es>n~7|2m_D& z;oxu|inrfW`;N=9O`?dc^&*KVspuRr?T1o?prDvK;Bn5=Ju2Qi-Y^Sq1=|<4FhW;S z{D$42J7?~e=s%);7_$tHa|^@*Tm@ohz`>_UF|o4$_g_BjzSB=x-Ka_G;%v6)Ih|ad z-htU|C+QH>N19qo{OzFXB#n`o);*Ionx4(pjxG+v+L?e`S7G2-d$n?-c~Kp*Zf0){ zY4Tz4I{b~^kRRI%UC5fXKrUf*w%Dcdc2rm(`y{|@plU_WbO# z7%Yb0JFrvQ1T+TF)n#2!_3d&6dINe?eu&q*I9;IsVAnl=j6mF?f!5}rWQ)L2rn zXzld4GOT?_xzZPAiDiFS7zI(L(bq1p&^kEloRc@Hqv>Y=P8K8gX?(V z+R~NbYV8iNZp{-PM+$rrvLFj>=6!H8(~!|@DwKz}BvmBxWT#-!^H7Gzi7o}c$!*3O zA6`iK9&wML;`nG0XKxlFgvHasx>4lUz9ki4E`6k+{QVY26=JRUXaLWz(=1H6n;V_C zl@l;q^!H40KI+u$LM%YJLp~B1oy8eMfl`8Z;|IzuU7p;E?MV*ZSQaMG-|)@P03{rHhOD!hycUoL8=F9hjaA zvVU%ehtp0!as(G)mht+CXO5UL%0Ed&x;JPe-B)%wh^>Qw8Y6YP9tmKG-tcuDM1}Hr zF_kvt5=;f=0S|b%wQ;@G-!vlDDaD2JP%I@B4Zeyx9MlLMbQ0wV(EXXCha1DWZ2R0! z#SBFJx${zALylO4++TNpfLk)^a`F7C2jGI(6!D%WaWgB3;;led=poCx$S$!$z}B#^ zDOu*deqte~m7M=M(8+aPNJGh3_hk$Z8KV^w&tp{237o{v>3NQ`??&!dbkjJtC3n2z$;m^IDinE_($L zdz^|Gz%IeT*Y$bsFe1KSRr{p8DVn5cTmAn0Z7eUK47a93pV#l1A}ql|x-$vsUA{Kg zM&CPS1Cj%YWhNVv#2Dk!+LavqOQ@5!F{Qbqt%(I7^3l81R(a@O6L}C_keYyY%Dc@= zjIFB5f>e8T8d}MLn0u3>3OIr9OK+O~mTrn@%c|Cz^1+bpFGWl%wv+m@&HePq*;Mi6 z|Ll22(C#=N$iFKv6Om)U`pzDK50}=)m0$<_ma4|$AqP6|w4uQx#qG;(m3Ipw8$qR%A!fUBDKV5x* z`io!;Z?u1M0PjHo+S68D4N+m_VdjxU*N|4+L2fo>h&PeMr7ZvUoTaqeR?NAYeZm2b zEU8~c=7xIRPc|tkQJbC9an7Mt-x)_B`6_-fZa{&qmj;qm$Ngxz1unx5Te+MeD0sC* z_ygUw0fu!s_Tc3=r_dx(o_5!_#wj_ii{3=!didL9veHVOMG8f zv>+3JD@h`_qco2#6Ep%lN^Na3C=uLifP-v+^6yBwsE4A`uXJ^uSPb4%@%T+Qs16L> z0GXX>sdl&W%3z*r2$9h38L-Fr;&(JDdlt3+aH`+_E&K@A{Rth;> z5;}zbYyEl4IH+k>-<;~#y!7QK54YjqJJMyRzOZl${~Wfz-!xW14U_N!QpBm) zcIcyC$vWZNe@HHPwvSweCR17Tn4>0pNs-w-ys@A!*1T?4;Dn|(d+KrmKgs%qaasAQ zb0!imw!75heILPeT0WmFCg@Y=5LFfd89Go-&yd5PA{x#Dza}Mc6Deo$C!e0wpdit& z66><~Ix4P^CV)b*Fx{QqwCw0JK+XevoSQ<|Xx>)bz(AVs$OD_fwFZZ{z4E|ant=}>Le{%0U7U5Z&9wPS@1qX1K@d`vc1*g_7J54mr!GfjCZRf$T z4)G;C)OGbQH%j3VR?MJfR7VF`R2!9Se>CEnoUv3pN+^$<_+C#r;n^Z8R1Aj?BSL#k zZW3afZ@HmDYM-~o*)&<~A{^n!AQ6;44Eepy6OXD3W)w2a61f0HH)^sj3s<17|3ebAH{SYFv|zsOqgI1HRps4gX%Jl= zs*0|-ilfx2=J(elR-RsUC94KT0*d#?l|qIac(hcPv1j=ni5V+3Dm6WGJ}_l;!Wca) zqf;upu3Ic@yTB1l96mNNDu&9K=3ExMz=?QIG;b zIac)UvrVKEn~=}aEqXY{t0IwF^uD=S}gOD>^v_G7KPL z=ea^Q(K&$27es)}a5oHGLG-ajP^@2J=8+qfH#D6Y54y4Fmr2bb4d_m-&VMP7r#HJ0RE7&>~56c_lhu|D5sQYQmbik=z+$D-X63w zU^lx;QoZ^OCFo92`sHc>lWw39?j24MafVl!h7>*_Fu1G*6SDZZ7x`5S!P(M>zNkPosqDo`Hh)M66U9E)4@_Xp#?0z$) z<`SvWUv9=56GGHCj|X)UI5tXk=x?1+5R03Sc>X$e0gItbM?_AXJ_qr&{rj#g{4dbk z>>GoIrg};7eYQy%!*HF2e#((GVH&ogL2-_=AlPlil8Urg?BRxBt(4BdRoFjux+AS^ zJ-=TZ^z^7B$WAd zmEvm`sjBnVlwAGJs&X9U2?8N@ygw+u+fE~Vw~Mu2D&dv4zPqn$MMd3OaNK6xn{x)BK=~5PlBsHkOZW z{GRgWAP3fgA*Ec;M-lOM;;A)rPNUUe)OqNW3+rmvkTc1dcmMt%la3IWF~(gvc`yWv zhCMg7!@r7S`66Ty)!%J9R5p~;G6V9_?XK`R9a+~g#lEK^de3031pH#fXtif$)YVsl zY+JKylzH>zLFT>{6jPl55TUmmZ1xp7AMhPF!h7#3(9- z@uk2U4u6U;$$1cWPH96Z4gYiKsXs(psnF-a`oyxYK9V}GEg(Y*46uNn$I17! zHP^!|M$}wlAC%AU*j<2rSs;QpkH^g_ znRHJ6VNrm}$Q%%ZRGjI4$libnNHnGEs9F&-90eavOiWEA@>1C`@=R4o8X`2-#ce;}x-Wu8kn13Bd<3qF`|cfY1N zw==)o+43kY%In9!cD_!OHDrA{$8+4%KZY+C10&LttI`j51{w;$~bp_LiM{L{+apZZ^K`54D(x07{^TftZk`w@uitz{X{y*w(KO$Gf~1 z*8Ng&H0N9t?5^oYzyOwJXzS+*RskW#tnN+VAWHrOfYi)0(3@D%O z+zAahh zInLG8CPz#hh`JWawJBW$PEA|-q6Pw*88L+p!nCABLxZgFzOaCx)7i?GSR0AI!IBsq zdL96-0>0M5KCf-sbw2lE!q}CY1Ws!~6>dnc0q9@dqOoRd!o)b{dyh~athtWzm&r7S zNuGPSn2{H1e~?i-luvPVES5=?Cq5ZGjbf4h z!uiP^pxS-UqcAt{tdnL_g}bkZCT1Xg(E+-n2^T=Yt%L&S5)pWc8_QMg z)6n}tm3aVN@`5=WRL+4bz_M+ma!bMCDrTt^anv-S_94R@Z!gWi}6r@yH#G@O;K^_b#P}X&ySC5pkdaIwpVL3FVgj+>u6M;W^L~vtLm!4 zH2+q`y<4YRjH|Zv*D;;o*T7Uto`4p~T=tvKN2^w}E#1@tfy3Fa!GSgp@bB2xq++v+ za{2Hbm1zW!F|fmXenwBFv)=d_aw&cm$1su~Wje|{KInTpZMqfmRJlU$nw`fM4el8w zm~@oE%Vb@3>+OY`<_qh%y>j!+P`ST2EV-)x{4=7Yp|uvnS9g$YA|Nv%#(-e~W~_Y? z6*RTCZOfCQB$|QI#?SU2cyTEW0(Q-_vD6+*Ex8CUS+@OOoZoiRvlbJ9uM8*5Z7v(1 z;%AN7&T@XSNS$C{mW&r-!8r z&OHVd;3%`^iioVtNeFr?bQXc>3Z_QYlI?LF!GX{O|0}Nv}pFo4)bD*gnZD!2~?BDMhlUNeZ9#l2w_F0944HoGT z86UW-C(m0gqWHm0BI95KbOertojL3tpc7ul(=KB zzu;rrJeg6Obt1Y<9N@Fm;Lznemv~ICZlsOLsDhbGlD3Sdw-+?qeg;YGNE7f5aOv9Z zJVtgM+}bAT!Jj^uAH)UNj_S8Mbv2-%>$=#zhinrvde+568h zoE+QfFr;*?Ro5=&Eoyna6Z@8;ciP?a5B0CgUa(uN=H6Z?9y2}Y=oSSa1m)M-Ab#GA zHKTuao?BadbS$XvwaO##Bu44E6RM-M{e0~g?N7F*pgz=M(^EvM@l!+Z>?nvx>Hck2 zepXPQJ6!9g59>yVar(&5p*jNi>voE))z-w+KbIlV)WFt&osu>%pxX}3pUQ!V$6^x$ z`?ShM1XE<@n=aOOSVK_JOge|#KTB~J!V`ytHWnFYu9lOJf4@iuRdxEoN<6^GSSyhR zaK@tgY#Ubp{|pIQw@a3@eD0BzERkVtlNTBXCa5E<=$2VF(W2e;Muq1bG8hEIeN-nI zIo(3TN#C0I@G1%8?L4IB1Mbv4$~mOyJKI;77;5X=EwfoLn>+cYhzPtG%7dzLL(>4ApoO zm)&8MmkQ}o2DMp7NfRKn>BKfjE8^%^EG+Ho0eJx4D4rF!s@dWwR16rlCjJ+s^2yhO zEaSuEK=cbm<5yDagu4&WxD(G?w%@YM zmM;2g&>ntFBF>t*Lz{t`olYi9Y|7_}4JxLcs_}3+`6hc>guNAK)DJda-%^o;h3c0t zb;9iaC|?^%(hM$tJ}$zzCk&%cbWA0pC&0J){cJUI7Upvf%o#sM)68Y?KCbf_DisxA zOg&|C_xP-6x5-wxcVUBWyng%E5{hmYy|R1@qbTfX2+1ZXQ(q`8f2I8|g2tX2Q4pY| zjNUuAnf7}^uU=S^yHIaVwKk~iC7Wk7-%A|#PWAA&&h8XY)3;x08e$v^-to4FBi^kl z8DQSn*Kux`Md-_=$oC@^X4v$_?TgQGdwA_T5s3VGtsw!54RRU z+YQK^RIbj71o|EJ3A^+#<_A8fUhZLb{q6w5P5g*I{5YQ|S@yIgaaO-X7yDA;Qul70 zA_G;>Ni%5$vb@cP-mF@fs*AeLHZFUx6r@Dy!`dTkZAoNkRv<%7x$+*1HB1U|n}@S2 zp!_*g2Smoy`1MIL2bHWnRBX|Er!`8VIm=rAy416+`@}j=2z*D=X<5{2FLfyRX_LqL{6qbxRO`7(TOl6*bKFpN zS|2v!UTkx12Mr>QVoY+u>U*QZl)b&pd>^CrhmxxcnBvWC=DN-MBE}Fm&lG1F4IK5& zvTIKPb5Xcv70b*C%{50>KrlKSa<}{YzpO%}bZ-yn>Ye%A#nywYDzd{}cRYb{P~vDJ z@BZ`>Q!3|M)a&V+MGm;>aALi$ZG%6Dtg}fe>(UAQof!hMNgd*0l=J%Jp1H4R*0Y5= zs@?^ZQH^+`7il7uJT4N^;YRbH<1-?(eqYgyj&%SEsw)F^sv#nY-mnF#GefKU3Y_5d zqw7+2QkIaAt+$UP9BGVC?t`NB(=c7XP^;bHu%Ly_Ut-eaW&#qMN8{$ZbVz4N#ppX= z)Hez@k*C74q$Ilu@NZt>I)yumTS2+nB}J_BI5(tcusw@#yy4>k$0G4|BRJH|onn^R zMNBl@dIZ+At8ZPXMOzU#`sB!KKBp)`f3n|hKi2nPL_X@K?+9FR< zwp@;& z{r=Tc64)KOIV95k0Z+KfaUlhr!L9Q(c@{+=NzBQ%_%z!?f}&U)OL4k*wE38xUG8w&g*^#OJo`zVP7n^L z7Y;ENaxl!pXq32hb5J=If2#;};*!}FV{Tv+&5;K(rM5)07(@S#|HsKJ+bIJ9hvmML ziqWr3mV`ie1fIurh?y;#Lxen1vpSj%L2xVx@z&xlnrclq&j2X=iaQ*YY$4wqV26w< zcwBN@Um(3@fBn}i6Zo*nChX@1jqmph9nope%XWw0Ugt!`r^ujD(tra|UoYTw-@6;( zR4uoVmmZ6HV7D`fPFLXIJ|1&&a_ayW=DJEpAf+1x@+U+`ulqyuLzqFtlVk3k2Ff1n zCskv&NqZp%YaA{;15Ep=MP;vA75!CYMyJhM2v{a0=qu;359{vLyp&o~P>jKQYEic% zJ(KX^30Im+t7)3T)Qwyv>l9#aK#v|aT6L(@=IaE2wF|%dD?)%DvxzeguCV{^>(TgR z!&QWh@HRqQTdBPYUysEKl!B} z^-A85G_W#X-;d#iE&9_z**rllU;`FnJu3A62~vrwiehD zaEqrtaxI-uDqDA%#ITm{Y6AkFsXi*>3Ha<9tF$x_Bh$}>vRMZW9rqC#IN00!xa2TX zA=>QT-=q}9nGhq8&d>$^F`|M21o6Xv&Oq~TlwGTQ1XHB}ztiXnc}30EBmdGA2JIUj z0;R26%Hg_i{ez))DUp$%82@JHN>uolc%~gsRChGD&qr!tcV$VW=TPVuxM5A`1H7yJ zN5?5U=QJ=e$7D4(jl`t`GQj}stJ~h}E*(1v$PFEu4IsPMkF7)vHs6Tw;`S7SkA1>I zJe0z~EGzSQ91P$NocP(r!_u^mkD8CBo!?&L(!N7}>5QF2a3);XreoW-ZQEwYww;cX zj`Kzx+qP}vjcq&W*v|jWVyb4UW--fWbL!cibME`PwgDMkIXRRGByF?Aj8+UPsH+=1 zJnZ^R9G^1t5`NA6W5UTxT*j2nI|}LN_C#1Rq6%~fRmAjAIA{N5PK?~*9CtY~I2(m{ zH)qOq6OAE*iZs|a_TlS3wau*xmto`=M0=NI%G|2_V*S%toveYrieN|&_UYwBua~{J zvqSs&E}abmrd2U94v^P|LZJGwc+y|IL7nLcr5q3Mya)7YV5aOrG)Z_PbW3#uCE?yL zK;M@Fe1Uxojg-kkSoN^!-~TT*BK!Y08f!K`56XytBA!p6$Y z!uEf&5!>9{EsU@j3A#*w{px7=kBXR+bu`-Q&}8~6`%rL|c+XtVjwI^x zAbD9?S@Bs-^dU)AAVb2@zk);pqbX60ks3k4BrsE&OE4)wek;@{epy z!Py|kgA{^1W<+cQJ9^OjPlS>Bmv&|l9+{P95PqnP|8q;azD1;WB=sZnt zk}yq_Q^B#cvV)Jyel=~)jAWb=bIdIb9~yNPfwzCoHnM)_S=znId-+945_9wf? zI4wubk|UVbKip71O3|Ac8(Be@3?P+EKQy+N=FffoeT#CV`9D*0e=0sbOF^c7R@1mW zT)@0R+%s^#IVlu=eEw@Q{um_#06h`hg7EP4fw?Ie;Qdnr(@=YsCNE!q&N4gsctNl9 zzZpM-ec$SSZd|~?1OrQ9>?WT}yGb?Ar%jFn4kVi}=bD=qr7oH$r}pU8x4Ap5^F`&^ zhlc38`8m7&JShe`0`}> z{WolvbSCEp?a&9(dN={MpL+(y_^$fmlY{pn5&!)ve11V6dR#srrlRQT)uVpUXkI9yDb(RbmG8TClyZTol`v2-AFiL%c)Y-U8iKY34a;yrQ`P(^rKR_LtEKzmuk5UaTB{;P*AJWn<(S90L**3^STD`rZaCgWa8JR}aMmDPPz4?8iujutF&c0rVv(9P& zkwLP|VQcr&LQN$HR5U58g6irY%(gyNo=~zyz;3JJ_$zd(=xw|VcbCr@Xv~)3NuK-s zSEYedt!wt9yZ0>t)#45S=AZt~O*XV%G{Yaf!lQrs4LWh-Tedp(1FKr;RXM3YN95h~ zkA38YHd)R&$zGyW_fV8HXgd&Pa0%C4g6_H}MibyK9HZC-@9!E6vD2Ykf7`zOEckBn zfC*ulYAO2~h~@`eJ(+Pap}S^Rr*x_fThRZhQiRyL%nT!N>E0<8+NHUd=#HffGG`GR zYP51zUKNe<^Day*jp;>SwWd7LZSeI(Nka_&zR0BydS`o3$-KFC^dJrRbDxZO7T+{S9t_}_K zX)yLryM`t!+C`CrTVD4I2f9)F-9o96-&$d(Z znrv(ebMAT>rQ4={BUhv;03Cx-40G|M%$pum8PH(CF#RZF3J)P7CA(G&UC}QZnZ%Y+ z(q3%>jt=ZG@^BR;6ux+uO;IyBqOg;{cBPoS!s#rc#qVu1n;XX(6zN22{!;AxXsxW{ zB>{8U95zR|(?o8ri%0`zrewC{=vNne)=`e%xYA0N%rj9XNFS#3VOU;Uced6P>tGkm z&{3z2tat&h60#uTU}GZzoWu;P&)H)}Z7(cz-K{Sjz{W*hY{o2|@>oXB^+?Pon>dkM z*ch9_v1QD%5Axdf@!1ozQ+|oAWP93~Q!p$Vp1cC31pu;o^nBU&d8YR|GG*s(x*OD! z^LJ5ZJIjk(+jpB=pErv8VNXvt4Ah$!x7q-4LHjToPZeUxpJE*j{++jA9&1%ZQ<1rJ zb1Eh@SWmf%@?TEgrP~~BMksCYt0G!bR7;@v5QgtfK&s~aCT0W&U>s`nwxS=+J*s^( zxGW?Ft6C#*(pa;FzoOm`jev>p%Y@M}oM4u;)-Kk9ij3eo7J$%F21_18ELV$rs{v_O zvECzx4SYU!ziFu4kc)2-Vh9AqrLaEkvlfHA$Rb}I`@-?h^xs%9YtGWh|9yY7jaAhx zqa?41Cf(1lxR5LO`(Dz3Dt3Sv5vTjbB{V;2Pb<}meJBcN0BWO!*GRow@<;k5^@a6{ zf;>+_DeS>5zwhXo7>ePT|A8uZB+)gC>&*D@fDR;1_Nh+Vb|ZKwX0)Pr=4xr%MmY$w zko~yNz`*oX@>s}oDO*!%k0In*+KWy689I=Y^eW`cNZ#p?dQGTkBrh8g`XB zeaQ|kr8XwUIe`r}dNAY4hwG#kw9q{6J5jJ(&tL9KBk^~iI9bWJgMkEHa{5<}P@GgJ#jiQQAuf9ddC3OPJmtJ)+u23eKMAd37t0DS=;uOI#I zvf*)?kMkis)z0N@LG+;uuv#xOn_KYZLLpr1!M3^fcwM2h8h{R8f4I_A2ikY7Jl_i* zW%2|$+=wH`p#@m+nnua1wFp|!ns%Dyx}>tCP?u!dKy&n$`T2kAjoDWQet+gcZY zGw6M9^5wDpHt3*3I126Jc&Hc{a`1;nNmvqSTLhsH^yczz{$U{T8&K;rjAr~qR5h}X zxPDuwY6KoUVpwST==AQ7WOD+7b~(5^%+ytq|7@PV8QW?vH?0%~`>{H@-VP296d zZ^Mr6+gjdpwi~O>mPr2l0W!>g>o5IM^meA0V8fSQmzFW}xGwQ{_yH6Q0cjWg2`!|ClBpIW4FyEP&47NDBPhX3H z*)J{(D))js_Kp&=mU9H;Z}P+xzaDEN%%1EP@vBOWTGLyq5gq`_>)NZuC!q4B0>AWw zwu;J+RAWC&nTNv;YlNFm!v*u!eWrb_H^%|r>exdx=XuPM(*z43M*8|$dF#pU^;+Uu z=C>iT!x5(F#2^;33gj2Hv}yDR?+uvS#O4(#IbcJD*hjp(W@f;1i6`B|pAapl-!u3# zr_e}oBp$zMwRUNdoV?6_TWKKr*~l?b2T@M9bfskLP!VMg^|ENMRc@k(2Yy*Eqv3LC zPs4v#|Kc`Tbt^{>rqnSj)5~4sC5k*+|GL=r?b+hw$gUeK7kuL-j_P4g8`P*!@S7m~ zy&r7{J$AZT3HNOT@w^AS|9tkl`#X6a?hfbsf;b{Kl1?XFczl{FTrdcT9@30Y8EW_& zK_|e`gJZg$-GUWVo?(zCJ5SipATw*0Ujb#*^5vRprh9(saj= zf6&=Z()V2-OD*l{Nu_!{jgU$FvZ{p)do|y>p1Ar{=LEJG%{49#mezETFAZ z&C9X%W?0h0m5cFi8G8FFqt9foxN}n#=`1HtZuPizG7^t4&azZwsA3>hu^iEk4+Cnr4IcrNb{{>&J@e{rHyF)x_JBO!%Kn4>ZiHjeeKkEuD$RquHuLuwti43Y)BT zuO^NRh>e-Tg;7zEPcJy)r>C5@`T9RFVdH)aF<>9}3G(MC4!*5w$@jzhdqgjD=?%N( zOzj-eg`H?$+G5uQ3m&jpb^hEi17x2S&%^64CLW(1!FeDAqUFx(r(G*t$WJwJ_Vp6q z?^c>xi&*0!@Q}!ARWT|>|G=S2jA+k~#1ss;D0NBen1=hBJviGeX0)34fF8``zXCZ+ zX$s5x|F}utAab<QQw-T7xr(x3z(=vscm-ccl! zy-E`+>1Q&g*M4cy1#@h~9Ow)Y1N~Y+T(-vU>9CV`A+7G>rZeYD-a79Y-G3QrLD|pF zjVjZU?+{)9;}9Z!6enxOzn6Z3 zw!iI3p>$&WO%wTus|!dM4ydZH*ZN|@eu62rT-o*%(v1iDGEu_!Pb-m;9Jlf*QYPsS z#o03^pq(VO9y3wbf#V^Ggg(?!So7Fy^RpU>`-LTi7Z!B5Cs`+#5k3A?9F;s#9_vtt z7qX$shIvEG%vWxdKNDKB=)~Q*hASr0D8Vc?25U3EdD@TEwOvuQcxQUrxALa?dw|XA z%9%rM@>g-9M;Re5^}pHi3&OTG5oUjlE7~`=eMnjw(`-JC9aazVnRjkZQDk(%Nz^aQ z7K@spg3_7Ek<5 z)_Z?{3d%p2zJ===GyvCRm~Xga8Y%_s)i%c#u!v+CZY^ENdo8X;wl^L!z+Cmjefx!u z_Z?iDT&0xR4p$^>6!pDlcL_&nQns;}G`>2TN)QWu0@^=f-|Z9k6B)X53*COsvzRaE zz$Qy6k|MHvwZ@{bKAhtvknQ6joeO?EtURlY_o;Uvslxwlzy@{N24%NKHPDw))KAQ= z2z*qMIdrhjsW#iZq)CM(~wR}HcLtGnWp&{9tbV9n`rW$+^P9Z* z-|_u|-K~GBJ0?VR?q|fH8sC#MPrI&9Y3dS9SdmN(>Jz(D{T^jrs;SpI3V1_RpGgZa z+-NF5pGw%*;*5sLn`!|J#Olq5QKXKw&tOG*&j;;+&*N`Qmv@{%xq2y8Vr^RM^L3gk zAYU*$1;GQdUT1fDAEJ!(tjz8-ds+0a>JGZ!W6P+BVR=FgXi?xo&2Id^6_W?qi!UJjffy^ zfHWD5#SiD93D4sl`(->AkDgz7-;&r(aC4+xfyUieb>=#3KMF&X)*w{ehv7-FS!C(5 zJA?aiuvz7Z!Sbi3PA1c0gFp1_(U-x5;ajo4aP)C3=QrJ&*laAbgPXjMa?4^U%Pkj= zTH~ag;p73jQ6SL?c^wjfBQ&?a?_l5tnf-MR>DnrpUHP@)t+C2BE@sbC%%hgs@y48y z$6h%Xn(i$%k#4$LxQv?GpcwOR7)i;LWXkxwZz=WE<9B57Y~m>f)P@>{AxJ+j9T6zB zs&VtGR`Jk>kU-fC1>q`G~*%1cfSQ@z}4yf2G(fexc(cW_1kkx++C^aBw6AG^B*j z_IhpqN%B<3DqO8=-Ky$mKpVTx2zw2ciAT2GXhM+>`BTt(-qr0eNik#R+uwq_a?sv6 z^Xn?g6{U?&!?n8IWLr0&-NKY%>gW%)EB2t*-aV&+XRp{B=EWgX{b}liFZTq)<#U8p zLC2lE{0M&iNdykB10M<2*P2n`)?d1W^6kEeJ8qo1Ve|RCqOuq4Z4Ef$xz!c{->`QUe^duwuZ?-$pey zXdzeVq9$yLK6>q}1IHXE`6@3@=;B2hlW~X{1;~_M^3-4rEpA11bdA+sivAKKbV=A@ z%;noF@jaKw>LU<6`VW`z=Y_Sjc19j*r2&g%<__f9@IJpH^;CNI3yS7rc6UlYVI%OP zcKnO_JOcvH>9LoGCyJkb7h^{%mUYlE>B{|((ifvqa{X>n`ICR|5;l%X>w@{(rzg2y^%{;b7RtG^jf44k!I;y2{O`R9P{dD?)3yo6c@|#y9-HO z->jraLA5+Ku8Q)6(bRvm%>yg~ORDtJ+*1HyND+&m`u_OZFCooKqq|WUTWPX4i{9Ck ztQ-d^1wNvWac|;L7gsYBr^k!pISF^Zv;bh_KH?A;uqwUJVD{5dw`){29#@r1JY={C zBX5NrA4o2$dr5mv+SCiqo8hP$)B_fAj!mp>?tmGR9>B!PsRjM_aLmOLLUpP}|0W+M zdj7)}za$+&kuvNs>h1g5h=wZ_En9M^-~MQRcSmwx0rJ6fzeNlYP;X19pf zx_1rMJMNMk@FfxVek#;(;?4p28^weru1n|Fd4o}k3v5lE91}!1RGUeV-LlJywbSEb ziqV(%T#>lkl`kxwrSbr#5**{n8yy9NsQ)rR01M84YJ#m|lkjTHHET6)-;wt^iJqV_ zD#fs1vag^d_*eJjca6knJU{$kPsl_9m;?=?UfOrAR<5od;Hx}APL1mQB)~z!WhBbu8^*#RquySA9f8$RCRyuVtC?j0-twkr@JLK{c1?Fw~WYlG1Na;*Wo-$58df3d?18Ea^_81{9 z8i$(;3^XV$#Ae(!s9GBq`1VvyRyWa|ud0b=kQI|WqM3H82GC}X{Q83l$7+=l3H~!L z-}P?LKvQ11id+$McKS0sUB%Du&R}iww?{OY2el5Gl&FJG zZx<1!XDUsse9ixCphvYMdT`hBW1posE;)Q3wiu?hs!(pqY+ic2d|w95W()Ei{_GpG#vu^p0Gb(Mczs(PD z$-ouC!_$ecHwB>b3!1a*H`Y=#bkHCzSok9X*dCY?DJ^bmgNF8bP;ln5aml|VhT(Be z+mj6NZQ>ctnV|FXPTcywr!V0uTjwjD&X1V@e8p~*Or1F|@MSW4BVR=+{`|OR3C%f1&d0suYZ%V_4)lBa;rkmJo z^39s%p|&Z0tOTt5eWYJ=-KZclHDdy|lV(m;N4g!aRdnsyO(3JveUOz2(cRe<_~9kP zHam!*hCMax%Z;<|qw?enJ~tt_lq9U|5thEs7c4W?(AAWb6n(D9(5=+E)$)yAlb9Ic zFOXWd(1f9E_t(OEOojG5%q-aIjX@Z%ijoo`_3PHNz_-<;j#JyAB=}PO@`0PHH+evR zM)_*|`77~)(N5ww8U9YGzY*LX{S>=tX!3f2!M5aYsa~(vdr(yvt<)n)VZ1g+`IK9S zW94vuA^>b!QRJE}mez~fne>K`jBDcV68yNw@>Rr;*GdsUU=2x=LW96qw76i`%(f}~@9LQk?X|GG~(OO9ln`XO-Z=*pyuKH7c{NAQ$;p#03-U0mn*Zkf(s z!p1$(AaiP@w`a8UfS-zT-aF0T$p6(XPTgL8NJPlp_Y}w}Z7K2^zeCvbzDkX(lY1K3 z>=!alBSY@(usgC(={l~Iet%jY-J$@r)2U3cRI^JwF-h>&088F;|(BFdn$D%k#ICG^Ph#<5&qxwp~o~Do{ITF>Q|N;aSo%d{l50w2Eq056569 zy@&<0x&q{Hp#K<|jr;gVBl7}U4xls=BCOIig`%hiZ4d2LqwOnT^^T5keQ~=OC z0s#d2r+)W(S#2&Cea=ISO**nEJm{xhvqs1AaWlNWuEMLgNld=RdcDpyN$H*!V+x45 z$OGQx`F4Wgz zowEwS_KKh#p!`MjK<@;Md;D-S**_C_DbbR-Rj9a{x1Fpixh3D0j9j5VvS^4{2jt~x zRpzG7p_WgK;<|Z$_}1Kg%-Btzx^bIQi|0BmL2s+sD<|* zmFr)*ud^@c|FaR2u&K8dt5&vYJ(=0qlQ7X<43ZFlQ3F7jv?y?DP`$w%a1nagGu>Y_ z^WLt1Ts8P{Y+D8B*7{+irgybwmUwtCb zwVnN0U^JHV)}rndA1tN2H4K}$@r(=4yWc4UcQ&HTvSo-QMk8sD3r_X8;9|)vu5AQCVlK519Csk1Tip0!#FzXUG^JuuVRA5E0DG z(32x$UARVC#;8Y>>{^{V;V0rXdhCrfsp3iW_ZOUh<}=x-p` z?kLO?db)RAi$*cluLV8LY7(<=-**;REf9P7gnTtmc5&h6{n}_nBzLzPoEN9vqkcba zA-90`^NU7L7X(_TO%W z)QmrX*dV`Lc~OG*;Hz2XoPryN#-%cF+P!R5twfUWJ(bP+ZdSe+l$FHX9vy)>ID>Ww zB?6RDUnl=6SMT`Z4E-WDe2IRu`rm$Bv)Qx`xtcX6PZhDIuPivV4>^O+;|iu)6q<0O zLv7ip;Pxu3?Dh%`rvC95-Dsp(I2dAebsnT)YQEJcGeYu;LTjHlq-I%WbM_j&?+v+C-}c z%)@4AIm`fKj|U|vfi>hsTqG1Cnp16w)B;5|i90pw1E$>ftXkgvv1OJaGMz7GWuOpW z*-CW-ce$RhUQFompI>*%Tya{?BV>!ont$->9jry0MLxr3wEm3E(srPxnQ^ZgK;TlEtcnr<-di1f+#z4I_YBfMq|Aqi*dToyEqU7}h*)n<@zoo8+ys z0(z{_0>JX!X+DZ-iw^mhh=^s$@Yiy_eSV9d41`qSwHHjc|HP-9(NS)QsTKYX2}5@6 zpSKqzzYHepN^C1`vt&VWyONlUmW&=|7^^Xks$p3oE(0-xfOE##Wuz5EjMj};_i|ok zqHI8-sy~?GRaPveci=dCNVU0x>>L~AS!08*caC$4O9n1_B5qXa$@_(L)`FoDg}pU! zC;U_ns%*`q$ioY|wTKMJr(kS}!d)ms#o>VN&!tk=j=j!Xyv4D4MK6)5@VLXkao5ih z*ZGTe(pNVuPFI9I$~HdUq*<3dX%VSs8dDK$+d~CR%9df{D}MmfK65+qR1};ir-nam z3+@f02TRueW~3pDmU9PR^z8NPQ3Tu0R93#>;4fwqPz7#UnoSJ1ht5Cbv=6tcLvW*f zzu>Ipv8=HWGF2l10yYif~tfF3TnjlBYNWEre$y88IQ&BPHt>mkAgE z37Fb-jkVq}uEHoQXC7|nn1DbqZTs)$;oIBX8ZLbsSOZ;#l&Vgrp{KxFFyUysZb1N_k|w_jyj6$*zd&RufY z&#CT*$?IY)*e3>kZ_*6=@h1FrL7#bBU(OFj7RU&IzzIoL=o~9nNVIjDp0bD`a~t zoy%31#z~+-gC|N7K$nPB!L*O08+=p~rqYjik6MP^n33B>LZFZ%(MWMLHJc&*0u#6S zR<#aX-L+iS-vlny%IbccrUd#(?||EEGGaCoK#%LIoGmk}`}6+}7Pe_#e+3A}&c_%j zR&srD;wDPv#_G|KZtwZSW@Sdew~I7yz}0&mtNXu`nH+p0CtT$N6QwkPlHMFxqT zgVQi=ys*Qh+01kkQbA;sHEkt!;C~G2?*(naH+?9Cf9leO?YqN_L!Xyryh6m3#h$JD z6jm9iZxBkawQ!~%7xW1&qa}lE^>Tc1=$jN|q*$7J&`A4GhbTFl{^dl;{~eOhfs~WJ z6^lH2Hfc%ZNFAb(h+JJ&D~s7D&M6*SzQvGBJ87X4RKKTe%X=^Uz3nqUZyN9gt8jKy zxDMeKFo0ypzL)JEJ*5w0L3zS=?!%ODIbeC%2PfVpnqa_DcDlkmg|AtuG^e&g*}NJT z+AEbgmin^6=DVAOIop$7XyF)6<_}L=Lr)^B&9spb$f8mgB>E*OLN@d zl+g^UbaRxoqD#ty_@{S2^4;Zli$GMhEJy74ED+!(!7ZuH!8#V5E4|d*$8tInZF_pT zYY=66B;YVkL~$Cp<6=HHBogR=;Sm0xTqYWh?WXt2MW)fnb!AoJ2xxGnSHhx1F*A`)&)krP7RKj?b3CU9LzU9FrF05Yf zIL%K7q@O_qxs3@Nx-yRBVGMlm#wn2vs1CWMShXg&<`7(A9F$w1dl?6;K>r$G;7=)w z&}+DIV%J~j4bVg^o;I7`CSr?!$3uo43Uv}6_*v(>UaC{H`Oa(ivYnNFrxLgCG%1lk zbNvYkL$`0kPTGGM6!t#QAB`YxRzb-d{iy2#ZLZ^@sLr@qnqAltt9ZCWeXpGWfMcFH>UAke%d-`G6?45>ZJ93enzrf;XQYZGJT zC8rCu6aQQr*W%80gqS?h18q$)tjyRf)i|xu4spH-Oxc8zraVMfa`52q47CKR3M&p$ zJWph5<75=6!@+4pzp_dc3Bfr>V<0;z6;}_b^q}WqZ~aE+!NPB6+dn;Hz_4Q3VtmBesK*Eaz67gt6>MeV}*n#uE#Ussfk1 z5~CHk%9@yJF@?fQhLPId)mHAmn;xcr9vTwDtpp=Q@9K<_DrIs-o)juruoU?a10Nz4 z0}sz0PnMTAW9-i@+B!w}fUF;8fhDKuq6%-AP4-0?$Q#Zn=*AF4cs{>=G9~DgR8%(Lfu6!+XiZ+XZtUfSG-_|f(>JDahM^ShPtU_)!QZg zX6)FNgH9f5SzyahF;CcMmF=N~$adhf2&$SoDdW~}h``gs8h)EKoHTEosN)~K(9+(* zeTpN^q#;;MG&br3uXVQbPD2zgYU?6BS<$S~Jg8JdX`Lc%@oO;?UCByjz|L1ejL$*D zl9D-nGSr;xMAoeRwH$`r$K`D?4v}lUC4xl~L-L$4%^!=n*XFLR{S`mxAD^=PL-$dA z@IIa7&rdqIlXoA%y5J_1XUNH}R^JAD^7TG0po%tVMc3y+Uqyg;<_xMaK2!8myLPBi zW0NNMLvJS06Dbr>u@%Oy{#lT69t55#PX*EOm*k_uk3(ubx8N>z)d1o$smh%$sB$S3 z1=TRPE|y(H%s=6SBassM!h_I)jr3LV@$cSQc1py2$zc_c*U~EEPFYZfuad~9Df7#n zJs2&DnQU%G-v0@<+hT9ouu^YD8`ak0IoHSahi+VAt9x8`J-xvi9@IO45}?k9Fj;1#YARhzQ}c4{Ct{? zPdd7#*Tuau>C(?^SZ1?}Q1=l7wmQnh#q9k)?F)3K(;b_5hyh=Cv=s+_s*@&<&cL-= zU9<4uHZ8yDGh&C9($Q{yOQ5mi(f+Rg?PHESa+NUebzO=eNQY_-Pyzy$;kJmS)POJD z8CXg7*BlC0zl)q(#pd{Oev=QulZ>Ax=%XVy@tD`$JwK>$^Qih@0BQkC5aZusJwk{B zkjO}A%B3xv#*A(3+aVi;X6bm_23bA9xC|tWKcCn5op5(@|AQ8b0ipND*8gbG`Lgun z#m#t&YxSlQAcg5`LFfsF0$qr*{HN>o!1LP z%vf_gY2Bjh3eHmUVp(lzH4BPP=)ohxNeE)wm&tKP;*t7*Gvq|`46Ht>3wmSGa1;Eg zQ1wp4*&gz-=L+SVoQ;uTi&MdozTI7tI?#58PX%nZiU}D|plx)c@|rl_vO7@$ z5AjJCHHZ|stNJEqw`VyUf8_|K{w=ilphh48->rIwV&V64jZ=}<$kd?qZ-S1wh$DCn=B4BZrnn!$mKX&TXf@Ba>h$`q;#CwVBeU6lqFwKu`-y>&;?X#zx`LqG$lDw4cxCG~Ij!EhU zT1D=088GY$>6#qOJH;uc1|6|9lgYEu+8jf+?4AcAU2;=wsx1#rhEdQtkzRRB2QQOS zMh9lS$c#oN#lpaAKduGqbh!W}KeE0+EdTq@+Ay4zyuT8j(=Za%MWL>Md3(TJrDol{ zsk<0;-_+;@bmTp|rob9zU29$VPG_dlelLS|kiyB>Uop5@Kta0LWQ~qC+XQG94OjqLjim z;qWdbfB*ru@AS@Cf zMtgT7ipk;QkFOMjP@5^`JhB-IVeyO&X&WZb2{=KAuJHUXgwT*sH0=e2F=n~5H^-`>mJxY7C@hm75CQrXRL9Z0Zxs13 zwN~o#JKh5|iLoU&-=!fTZ8Igwcz)V4?IyT_{5)W4s66m(UwEfOV1UB~Sg6IAb>5iw zL%?(oMLuPpxW$v2PdCj2S+b^J~UY-SJk=U@&(b2H{vQ{OD`jTHM zt-}NkxT+6WaMeed*m7|aZAC~&DQ%}(%l%=B2;V_1`J~)gTlZAQHm=R)7?m?MK9eZ~ zESyp3jXB)ZP$3_G+|%ttHl1`>)LRVjtA#?Ii4>)9E~bt4Y( zCob$mCx8wX8xX$oD1~P?TV$b~%5;K7x*D4{DWbYV{Nb`k0z;M<5Eaz^wQ=p)K%S+p z7Q+e6LG;^hd4+iV4ML4dlqjY2pvnT=8sBxrs~wIp@KZv$5pp)jm``FTqGH(}^r>}n z1apJ@@I*M6`*`EimK>LH@@kIQOXig|5S0vUpPac+exUk3ht%^QBTI!CB#{jmUwPKW z-#lciC>^CS%DC%yhLdt3<2?mtr1covc|W-6q2GAo=6W=5W46aAfh}Jlx*sEz#DlP> zj`#zgmy)9}%@9nnbQS5%l`G$R$YSg-{91p(6gn>(db+ z3Ef#=+R-Q&;=@H&&mw!(%SA9|XJ)b|=(R0xY*UdSds~d>LdZ*oY~OYtCYgz3K{+Hu z+LX~Deu*_XZ5<+;4G2O*vPOlkvWBSN2uJFT!yM^lZ9Imh^Js?>NHgS)T1gvg<{B5k*smP+7sN6z4nuzRTrQ|H z%z^z*!iVzn$-ix~R$g*s3Xe@Okle$WuHh?@11W(xAiVX0*1yo@lH#kW6mXFsKw5ndhE6WgAB|qiDE?dj9>dcJ7 zXQxY4e7C?YZQAQ;0XT9K0+Z7Way)gyKS81f5F;eZ-DiRo$x+&iD+yQ*Fw(GXlHkHkNPL zG$Fvs>hOQ86Xc&=mG)*{DTR=z1VkaLlVFZZ#-}LNW+1tEAuqMta#jpgvB3eQK2wwt z3z}~irP5x0xd# zJnM*qfLA&F&Fl|9QI!D!nD*}`+Ho`s&*swd3$oW9mh)TKyNeMF+V2A_5Es6X@g?h_YzJ zv;}e+`mxDEt^ZoxKemEl)t-E&qk6(mjf;%pD~0J0`Xo0|q&U5y)ck6Yu7?i_GcwZ2 zrVyEb(E{AOvAz+*&HX)5(}{Dx+HSO(w&{n&-| z*$Nd+P?m0o$Xk(X@{J>1LKYa6=D=bN2-xYA!w~GkXl`q0_C5*&>kSH(=wO3qA648{w^!Bo*Q+K zr^H&N6I&>o1sX~f=hlEtDH>b;3!O#h2@lu=zZwDhAl0B=*K7s(ToLBU;_}SlO9s7f zSvGZ6R1HiO10x==3ShX2|AGA%4WK9PM45IUjUgd#)Q%NNd+!sfbdKo#RN*^1l*5T1 zyAER!dPvnSGY^?;j8wlr8UOVSua_J}wlIQUNDn!!D7N)yx*$20lOs0A9Pd_7eG>Wd+^!Oz~rw*v(?vC1oj6l7Dy>|5Vv(h8F#5Z%jfuXcfq?$&_EX}_G--5D& z*lhGO;=)U=L%&_I;aGk8)5Wv*0yFkwfhrvDntI=pbVx@5t6BIDna-a#^3K-2SW~3owjC}P6#R<;d)|U@Vvayj-*q-INO;GIv z_C4%EGl;G-<%**5UWQG@KUa=w{my$AdUASy_cpd#YGHcqEN82A_<;jZ zagM#u%MMkMhaQ4~?)&;0{1xx@-upv>>3D$xvDQHPP*HHl3L_NB!S+@Rdo6sGhGoW0 z;~mP$f}w1)h0`xyRjuGfZLa}Y!f)@9ehc-9JBlLMEQ%4eaH|j6aKD8Dkrnbz!%ToL)i9FIL z{y@~o+f`Ft&EVu}d1M0WRL{uqLwv{b9)s%0W6yA7P>1-C$PJ-A+2nl3u%|i@mD(J+ zh59w79k)rBYdV}KCU>%P85u@=E?(Zi{h5bVFC1*%0aH@umZ67icDwPj03kc#2vIc+DajXWmQmo{TEbr6txFF2{kFe(yiQ7)75yZso?7t}r;CMb$ zL|qQ#Ts}#B@IU1dSk+oeM+O^c7*Z};=i&{g;@+#gscraqRx27p2nzIgw5(4l8lrr3 zXaYAVDo?35B`s^qQmT$c>uv5^&N%Oqqdsd-MeU^U;HwjczYG8+I*~eq(rl7z6$;Bl z2Uf#P>RP-D$&(T1n8V7j#}C}-9*IS0l3}~W-%{6^;>(I`E6hvgrQ03$FMu+_?6@IU zAg>WR#~YgkAt~_;9KJr^ZYM>&3b0rYVF24{{n{c@;*u5&AUzk>wv5vWsuvrH9#Oni zsk|I#ELxcd8pbwr5FTr5dBCfdK!*%~=Y$tUC3N^BE(Y1v0!rF;wue$2($xOL1@yTah#xoT)_{P!MN53<2SwWHt)kFG@UjeU3MdVDI2YNVZM5fj zw=vS0p9jlna=OLt2e5e%RrqLEr%+GTxk423@20VeW8UzWp~VO@Tqc#o$`wE?A!alD z_InUc_@t|!^`98I4P}A)OcnLUE5kwd?>lfe-&7}MVQJw=wkPbTYY`0-t*n&m`)BN7gD`S? zjFk4a=HL)1v9@5BV|~;v@II}S$P$wmFxfp^O|vnJS#3^X@wCikA(^AdLU%<->-EQ) zbj+aF)tV}UD^(9#PwG0JgrER6pYg^~A7F3lT8}eeKD)w9;W=T!{CQ?685K^s53RMr z)v?<1)RMM5`T|=*-xE&1?i|zZxDtZ;^*t0Y@i=wH%buibL`t&=EKz3|r4D3eGxX*w zdk}^vWU;EiPQpYf>`!9RaN*NV@F<+wPMnL0EIfn+lb4f>j%Z_Z#&L#M?7b#7b9q=C zA7_c{*s``|mkemj{CNq8vF0jX8kCZ*eFbt5Inw~a4mxRL0ju)I`os*Tf44* zIhg#~d`nSG@sK}g6JJ^Pz6jY`RhjQ6u@YDDAw$eJL>!E=C#e6<-S7YL+t8SZ+xP?} zRo75K^rpdM6~C)#yQ`PbbzaWYIr@c0M!CK!^daY5rdRbCce2o8&(Xq?o+?f&1cbyj zPTR!)oGwkB?+SD5ILd`L&#R`?s%r{?n8Y408@+CfP8_(g=-AVH>;ZJbbn}P$)D~%O zQ6~$6pU+|DYl`eI9`g{^9u>{2>h|*6LU#AR3L{lR4^UV*;gR>uQZ@ zadK9V1i0f=#6dC}5alS^;0MsyfjM{Zh{C}p5yvxg0zi8|Vq;SFyvmi;=K1+F4Qb`H z4O^<9-Q@uuA2S_8j5(e|?oxsXpUXKWw|W!=J6kw*^AR&6dJzLd9Gv;P4gt1zCY-S} zc^@#?xEdHU5Vwlgg%(5ctq}}dkxBTI C9`BOT%`%7k#R$hNAl_{Z?Ei=EJ8qxi; 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 IYYmgVAFTlIlE-Bdf)APHsa8Fej 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 Pgh7!&X=x)1W8gml%An0J literal 0 HcmV?d00001 diff --git a/documentation/docs/guide/core_concepts/consensus.md b/documentation/docs/guide/core_concepts/consensus.md index 503daa105a..91c381da68 100644 --- a/documentation/docs/guide/core_concepts/consensus.md +++ b/documentation/docs/guide/core_concepts/consensus.md @@ -49,5 +49,6 @@ The rest of the consensus algorithm is built on top of the ACS. Each node suppli It is ensured that all honest nodes have the same input for the VM. After running the selected batch, the VM results are then collectively signed using the threshold signature. The signed transaction can be published by any node at this point. In order to minimize the load on the IOTA network, the nodes calculate a delay for posting the transaction to the network based on a deterministic permutation of the nodes relative to the local perception of time. :::note -A more in-depth explanation of the topics described in this page can be found on the [architecture document](https://github.com/iotaledger/wasp/raw/master/documentation/ISCP%20architecture%20description%20v3.pdf) +The comprehensive overview of architectural design decisions of IOTA Smart Contracts can be found in the +[whitepaper](https://github.com/iotaledger/wasp/raw/master/documentation/ISC_WP_Nov_10_2021.pdf). ::: diff --git a/documentation/docs/guide/core_concepts/iscp-architecture.md b/documentation/docs/guide/core_concepts/iscp-architecture.md index 9e45fb2ba6..94203e4b6b 100644 --- a/documentation/docs/guide/core_concepts/iscp-architecture.md +++ b/documentation/docs/guide/core_concepts/iscp-architecture.md @@ -16,7 +16,7 @@ Each chain has its own state where a state update (going from one block to the n The multi-chain nature of ISCP makes it a more complex implementation of smart contracts, over say Ethereum, as illustrated here: -![ISCP multichain architecture](/img/multichain.png) +![ISCP multichain architecture](../../../static/img/multichain.png) -A full and extensive documentation of the IOTA Architecture describing all components in detail can be found in this -[technical description](https://github.com/iotaledger/wasp/raw/master/documentation/ISCP%20architecture%20description%20v3.pdf). +The comprehensive overview of architectural design decisions of IOTA Smart Contracts can be found in the +[whitepaper](https://github.com/iotaledger/wasp/raw/master/documentation/ISC_WP_Nov_10_2021.pdf). From 115debe0a39f40813c915590a5d06d5ec444bf8c Mon Sep 17 00:00:00 2001 From: Jorge Silva Date: Thu, 11 Nov 2021 09:49:29 +0000 Subject: [PATCH 060/198] chore: exclude documentation from automated testing --- .github/workflows/build-test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 8d05a8188f..f2715fce21 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -1,10 +1,11 @@ name: Test on: - push: - branches: [develop] pull_request: branches: [develop] + paths-ignore: + - 'documentation/**' + - 'temupdates/**' jobs: build: From 64200df9f1bdb101027a2ce4dbf27facacfdcbbc Mon Sep 17 00:00:00 2001 From: Jorge Silva Date: Thu, 11 Nov 2021 12:30:52 +0000 Subject: [PATCH 061/198] feat: cross-chain replay protection --- client/chainclient/chainclient.go | 2 +- packages/chain/chainimpl/chainimpl_test.go | 22 +++++ packages/chain/chainimpl/interface.go | 17 ++-- packages/chain/consensus/setup_test.go | 24 +++--- packages/chain/mempool/mempool.go | 39 +++------ packages/chain/mempool/mempool_test.go | 26 ++---- .../chain/messages/offledger_req_msg_test.go | 2 +- packages/iscp/request/request.go | 16 +++- packages/iscp/request/request_test.go | 2 +- packages/iscp/rotate/rotate.go | 4 +- packages/iscp/rotate/rotate_test.go | 4 +- packages/solo/req.go | 6 +- packages/testutil/dummyrequest.go | 19 +++++ packages/vm/core/blocklog/blocklog_test.go | 2 +- packages/webapi/request/request.go | 20 +++-- packages/webapi/request/request_test.go | 82 +++++++------------ tools/cluster/tests/missing_requests_test.go | 4 +- 17 files changed, 153 insertions(+), 138 deletions(-) create mode 100644 packages/chain/chainimpl/chainimpl_test.go create mode 100644 packages/testutil/dummyrequest.go diff --git a/client/chainclient/chainclient.go b/client/chainclient/chainclient.go index 6317221c1d..e2d9e70c9b 100644 --- a/client/chainclient/chainclient.go +++ b/client/chainclient/chainclient.go @@ -82,7 +82,7 @@ func (c *Client) PostOffLedgerRequest( c.nonces[c.KeyPair.PublicKey]++ par.Nonce = c.nonces[c.KeyPair.PublicKey] } - offledgerReq := request.NewOffLedger(contractHname, entrypoint, par.Args).WithTransfer(par.Transfer) + offledgerReq := request.NewOffLedger(c.ChainID, contractHname, entrypoint, par.Args).WithTransfer(par.Transfer) offledgerReq.WithNonce(par.Nonce) offledgerReq.Sign(c.KeyPair) return offledgerReq, c.WaspClient.PostOffLedgerRequest(c.ChainID, offledgerReq) diff --git a/packages/chain/chainimpl/chainimpl_test.go b/packages/chain/chainimpl/chainimpl_test.go new file mode 100644 index 0000000000..8670c53fe9 --- /dev/null +++ b/packages/chain/chainimpl/chainimpl_test.go @@ -0,0 +1,22 @@ +package chainimpl + +import ( + "testing" + + "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/testutil" + "github.com/stretchr/testify/require" +) + +func TestValidateOffledger(t *testing.T) { + c := &chainObj{ + chainID: iscp.RandomChainID(), + } + req := testutil.DummyOffledgerRequest(c.chainID) + require.True(t, c.isRequestValid(req)) + req.WithNonce(999) // signature must be invalid after request content changes + require.False(t, c.isRequestValid(req)) + + wrongChainReq := testutil.DummyOffledgerRequest(iscp.RandomChainID()) + require.False(t, c.isRequestValid(wrongChainReq)) +} diff --git a/packages/chain/chainimpl/interface.go b/packages/chain/chainimpl/interface.go index 8638465d93..4fb64c0933 100644 --- a/packages/chain/chainimpl/interface.go +++ b/packages/chain/chainimpl/interface.go @@ -154,9 +154,19 @@ func (c *chainObj) broadcastOffLedgerRequest(req *request.OffLedger) { }() } +func (c *chainObj) isRequestValid(req *request.OffLedger) bool { + return req.ChainID().Equals(c.ID()) && req.VerifySignature() +} + func (c *chainObj) ReceiveOffLedgerRequest(req *request.OffLedger, senderNetID string) { c.log.Debugf("ReceiveOffLedgerRequest: reqID: %s, peerID: %s", req.ID().Base58(), senderNetID) c.sendRequestAcknowledgementMsg(req.ID(), senderNetID) + + if !c.isRequestValid(req) { + // this means some node broadcasted an invalid request (bad chainID or signature) + // TODO should the sender node be punished somehow? + return + } if !c.mempool.ReceiveRequest(req) { return } @@ -200,18 +210,13 @@ func (c *chainObj) ReceiveTransaction(tx *ledgerstate.Transaction) { return } for _, req := range reqs { - c.ReceiveRequest(req) + c.mempool.ReceiveRequest(req) } if chainOut := transaction.GetAliasOutput(tx, c.chainID.AsAddress()); chainOut != nil { c.ReceiveState(chainOut, tx.Essence().Timestamp()) } } -func (c *chainObj) ReceiveRequest(req iscp.Request) { - c.log.Debugf("ReceiveRequest: %s", req.ID()) - c.mempool.ReceiveRequests(req) -} - func (c *chainObj) ReceiveState(stateOutput *ledgerstate.AliasOutput, timestamp time.Time) { c.log.Debugf("ReceiveState #%d: outputID: %s, stateAddr: %s", stateOutput.GetStateIndex(), iscp.OID(stateOutput.ID()), stateOutput.GetStateAddress().Base58()) diff --git a/packages/chain/consensus/setup_test.go b/packages/chain/consensus/setup_test.go index 58a6aa3f87..bebac75dab 100644 --- a/packages/chain/consensus/setup_test.go +++ b/packages/chain/consensus/setup_test.go @@ -12,9 +12,6 @@ import ( "testing" "time" - "github.com/iotaledger/wasp/packages/iscp/colored" - "github.com/iotaledger/wasp/packages/metrics" - "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/goshimmer/packages/ledgerstate/utxodb" "github.com/iotaledger/goshimmer/packages/ledgerstate/utxoutil" @@ -28,8 +25,11 @@ import ( "github.com/iotaledger/wasp/packages/chain/messages" "github.com/iotaledger/wasp/packages/hashing" "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/iscp/colored" "github.com/iotaledger/wasp/packages/iscp/coreutil" + "github.com/iotaledger/wasp/packages/iscp/request" "github.com/iotaledger/wasp/packages/kv" + "github.com/iotaledger/wasp/packages/metrics" "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/registry" "github.com/iotaledger/wasp/packages/solo" @@ -432,22 +432,20 @@ func (env *MockedEnv) WaitForEventFromNodesQuorum(waitName string, quorum int, i } func (env *MockedEnv) PostDummyRequests(n int, randomize ...bool) { - reqs := make([]iscp.Request, n) + reqs := make([]*request.OffLedger, n) for i := 0; i < n; i++ { reqs[i] = solo.NewCallParams("dummy", "dummy", "c", i). - NewRequestOffLedger(env.OriginatorKeyPair) + NewRequestOffLedger(iscp.RandomChainID(), env.OriginatorKeyPair) } rnd := len(randomize) > 0 && randomize[0] for _, n := range env.Nodes { - if rnd { - for _, req := range reqs { - go func(node *mockedNode, r iscp.Request) { + for _, req := range reqs { + go func(node *mockedNode, r *request.OffLedger) { + if rnd { time.Sleep(time.Duration(rand.Intn(50)) * time.Millisecond) - node.Mempool.ReceiveRequests(r) - }(n, req) - } - } else { - n.Mempool.ReceiveRequests(reqs...) + } + node.Mempool.ReceiveRequest(r) + }(n, req) } } } diff --git a/packages/chain/mempool/mempool.go b/packages/chain/mempool/mempool.go index 7110585881..15f2978935 100644 --- a/packages/chain/mempool/mempool.go +++ b/packages/chain/mempool/mempool.go @@ -106,13 +106,6 @@ func (m *Mempool) takeInBuffer(buf []iscp.Request) []iscp.Request { // addToPool adds request to the pool. It may fail // returns true if it must be removed from the input buffer func (m *Mempool) addToPool(req iscp.Request) bool { - if offLedgerReq, ok := req.(*request.OffLedger); ok { - if !offLedgerReq.VerifySignature() { - // wrong signature, must be removed from in buffer - m.log.Warnf("ReceiveRequest.VerifySignature: invalid signature") - return true - } - } reqid := req.ID() // checking in the state if request is processed. Reading may fail @@ -152,37 +145,29 @@ func (m *Mempool) addToPool(req iscp.Request) bool { return true } +func (m *Mempool) countRequestInMetrics(req iscp.Request) { + // TODO refactor, this should be part of metrics logic. + if req.IsOffLedger() { + m.mempoolMetrics.CountOffLedgerRequestIn() + } else { + m.mempoolMetrics.CountOnLedgerRequestIn() + } +} + // ReceiveRequests places requests into the inBuffer. InBuffer is unordered and non-deterministic func (m *Mempool) ReceiveRequests(reqs ...iscp.Request) { for _, req := range reqs { - if req.IsOffLedger() { - m.mempoolMetrics.CountOffLedgerRequestIn() - } else { - m.mempoolMetrics.CountOnLedgerRequestIn() - } + m.countRequestInMetrics(req) m.addToInBuffer(req) } } -// ReceiveRequest used to receive off-ledger request +// ReceiveRequest receives a single request and returns whether that request has been added to the in-buffer func (m *Mempool) ReceiveRequest(req iscp.Request) bool { - // could be worth it to check if the request was already processed in the blocklog. - // Not adding this check now to avoid overhead, but should be looked into in case re-gossiping happens a lot - if m.checkInBuffer(req) { - return false - } - m.mempoolMetrics.CountOffLedgerRequestIn() + m.countRequestInMetrics(req) return m.addToInBuffer(req) } -func (m *Mempool) checkInBuffer(req iscp.Request) bool { - m.inMutex.RLock() - defer m.inMutex.RUnlock() - - _, exists := m.inBuffer[req.ID()] - return exists -} - // RemoveRequests removes requests from the pool func (m *Mempool) RemoveRequests(reqs ...iscp.RequestID) { m.poolMutex.Lock() diff --git a/packages/chain/mempool/mempool_test.go b/packages/chain/mempool/mempool_test.go index 2a8d71edf7..ad8fe8eb61 100644 --- a/packages/chain/mempool/mempool_test.go +++ b/packages/chain/mempool/mempool_test.go @@ -5,6 +5,7 @@ import ( "time" "github.com/iotaledger/wasp/packages/iscp/colored" + "go.uber.org/zap/zapcore" "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/goshimmer/packages/ledgerstate/utxodb" @@ -25,7 +26,6 @@ import ( "github.com/iotaledger/wasp/packages/vm/core/blocklog" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.uber.org/zap/zapcore" ) func createStateReader(t *testing.T, glb coreutil.ChainStateSync) (state.OptimisticStateReader, state.VirtualStateAccess) { @@ -183,8 +183,7 @@ func TestAddRequestTwice(t *testing.T) { require.EqualValues(t, 1, stats.ReadyCounter) } -// Test if adding off ledger requests works as expected: correctly signed ones -// are added, others are ignored +// Test if adding off ledger requests works as expected func TestAddOffLedgerRequest(t *testing.T) { log := testlogger.NewLogger(t) testlogger.WithLevel(log, zapcore.InfoLevel, false) @@ -197,31 +196,20 @@ func TestAddOffLedgerRequest(t *testing.T) { offFromOnLedgerFun := func(onLedger *request.OnLedger) *request.OffLedger { target := onLedger.Target() - return request.NewOffLedger(target.Contract, target.EntryPoint, onLedger.GetMetadata().Args()) + return request.NewOffLedger(iscp.RandomChainID(), target.Contract, target.EntryPoint, onLedger.GetMetadata().Args()) } - offLedgerRequestUnsigned := offFromOnLedgerFun(onLedgerRequests[0]) offLedgerRequestSigned := offFromOnLedgerFun(onLedgerRequests[1]) offLedgerRequestSigned.Sign(keyPair) - require.NotEqual(t, offLedgerRequestUnsigned.ID(), offLedgerRequestSigned.ID()) require.EqualValues(t, 0, mempoolMetrics.offLedgerRequestCounter) - pool.ReceiveRequests(offLedgerRequestUnsigned) - require.False(t, pool.WaitRequestInPool(offLedgerRequestUnsigned.ID(), 200*time.Millisecond)) - stats := pool.Info() - require.EqualValues(t, 0, stats.InPoolCounter) - require.EqualValues(t, 0, stats.OutPoolCounter) - require.EqualValues(t, 0, stats.TotalPool) - require.EqualValues(t, 0, stats.ReadyCounter) - require.EqualValues(t, 1, mempoolMetrics.offLedgerRequestCounter) - pool.ReceiveRequests(offLedgerRequestSigned) require.True(t, pool.WaitRequestInPool(offLedgerRequestSigned.ID(), 200*time.Millisecond)) - stats = pool.Info() + stats := pool.Info() require.EqualValues(t, 1, stats.InPoolCounter) require.EqualValues(t, 0, stats.OutPoolCounter) require.EqualValues(t, 1, stats.TotalPool) require.EqualValues(t, 1, stats.ReadyCounter) - require.EqualValues(t, 2, mempoolMetrics.offLedgerRequestCounter) + require.EqualValues(t, 1, mempoolMetrics.offLedgerRequestCounter) } // Test if processed request cannot be added to mempool @@ -623,10 +611,10 @@ func TestRotateRequest(t *testing.T) { require.True(t, len(ready) == 5) kp, addr := testkey.GenKeyAddr() - rotateReq := rotate.NewRotateRequestOffLedger(addr, kp) + rotateReq := rotate.NewRotateRequestOffLedger(iscp.RandomChainID(), addr, kp) require.True(t, rotate.IsRotateStateControllerRequest(rotateReq)) - pool.ReceiveRequests(rotateReq) + pool.ReceiveRequest(rotateReq) require.True(t, pool.WaitRequestInPool(rotateReq.ID())) require.True(t, pool.HasRequest(rotateReq.ID())) diff --git a/packages/chain/messages/offledger_req_msg_test.go b/packages/chain/messages/offledger_req_msg_test.go index 03dd3e4c87..0d8ea7f9d2 100644 --- a/packages/chain/messages/offledger_req_msg_test.go +++ b/packages/chain/messages/offledger_req_msg_test.go @@ -26,7 +26,7 @@ func TestMarshalling(t *testing.T) { msg := NewOffLedgerRequestMsg( iscp.RandomChainID(), - request.NewOffLedger(contract, entrypoint, args), + request.NewOffLedger(iscp.RandomChainID(), contract, entrypoint, args), ) // marshall the msg diff --git a/packages/iscp/request/request.go b/packages/iscp/request/request.go index b13e9683f3..702bf18265 100644 --- a/packages/iscp/request/request.go +++ b/packages/iscp/request/request.go @@ -390,6 +390,7 @@ func (req *OnLedger) String() string { type OffLedger struct { args requestargs.RequestArgs + chainID *iscp.ChainID contract iscp.Hname entryPoint iscp.Hname params atomic.Value // mutable @@ -404,8 +405,9 @@ type OffLedger struct { var _ iscp.Request = &OffLedger{} // NewOffLedger creates a basic request -func NewOffLedger(contract, entryPoint iscp.Hname, args requestargs.RequestArgs) *OffLedger { +func NewOffLedger(chainID *iscp.ChainID, contract, entryPoint iscp.Hname, args requestargs.RequestArgs) *OffLedger { return &OffLedger{ + chainID: chainID, args: args.Clone(), contract: contract, entryPoint: entryPoint, @@ -448,7 +450,8 @@ func (req *OffLedger) readFromMarshalUtil(mu *marshalutil.MarshalUtil) error { } func (req *OffLedger) writeEssenceToMarshalUtil(mu *marshalutil.MarshalUtil) { - mu.Write(req.contract). + mu.Write(req.chainID). + Write(req.contract). Write(req.entryPoint). Write(req.args). WriteBytes(req.publicKey[:]). @@ -457,6 +460,11 @@ func (req *OffLedger) writeEssenceToMarshalUtil(mu *marshalutil.MarshalUtil) { } func (req *OffLedger) readEssenceFromMarshalUtil(mu *marshalutil.MarshalUtil) error { + var err error + if req.chainID, err = iscp.ChainIDFromMarshalUtil(mu); err != nil { + return err + } + if err := req.contract.ReadFromMarshalUtil(mu); err != nil { return err } @@ -522,6 +530,10 @@ func (req *OffLedger) ID() (requestID iscp.RequestID) { return iscp.RequestID(ledgerstate.NewOutputID(txid, 0)) } +func (req *OffLedger) ChainID() (chainID *iscp.ChainID) { + return req.chainID +} + // IsFeePrepaid always true for off-ledger func (req *OffLedger) IsFeePrepaid() bool { return true diff --git a/packages/iscp/request/request_test.go b/packages/iscp/request/request_test.go index 50fd190a3b..bc5c47f346 100644 --- a/packages/iscp/request/request_test.go +++ b/packages/iscp/request/request_test.go @@ -90,7 +90,7 @@ func TestOffLedger(t *testing.T) { target := iscp.Hn("target") ep := iscp.Hn("entry point") args := requestargs.New() - req := NewOffLedger(target, ep, args) + req := NewOffLedger(iscp.RandomChainID(), target, ep, args) reqBack, err := FromMarshalUtil(marshalutil.New(req.Bytes())) require.NoError(t, err) _, ok := reqBack.(*OffLedger) diff --git a/packages/iscp/rotate/rotate.go b/packages/iscp/rotate/rotate.go index 534f70f189..3a29c2fa24 100644 --- a/packages/iscp/rotate/rotate.go +++ b/packages/iscp/rotate/rotate.go @@ -21,10 +21,10 @@ func IsRotateStateControllerRequest(req iscp.Request) bool { return target.Contract == coreutil.CoreContractGovernanceHname && target.EntryPoint == coreutil.CoreEPRotateStateControllerHname } -func NewRotateRequestOffLedger(newStateAddress ledgerstate.Address, keyPair *ed25519.KeyPair) iscp.Request { +func NewRotateRequestOffLedger(chainID *iscp.ChainID, newStateAddress ledgerstate.Address, keyPair *ed25519.KeyPair) *request.OffLedger { args := requestargs.New(nil) args.AddEncodeSimple(coreutil.ParamStateControllerAddress, codec.EncodeAddress(newStateAddress)) - ret := request.NewOffLedger(coreutil.CoreContractGovernanceHname, coreutil.CoreEPRotateStateControllerHname, args) + ret := request.NewOffLedger(chainID, coreutil.CoreContractGovernanceHname, coreutil.CoreEPRotateStateControllerHname, args) ret.Sign(keyPair) return ret } diff --git a/packages/iscp/rotate/rotate_test.go b/packages/iscp/rotate/rotate_test.go index 91f7720d99..256a328cde 100644 --- a/packages/iscp/rotate/rotate_test.go +++ b/packages/iscp/rotate/rotate_test.go @@ -3,13 +3,13 @@ package rotate import ( "testing" + "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/testutil/testkey" - "github.com/stretchr/testify/require" ) func TestBasicRotateRequest(t *testing.T) { kp, addr := testkey.GenKeyAddr() - req := NewRotateRequestOffLedger(addr, kp) + req := NewRotateRequestOffLedger(iscp.RandomChainID(), addr, kp) require.True(t, IsRotateStateControllerRequest(req)) } diff --git a/packages/solo/req.go b/packages/solo/req.go index 257e73be87..76e3a11b56 100644 --- a/packages/solo/req.go +++ b/packages/solo/req.go @@ -101,8 +101,8 @@ func (r *CallParams) WithMint(targetAddress ledgerstate.Address, amount uint64) } // NewRequestOffLedger creates off-ledger request from parameters -func (r *CallParams) NewRequestOffLedger(keyPair *ed25519.KeyPair) *request.OffLedger { - ret := request.NewOffLedger(r.target, r.entryPoint, r.args).WithTransfer(r.transfer) +func (r *CallParams) NewRequestOffLedger(chainID *iscp.ChainID, keyPair *ed25519.KeyPair) *request.OffLedger { + ret := request.NewOffLedger(chainID, r.target, r.entryPoint, r.args).WithTransfer(r.transfer) ret.Sign(keyPair) return ret } @@ -212,7 +212,7 @@ func (ch *Chain) PostRequestOffLedger(req *CallParams, keyPair *ed25519.KeyPair) if keyPair == nil { keyPair = ch.OriginatorKeyPair } - r := req.NewRequestOffLedger(keyPair) + r := req.NewRequestOffLedger(ch.ChainID, keyPair) res, err := ch.runRequestsSync([]iscp.Request{r}, "off-ledger") if err != nil { return nil, err diff --git a/packages/testutil/dummyrequest.go b/packages/testutil/dummyrequest.go new file mode 100644 index 0000000000..1034ac6bdd --- /dev/null +++ b/packages/testutil/dummyrequest.go @@ -0,0 +1,19 @@ +package testutil + +import ( + "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/iscp/request" + "github.com/iotaledger/wasp/packages/iscp/requestargs" + "github.com/iotaledger/wasp/packages/kv/dict" + "github.com/iotaledger/wasp/packages/testutil/testkey" +) + +func DummyOffledgerRequest(chainID *iscp.ChainID) *request.OffLedger { + contract := iscp.Hn("somecontract") + entrypoint := iscp.Hn("someentrypoint") + args := requestargs.New(dict.Dict{}) + req := request.NewOffLedger(chainID, contract, entrypoint, args) + keys, _ := testkey.GenKeyAddr() + req.Sign(keys) + return req +} diff --git a/packages/vm/core/blocklog/blocklog_test.go b/packages/vm/core/blocklog/blocklog_test.go index b8cd3e72cf..3a97b9fbf0 100644 --- a/packages/vm/core/blocklog/blocklog_test.go +++ b/packages/vm/core/blocklog/blocklog_test.go @@ -13,7 +13,7 @@ import ( func TestSerdeRequestLogRecord(t *testing.T) { var txid ledgerstate.TransactionID rand.Read(txid[:]) - req := request.NewOffLedger(iscp.Hn("0"), iscp.Hn("0"), nil) + req := request.NewOffLedger(iscp.RandomChainID(), iscp.Hn("0"), iscp.Hn("0"), nil) rec := &RequestReceipt{ Request: req, Error: "some log data", diff --git a/packages/webapi/request/request.go b/packages/webapi/request/request.go index fb9bd3d377..32da20a43b 100644 --- a/packages/webapi/request/request.go +++ b/packages/webapi/request/request.go @@ -67,23 +67,30 @@ func (o *offLedgerReqAPI) handleNewRequest(c echo.Context) error { return err } + reqID := offLedgerReq.ID() + + if o.requestsCache.Get(reqID) != nil { + return httperrors.BadRequest("request already processed") + } + // check req signature if !offLedgerReq.VerifySignature() { + o.requestsCache.Set(reqID, true) return httperrors.BadRequest("Invalid signature.") } + // check req is for the correct chain + if !offLedgerReq.ChainID().Equals(chainID) { + // do not add to cache, it can still be sent to the correct chain + return httperrors.BadRequest("Request is for a different chain") + } + // check chain exists ch := o.getChain(chainID) if ch == nil { return httperrors.NotFound(fmt.Sprintf("Unknown chain: %s", chainID.Base58())) } - reqID := offLedgerReq.ID() - - if o.requestsCache.Get(reqID) != nil { - return httperrors.BadRequest("request already processed") - } - alreadyProcessed, err := o.hasRequestBeenProcessed(ch, reqID) if err != nil { o.log.Errorf("webapi.offledger - check if already processed: %w", err) @@ -91,6 +98,7 @@ func (o *offLedgerReqAPI) handleNewRequest(c echo.Context) error { } if alreadyProcessed { + o.requestsCache.Set(reqID, true) return httperrors.BadRequest("request already processed") } diff --git a/packages/webapi/request/request_test.go b/packages/webapi/request/request_test.go index 1924ea0e91..08ce7ff381 100644 --- a/packages/webapi/request/request_test.go +++ b/packages/webapi/request/request_test.go @@ -11,11 +11,8 @@ import ( "github.com/iotaledger/wasp/packages/chains" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/colored" - "github.com/iotaledger/wasp/packages/iscp/request" - "github.com/iotaledger/wasp/packages/iscp/requestargs" - "github.com/iotaledger/wasp/packages/kv/dict" + util "github.com/iotaledger/wasp/packages/testutil" "github.com/iotaledger/wasp/packages/testutil/testchain" - "github.com/iotaledger/wasp/packages/testutil/testkey" "github.com/iotaledger/wasp/packages/testutil/testlogger" "github.com/iotaledger/wasp/packages/util/expiringcache" "github.com/iotaledger/wasp/packages/webapi/model" @@ -77,72 +74,53 @@ func hasRequestBeenProcessedMocked(ret bool) hasRequestBeenProcessedFn { } } -func dummyOffledgerRequest() *request.OffLedger { - contract := iscp.Hn("somecontract") - entrypoint := iscp.Hn("someentrypoint") - args := requestargs.New(dict.Dict{}) - req := request.NewOffLedger(contract, entrypoint, args) - keys, _ := testkey.GenKeyAddr() - req.Sign(keys) - return req -} - -func TestNewRequestBase64(t *testing.T) { - instance := &offLedgerReqAPI{ +func newMockedAPI(t *testing.T) *offLedgerReqAPI { + return &offLedgerReqAPI{ getChain: createMockedGetChain(t), getAccountBalance: getAccountBalanceMocked, hasRequestBeenProcessed: hasRequestBeenProcessedMocked(false), requestsCache: expiringcache.New(10 * time.Second), } +} +func testRequest(t *testing.T, instance *offLedgerReqAPI, chainID *iscp.ChainID, body interface{}, expectedStatus int) { testutil.CallWebAPIRequestHandler( t, instance.handleNewRequest, http.MethodPost, routes.NewRequest(":chainID"), - map[string]string{"chainID": iscp.RandomChainID().Base58()}, - model.OffLedgerRequestBody{Request: model.NewBytes(dummyOffledgerRequest().Bytes())}, + map[string]string{"chainID": chainID.Base58()}, + body, nil, - http.StatusAccepted, + expectedStatus, ) } -func TestNewRequestBinary(t *testing.T) { - instance := &offLedgerReqAPI{ - getChain: createMockedGetChain(t), - getAccountBalance: getAccountBalanceMocked, - hasRequestBeenProcessed: hasRequestBeenProcessedMocked(false), - requestsCache: expiringcache.New(10 * time.Second), - } +func TestNewRequestBase64(t *testing.T) { + instance := newMockedAPI(t) + chainID := iscp.RandomChainID() + body := model.OffLedgerRequestBody{Request: model.NewBytes(util.DummyOffledgerRequest(chainID).Bytes())} + testRequest(t, instance, chainID, body, http.StatusAccepted) +} - testutil.CallWebAPIRequestHandler( - t, - instance.handleNewRequest, - http.MethodPost, - routes.NewRequest(":chainID"), - map[string]string{"chainID": iscp.RandomChainID().Base58()}, - dummyOffledgerRequest().Bytes(), - nil, - http.StatusAccepted, - ) +func TestNewRequestBinary(t *testing.T) { + instance := newMockedAPI(t) + chainID := iscp.RandomChainID() + body := util.DummyOffledgerRequest(chainID).Bytes() + testRequest(t, instance, chainID, body, http.StatusAccepted) } func TestRequestAlreadyProcessed(t *testing.T) { - instance := &offLedgerReqAPI{ - getChain: createMockedGetChain(t), - getAccountBalance: getAccountBalanceMocked, - hasRequestBeenProcessed: hasRequestBeenProcessedMocked(true), - requestsCache: expiringcache.New(10 * time.Second), - } + instance := newMockedAPI(t) + instance.hasRequestBeenProcessed = hasRequestBeenProcessedMocked(true) - testutil.CallWebAPIRequestHandler( - t, - instance.handleNewRequest, - http.MethodPost, - routes.NewRequest(":chainID"), - map[string]string{"chainID": iscp.RandomChainID().Base58()}, - dummyOffledgerRequest().Bytes(), - nil, - http.StatusBadRequest, - ) + chainID := iscp.RandomChainID() + body := util.DummyOffledgerRequest(chainID).Bytes() + testRequest(t, instance, chainID, body, http.StatusBadRequest) +} + +func TestWrongChainID(t *testing.T) { + instance := newMockedAPI(t) + body := util.DummyOffledgerRequest(iscp.RandomChainID()).Bytes() + testRequest(t, instance, iscp.RandomChainID(), body, http.StatusBadRequest) } diff --git a/tools/cluster/tests/missing_requests_test.go b/tools/cluster/tests/missing_requests_test.go index d774fcd6d5..ab2375d160 100644 --- a/tools/cluster/tests/missing_requests_test.go +++ b/tools/cluster/tests/missing_requests_test.go @@ -47,7 +47,7 @@ func TestMissingRequests(t *testing.T) { require.NoError(t, err) // send off-ledger request to all nodes except #3 - req := request.NewOffLedger(incCounterSCHname, inccounter.FuncIncCounter.Hname(), requestargs.RequestArgs{}) //.WithTransfer(par.Tokens) + req := request.NewOffLedger(chainID, incCounterSCHname, inccounter.FuncIncCounter.Hname(), requestargs.RequestArgs{}) //.WithTransfer(par.Tokens) req.Sign(userWallet) err = clu.WaspClient(0).PostOffLedgerRequest(chainID, req) @@ -63,7 +63,7 @@ func TestMissingRequests(t *testing.T) { //------ // send a dummy request to node #3, so that it proposes a batch and the consensus hang is broken - req2 := request.NewOffLedger(iscp.Hn("foo"), iscp.Hn("bar"), nil) + req2 := request.NewOffLedger(chainID, iscp.Hn("foo"), iscp.Hn("bar"), nil) req2.Sign(userWallet) err = clu.WaspClient(3).PostOffLedgerRequest(chainID, req2) require.NoError(t, err) From 4047dcedeafecb14be6f05fd6c31a9f518a2750d Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Thu, 11 Nov 2021 19:04:16 +0200 Subject: [PATCH 062/198] Peering refactor. Work in progress. --- packages/peering/domain/domain.go | 49 +++---- packages/peering/group/group.go | 54 ++++--- packages/peering/lpp/lppNetImpl.go | 47 ++++--- packages/peering/lpp/lppPeer.go | 26 ++-- packages/peering/peer_message.go | 124 ++++++++++++++++ packages/peering/peering.go | 218 ++--------------------------- packages/peering/peering_id.go | 49 +++++++ packages/peering/trusted_peer.go | 57 ++++++++ 8 files changed, 332 insertions(+), 292 deletions(-) create mode 100644 packages/peering/peer_message.go create mode 100644 packages/peering/peering_id.go create mode 100644 packages/peering/trusted_peer.go diff --git a/packages/peering/domain/domain.go b/packages/peering/domain/domain.go index ac042635a2..50106192ac 100644 --- a/packages/peering/domain/domain.go +++ b/packages/peering/domain/domain.go @@ -4,7 +4,6 @@ import ( "crypto/rand" "sort" "sync" - "time" "github.com/iotaledger/hive.go/logger" "github.com/iotaledger/wasp/packages/peering" @@ -12,7 +11,6 @@ import ( ) type DomainImpl struct { - attachedTo peering.PeeringID netProvider peering.NetworkProvider nodes map[string]peering.PeerSender permutation *util.Permutation16 @@ -21,6 +19,8 @@ type DomainImpl struct { mutex *sync.RWMutex } +var _ peering.PeerDomainProvider = &DomainImpl{} + // NewPeerDomain creates a collection. Ignores self func NewPeerDomain(netProvider peering.NetworkProvider, initialNodes []peering.PeerSender, log *logger.Logger) *DomainImpl { ret := &DomainImpl{ @@ -53,7 +53,7 @@ func NewPeerDomainByNetIDs(netProvider peering.NetworkProvider, peerNetIDs []str return NewPeerDomain(netProvider, peers, log), nil } -func (d *DomainImpl) SendMsgByNetID(netID string, msg *peering.PeerMessage) { +func (d *DomainImpl) SendMsgByNetID(netID string, msg *peering.PeerMessageData) { d.mutex.RLock() defer d.mutex.RUnlock() peer, ok := d.nodes[netID] @@ -61,19 +61,10 @@ func (d *DomainImpl) SendMsgByNetID(netID string, msg *peering.PeerMessage) { d.log.Warnf("SendMsgByNetID: NetID %v is not in the domain", netID) return } - peer.SendMsg(msg) + peer.SendMsg(&peering.PeerMessageNet{PeerMessageData: *msg}) } -func (d *DomainImpl) SendSimple(netID string, msgType byte, msgData []byte) { - d.SendMsgByNetID(netID, &peering.PeerMessage{ - PeeringID: d.attachedTo, - Timestamp: time.Now().UnixNano(), - MsgType: msgType, - MsgData: msgData, - }) -} - -func (d *DomainImpl) SendMsgToRandomPeers(upToNumPeers uint16, msg *peering.PeerMessage) { +func (d *DomainImpl) SendMsgToRandomPeers(upToNumPeers uint16, msg *peering.PeerMessageData) { d.mutex.RLock() defer d.mutex.RUnlock() @@ -85,15 +76,6 @@ func (d *DomainImpl) SendMsgToRandomPeers(upToNumPeers uint16, msg *peering.Peer } } -func (d *DomainImpl) SendMsgToRandomPeersSimple(upToNumPeers uint16, msgType byte, msgData []byte) { - d.SendMsgToRandomPeers(upToNumPeers, &peering.PeerMessage{ - PeeringID: d.attachedTo, - Timestamp: time.Now().UnixNano(), - MsgType: msgType, - MsgData: msgData, - }) -} - func (d *DomainImpl) GetRandomPeers(upToNumPeers int) []string { d.mutex.RLock() defer d.mutex.RUnlock() @@ -157,17 +139,20 @@ func (d *DomainImpl) reshufflePeers(seedBytes ...[]byte) { d.permutation.Shuffle(seedB) } -func (d *DomainImpl) Attach(peeringID *peering.PeeringID, callback func(recv *peering.RecvEvent)) interface{} { - d.attachedTo = *peeringID - return d.netProvider.Attach(peeringID, func(recv *peering.RecvEvent) { - peer, ok := d.nodes[recv.From.NetID()] - if ok && peer.NetID() != d.netProvider.Self().NetID() { - recv.Msg.SenderNetID = peer.NetID() - callback(recv) +func (d *DomainImpl) Attach(peeringID *peering.PeeringID, receiver byte, callback func(recv *peering.PeerMessageIn)) interface{} { + return d.netProvider.Attach(peeringID, receiver, func(recv *peering.PeerMessageIn) { + if recv.SenderNetID == d.netProvider.Self().NetID() { + d.log.Warnf("dropping message for receiver=%v MsgType=%v from %v: message from self.", + recv.MsgReceiver, recv.MsgType, recv.SenderNetID) + return + } + _, ok := d.nodes[recv.SenderNetID] + if !ok { + d.log.Warnf("dropping message for receiver=%v MsgType=%v from %v: it does not belong to the peer domain.", + recv.MsgReceiver, recv.MsgType, recv.SenderNetID) return } - d.log.Warnf("dropping message MsgType=%v from %v, it does not belong to the peer domain.", - recv.Msg.MsgType, recv.From.NetID()) + callback(recv) }) } diff --git a/packages/peering/group/group.go b/packages/peering/group/group.go index 38b4e43099..10d32aa31b 100644 --- a/packages/peering/group/group.go +++ b/packages/peering/group/group.go @@ -27,6 +27,8 @@ type groupImpl struct { log *logger.Logger } +var _ peering.GroupProvider = &groupImpl{} + // NewPeeringGroupProvider creates a generic peering group. // That should be used as a helper for peering implementations. func NewPeeringGroupProvider(netProvider peering.NetworkProvider, nodes []peering.PeerSender, log *logger.Logger) (peering.GroupProvider, error) { @@ -74,12 +76,12 @@ func (g *groupImpl) PeerIndexByNetID(peerNetID string) (uint16, error) { } // SendMsgByIndex implements peering.GroupProvider. -func (g *groupImpl) SendMsgByIndex(peerIdx uint16, msg *peering.PeerMessage) { - g.nodes[peerIdx].SendMsg(msg) +func (g *groupImpl) SendMsgByIndex(peerIdx uint16, msg *peering.PeerMessageData) { + g.nodes[peerIdx].SendMsg(&peering.PeerMessageNet{PeerMessageData: *msg}) } // Broadcast implements peering.GroupProvider. -func (g *groupImpl) Broadcast(msg *peering.PeerMessage, includingSelf bool, except ...uint16) { +func (g *groupImpl) SendMsgBroadcast(msg *peering.PeerMessageData, includingSelf bool, except ...uint16) { var peers map[uint16]peering.PeerSender if includingSelf { peers = g.AllNodes(except...) @@ -87,7 +89,7 @@ func (g *groupImpl) Broadcast(msg *peering.PeerMessage, includingSelf bool, exce peers = g.OtherNodes(except...) } for i := range peers { - peers[i].SendMsg(msg) + g.SendMsgByIndex(i, msg) } } @@ -95,11 +97,11 @@ func (g *groupImpl) Broadcast(msg *peering.PeerMessage, includingSelf bool, exce // Resends the messages if acks are not received for some time. func (g *groupImpl) ExchangeRound( peers map[uint16]peering.PeerSender, - recvCh chan *peering.RecvEvent, + recvCh chan *peering.PeerMessageGroupIn, retryTimeout time.Duration, giveUpTimeout time.Duration, sendCB func(peerIdx uint16, peer peering.PeerSender), - recvCB func(recv *peering.RecvEvent) (bool, error), + recvCB func(recv *peering.PeerMessageGroupIn) (bool, error), ) error { var err error acks := make(map[uint16]bool) @@ -124,29 +126,29 @@ func (g *groupImpl) ExchangeRound( if !ok { return errors.New("recv_channel_closed") } - if recvMsg.Msg.SenderIndex, err = g.PeerIndex(recvMsg.From); err != nil { + /*if recvMsg.Msg.SenderIndex, err = g.PeerIndex(recvMsg.From); err != nil { g.log.Warnf( "Dropping message %v -> %v, MsgType=%v because of %v", recvMsg.From.NetID(), g.netProvider.Self().NetID(), recvMsg.Msg.MsgType, err, ) continue - } - if acks[recvMsg.Msg.SenderIndex] { // Only consider first successful message. + }*/ + if acks[recvMsg.SenderIndex] { // Only consider first successful message. g.log.Warnf( - "Dropping duplicate message %v -> %v, MsgType=%v", - recvMsg.From.NetID(), g.netProvider.Self().NetID(), - recvMsg.Msg.MsgType, + "Dropping duplicate message %v -> %v, receiver=%v, MsgType=%v", + recvMsg.SenderNetID, g.netProvider.Self().NetID(), + recvMsg.MsgReceiver, recvMsg.MsgType, ) continue } - if acks[recvMsg.Msg.SenderIndex], err = recvCB(recvMsg); err != nil { - errs[recvMsg.Msg.SenderIndex] = err + if acks[recvMsg.SenderIndex], err = recvCB(recvMsg); err != nil { + errs[recvMsg.SenderIndex] = err continue } - if acks[recvMsg.Msg.SenderIndex] { + if acks[recvMsg.SenderIndex] { // Clear previous errors on success. - delete(errs, recvMsg.Msg.SenderIndex) + delete(errs, recvMsg.SenderIndex) } case <-retryCh: for i := range peers { @@ -216,14 +218,22 @@ func (g *groupImpl) OtherNodes(except ...uint16) map[uint16]peering.PeerSender { // Attach starts listening for messages. Messages in this case will be filtered // to those received from nodes in the group only. SenderIndex will be filled // for the messages according to the message source. -func (g *groupImpl) Attach(peeringID *peering.PeeringID, callback func(recv *peering.RecvEvent)) interface{} { - return g.netProvider.Attach(peeringID, func(recv *peering.RecvEvent) { - if idx, err := g.PeerIndexByNetID(recv.From.NetID()); err == nil && idx != NotInGroup { - recv.Msg.SenderIndex = idx - callback(recv) +func (g *groupImpl) Attach(peeringID *peering.PeeringID, receiver byte, callback func(recv *peering.PeerMessageGroupIn)) interface{} { + return g.netProvider.Attach(peeringID, receiver, func(recv *peering.PeerMessageIn) { + idx, err := g.PeerIndexByNetID(recv.SenderNetID) + if idx == NotInGroup { + err = xerrors.Errorf("sender does not belong to the group") + } + if err != nil { + g.log.Warnf("dropping message for receiver=%v MsgType=%v from %v: %v.", + recv.MsgReceiver, recv.MsgType, recv.SenderNetID, err) return } - g.log.Warnf("Dropping message MsgType=%v from %v, it does not belong to the group.", recv.Msg.MsgType, recv.From.NetID()) + gRecv := &peering.PeerMessageGroupIn{ + PeerMessageIn: *recv, + SenderIndex: idx, + } + callback(gRecv) }) } diff --git a/packages/peering/lpp/lppNetImpl.go b/packages/peering/lpp/lppNetImpl.go index 10472812eb..facf1f390e 100644 --- a/packages/peering/lpp/lppNetImpl.go +++ b/packages/peering/lpp/lppNetImpl.go @@ -70,6 +70,9 @@ type netImpl struct { log *logger.Logger } +var _ peering.NetworkProvider = &netImpl{} +var _ peering.PeerSender = &netImpl{} + // NewNetworkProvider is a constructor for the TCP based // peering network implementation. func NewNetworkProvider( @@ -208,7 +211,7 @@ func (n *netImpl) lppPeeringProtocolHandler(stream network.Stream) { n.log.Warnf("Failed to read incoming payload from %v, reason=%v", remotePeer.remoteNetID, err) return } - peerMsg, err := peering.NewPeerMessageFromBytes(payload) // Do not use the signatures, we have TLS. + peerMsg, err := peering.NewPeerMessageNetFromBytes(payload) // Do not use the signatures, we have TLS. if err != nil { n.log.Warnf("Error while decoding a message, reason=%v", err) return @@ -289,8 +292,8 @@ func (n *netImpl) delPeer(peer *peer) { // A handler suitable for events.NewEvent(). func (n *netImpl) eventHandler(handler interface{}, params ...interface{}) { - callback := handler.(func(_ *peering.RecvEvent)) - recvEvent := params[0].(*peering.RecvEvent) + callback := handler.(func(_ *peering.PeerMessageIn)) + recvEvent := params[0].(*peering.PeerMessageIn) callback(recvEvent) } @@ -341,10 +344,20 @@ func (n *netImpl) PeerDomain(peerNetIDs []string) (peering.PeerDomainProvider, e return domain.NewPeerDomain(n, peers, n.log), nil } +func (n *netImpl) SendMsgByNetID(netID string, msg *peering.PeerMessageData) { + peer, err := n.PeerByNetID(netID) + if err != nil { + n.log.Warnf("SendMsgByNetID: NetID %v is not in the network", netID) + return + } + peer.SendMsg(&peering.PeerMessageNet{PeerMessageData: *msg}) +} + // Attach implements peering.NetworkProvider. -func (n *netImpl) Attach(peeringID *peering.PeeringID, callback func(recv *peering.RecvEvent)) interface{} { - closure := events.NewClosure(func(recv *peering.RecvEvent) { - if peeringID == nil || *peeringID == recv.Msg.PeeringID { +func (n *netImpl) Attach(peeringID *peering.PeeringID, receiver byte, callback func(recv *peering.PeerMessageIn)) interface{} { + closure := events.NewClosure(func(recv *peering.PeerMessageIn) { + //if peeringID == nil || *peeringID == recv.Msg.PeeringID { + if *peeringID == recv.PeeringID && receiver == recv.MsgReceiver { callback(recv) } }) @@ -354,12 +367,8 @@ func (n *netImpl) Attach(peeringID *peering.PeeringID, callback func(recv *peeri // Detach implements peering.NetworkProvider. func (n *netImpl) Detach(attachID interface{}) { - switch closure := attachID.(type) { - case *events.Closure: - n.recvEvents.Detach(closure) - default: - panic("invalid_attach_id") - } + closure := attachID.(*events.Closure) + n.recvEvents.Detach(closure) } // PeerByNetID implements peering.NetworkProvider. @@ -403,16 +412,16 @@ func (n *netImpl) PubKey() *ed25519.PublicKey { } // SendMsg implements peering.PeerSender for the Self() node. -func (n *netImpl) SendMsg(msg *peering.PeerMessage) { +func (n *netImpl) SendMsg(msg *peering.PeerMessageNet) { // Don't go via the network, if sending a message to self. - n.triggerRecvEvents(&peering.RecvEvent{ - From: n.Self(), - Msg: msg, - }) + n.triggerRecvEvents(n.Self().NetID(), msg) } -func (n *netImpl) triggerRecvEvents(msg *peering.RecvEvent) { - n.recvEvents.Trigger(msg) +func (n *netImpl) triggerRecvEvents(from string, msg *peering.PeerMessageNet) { + n.recvEvents.Trigger(&peering.PeerMessageIn{ + PeerMessageData: msg.PeerMessageData, + SenderNetID: from, + }) } // IsAlive implements peering.PeerSender for the Self() node. diff --git a/packages/peering/lpp/lppPeer.go b/packages/peering/lpp/lppPeer.go index 2a54b05ee2..22d4acaed5 100644 --- a/packages/peering/lpp/lppPeer.go +++ b/packages/peering/lpp/lppPeer.go @@ -9,7 +9,6 @@ import ( "github.com/iotaledger/hive.go/crypto/ed25519" "github.com/iotaledger/hive.go/logger" - "github.com/iotaledger/wasp/packages/chain/messages" "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/util/pipe" libp2ppeer "github.com/libp2p/go-libp2p-core/peer" @@ -37,19 +36,22 @@ type peer struct { log *logger.Logger } +var _ peering.PeerSender = &peer{} + func newPeer(remoteNetID string, remotePubKey *ed25519.PublicKey, remoteLppID libp2ppeer.ID, n *netImpl) *peer { log := n.log.Named("peer:" + remoteNetID) messagePriorityFun := func(msg interface{}) bool { - peerMsg, ok := msg.(*peering.PeerMessage) + peerMsg, ok := msg.(*peering.PeerMessageNet) if ok { - switch peerMsg.MsgType { + return peerMsg.MsgType > 0 + /*switch peerMsg.MsgType { case messages.MsgGetBlock, messages.MsgBlock, messages.MsgSignedResult, messages.MsgSignedResultAck: return true default: - } + }*/ } return false } @@ -123,7 +125,7 @@ func (p *peer) PubKey() *ed25519.PublicKey { // SendMsg implements peering.PeerSender interface for the remote peers. // The send operation is performed asynchronously. // The async sending helped to cope with sporadic deadlocks. -func (p *peer) SendMsg(msg *peering.PeerMessage) { +func (p *peer) SendMsg(msg *peering.PeerMessageNet) { // p.accessLock.RLock() if !p.trusted { @@ -135,31 +137,27 @@ func (p *peer) SendMsg(msg *peering.PeerMessage) { p.sendPipe.In() <- msg } -func (p *peer) RecvMsg(msg *peering.PeerMessage) { +func (p *peer) RecvMsg(msg *peering.PeerMessageNet) { p.noteReceived() - msg.SenderNetID = p.NetID() p.recvPipe.In() <- msg } func (p *peer) sendLoop() { for msg := range p.sendPipe.Out() { - p.sendMsgDirect(msg.(*peering.PeerMessage)) + p.sendMsgDirect(msg.(*peering.PeerMessageNet)) } } func (p *peer) recvLoop() { for msg := range p.recvPipe.Out() { - peerMsg, ok := msg.(*peering.PeerMessage) + peerMsg, ok := msg.(*peering.PeerMessageNet) if ok { - p.net.triggerRecvEvents(&peering.RecvEvent{ - From: p, - Msg: peerMsg, - }) + p.net.triggerRecvEvents(p.NetID(), peerMsg) } } } -func (p *peer) sendMsgDirect(msg *peering.PeerMessage) { +func (p *peer) sendMsgDirect(msg *peering.PeerMessageNet) { stream, err := p.net.lppHost.NewStream(p.net.ctx, p.remoteLppID, lppProtocolPeering) if err != nil { p.log.Warnf("Failed to send outgoing message, unable to allocate stream, reason=%v", err) diff --git a/packages/peering/peer_message.go b/packages/peering/peer_message.go new file mode 100644 index 0000000000..a9866b8f6d --- /dev/null +++ b/packages/peering/peer_message.go @@ -0,0 +1,124 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// Package peering provides an overlay network for communicating +// between nodes in a peer-to-peer style with low overhead +// encoding and persistent connections. The network provides only +// the asynchronous communication. +// +// It is intended to use for the committee consensus protocol. +// +package peering + +import ( + "bytes" + + "github.com/iotaledger/wasp/packages/hashing" + "github.com/iotaledger/wasp/packages/util" + "github.com/iotaledger/wasp/packages/util/pipe" +) + +// RecvEvent stands for a received message along with +// the reference to its sender peer. +/*type RecvEvent struct { + From PeerSender + Msg *PeerMessage +}*/ + +// PeerMessage is an envelope for all the messages exchanged via +// the peering module. +type PeerMessageData struct { + PeeringID PeeringID + Timestamp int64 + MsgReceiver byte + MsgType byte + MsgData []byte +} + +type PeerMessageNet struct { + PeerMessageData + serialized *[]byte +} + +type PeerMessageIn struct { + PeerMessageData + SenderNetID string +} + +type PeerMessageGroupIn struct { + PeerMessageIn + SenderIndex uint16 +} + +var _ pipe.Hashable = &PeerMessageNet{} + +//nolint:gocritic +func NewPeerMessageDataFromBytes(buf []byte) (*PeerMessageData, error) { + var err error + r := bytes.NewBuffer(buf) + m := PeerMessageData{} + if err = util.ReadInt64(r, &m.Timestamp); err != nil { + return nil, err + } + if m.MsgType, err = util.ReadByte(r); err != nil { + return nil, err + } + if err = m.PeeringID.Read(r); err != nil { + return nil, err + } + if m.MsgData, err = util.ReadBytes32(r); err != nil { + return nil, err + } + return &m, nil +} + +func NewPeerMessageNetFromBytes(buf []byte) (*PeerMessageNet, error) { + data, err := NewPeerMessageDataFromBytes(buf) + if err != nil { + return nil, err + } + return &PeerMessageNet{ + PeerMessageData: *data, + serialized: &buf, + }, nil +} + +func (m *PeerMessageNet) Bytes() ([]byte, error) { + if m.serialized == nil { + serialized, err := m.PeerMessageData.bytes() + if err != nil { + return nil, err + } + m.serialized = &serialized + } + return *(m.serialized), nil +} + +func (m *PeerMessageData) bytes() ([]byte, error) { + var buf bytes.Buffer + if err := util.WriteInt64(&buf, m.Timestamp); err != nil { + return nil, err + } + if err := util.WriteByte(&buf, m.MsgType); err != nil { + return nil, err + } + if err := m.PeeringID.Write(&buf); err != nil { + return nil, err + } + if err := util.WriteBytes32(&buf, m.MsgData); err != nil { + return nil, err + } + return buf.Bytes(), nil +} + +/*func (m *PeerMessage) IsUserMessage() bool { + return m.MsgType >= FirstUserMsgCode +}*/ + +func (m *PeerMessageNet) GetHash() hashing.HashValue { + mBytes, err := m.Bytes() + if err != nil { + return hashing.HashValue{} + } + return hashing.HashData(mBytes) +} diff --git a/packages/peering/peering.go b/packages/peering/peering.go index 78bf609c39..3d6a3462ec 100644 --- a/packages/peering/peering.go +++ b/packages/peering/peering.go @@ -11,62 +11,21 @@ package peering import ( - "bytes" - "io" - "math/rand" "strconv" "strings" "time" - "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/hive.go/crypto/ed25519" - "github.com/iotaledger/wasp/packages/hashing" - "github.com/iotaledger/wasp/packages/util" - "github.com/iotaledger/wasp/packages/util/pipe" - "github.com/mr-tron/base58" "golang.org/x/xerrors" ) const ( - MsgTypeReserved = byte(0) - MsgTypeHandshake = byte(1) - MsgTypeMsgChunk = byte(2) - // FirstUserMsgCode is the first committee message type. // All the equal and larger msg types are committee messages. // those with smaller are reserved by the package for heartbeat and handshake messages FirstUserMsgCode = byte(0x10) ) -// PeeringID is relates peers in different nodes for a particular -// communication group. E.g. PeeringID identifies a committee in -// the consensus, etc. -type PeeringID [ledgerstate.AddressLength]byte - -func RandomPeeringID(seed ...[]byte) PeeringID { - var pid PeeringID - _, _ = rand.Read(pid[:]) - return pid -} - -func (pid *PeeringID) String() string { - return base58.Encode(pid[:]) -} - -func (pid *PeeringID) Read(r io.Reader) error { - if n, err := r.Read(pid[:]); err != nil || n != ledgerstate.AddressLength { - return xerrors.Errorf("error while parsing PeeringID (err=%v)", err) - } - return nil -} - -func (pid *PeeringID) Write(w io.Writer) error { - if n, err := w.Write(pid[:]); err != nil || n != ledgerstate.AddressLength { - return xerrors.Errorf("error while serializing PeeringID (err=%v)", err) - } - return nil -} - // NetworkProvider stands for the peer-to-peer network, as seen // from the viewpoint of a single participant. type NetworkProvider interface { @@ -74,11 +33,10 @@ type NetworkProvider interface { Self() PeerSender PeerGroup(peerAddrs []string) (GroupProvider, error) PeerDomain(peerAddrs []string) (PeerDomainProvider, error) - Attach(peeringID *PeeringID, callback func(recv *RecvEvent)) interface{} - Detach(attachID interface{}) PeerByNetID(peerNetID string) (PeerSender, error) PeerByPubKey(peerPub *ed25519.PublicKey) (PeerSender, error) PeerStatus() []PeerStatusProvider + PeerCollection } // TrustedNetworkManager is used maintain a configuration which peers are trusted. @@ -92,49 +50,10 @@ type TrustedNetworkManager interface { TrustedPeers() ([]*TrustedPeer, error) } -// TrustedPeer carries a peer information we use to trust it. -type TrustedPeer struct { - PubKey ed25519.PublicKey - NetID string -} - -func TrustedPeerFromBytes(buf []byte) (*TrustedPeer, error) { - var err error - r := bytes.NewBuffer(buf) - tp := TrustedPeer{} - var keyBytes []byte - if keyBytes, err = util.ReadBytes16(r); err != nil { - return nil, err - } - tp.PubKey, _, err = ed25519.PublicKeyFromBytes(keyBytes) - if err != nil { - return nil, err - } - if tp.NetID, err = util.ReadString16(r); err != nil { - return nil, err - } - return &tp, nil -} - -func (tp *TrustedPeer) Bytes() ([]byte, error) { - var buf bytes.Buffer - if err := util.WriteBytes16(&buf, tp.PubKey.Bytes()); err != nil { - return nil, err - } - if err := util.WriteString16(&buf, tp.NetID); err != nil { - return nil, err - } - return buf.Bytes(), nil -} - -func (tp *TrustedPeer) PubKeyBytes() ([]byte, error) { - return tp.PubKey.Bytes(), nil -} - type PeerCollection interface { - Attach(peeringID *PeeringID, callback func(recv *RecvEvent)) interface{} + Attach(peeringID *PeeringID, reveiver byte, callback func(recv *PeerMessageIn)) interface{} Detach(attachID interface{}) - Close() + SendMsgByNetID(netID string, msg *PeerMessageData) } // GroupProvider stands for a subset of a peer-to-peer network @@ -147,31 +66,31 @@ type GroupProvider interface { SelfIndex() uint16 PeerIndex(peer PeerSender) (uint16, error) PeerIndexByNetID(peerNetID string) (uint16, error) - SendMsgByIndex(peerIdx uint16, msg *PeerMessage) - Broadcast(msg *PeerMessage, includingSelf bool, except ...uint16) + Attach(peeringID *PeeringID, receiver byte, callback func(recv *PeerMessageGroupIn)) interface{} + Detach(attachID interface{}) + SendMsgByIndex(peerIdx uint16, msg *PeerMessageData) + SendMsgBroadcast(msg *PeerMessageData, includingSelf bool, except ...uint16) ExchangeRound( peers map[uint16]PeerSender, - recvCh chan *RecvEvent, + recvCh chan *PeerMessageGroupIn, retryTimeout time.Duration, giveUpTimeout time.Duration, sendCB func(peerIdx uint16, peer PeerSender), - recvCB func(recv *RecvEvent) (bool, error), + recvCB func(recv *PeerMessageGroupIn) (bool, error), ) error AllNodes(except ...uint16) map[uint16]PeerSender // Returns all the nodes in the group except specified. OtherNodes(except ...uint16) map[uint16]PeerSender // Returns other nodes in the group (excluding Self and specified). - PeerCollection + Close() } // PeerDomainProvider implements unordered set of peers which can dynamically change // All peers in the domain shares same peeringID. Each peer within domain is identified via its netID type PeerDomainProvider interface { - SendMsgByNetID(netID string, msg *PeerMessage) - SendMsgToRandomPeers(upToNumPeers uint16, msg *PeerMessage) - SendSimple(netID string, msgType byte, msgData []byte) - SendMsgToRandomPeersSimple(upToNumPeers uint16, msgType byte, msgData []byte) ReshufflePeers(seedBytes ...[]byte) GetRandomPeers(upToNumPeers int) []string PeerCollection + SendMsgToRandomPeers(upToNumPeers uint16, msg *PeerMessageData) + Close() } // PeerSender represents an interface to some remote peer. @@ -188,7 +107,7 @@ type PeerSender interface { // SendMsg works in an asynchronous way, and therefore the // errors are not returned here. - SendMsg(msg *PeerMessage) + SendMsg(msg *PeerMessageNet) // IsAlive indicates, if there is a working connection with the peer. // It is always an approximate state. @@ -215,117 +134,6 @@ type PeerStatusProvider interface { NumUsers() int } -// RecvEvent stands for a received message along with -// the reference to its sender peer. -type RecvEvent struct { - From PeerSender - Msg *PeerMessage -} - -// PeerMessage is an envelope for all the messages exchanged via -// the peering module. -type PeerMessage struct { - PeeringID PeeringID - SenderIndex uint16 // TODO: Only meaningful in a group, and when calculated by the client. - SenderNetID string // TODO: Non persistent. Only used by PeeringDomain, filled by the receiver - Timestamp int64 - MsgType byte - MsgData []byte - serialized *[]byte -} - -var _ pipe.Hashable = &PeerMessage{} - -//nolint:gocritic -func NewPeerMessageFromBytes(buf []byte) (*PeerMessage, error) { - var err error - r := bytes.NewBuffer(buf) - m := PeerMessage{} - if err = util.ReadInt64(r, &m.Timestamp); err != nil { - return nil, err - } - if m.MsgType, err = util.ReadByte(r); err != nil { - return nil, err - } - switch m.MsgType { - case MsgTypeReserved: - case MsgTypeHandshake: - if m.MsgData, err = util.ReadBytes32(r); err != nil { - return nil, err - } - case MsgTypeMsgChunk: - if m.MsgData, err = util.ReadBytes32(r); err != nil { - return nil, err - } - default: - if err = m.PeeringID.Read(r); err != nil { - return nil, err - } - if err = util.ReadUint16(r, &m.SenderIndex); err != nil { - return nil, err - } - if m.MsgData, err = util.ReadBytes32(r); err != nil { - return nil, err - } - } - return &m, nil -} - -func (m *PeerMessage) Bytes() ([]byte, error) { - if m.serialized == nil { - serialized, err := m.bytes() - if err != nil { - return nil, err - } - m.serialized = &serialized - } - return *(m.serialized), nil -} - -func (m *PeerMessage) bytes() ([]byte, error) { - var buf bytes.Buffer - if err := util.WriteInt64(&buf, m.Timestamp); err != nil { - return nil, err - } - if err := util.WriteByte(&buf, m.MsgType); err != nil { - return nil, err - } - switch m.MsgType { - case MsgTypeReserved: - case MsgTypeHandshake: - if err := util.WriteBytes32(&buf, m.MsgData); err != nil { - return nil, err - } - case MsgTypeMsgChunk: - if err := util.WriteBytes32(&buf, m.MsgData); err != nil { - return nil, err - } - default: - if err := m.PeeringID.Write(&buf); err != nil { - return nil, err - } - if err := util.WriteUint16(&buf, m.SenderIndex); err != nil { - return nil, err - } - if err := util.WriteBytes32(&buf, m.MsgData); err != nil { - return nil, err - } - } - return buf.Bytes(), nil -} - -func (m *PeerMessage) IsUserMessage() bool { - return m.MsgType >= FirstUserMsgCode -} - -func (m *PeerMessage) GetHash() hashing.HashValue { - mBytes, err := m.Bytes() - if err != nil { - return hashing.HashValue{} - } - return hashing.HashData(mBytes) -} - // ParseNetID parses the NetID and returns the corresponding host and port. func ParseNetID(netID string) (string, int, error) { parts := strings.Split(netID, ":") diff --git a/packages/peering/peering_id.go b/packages/peering/peering_id.go new file mode 100644 index 0000000000..78803d82b3 --- /dev/null +++ b/packages/peering/peering_id.go @@ -0,0 +1,49 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// Package peering provides an overlay network for communicating +// between nodes in a peer-to-peer style with low overhead +// encoding and persistent connections. The network provides only +// the asynchronous communication. +// +// It is intended to use for the committee consensus protocol. +// +package peering + +import ( + "io" + "math/rand" + + "github.com/iotaledger/goshimmer/packages/ledgerstate" + "github.com/mr-tron/base58" + "golang.org/x/xerrors" +) + +// PeeringID is relates peers in different nodes for a particular +// communication group. E.g. PeeringID identifies a committee in +// the consensus, etc. +type PeeringID [ledgerstate.AddressLength]byte + +func RandomPeeringID(seed ...[]byte) PeeringID { + var pid PeeringID + _, _ = rand.Read(pid[:]) + return pid +} + +func (pid *PeeringID) String() string { + return base58.Encode(pid[:]) +} + +func (pid *PeeringID) Read(r io.Reader) error { + if n, err := r.Read(pid[:]); err != nil || n != ledgerstate.AddressLength { + return xerrors.Errorf("error while parsing PeeringID (err=%v)", err) + } + return nil +} + +func (pid *PeeringID) Write(w io.Writer) error { + if n, err := w.Write(pid[:]); err != nil || n != ledgerstate.AddressLength { + return xerrors.Errorf("error while serializing PeeringID (err=%v)", err) + } + return nil +} diff --git a/packages/peering/trusted_peer.go b/packages/peering/trusted_peer.go new file mode 100644 index 0000000000..31e446ac4e --- /dev/null +++ b/packages/peering/trusted_peer.go @@ -0,0 +1,57 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// Package peering provides an overlay network for communicating +// between nodes in a peer-to-peer style with low overhead +// encoding and persistent connections. The network provides only +// the asynchronous communication. +// +// It is intended to use for the committee consensus protocol. +// +package peering + +import ( + "bytes" + + "github.com/iotaledger/hive.go/crypto/ed25519" + "github.com/iotaledger/wasp/packages/util" +) + +// TrustedPeer carries a peer information we use to trust it. +type TrustedPeer struct { + PubKey ed25519.PublicKey + NetID string +} + +func TrustedPeerFromBytes(buf []byte) (*TrustedPeer, error) { + var err error + r := bytes.NewBuffer(buf) + tp := TrustedPeer{} + var keyBytes []byte + if keyBytes, err = util.ReadBytes16(r); err != nil { + return nil, err + } + tp.PubKey, _, err = ed25519.PublicKeyFromBytes(keyBytes) + if err != nil { + return nil, err + } + if tp.NetID, err = util.ReadString16(r); err != nil { + return nil, err + } + return &tp, nil +} + +func (tp *TrustedPeer) Bytes() ([]byte, error) { + var buf bytes.Buffer + if err := util.WriteBytes16(&buf, tp.PubKey.Bytes()); err != nil { + return nil, err + } + if err := util.WriteString16(&buf, tp.NetID); err != nil { + return nil, err + } + return buf.Bytes(), nil +} + +func (tp *TrustedPeer) PubKeyBytes() ([]byte, error) { + return tp.PubKey.Bytes(), nil +} From e02a528537a0bbb19f4f61882b39177d262cf83d Mon Sep 17 00:00:00 2001 From: marktwtn Date: Fri, 12 Nov 2021 03:38:31 +0800 Subject: [PATCH 063/198] fix: Add int16 decoding for wasp-cli view calling The commit fixes the error when using wasp-cli for calling a view from smart contract with state type as Int16. --- tools/wasp-cli/util/types.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/wasp-cli/util/types.go b/tools/wasp-cli/util/types.go index 237d0466c1..1a6b92420c 100644 --- a/tools/wasp-cli/util/types.go +++ b/tools/wasp-cli/util/types.go @@ -72,6 +72,10 @@ func ValueToString(vtype string, v []byte) string { n, err := codec.DecodeUint64(v) log.Check(err) return fmt.Sprintf("%d", n) + case "int16": + n, err := codec.DecodeInt16(v) + log.Check(err) + return fmt.Sprintf("%d", n) case "int", "int64": n, err := codec.DecodeInt64(v) log.Check(err) From 4853dd81a6d250074b069f97fbf99c3e9d0fcc83 Mon Sep 17 00:00:00 2001 From: Diego Essaya Date: Fri, 12 Nov 2021 16:26:44 -0300 Subject: [PATCH 064/198] fix: eth_getBlockByHash returns null (fixes #600) --- .../evm/evmlight/emulator/blockchaindb.go | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/contracts/native/evm/evmlight/emulator/blockchaindb.go b/contracts/native/evm/evmlight/emulator/blockchaindb.go index da24443fb7..2220b584da 100644 --- a/contracts/native/evm/evmlight/emulator/blockchaindb.go +++ b/contracts/native/evm/evmlight/emulator/blockchaindb.go @@ -289,11 +289,12 @@ func (bc *BlockchainDB) headerFromGob(g *headerGob, blockNumber uint64) *types.H parentHash = bc.GetBlockHashByBlockNumber(blockNumber - 1) } return &types.Header{ - ParentHash: parentHash, + Difficulty: &big.Int{}, Number: new(big.Int).SetUint64(blockNumber), GasLimit: bc.GetGasLimit(), - GasUsed: g.GasUsed, Time: g.Time, + ParentHash: parentHash, + GasUsed: g.GasUsed, TxHash: g.TxHash, ReceiptHash: g.ReceiptHash, Bloom: g.Bloom, @@ -418,33 +419,32 @@ func (bc *BlockchainDB) GetTimestampByBlockNumber(blockNumber uint64) uint64 { } func (bc *BlockchainDB) makeHeader(txs []*types.Transaction, receipts []*types.Receipt, blockNumber, timestamp uint64) *types.Header { + header := &types.Header{ + Difficulty: &big.Int{}, + Number: new(big.Int).SetUint64(blockNumber), + GasLimit: bc.GetGasLimit(), + Time: timestamp, + TxHash: types.EmptyRootHash, + ReceiptHash: types.EmptyRootHash, + UncleHash: types.EmptyUncleHash, + } if blockNumber == 0 { // genesis block hash - return &types.Header{ - Number: new(big.Int).SetUint64(blockNumber), - GasLimit: bc.GetGasLimit(), - Time: timestamp, - TxHash: types.EmptyRootHash, - ReceiptHash: types.EmptyRootHash, - UncleHash: types.EmptyUncleHash, - } + return header } prevBlockNumber := blockNumber - 1 gasUsed := uint64(0) if len(receipts) > 0 { gasUsed = receipts[len(receipts)-1].CumulativeGasUsed } - return &types.Header{ - ParentHash: bc.GetBlockHashByBlockNumber(prevBlockNumber), - Number: new(big.Int).SetUint64(blockNumber), - GasLimit: bc.GetGasLimit(), - GasUsed: gasUsed, - Time: timestamp, - TxHash: types.DeriveSha(types.Transactions(txs), &fakeHasher{}), - ReceiptHash: types.DeriveSha(types.Receipts(receipts), &fakeHasher{}), - Bloom: types.CreateBloom(receipts), - UncleHash: types.EmptyUncleHash, + header.ParentHash = bc.GetBlockHashByBlockNumber(prevBlockNumber) + header.GasUsed = gasUsed + if len(txs) > 0 { + header.TxHash = types.DeriveSha(types.Transactions(txs), &fakeHasher{}) + header.ReceiptHash = types.DeriveSha(types.Receipts(receipts), &fakeHasher{}) } + header.Bloom = types.CreateBloom(receipts) + return header } func (bc *BlockchainDB) GetHeaderByBlockNumber(blockNumber uint64) *types.Header { From 6c8b60bb56660b653c57a582bdc6ba14b9c1aec6 Mon Sep 17 00:00:00 2001 From: Jorge Silva Date: Mon, 15 Nov 2021 11:51:34 +0000 Subject: [PATCH 065/198] fix: (VM) continue processing offledger requests when max number of inputs is reached --- packages/vm/runvm/runtask.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vm/runvm/runtask.go b/packages/vm/runvm/runtask.go index 1fab4b550f..63fce8cb5b 100644 --- a/packages/vm/runvm/runtask.go +++ b/packages/vm/runvm/runtask.go @@ -55,7 +55,7 @@ func runTask(task *vm.VMTask) { numOffLedger++ } else { if numOnLedger == vmcontext.MaxBlockInputCount { - break // max number of inputs to be included in state transition reached, do not process more on-ledger requests + continue // max number of inputs to be included in state transition reached, do not process more on-ledger requests } numOnLedger++ } From 53dfc817d06bcb19b382566fdd507554d8dd7c01 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Mon, 15 Nov 2021 16:38:52 +0200 Subject: [PATCH 066/198] Peering message refactor --- packages/chain/chain.go | 32 ++- packages/chain/chainimpl/chainimpl.go | 58 +++-- packages/chain/chainimpl/eventproc.go | 96 ++++---- packages/chain/chainimpl/interface.go | 43 ++-- packages/chain/committee/committee.go | 36 ++- packages/chain/consensus/action.go | 65 +++--- packages/chain/consensus/batch_proposal.go | 2 +- .../consensus/commonsubset/commonsubset.go | 53 ++--- .../commonsubset/commonsubsetcoordinator.go | 44 ++-- packages/chain/consensus/consensus.go | 90 ++++---- packages/chain/consensus/eventproc.go | 30 +-- packages/chain/mempool/mempool.go | 52 ++--- packages/chain/mempool/mempool_test.go | 2 +- packages/chain/messages/missing_req_msg.go | 78 ------- packages/chain/messages/peer_block_msg.go | 36 +++ packages/chain/messages/peer_get_block_msg.go | 36 +++ .../messages/peer_missing_request_ids_msg.go | 44 ++++ .../messages/peer_missing_request_msg.go | 28 +++ ...q_msg.go => peer_offledger_request_msg.go} | 28 ++- ....go => peer_offledger_request_msg_test.go} | 10 +- ...req_ack_msg.go => peer_request_ack_msg.go} | 29 ++- .../chain/messages/peer_signed_result_msg.go | 55 +++++ .../messages/peer_signed_result_msg_ack.go | 47 ++++ packages/chain/messages/peermsg.go | 93 -------- packages/chain/statemgr/eventproc.go | 35 +-- packages/chain/statemgr/statemgr.go | 59 ++--- packages/chain/statemgr/syncmgr.go | 6 +- packages/dkg/messages.go | 31 ++- packages/dkg/node.go | 133 ++++++----- packages/dkg/proc.go | 210 +++++++++--------- packages/peering/group/group.go | 27 ++- packages/peering/peering.go | 3 +- packages/webapi/request/request.go | 9 +- 33 files changed, 887 insertions(+), 713 deletions(-) delete mode 100644 packages/chain/messages/missing_req_msg.go create mode 100644 packages/chain/messages/peer_block_msg.go create mode 100644 packages/chain/messages/peer_get_block_msg.go create mode 100644 packages/chain/messages/peer_missing_request_ids_msg.go create mode 100644 packages/chain/messages/peer_missing_request_msg.go rename packages/chain/messages/{offledger_req_msg.go => peer_offledger_request_msg.go} (66%) rename packages/chain/messages/{offledger_req_msg_test.go => peer_offledger_request_msg_test.go} (83%) rename packages/chain/messages/{req_ack_msg.go => peer_request_ack_msg.go} (64%) create mode 100644 packages/chain/messages/peer_signed_result_msg.go create mode 100644 packages/chain/messages/peer_signed_result_msg_ack.go diff --git a/packages/chain/chain.go b/packages/chain/chain.go index 851c5e59ec..478c0415c7 100644 --- a/packages/chain/chain.go +++ b/packages/chain/chain.go @@ -14,7 +14,6 @@ import ( "github.com/iotaledger/wasp/packages/hashing" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/coreutil" - "github.com/iotaledger/wasp/packages/iscp/request" "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/state" "github.com/iotaledger/wasp/packages/tcrypto" @@ -25,7 +24,9 @@ import ( type ChainCore interface { ID() *iscp.ChainID GetCommitteeInfo() *CommitteeInfo - AttachToPeerMessages(fun func(recv *peering.RecvEvent)) + AttachToPeerMessages(receiver byte, fun func(recv *peering.PeerMessageIn)) + SendPeerMsgByNetID(netID string, msgReceiver byte, msgType byte, msgData []byte) + SendPeerMsgToRandomPeers(upToNumPeers uint16, msgReceiver byte, msgType byte, msgData []byte) StateCandidateToStateManager(state.VirtualStateAccess, ledgerstate.OutputID) Events() ChainEvents Processors() *processors.Cache @@ -36,7 +37,7 @@ type ChainCore interface { // Most of these methods are made publick for mocking in tests EnqueueDismissChain(reason string) // This one should really be public EnqueueLedgerState(chainOutput *ledgerstate.AliasOutput, timestamp time.Time) - EnqueueOffLedgerRequestPeerMsg(req *request.OffLedger, senderNetID string) + EnqueueOffLedgerRequestMsg(msg *messages.OffLedgerRequestMsgIn) } // ChainEntry interface to access chain from the chain registry side @@ -74,12 +75,12 @@ type Committee interface { Quorum() uint16 OwnPeerIndex() uint16 DKShare() *tcrypto.DKShare - SendMsg(targetPeerIndex uint16, msgType byte, msgData []byte) error - SendMsgToPeers(msgType byte, msgData []byte, ts int64, except ...uint16) + SendMsgByIndex(peerIdx uint16, msgReceiver byte, msgType byte, msgData []byte) error + SendMsgBroadcast(msgReceiver byte, msgType byte, msgData []byte, except ...uint16) IsAlivePeer(peerIndex uint16) bool QuorumIsAlive(quorum ...uint16) bool PeerStatus() []*PeerStatus - AttachToPeerMessages(fun func(recv *peering.RecvEvent)) + AttachToPeerMessages(receiver byte, fun func(recv *peering.PeerMessageGroupIn)) IsReady() bool Close() RunACSConsensus(value []byte, sessionID uint64, stateIndex uint32, callback func(sessionID uint64, acs [][]byte)) @@ -98,8 +99,8 @@ type NodeConnection interface { type StateManager interface { Ready() *ready.Ready - EventGetBlockMsg(msg *messages.GetBlockMsg) - EventBlockMsg(msg *messages.BlockMsg) + EnqueueGetBlockMsg(msg *messages.GetBlockMsgIn) + EnqueueBlockMsg(msg *messages.BlockMsgIn) EventStateMsg(msg *messages.StateMsg) EventOutputMsg(msg ledgerstate.Output) EventStateCandidateMsg(state.VirtualStateAccess, ledgerstate.OutputID) @@ -110,8 +111,8 @@ type StateManager interface { type Consensus interface { EventStateTransitionMsg(state.VirtualStateAccess, *ledgerstate.AliasOutput, time.Time) - EventSignedResultMsg(*messages.SignedResultMsg) - EventSignedResultAckMsg(*messages.SignedResultAckMsg) + EnqueueSignedResultMsg(*messages.SignedResultMsgIn) + EnqueueSignedResultAckMsg(*messages.SignedResultAckMsgIn) EventInclusionsStateMsg(ledgerstate.TransactionID, ledgerstate.InclusionState) EventAsynchronousCommonSubsetMsg(msg *messages.AsynchronousCommonSubsetMsg) EventVMResultMsg(msg *messages.VMResultMsg) @@ -138,7 +139,7 @@ type Mempool interface { type AsynchronousCommonSubsetRunner interface { RunACSConsensus(value []byte, sessionID uint64, stateIndex uint32, callback func(sessionID uint64, acs [][]byte)) - TryHandleMessage(recv *peering.RecvEvent) bool + //TryHandleMessage(recv *peering.PeerMessageGroupIn) bool Close() } @@ -210,3 +211,12 @@ const ( // TimerTickPeriod time tick for consensus and state manager objects TimerTickPeriod = 100 * time.Millisecond ) + +const ( + PeerMessageReceiverChain = byte(3) + + PeerMsgTypeMissingRequestIDs = iota + PeerMsgTypeMissingRequest + PeerMsgTypeOffLedgerRequest + PeerMsgTypeRequestAck +) diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index b41ba6807d..cc9da0e962 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -4,6 +4,7 @@ package chainimpl import ( + "fmt" "sync" "time" @@ -156,37 +157,64 @@ func NewChain( } ret.stateMgr = statemgr.New(db, ret, peers, ret.nodeConn) ret.peers = &peers - ret.AttachToPeerMessages(ret.receiveChainPeerMessages) + ret.AttachToPeerMessages(chain.PeerMessageReceiverChain, ret.receiveChainPeerMessages) go ret.handleMessagesLoop() ret.startTimer() return ret } -func (c *chainObj) receiveCommitteePeerMessages(event *peering.RecvEvent) { - if event.Msg.MsgType == messages.MsgMissingRequestIDs { - c.enqueueMissingRequestIDsPeerMsg(event.Msg) +func (c *chainObj) receiveCommitteePeerMessages(peerMsg *peering.PeerMessageGroupIn) { + if peerMsg.MsgReceiver != chain.PeerMessageReceiverChain { + panic(fmt.Errorf("Chain does not accept peer messages of other receiver type %v, message type=%v", + peerMsg.MsgReceiver, peerMsg.MsgType)) } + if peerMsg.MsgType != chain.PeerMsgTypeMissingRequestIDs { + panic(fmt.Errorf("Wrong type of chain message: %v", peerMsg.MsgType)) + } + msg, err := messages.NewMissingRequestIDsMsg(peerMsg.MsgData) + if err != nil { + c.log.Error(err) + return + } + c.enqueueMissingRequestIDsMsg(&messages.MissingRequestIDsMsgIn{ + MissingRequestIDsMsg: *msg, + SenderNetID: peerMsg.SenderNetID, + }) } -func (c *chainObj) receiveChainPeerMessages(event *peering.RecvEvent) { - peerMsg := event.Msg - switch event.Msg.MsgType { - case messages.MsgOffLedgerRequest: - msg, err := messages.OffLedgerRequestPeerMsgFromBytes(peerMsg.MsgData) +func (c *chainObj) receiveChainPeerMessages(peerMsg *peering.PeerMessageIn) { + if peerMsg.MsgReceiver != chain.PeerMessageReceiverChain { + panic(fmt.Errorf("Chain does not accept peer messages of other receiver type %v, message type=%v", + peerMsg.MsgReceiver, peerMsg.MsgType)) + } + switch peerMsg.MsgType { + case chain.PeerMsgTypeOffLedgerRequest: + msg, err := messages.NewOffLedgerRequestMsg(peerMsg.MsgData) if err != nil { c.log.Error(err) return } - c.EnqueueOffLedgerRequestPeerMsg(msg.Req, peerMsg.SenderNetID) - case messages.MsgRequestAck: - msg, err := messages.RequestAckPeerMsgFromBytes(peerMsg.MsgData) + c.EnqueueOffLedgerRequestMsg(&messages.OffLedgerRequestMsgIn{ + OffLedgerRequestMsg: *msg, + SenderNetID: peerMsg.SenderNetID, + }) + case chain.PeerMsgTypeRequestAck: + msg, err := messages.NewRequestAckMsg(peerMsg.MsgData) if err != nil { c.log.Error(err) return } - c.enqueueRequestAckPeerMsg(msg.ReqID, peerMsg.SenderNetID) + c.enqueueRequestAckMsg(&messages.RequestAckMsgIn{ + RequestAckMsg: *msg, + SenderNetID: peerMsg.SenderNetID, + }) case messages.MsgMissingRequest: - //c.enqueueMissingRequestPeerMsg(msg) + msg, err := messages.NewMissingRequestMsg(peerMsg.MsgData) + if err != nil { + c.log.Error(err) + return + } + c.enqueueMissingRequestMsg(msg) default: } } @@ -339,7 +367,7 @@ func (c *chainObj) createNewCommitteeAndConsensus(cmtRec *registry.CommitteeReco return xerrors.Errorf("createNewCommitteeAndConsensus: failed to create committee object for state address %s: %w", cmtRec.Address.Base58(), err) } - cmt.AttachToPeerMessages(c.receiveCommitteePeerMessages) + cmt.AttachToPeerMessages(chain.PeerMessageReceiverChain, c.receiveCommitteePeerMessages) c.log.Debugf("creating new consensus object...") c.consensus = consensus.New(c, c.mempool, cmt, c.nodeConn, c.pullMissingRequestsFromCommittee, c.chainMetrics) c.setCommittee(cmt) diff --git a/packages/chain/chainimpl/eventproc.go b/packages/chain/chainimpl/eventproc.go index 9c3577bf85..72f09c37c2 100644 --- a/packages/chain/chainimpl/eventproc.go +++ b/packages/chain/chainimpl/eventproc.go @@ -7,11 +7,9 @@ import ( "time" "github.com/iotaledger/goshimmer/packages/ledgerstate" + "github.com/iotaledger/wasp/packages/chain" "github.com/iotaledger/wasp/packages/chain/messages" "github.com/iotaledger/wasp/packages/hashing" - "github.com/iotaledger/wasp/packages/iscp" - "github.com/iotaledger/wasp/packages/iscp/request" - "github.com/iotaledger/wasp/packages/peering" "golang.org/x/xerrors" // "github.com/iotaledger/wasp/packages/state" // "github.com/iotaledger/wasp/packages/util" @@ -20,10 +18,10 @@ import ( func (c *chainObj) handleMessagesLoop() { dismissChainMsgChannel := c.dismissChainMsgPipe.Out() stateMsgChannel := c.stateMsgPipe.Out() - offLedgerRequestPeerMsgChannel := c.offLedgerRequestPeerMsgPipe.Out() - requestAckPeerMsgChannel := c.requestAckPeerMsgPipe.Out() - missingRequestIDsPeerMsgChannel := c.missingRequestIDsPeerMsgPipe.Out() - missingRequestPeerMsgChannel := c.missingRequestPeerMsgPipe.Out() + offLedgerRequestMsgChannel := c.offLedgerRequestPeerMsgPipe.Out() + requestAckMsgChannel := c.requestAckPeerMsgPipe.Out() + missingRequestIDsMsgChannel := c.missingRequestIDsPeerMsgPipe.Out() + missingRequestMsgChannel := c.missingRequestPeerMsgPipe.Out() timerTickMsgChannel := c.timerTickMsgPipe.Out() for { select { @@ -39,29 +37,29 @@ func (c *chainObj) handleMessagesLoop() { } else { stateMsgChannel = nil } - case msg, ok := <-offLedgerRequestPeerMsgChannel: + case msg, ok := <-offLedgerRequestMsgChannel: if ok { - c.handleOffLedgerRequestPeerMsg(msg.(OffLedgerRequestMsg)) + c.handleOffLedgerRequestMsg(msg.(*messages.OffLedgerRequestMsgIn)) } else { - offLedgerRequestPeerMsgChannel = nil + offLedgerRequestMsgChannel = nil } - case msg, ok := <-requestAckPeerMsgChannel: + case msg, ok := <-requestAckMsgChannel: if ok { - c.handleRequestAckPeerMsg(msg.(RequestAckMsg)) + c.handleRequestAckPeerMsg(msg.(*messages.RequestAckMsgIn)) } else { - requestAckPeerMsgChannel = nil + requestAckMsgChannel = nil } - case msg, ok := <-missingRequestIDsPeerMsgChannel: + case msg, ok := <-missingRequestIDsMsgChannel: if ok { - c.handleMissingRequestIDsPeerMsg(msg.(*peering.PeerMessage)) + c.handleMissingRequestIDsMsg(msg.(*messages.MissingRequestIDsMsgIn)) } else { - missingRequestIDsPeerMsgChannel = nil + missingRequestIDsMsgChannel = nil } - case msg, ok := <-missingRequestPeerMsgChannel: + case msg, ok := <-missingRequestMsgChannel: if ok { - c.handleMissingRequestPeerMsg(msg.(*peering.PeerMessage)) + c.handleMissingRequestMsg(msg.(*messages.MissingRequestMsg)) } else { - missingRequestPeerMsgChannel = nil + missingRequestMsgChannel = nil } case msg, ok := <-timerTickMsgChannel: if ok { @@ -72,10 +70,10 @@ func (c *chainObj) handleMessagesLoop() { } if dismissChainMsgChannel == nil && stateMsgChannel == nil && - offLedgerRequestPeerMsgChannel == nil && - requestAckPeerMsgChannel == nil && - missingRequestIDsPeerMsgChannel == nil && - missingRequestPeerMsgChannel == nil && + offLedgerRequestMsgChannel == nil && + requestAckMsgChannel == nil && + missingRequestIDsMsgChannel == nil && + missingRequestMsgChannel == nil && timerTickMsgChannel == nil { return } @@ -123,14 +121,11 @@ func (c *chainObj) handleLedgerState(msg *messages.StateMsg) { c.stateMgr.EventStateMsg(msg) } -func (c *chainObj) EnqueueOffLedgerRequestPeerMsg(req *request.OffLedger, senderNetID string) { - c.offLedgerRequestPeerMsgPipe.In() <- OffLedgerRequestMsg{ - Req: req, - SenderNetID: senderNetID, - } +func (c *chainObj) EnqueueOffLedgerRequestMsg(msg *messages.OffLedgerRequestMsgIn) { + c.offLedgerRequestPeerMsgPipe.In() <- msg } -func (c *chainObj) handleOffLedgerRequestPeerMsg(msg OffLedgerRequestMsg) { +func (c *chainObj) handleOffLedgerRequestMsg(msg *messages.OffLedgerRequestMsgIn) { req := msg.Req senderNetID := msg.SenderNetID c.log.Debugf("handleOffLedgerRequestPeerMsg: reqID: %s, peerID: %s", req.ID().Base58(), senderNetID) @@ -142,53 +137,44 @@ func (c *chainObj) handleOffLedgerRequestPeerMsg(msg OffLedgerRequestMsg) { c.broadcastOffLedgerRequest(req) } -func (c *chainObj) enqueueRequestAckPeerMsg(requestID *iscp.RequestID, senderNetID string) { - c.requestAckPeerMsgPipe.In() <- RequestAckMsg{ - ReqID: requestID, - SenderNetID: senderNetID, - } +func (c *chainObj) enqueueRequestAckMsg(msg *messages.RequestAckMsgIn) { + c.requestAckPeerMsgPipe.In() <- msg } -func (c *chainObj) handleRequestAckPeerMsg(msg RequestAckMsg) { - c.ReceiveRequestAckMessage(msg.ReqID, msg.SenderNetID) +func (c *chainObj) handleRequestAckPeerMsg(msg *messages.RequestAckMsgIn) { + c.log.Debugf("handleRequestAckPeerMsg: reqID: %s, peerID: %s", msg.ReqID.Base58(), msg.SenderNetID) + c.offLedgerReqsAcksMutex.Lock() + defer c.offLedgerReqsAcksMutex.Unlock() + c.offLedgerReqsAcks[*msg.ReqID] = append(c.offLedgerReqsAcks[*msg.ReqID], msg.SenderNetID) + c.chainMetrics.CountRequestAckMessages() } -func (c *chainObj) enqueueMissingRequestIDsPeerMsg(peerMsg *peering.PeerMessage) { - c.missingRequestIDsPeerMsgPipe.In() <- peerMsg +func (c *chainObj) enqueueMissingRequestIDsMsg(msg *messages.MissingRequestIDsMsgIn) { + c.missingRequestIDsPeerMsgPipe.In() <- msg } -func (c *chainObj) handleMissingRequestIDsPeerMsg(peerMsg *peering.PeerMessage) { +func (c *chainObj) handleMissingRequestIDsMsg(msg *messages.MissingRequestIDsMsgIn) { if !c.pullMissingRequestsFromCommittee { return } - msg, err := messages.MissingRequestIDsMsgFromBytes(peerMsg.MsgData) - if err != nil { - c.log.Error(err) - return - } - peerID := peerMsg.SenderNetID + peerID := msg.SenderNetID for _, reqID := range msg.IDs { c.log.Debugf("Sending MissingRequestsToPeer: reqID: %s, peerID: %s", reqID.Base58(), peerID) if req := c.mempool.GetRequest(reqID); req != nil { - msg := messages.NewMissingRequestMsg(req) - (*c.peers).SendSimple(peerID, messages.MsgMissingRequest, msg.Bytes()) + msg := &messages.MissingRequestMsg{Request: req} + c.SendPeerMsgByNetID(peerID, chain.PeerMessageReceiverChain, chain.PeerMsgTypeMissingRequest, msg.Bytes()) } } } -func (c *chainObj) enqueueMissingRequestPeerMsg(peerMsg *peering.PeerMessage) { - c.missingRequestPeerMsgPipe.In() <- peerMsg +func (c *chainObj) enqueueMissingRequestMsg(msg *messages.MissingRequestMsg) { + c.missingRequestPeerMsgPipe.In() <- msg } -func (c *chainObj) handleMissingRequestPeerMsg(peerMsg *peering.PeerMessage) { +func (c *chainObj) handleMissingRequestMsg(msg *messages.MissingRequestMsg) { if !c.pullMissingRequestsFromCommittee { return } - msg, err := messages.MissingRequestMsgFromBytes(peerMsg.MsgData) - if err != nil { - c.log.Error(err) - return - } if c.consensus.ShouldReceiveMissingRequest(msg.Request) { c.mempool.ReceiveRequest(msg.Request) } diff --git a/packages/chain/chainimpl/interface.go b/packages/chain/chainimpl/interface.go index c9488b8026..60f6c29d41 100644 --- a/packages/chain/chainimpl/interface.go +++ b/packages/chain/chainimpl/interface.go @@ -94,8 +94,28 @@ func (c *chainObj) IsDismissed() bool { return c.dismissed.Load() } -func (c *chainObj) AttachToPeerMessages(fun func(recv *peering.RecvEvent)) { - c.attachIDs = append(c.attachIDs, (*c.peers).Attach(&c.peeringID, fun)) +func (c *chainObj) AttachToPeerMessages(msgReceiver byte, fun func(recv *peering.PeerMessageIn)) { + c.attachIDs = append(c.attachIDs, (*c.peers).Attach(&c.peeringID, msgReceiver, fun)) +} + +func (c *chainObj) SendPeerMsgByNetID(netID string, msgReceiver byte, msgType byte, msgData []byte) { + (*c.peers).SendMsgByNetID(netID, &peering.PeerMessageData{ + PeeringID: c.peeringID, + Timestamp: time.Now().UnixNano(), + MsgReceiver: msgReceiver, + MsgType: msgType, + MsgData: msgData, + }) +} + +func (c *chainObj) SendPeerMsgToRandomPeers(upToNumPeers uint16, msgReceiver byte, msgType byte, msgData []byte) { + (*c.peers).SendMsgToRandomPeers(upToNumPeers, &peering.PeerMessageData{ + PeeringID: c.peeringID, + Timestamp: time.Now().UnixNano(), + MsgReceiver: msgReceiver, + MsgType: msgType, + MsgData: msgData, + }) } func (c *chainObj) StateCandidateToStateManager(virtualState state.VirtualStateAccess, outputID ledgerstate.OutputID) { @@ -119,7 +139,10 @@ func shouldSendToPeer(peerID string, ackPeers []string) bool { func (c *chainObj) broadcastOffLedgerRequest(req *request.OffLedger) { c.log.Debugf("broadcastOffLedgerRequest: toNPeers: %d, reqID: %s", c.offledgerBroadcastUpToNPeers, req.ID().Base58()) - msgData := messages.NewOffLedgerRequestPeerMsg(c.chainID, req).Bytes() + msg := &messages.OffLedgerRequestMsg{ + ChainID: c.chainID, + Req: req, + } committee := c.getCommittee() getPeerIDs := (*c.peers).GetRandomPeers @@ -132,7 +155,7 @@ func (c *chainObj) broadcastOffLedgerRequest(req *request.OffLedger) { for _, peerID := range peerIDs { if shouldSendToPeer(peerID, ackPeers) { c.log.Debugf("sending offledger request ID: reqID: %s, peerID: %s", req.ID().Base58(), peerID) - (*c.peers).SendSimple(peerID, messages.MsgOffLedgerRequest, msgData) + c.SendPeerMsgByNetID(peerID, chain.PeerMessageReceiverChain, chain.PeerMsgTypeOffLedgerRequest, msg.Bytes()) } } } @@ -170,16 +193,8 @@ func (c *chainObj) sendRequestAcknowledgementMsg(reqID iscp.RequestID, peerID st if peerID == "" { return } - msgData := messages.NewRequestAckMsg(reqID).Bytes() - (*c.peers).SendSimple(peerID, messages.MsgRequestAck, msgData) -} - -func (c *chainObj) ReceiveRequestAckMessage(reqID *iscp.RequestID, peerID string) { - c.log.Debugf("ReceiveRequestAckMessage: reqID: %s, peerID: %s", reqID.Base58(), peerID) - c.offLedgerReqsAcksMutex.Lock() - defer c.offLedgerReqsAcksMutex.Unlock() - c.offLedgerReqsAcks[*reqID] = append(c.offLedgerReqsAcks[*reqID], peerID) - c.chainMetrics.CountRequestAckMessages() + msg := &messages.RequestAckMsg{ReqID: &reqID} + c.SendPeerMsgByNetID(peerID, chain.PeerMessageReceiverChain, chain.PeerMsgTypeRequestAck, msg.Bytes()) } func (c *chainObj) ReceiveTransaction(tx *ledgerstate.Transaction) { diff --git a/packages/chain/committee/committee.go b/packages/chain/committee/committee.go index e6aaea746c..4ec7f1883c 100644 --- a/packages/chain/committee/committee.go +++ b/packages/chain/committee/committee.go @@ -94,18 +94,13 @@ func New( // That's the default implementation of the ACS. // We use it, of the mocked variant was not passed. ret.acsRunner = commonsubset.NewCommonSubsetCoordinator( - peerGroupID, + ret, netProvider, peers, dkshare, log, ) } - ret.AttachToPeerMessages(func(recv *peering.RecvEvent) { - if ret.acsRunner != nil { - ret.acsRunner.TryHandleMessage(recv) - } - }) go ret.waitReady(waitReady) return ret, nil @@ -135,28 +130,31 @@ func (c *committee) DKShare() *tcrypto.DKShare { return c.dkshare } -func (c *committee) SendMsg(targetPeerIndex uint16, msgType byte, msgData []byte) error { +func (c *committee) SendMsgByIndex(targetPeerIndex uint16, msgReceiver byte, msgType byte, msgData []byte) error { if peer, ok := c.validatorNodes.OtherNodes()[targetPeerIndex]; ok { - peer.SendMsg(&peering.PeerMessage{ - PeeringID: c.peeringID, - SenderIndex: c.ownIndex, - MsgType: msgType, - MsgData: msgData, + peer.SendMsg(&peering.PeerMessageNet{ + PeerMessageData: peering.PeerMessageData{ + PeeringID: c.peeringID, + Timestamp: time.Now().UnixNano(), + MsgReceiver: msgReceiver, + MsgType: msgType, + MsgData: msgData, + }, }) return nil } return fmt.Errorf("SendMsg: wrong peer index") } -func (c *committee) SendMsgToPeers(msgType byte, msgData []byte, ts int64, except ...uint16) { - msg := &peering.PeerMessage{ +func (c *committee) SendMsgBroadcast(msgReceiver byte, msgType byte, msgData []byte, except ...uint16) { + msg := &peering.PeerMessageData{ PeeringID: c.peeringID, - SenderIndex: c.ownIndex, - Timestamp: ts, + Timestamp: time.Now().UnixNano(), + MsgReceiver: msgReceiver, MsgType: msgType, MsgData: msgData, } - c.validatorNodes.Broadcast(msg, false, except...) + c.validatorNodes.SendMsgBroadcast(msg, false, except...) } func (c *committee) IsAlivePeer(peerIndex uint16) bool { @@ -210,8 +208,8 @@ func (c *committee) PeerStatus() []*chain.PeerStatus { return ret } -func (c *committee) AttachToPeerMessages(fun func(recv *peering.RecvEvent)) { - c.attachIDs = append(c.attachIDs, c.validatorNodes.Attach(&c.peeringID, fun)) +func (c *committee) AttachToPeerMessages(peerMsgReceiver byte, fun func(peerMsg *peering.PeerMessageGroupIn)) { + c.attachIDs = append(c.attachIDs, c.validatorNodes.Attach(&c.peeringID, peerMsgReceiver, fun)) } func (c *committee) Close() { diff --git a/packages/chain/consensus/action.go b/packages/chain/consensus/action.go index 68ffe34027..f303b82074 100644 --- a/packages/chain/consensus/action.go +++ b/packages/chain/consensus/action.go @@ -11,6 +11,7 @@ import ( "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/hive.go/identity" + "github.com/iotaledger/wasp/packages/chain" "github.com/iotaledger/wasp/packages/chain/messages" "github.com/iotaledger/wasp/packages/hashing" "github.com/iotaledger/wasp/packages/iscp" @@ -24,7 +25,7 @@ import ( ) // takeAction triggers actions whenever relevant -func (c *Consensus) takeAction() { +func (c *consensus) takeAction() { if !c.workflow.stateReceived || !c.workflow.inProgress { c.log.Debugf("takeAction skipped: stateReceived: %v, workflow in progress: %v", c.workflow.stateReceived, c.workflow.inProgress) @@ -41,7 +42,7 @@ func (c *Consensus) takeAction() { // proposeBatchIfNeeded when non empty ready batch is available is in mempool propose it as a candidate // for the ACS agreement -func (c *Consensus) proposeBatchIfNeeded() { +func (c *consensus) proposeBatchIfNeeded() { if c.workflow.batchProposalSent { c.log.Debugf("proposeBatch not needed: batch proposal already sent") return @@ -80,7 +81,7 @@ func (c *Consensus) proposeBatchIfNeeded() { // runVMIfNeeded attempts to extract deterministic batch of requests from ACS. // If it succeeds (i.e. all requests are available) and the extracted batch is nonempty, it runs the request -func (c *Consensus) runVMIfNeeded() { +func (c *consensus) runVMIfNeeded() { if !c.workflow.consensusBatchKnown { c.log.Debugf("runVM not needed: consensus batch is not known") return @@ -152,7 +153,7 @@ func (c *Consensus) runVMIfNeeded() { } } -func (c *Consensus) pollMissingRequests(missingRequestIndexes []int) { +func (c *consensus) pollMissingRequests(missingRequestIndexes []int) { // some requests are not ready, so skip VM call this time. Maybe next time will be more luck c.delayRunVMUntil = time.Now().Add(c.timers.VMRunRetryToWaitForReadyRequests) c.log.Infof( // Was silently failing when entire arrays were logged instead of counts. @@ -172,13 +173,13 @@ func (c *Consensus) pollMissingRequests(missingRequestIndexes []int) { missingRequestIds = append(missingRequestIds, reqID) } c.log.Debugf("runVMIfNeeded: asking for missing requests, ids: %v", missingRequestIds) - msgData := messages.NewMissingRequestIDsMsg(missingRequestIds).Bytes() - c.committee.SendMsgToPeers(messages.MsgMissingRequestIDs, msgData, time.Now().UnixNano()) + msg := &messages.MissingRequestIDsMsg{IDs: missingRequestIds} + c.committee.SendMsgBroadcast(chain.PeerMessageReceiverChain, chain.PeerMsgTypeMissingRequestIDs, msg.Bytes()) } // sortBatch deterministically sorts batch based on the value extracted from the consensus entropy // It is needed for determinism and as a MEV prevention measure see [prevent-mev.md] -func (c *Consensus) sortBatch(reqs []iscp.Request) { +func (c *consensus) sortBatch(reqs []iscp.Request) { if len(reqs) <= 1 { return } @@ -210,7 +211,7 @@ func (c *Consensus) sortBatch(reqs []iscp.Request) { } } -func (c *Consensus) prepareVMTask(reqs []iscp.Request) *vm.VMTask { +func (c *consensus) prepareVMTask(reqs []iscp.Request) *vm.VMTask { stateBaseline := c.chain.GlobalStateSync().GetSolidIndexBaseline() if !stateBaseline.IsValid() { c.log.Debugf("prepareVMTask: solid state baseline is invalid. Do not even start the VM") @@ -245,7 +246,7 @@ func (c *Consensus) prepareVMTask(reqs []iscp.Request) *vm.VMTask { return task } -func (c *Consensus) broadcastSignedResultIfNeeded() { +func (c *consensus) broadcastSignedResultIfNeeded() { if !c.workflow.vmResultSigned { c.log.Debugf("broadcastSignedResult not needed: vm result is not signed") return @@ -260,7 +261,7 @@ func (c *Consensus) broadcastSignedResultIfNeeded() { EssenceHash: signedResult.EssenceHash, SigShare: signedResult.SigShare, } - c.committee.SendMsgToPeers(messages.MsgSignedResult, util.MustBytes(msg), time.Now().UnixNano(), c.resultSigAck...) + c.committee.SendMsgBroadcast(peerMessageReceiverConsensus, peerMsgTypeSignedResult, util.MustBytes(msg), c.resultSigAck...) c.delaySendingSignedResult = time.Now().Add(c.timers.BroadcastSignedResultRetry) c.log.Debugf("broadcastSignedResult: broadcasted: essence hash: %s, chain input %s", @@ -275,7 +276,7 @@ func (c *Consensus) broadcastSignedResultIfNeeded() { // Then it deterministically calculates a priority sequence among contributing nodes for posting // the transaction to L1. The deadline por posting is set proportionally to the sequence number (deterministic) // If the node sees the transaction of the L1 before its deadline, it cancels its posting -func (c *Consensus) checkQuorum() { +func (c *consensus) checkQuorum() { if c.workflow.transactionFinalized { c.log.Debugf("checkQuorum not needed: transaction already finalized") return @@ -359,7 +360,7 @@ func (c *Consensus) checkQuorum() { } // postTransactionIfNeeded posts a finalized transaction upon deadline unless it was evidenced on L1 before the deadline. -func (c *Consensus) postTransactionIfNeeded() { +func (c *consensus) postTransactionIfNeeded() { if !c.workflow.transactionFinalized { c.log.Debugf("postTransaction not needed: transaction is not finalized") return @@ -389,7 +390,7 @@ func (c *Consensus) postTransactionIfNeeded() { // pullInclusionStateIfNeeded periodic pull to know the inclusions state of the transaction. Note that pulling // starts immediately after finalization of the transaction, not after posting it -func (c *Consensus) pullInclusionStateIfNeeded() { +func (c *consensus) pullInclusionStateIfNeeded() { if !c.workflow.transactionFinalized { c.log.Debugf("pullInclusionState not needed: transaction is not finalized") return @@ -408,7 +409,7 @@ func (c *Consensus) pullInclusionStateIfNeeded() { } // prepareBatchProposal creates a batch proposal structure out of requests -func (c *Consensus) prepareBatchProposal(reqs []iscp.Request) *BatchProposal { +func (c *consensus) prepareBatchProposal(reqs []iscp.Request) *BatchProposal { ts := time.Now() if !ts.After(c.stateTimestamp) { ts = c.stateTimestamp.Add(1 * time.Nanosecond) @@ -442,7 +443,7 @@ func (c *Consensus) prepareBatchProposal(reqs []iscp.Request) *BatchProposal { // receiveACS processed new ACS received from ACS consensus //nolint:funlen -func (c *Consensus) receiveACS(values [][]byte, sessionID uint64) { +func (c *consensus) receiveACS(values [][]byte, sessionID uint64) { if c.acsSessionID != sessionID { c.log.Debugf("receiveACS: session id missmatch: expected %v, received %v", c.acsSessionID, sessionID) return @@ -556,7 +557,7 @@ func (c *Consensus) receiveACS(values [][]byte, sessionID uint64) { c.runVMIfNeeded() } -func (c *Consensus) processInclusionState(msg *messages.InclusionStateMsg) { +func (c *consensus) processInclusionState(msg *messages.InclusionStateMsg) { if !c.workflow.transactionFinalized { c.log.Debugf("processInclusionState: transaction finalized -> skipping.") return @@ -582,7 +583,7 @@ func (c *Consensus) processInclusionState(msg *messages.InclusionStateMsg) { } } -func (c *Consensus) finalizeTransaction(sigSharesToAggregate [][]byte) (*ledgerstate.Transaction, *ledgerstate.AliasOutput, error) { +func (c *consensus) finalizeTransaction(sigSharesToAggregate [][]byte) (*ledgerstate.Transaction, *ledgerstate.AliasOutput, error) { signatureWithPK, err := c.committee.DKShare().RecoverFullSignature(sigSharesToAggregate, c.resultTxEssence.Bytes()) if err != nil { return nil, nil, xerrors.Errorf("finalizeTransaction RecoverFullSignature fail: %w", err) @@ -615,7 +616,7 @@ func (c *Consensus) finalizeTransaction(sigSharesToAggregate [][]byte) (*ledgers return tx, chained, nil } -func (c *Consensus) setNewState(msg *messages.StateTransitionMsg) { +func (c *consensus) setNewState(msg *messages.StateTransitionMsg) { if msg.State.BlockIndex() != msg.StateOutput.GetStateIndex() { c.log.Panicf("consensus::setNewState: state index is inconsistent: block: #%d != chain output: #%d", msg.State.BlockIndex(), msg.StateOutput.GetStateIndex()) @@ -634,7 +635,7 @@ func (c *Consensus) setNewState(msg *messages.StateTransitionMsg) { c.resetWorkflow() } -func (c *Consensus) resetWorkflow() { +func (c *consensus) resetWorkflow() { for i := range c.resultSignatures { c.resultSignatures[i] = nil } @@ -652,7 +653,7 @@ func (c *Consensus) resetWorkflow() { c.log.Debugf("Workflow reset") } -func (c *Consensus) processVMResult(result *vm.VMTask) { +func (c *consensus) processVMResult(result *vm.VMTask) { if !c.workflow.vmStarted || c.workflow.vmResultSigned || c.acsSessionID != result.ACSSessionID { @@ -681,11 +682,13 @@ func (c *Consensus) processVMResult(result *vm.VMTask) { sigShare, err := c.committee.DKShare().SignShare(essenceBytes) c.assert.RequireNoError(err, "processVMResult: ") - c.resultSignatures[c.committee.OwnPeerIndex()] = &messages.SignedResultMsg{ - SenderIndex: c.committee.OwnPeerIndex(), - ChainInputID: result.ChainInput.ID(), - EssenceHash: essenceHash, - SigShare: sigShare, + c.resultSignatures[c.committee.OwnPeerIndex()] = &messages.SignedResultMsgIn{ + SignedResultMsg: messages.SignedResultMsg{ + ChainInputID: result.ChainInput.ID(), + EssenceHash: essenceHash, + SigShare: sigShare, + }, + SenderIndex: c.committee.OwnPeerIndex(), } c.workflow.vmResultSigned = true @@ -693,7 +696,7 @@ func (c *Consensus) processVMResult(result *vm.VMTask) { c.log.Debugf("processVMResult signed: essence hash: %s", essenceHash.String()) } -func (c *Consensus) makeRotateStateControllerTransaction(task *vm.VMTask) *ledgerstate.TransactionEssence { +func (c *consensus) makeRotateStateControllerTransaction(task *vm.VMTask) *ledgerstate.TransactionEssence { c.log.Debugf("makeRotateStateControllerTransaction: %s", task.RotationAddress.Base58()) // TODO access and consensus pledge @@ -708,7 +711,7 @@ func (c *Consensus) makeRotateStateControllerTransaction(task *vm.VMTask) *ledge return essence } -func (c *Consensus) receiveSignedResult(msg *messages.SignedResultMsg) { +func (c *consensus) receiveSignedResult(msg *messages.SignedResultMsgIn) { if c.resultSignatures[msg.SenderIndex] != nil { if c.resultSignatures[msg.SenderIndex].EssenceHash != msg.EssenceHash || !bytes.Equal(c.resultSignatures[msg.SenderIndex].SigShare[:], msg.SigShare[:]) { @@ -743,12 +746,12 @@ func (c *Consensus) receiveSignedResult(msg *messages.SignedResultMsg) { ChainInputID: msg.ChainInputID, EssenceHash: msg.EssenceHash, } - if err := c.committee.SendMsg(msg.SenderIndex, messages.MsgSignedResultAck, util.MustBytes(msgAck)); err != nil { + if err := c.committee.SendMsgByIndex(msg.SenderIndex, peerMessageReceiverConsensus, peerMsgTypeSignedResultAck, util.MustBytes(msgAck)); err != nil { c.log.Errorf("receiveSignedResult: failed to send acknowledgement: %v", err) } } -func (c *Consensus) receiveSignedResultAck(msg *messages.SignedResultAckMsg) { +func (c *consensus) receiveSignedResultAck(msg *messages.SignedResultAckMsgIn) { own := c.resultSignatures[c.committee.OwnPeerIndex()] if own == nil || msg.EssenceHash != own.EssenceHash || msg.ChainInputID != own.ChainInputID { return @@ -764,7 +767,7 @@ func (c *Consensus) receiveSignedResultAck(msg *messages.SignedResultAckMsg) { // TODO mutex inside is not good // ShouldReceiveMissingRequest returns whether the request is missing, if the incoming request matches the expects ID/Hash it is removed from the list -func (c *Consensus) ShouldReceiveMissingRequest(req iscp.Request) bool { +func (c *consensus) ShouldReceiveMissingRequest(req iscp.Request) bool { c.log.Debugf("ShouldReceiveMissingRequest: reqID %s, hash %v", req.ID(), req.Hash()) c.missingRequestsMutex.Lock() @@ -782,7 +785,7 @@ func (c *Consensus) ShouldReceiveMissingRequest(req iscp.Request) bool { return result } -func (c *Consensus) cleanMissingRequests() { +func (c *consensus) cleanMissingRequests() { c.missingRequestsMutex.Lock() defer c.missingRequestsMutex.Unlock() diff --git a/packages/chain/consensus/batch_proposal.go b/packages/chain/consensus/batch_proposal.go index de4a1fc5e6..072d1f6cb7 100644 --- a/packages/chain/consensus/batch_proposal.go +++ b/packages/chain/consensus/batch_proposal.go @@ -145,7 +145,7 @@ func (b *BatchProposal) EnsureTimestampConsistent(requests []iscp.Request, state // Timestamp is calculated by taking maximal proposed timestamp excluding F highest proposals. // // TODO final version of pledges and fee destination -func (c *Consensus) calcBatchParameters(props []*BatchProposal) (*consensusBatchParams, error) { +func (c *consensus) calcBatchParameters(props []*BatchProposal) (*consensusBatchParams, error) { var retTS time.Time ts := make([]time.Time, len(props)) diff --git a/packages/chain/consensus/commonsubset/commonsubset.go b/packages/chain/consensus/commonsubset/commonsubset.go index e39938c08a..9c87df2d99 100644 --- a/packages/chain/consensus/commonsubset/commonsubset.go +++ b/packages/chain/consensus/commonsubset/commonsubset.go @@ -38,6 +38,7 @@ import ( "github.com/anthdm/hbbft" "github.com/iotaledger/hive.go/logger" + "github.com/iotaledger/wasp/packages/chain" "github.com/iotaledger/wasp/packages/chain/consensus/commoncoin" "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/tcrypto" @@ -63,11 +64,10 @@ type CommonSubset struct { recvMsgBatches []map[uint32]uint32 // [PeerId]ReceivedMbID -> AckedInMb (0 -- unacked). It remains 0, if acked in non-data message. sentMsgBatches map[uint32]*msgBatch // BatchID -> MsgBatch - sessionID uint64 // Unique identifier for this consensus instance. Used to route messages. - stateIndex uint32 // Sequence number of the CS transaction we are agreeing on. - peeringID peering.PeeringID // ID for the communication group. - netGroup peering.GroupProvider // Group of nodes we are communicating with. - netOwnIndex uint16 // Our index in the group. + sessionID uint64 // Unique identifier for this consensus instance. Used to route messages. + stateIndex uint32 // Sequence number of the CS transaction we are agreeing on. + committee chain.Committee + netOwnIndex uint16 // Our index in the group. inputCh chan []byte // For our input to the consensus. recvCh chan *msgBatch // For incoming messages. @@ -80,7 +80,7 @@ type CommonSubset struct { func NewCommonSubset( sessionID uint64, stateIndex uint32, - peeringID peering.PeeringID, + committee chain.Committee, netGroup peering.GroupProvider, dkShare *tcrypto.DKShare, allRandom bool, // Set to true to have real CC rounds for each epoch. That's for testing mostly. @@ -118,8 +118,7 @@ func NewCommonSubset( sentMsgBatches: make(map[uint32]*msgBatch), sessionID: sessionID, stateIndex: stateIndex, - peeringID: peeringID, - netGroup: netGroup, + committee: committee, netOwnIndex: ownIndex, inputCh: make(chan []byte, 1), recvCh: make(chan *msgBatch, 1), @@ -147,22 +146,6 @@ func (cs *CommonSubset) Input(input []byte) { cs.inputCh <- input } -// TryHandleMessage checks, if the RecvEvent is of suitable type and -// processed the message as an input from a peer if the type matches. -// This one is called from the ACS tests. -func (cs *CommonSubset) TryHandleMessage(recv *peering.RecvEvent) bool { - if recv.Msg.MsgType != acsMsgType { - return false - } - mb := msgBatch{} - if err := mb.FromBytes(recv.Msg.MsgData); err != nil { - cs.log.Errorf("Cannot decode message: %v", err) - return true - } - cs.HandleMsgBatch(&mb) - return true -} - // HandleMsgBatch accepts a parsed msgBatch as an input from other node. // This function is used in the CommonSubsetCoordinator to avoid parsing // the received message multiple times. @@ -396,13 +379,7 @@ func (cs *CommonSubset) send(msgBatch *msgBatch) { return } cs.log.Debugf("ACS::IO - Sending a msgBatch=%+v", msgBatch) - cs.netGroup.SendMsgByIndex(msgBatch.dst, &peering.PeerMessage{ - PeeringID: cs.peeringID, - SenderIndex: cs.netOwnIndex, - Timestamp: 0, - MsgType: acsMsgType, - MsgData: msgBatch.Bytes(), - }) + cs.committee.SendMsgByIndex(msgBatch.dst, peerMessageReceiverCommonSubset, peerMsgTypeBatch, msgBatch.Bytes()) } // endregion /////////////////////////////////////////////////////////////////// @@ -430,6 +407,15 @@ const ( acsMsgTypeAbaDoneRequest byte = 7 << 4 ) +func newMsgBatch(data []byte) (*msgBatch, error) { + mb := &msgBatch{} + r := bytes.NewReader(data) + if err := mb.Read(r); err != nil { + return nil, err + } + return mb, nil +} + func (b *msgBatch) NeedsAck() bool { return b.id != 0 } @@ -740,11 +726,6 @@ func (b *msgBatch) Read(r io.Reader) error { return nil } -func (b *msgBatch) FromBytes(buf []byte) error { - r := bytes.NewReader(buf) - return b.Read(r) -} - func (b *msgBatch) Bytes() []byte { var buf bytes.Buffer _ = b.Write(&buf) diff --git a/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go b/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go index f4b858b4bd..3b11bd89fa 100644 --- a/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go +++ b/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go @@ -4,10 +4,12 @@ package commonsubset import ( + "fmt" "sort" "sync" "github.com/iotaledger/hive.go/logger" + "github.com/iotaledger/wasp/packages/chain" "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/tcrypto" "golang.org/x/xerrors" @@ -16,6 +18,10 @@ import ( const ( futureInstances = 5 // How many future instances to accept. pastInstances = 2 // How many past instance to keep not closed. + + peerMessageReceiverCommonSubset = byte(2) + + peerMsgTypeBatch = iota ) // CommonSubsetCoordinator is responsible for maintaining a series of ACS @@ -47,28 +53,30 @@ type CommonSubsetCoordinator struct { currentStateIndex uint32 // Last state index passed by this node. lock sync.RWMutex - peeringID peering.PeeringID + committee chain.Committee netGroup peering.GroupProvider dkShare *tcrypto.DKShare log *logger.Logger } func NewCommonSubsetCoordinator( - peeringID peering.PeeringID, + committee chain.Committee, net peering.NetworkProvider, netGroup peering.GroupProvider, dkShare *tcrypto.DKShare, log *logger.Logger, ) *CommonSubsetCoordinator { - return &CommonSubsetCoordinator{ + ret := &CommonSubsetCoordinator{ csInsts: make(map[uint64]*CommonSubset), csAsked: make(map[uint64]bool), lock: sync.RWMutex{}, - peeringID: peeringID, + committee: committee, netGroup: netGroup, dkShare: dkShare, log: log, } + committee.AttachToPeerMessages(peerMessageReceiverCommonSubset, ret.receiveCommitteePeerMessages) + return ret } // Close implements the AsynchronousCommonSubsetRunner interface. @@ -104,24 +112,26 @@ func (csc *CommonSubsetCoordinator) RunACSConsensus( // TryHandleMessage implements the AsynchronousCommonSubsetRunner interface. // It handles the network messages, if they are of correct type. -func (csc *CommonSubsetCoordinator) TryHandleMessage(recv *peering.RecvEvent) bool { - if recv.Msg.MsgType != acsMsgType { - return false +func (csc *CommonSubsetCoordinator) receiveCommitteePeerMessages(peerMsg *peering.PeerMessageGroupIn) { + if peerMsg.MsgReceiver != peerMessageReceiverCommonSubset { + panic(fmt.Errorf("Committee does not accept peer messages of other receiver type %v, message type=%v", + peerMsg.MsgReceiver, peerMsg.MsgType)) } - mb := msgBatch{} - if err := mb.FromBytes(recv.Msg.MsgData); err != nil { - csc.log.Errorf("Cannot decode message: %v", err) - return true + if peerMsg.MsgType != peerMsgTypeBatch { + panic(fmt.Errorf("Wrong type of committee message: %v", peerMsg.MsgType)) } - csc.log.Debugf("ACS::IO - Received a msgBatch=%+v", mb) - var err error + mb, err := newMsgBatch(peerMsg.MsgData) + if err != nil { + csc.log.Error(err) + return + } + csc.log.Debugf("ACS::IO - Received a msgBatch=%+v", *mb) var cs *CommonSubset if cs, err = csc.getOrCreateCS(mb.sessionID, mb.stateIndex, nil); err != nil { csc.log.Debugf("Unable to get a CommonSubset instance for sessionID=%v, reason=%v", mb.sessionID, err) - return true + return } - cs.HandleMsgBatch(&mb) - return true + cs.HandleMsgBatch(mb) } func (csc *CommonSubsetCoordinator) getOrCreateCS( @@ -167,7 +177,7 @@ func (csc *CommonSubsetCoordinator) getOrCreateCS( var err error var newCS *CommonSubset outCh := make(chan map[uint16][]byte, 1) - if newCS, err = NewCommonSubset(sessionID, stateIndex, csc.peeringID, csc.netGroup, csc.dkShare, false, outCh, csc.log); err != nil { + if newCS, err = NewCommonSubset(sessionID, stateIndex, csc.committee, csc.netGroup, csc.dkShare, false, outCh, csc.log); err != nil { return nil, err } csc.csInsts[sessionID] = newCS diff --git a/packages/chain/consensus/consensus.go b/packages/chain/consensus/consensus.go index 93fc0601a9..30c439b239 100644 --- a/packages/chain/consensus/consensus.go +++ b/packages/chain/consensus/consensus.go @@ -4,7 +4,7 @@ package consensus import ( - "bytes" + "fmt" "sync" "time" @@ -23,7 +23,7 @@ import ( "go.uber.org/atomic" ) -type Consensus struct { +type consensus struct { isReady atomic.Bool chain chain.ChainCore committee chain.Committee @@ -45,7 +45,7 @@ type Consensus struct { delaySendingSignedResult time.Time resultTxEssence *ledgerstate.TransactionEssence resultState state.VirtualStateAccess - resultSignatures []*messages.SignedResultMsg + resultSignatures []*messages.SignedResultMsgIn resultSigAck []uint16 finalTx *ledgerstate.Transaction postTxDeadline time.Time @@ -55,8 +55,8 @@ type Consensus struct { timers ConsensusTimers log *logger.Logger eventStateTransitionMsgCh chan *messages.StateTransitionMsg - eventSignedResultMsgCh chan *messages.SignedResultMsg - eventSignedResultAckMsgCh chan *messages.SignedResultAckMsg + eventSignedResultMsgCh chan *messages.SignedResultMsgIn + eventSignedResultAckMsgCh chan *messages.SignedResultAckMsgIn eventInclusionStateMsgCh chan *messages.InclusionStateMsg eventACSMsgCh chan *messages.AsynchronousCommonSubsetMsg eventVMResultMsgCh chan *messages.VMResultMsg @@ -81,9 +81,16 @@ type workflowFlags struct { inProgress bool } -var _ chain.Consensus = &Consensus{} +var _ chain.Consensus = &consensus{} -func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Committee, nodeConn chain.NodeConnection, pullMissingRequestsFromCommittee bool, consensusMetrics metrics.ConsensusMetrics, timersOpt ...ConsensusTimers) *Consensus { +const ( + peerMessageReceiverConsensus = byte(1) + + peerMsgTypeSignedResult = iota + peerMsgTypeSignedResultAck +) + +func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Committee, nodeConn chain.NodeConnection, pullMissingRequestsFromCommittee bool, consensusMetrics metrics.ConsensusMetrics, timersOpt ...ConsensusTimers) chain.Consensus { var timers ConsensusTimers if len(timersOpt) > 0 { timers = timersOpt[0] @@ -91,19 +98,19 @@ func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Commi timers = NewConsensusTimers() } log := chainCore.Log().Named("c") - ret := &Consensus{ + ret := &consensus{ chain: chainCore, committee: committee, mempool: mempool, nodeConn: nodeConn, vmRunner: runvm.NewVMRunner(), - resultSignatures: make([]*messages.SignedResultMsg, committee.Size()), + resultSignatures: make([]*messages.SignedResultMsgIn, committee.Size()), resultSigAck: make([]uint16, 0, committee.Size()), timers: timers, log: log, eventStateTransitionMsgCh: make(chan *messages.StateTransitionMsg), - eventSignedResultMsgCh: make(chan *messages.SignedResultMsg), - eventSignedResultAckMsgCh: make(chan *messages.SignedResultAckMsg), + eventSignedResultMsgCh: make(chan *messages.SignedResultMsgIn), + eventSignedResultAckMsgCh: make(chan *messages.SignedResultAckMsgIn), eventInclusionStateMsgCh: make(chan *messages.InclusionStateMsg), eventACSMsgCh: make(chan *messages.AsynchronousCommonSubsetMsg), eventVMResultMsgCh: make(chan *messages.VMResultMsg), @@ -113,47 +120,50 @@ func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Commi pullMissingRequestsFromCommittee: pullMissingRequestsFromCommittee, consensusMetrics: consensusMetrics, } - committee.AttachToPeerMessages(ret.receiveCommitteePeerMessages) + committee.AttachToPeerMessages(peerMessageReceiverConsensus, ret.receiveCommitteePeerMessages) ret.refreshConsensusInfo() go ret.recvLoop() return ret } -func (c *Consensus) receiveCommitteePeerMessages(event *peering.RecvEvent) { - msg := event.Msg - switch msg.MsgType { - case messages.MsgSignedResult: - msgt := &messages.SignedResultMsg{} - rdr := bytes.NewReader(msg.MsgData) - if err := msgt.Read(rdr); err != nil { +func (c *consensus) receiveCommitteePeerMessages(peerMsg *peering.PeerMessageGroupIn) { + if peerMsg.MsgReceiver != peerMessageReceiverConsensus { + panic(fmt.Errorf("Consensus does not accept peer messages of other receiver type %v, message type=%v", + peerMsg.MsgReceiver, peerMsg.MsgType)) + } + switch peerMsg.MsgType { + case peerMsgTypeSignedResult: + msg, err := messages.NewSignedResultMsg(peerMsg.MsgData) + if err != nil { c.log.Error(err) return } - msgt.SenderIndex = msg.SenderIndex - c.EventSignedResultMsg(msgt) - case messages.MsgSignedResultAck: - msgt := &messages.SignedResultAckMsg{} - rdr := bytes.NewReader(msg.MsgData) - if err := msgt.Read(rdr); err != nil { + c.EnqueueSignedResultMsg(&messages.SignedResultMsgIn{ + SignedResultMsg: *msg, + SenderIndex: peerMsg.SenderIndex, + }) + case peerMsgTypeSignedResultAck: + msg, err := messages.NewSignedResultAckMsg(peerMsg.MsgData) + if err != nil { c.log.Error(err) return } - msgt.SenderIndex = msg.SenderIndex - c.EventSignedResultAckMsg(msgt) - default: - return + c.EnqueueSignedResultAckMsg(&messages.SignedResultAckMsgIn{ + SignedResultAckMsg: *msg, + SenderIndex: peerMsg.SenderIndex, + }) } } -func (c *Consensus) IsReady() bool { +func (c *consensus) IsReady() bool { return c.isReady.Load() } -func (c *Consensus) Close() { +func (c *consensus) Close() { close(c.closeCh) } -func (c *Consensus) recvLoop() { +func (c *consensus) recvLoop() { // wait at startup for !c.committee.IsReady() { select { @@ -174,15 +184,15 @@ func (c *Consensus) recvLoop() { } case msg, ok := <-c.eventSignedResultMsgCh: if ok { - c.log.Debugf("Consensus::recvLoop, eventSignedResult...") - c.eventSignedResult(msg) - c.log.Debugf("Consensus::recvLoop, eventSignedResult... Done") + c.log.Debugf("Consensus::recvLoop, handleSignedResultMsg...") + c.handleSignedResultMsg(msg) + c.log.Debugf("Consensus::recvLoop, handleSignedResultMsg... Done") } case msg, ok := <-c.eventSignedResultAckMsgCh: if ok { - c.log.Debugf("Consensus::recvLoop, eventSignedResultAck...") - c.eventSignedResultAck(msg) - c.log.Debugf("Consensus::recvLoop, eventSignedResultAck... Done") + c.log.Debugf("Consensus::recvLoop, handleSignedResultAckMsg...") + c.handleSignedResultAckMsg(msg) + c.log.Debugf("Consensus::recvLoop, handleSignedResultAckMsg... Done") } case msg, ok := <-c.eventInclusionStateMsgCh: if ok { @@ -214,7 +224,7 @@ func (c *Consensus) recvLoop() { } } -func (c *Consensus) refreshConsensusInfo() { +func (c *consensus) refreshConsensusInfo() { index := uint32(0) if c.currentState != nil { index = c.currentState.BlockIndex() @@ -235,7 +245,7 @@ func (c *Consensus) refreshConsensusInfo() { c.consensusInfoSnapshot.Store(consensusInfo) } -func (c *Consensus) GetStatusSnapshot() *chain.ConsensusInfo { +func (c *consensus) GetStatusSnapshot() *chain.ConsensusInfo { ret := c.consensusInfoSnapshot.Load() if ret == nil { return nil diff --git a/packages/chain/consensus/eventproc.go b/packages/chain/consensus/eventproc.go index 10e24be264..71c3c6e2e0 100644 --- a/packages/chain/consensus/eventproc.go +++ b/packages/chain/consensus/eventproc.go @@ -14,7 +14,7 @@ import ( "github.com/iotaledger/wasp/packages/state" ) -func (c *Consensus) EventStateTransitionMsg(state state.VirtualStateAccess, stateOutput *ledgerstate.AliasOutput, stateTimestamp time.Time) { +func (c *consensus) EventStateTransitionMsg(state state.VirtualStateAccess, stateOutput *ledgerstate.AliasOutput, stateTimestamp time.Time) { c.eventStateTransitionMsgCh <- &messages.StateTransitionMsg{ State: state, StateOutput: stateOutput, @@ -22,65 +22,65 @@ func (c *Consensus) EventStateTransitionMsg(state state.VirtualStateAccess, stat } } -func (c *Consensus) eventStateTransitionMsg(msg *messages.StateTransitionMsg) { +func (c *consensus) eventStateTransitionMsg(msg *messages.StateTransitionMsg) { c.log.Debugf("StateTransitionMsg received: state index: %d, state output: %s, timestamp: %v", msg.State.BlockIndex(), iscp.OID(msg.StateOutput.ID()), msg.StateTimestamp) c.setNewState(msg) c.takeAction() } -func (c *Consensus) EventSignedResultMsg(msg *messages.SignedResultMsg) { +func (c *consensus) EnqueueSignedResultMsg(msg *messages.SignedResultMsgIn) { c.eventSignedResultMsgCh <- msg } -func (c *Consensus) eventSignedResult(msg *messages.SignedResultMsg) { - c.log.Debugf("SignedResultMsg received: from sender %d, hash=%s, chain input id=%v", +func (c *consensus) handleSignedResultMsg(msg *messages.SignedResultMsgIn) { + c.log.Debugf("handleSignedResultMsg message received: from sender %d, hash=%s, chain input id=%v", msg.SenderIndex, msg.EssenceHash, iscp.OID(msg.ChainInputID)) c.receiveSignedResult(msg) c.takeAction() } -func (c *Consensus) EventSignedResultAckMsg(msg *messages.SignedResultAckMsg) { +func (c *consensus) EnqueueSignedResultAckMsg(msg *messages.SignedResultAckMsgIn) { c.eventSignedResultAckMsgCh <- msg } -func (c *Consensus) eventSignedResultAck(msg *messages.SignedResultAckMsg) { +func (c *consensus) handleSignedResultAckMsg(msg *messages.SignedResultAckMsgIn) { c.log.Debugf("SignedResultAckMsg received: from sender %d, hash=%s, chain input id=%v", msg.SenderIndex, msg.EssenceHash, iscp.OID(msg.ChainInputID)) c.receiveSignedResultAck(msg) c.takeAction() } -func (c *Consensus) EventInclusionsStateMsg(txID ledgerstate.TransactionID, state ledgerstate.InclusionState) { +func (c *consensus) EventInclusionsStateMsg(txID ledgerstate.TransactionID, state ledgerstate.InclusionState) { c.eventInclusionStateMsgCh <- &messages.InclusionStateMsg{ TxID: txID, State: state, } } -func (c *Consensus) eventInclusionState(msg *messages.InclusionStateMsg) { +func (c *consensus) eventInclusionState(msg *messages.InclusionStateMsg) { c.log.Debugf("InclusionStateMsg received: %s: '%s'", msg.TxID.Base58(), msg.State.String()) c.processInclusionState(msg) c.takeAction() } -func (c *Consensus) EventAsynchronousCommonSubsetMsg(msg *messages.AsynchronousCommonSubsetMsg) { +func (c *consensus) EventAsynchronousCommonSubsetMsg(msg *messages.AsynchronousCommonSubsetMsg) { c.eventACSMsgCh <- msg } -func (c *Consensus) eventAsynchronousCommonSubset(msg *messages.AsynchronousCommonSubsetMsg) { +func (c *consensus) eventAsynchronousCommonSubset(msg *messages.AsynchronousCommonSubsetMsg) { c.log.Debugf("AsynchronousCommonSubsetMsg received for session %v: len = %d", msg.SessionID, len(msg.ProposedBatchesBin)) c.receiveACS(msg.ProposedBatchesBin, msg.SessionID) c.takeAction() } -func (c *Consensus) EventVMResultMsg(msg *messages.VMResultMsg) { +func (c *consensus) EventVMResultMsg(msg *messages.VMResultMsg) { c.eventVMResultMsgCh <- msg } -func (c *Consensus) eventVMResultMsg(msg *messages.VMResultMsg) { +func (c *consensus) eventVMResultMsg(msg *messages.VMResultMsg) { var essenceString string if msg.Task.ResultTransactionEssence == nil { essenceString = "essence is nil" @@ -93,11 +93,11 @@ func (c *Consensus) eventVMResultMsg(msg *messages.VMResultMsg) { c.takeAction() } -func (c *Consensus) EventTimerMsg(msg messages.TimerTick) { +func (c *consensus) EventTimerMsg(msg messages.TimerTick) { c.eventTimerMsgCh <- msg } -func (c *Consensus) eventTimerMsg(msg messages.TimerTick) { +func (c *consensus) eventTimerMsg(msg messages.TimerTick) { c.lastTimerTick.Store(int64(msg)) c.refreshConsensusInfo() if msg%40 == 0 { diff --git a/packages/chain/mempool/mempool.go b/packages/chain/mempool/mempool.go index 7110585881..d65d524355 100644 --- a/packages/chain/mempool/mempool.go +++ b/packages/chain/mempool/mempool.go @@ -20,7 +20,7 @@ import ( "github.com/iotaledger/wasp/packages/vm/core/blocklog" ) -type Mempool struct { +type mempool struct { inBuffer map[iscp.RequestID]iscp.Request inMutex sync.RWMutex poolMutex sync.RWMutex @@ -47,10 +47,10 @@ const ( moveToPoolLoopDelay = 20 * time.Millisecond ) -var _ chain.Mempool = &Mempool{} +var _ chain.Mempool = &mempool{} -func New(stateReader state.OptimisticStateReader, blobCache registry.BlobCache, log *logger.Logger, mempoolMetrics metrics.MempoolMetrics, solidificationLoopDelay ...time.Duration) *Mempool { - ret := &Mempool{ +func New(stateReader state.OptimisticStateReader, blobCache registry.BlobCache, log *logger.Logger, mempoolMetrics metrics.MempoolMetrics, solidificationLoopDelay ...time.Duration) chain.Mempool { + ret := &mempool{ inBuffer: make(map[iscp.RequestID]iscp.Request), stateReader: stateReader, pool: make(map[iscp.RequestID]*requestRef), @@ -69,7 +69,7 @@ func New(stateReader state.OptimisticStateReader, blobCache registry.BlobCache, return ret } -func (m *Mempool) addToInBuffer(req iscp.Request) bool { +func (m *mempool) addToInBuffer(req iscp.Request) bool { // just check if it is already in the pool if m.HasRequest(req.ID()) { return false @@ -82,7 +82,7 @@ func (m *Mempool) addToInBuffer(req iscp.Request) bool { return true } -func (m *Mempool) removeFromInBuffer(req iscp.Request) { +func (m *mempool) removeFromInBuffer(req iscp.Request) { m.inMutex.Lock() defer m.inMutex.Unlock() if _, ok := m.inBuffer[req.ID()]; ok { @@ -92,7 +92,7 @@ func (m *Mempool) removeFromInBuffer(req iscp.Request) { } // fills up the buffer with requests from the in-buffer -func (m *Mempool) takeInBuffer(buf []iscp.Request) []iscp.Request { +func (m *mempool) takeInBuffer(buf []iscp.Request) []iscp.Request { buf = buf[:0] m.inMutex.RLock() defer m.inMutex.RUnlock() @@ -105,7 +105,7 @@ func (m *Mempool) takeInBuffer(buf []iscp.Request) []iscp.Request { // addToPool adds request to the pool. It may fail // returns true if it must be removed from the input buffer -func (m *Mempool) addToPool(req iscp.Request) bool { +func (m *mempool) addToPool(req iscp.Request) bool { if offLedgerReq, ok := req.(*request.OffLedger); ok { if !offLedgerReq.VerifySignature() { // wrong signature, must be removed from in buffer @@ -153,7 +153,7 @@ func (m *Mempool) addToPool(req iscp.Request) bool { } // ReceiveRequests places requests into the inBuffer. InBuffer is unordered and non-deterministic -func (m *Mempool) ReceiveRequests(reqs ...iscp.Request) { +func (m *mempool) ReceiveRequests(reqs ...iscp.Request) { for _, req := range reqs { if req.IsOffLedger() { m.mempoolMetrics.CountOffLedgerRequestIn() @@ -165,7 +165,7 @@ func (m *Mempool) ReceiveRequests(reqs ...iscp.Request) { } // ReceiveRequest used to receive off-ledger request -func (m *Mempool) ReceiveRequest(req iscp.Request) bool { +func (m *mempool) ReceiveRequest(req iscp.Request) bool { // could be worth it to check if the request was already processed in the blocklog. // Not adding this check now to avoid overhead, but should be looked into in case re-gossiping happens a lot if m.checkInBuffer(req) { @@ -175,7 +175,7 @@ func (m *Mempool) ReceiveRequest(req iscp.Request) bool { return m.addToInBuffer(req) } -func (m *Mempool) checkInBuffer(req iscp.Request) bool { +func (m *mempool) checkInBuffer(req iscp.Request) bool { m.inMutex.RLock() defer m.inMutex.RUnlock() @@ -184,7 +184,7 @@ func (m *Mempool) checkInBuffer(req iscp.Request) bool { } // RemoveRequests removes requests from the pool -func (m *Mempool) RemoveRequests(reqs ...iscp.RequestID) { +func (m *mempool) RemoveRequests(reqs ...iscp.RequestID) { m.poolMutex.Lock() defer m.poolMutex.Unlock() @@ -203,7 +203,7 @@ func (m *Mempool) RemoveRequests(reqs ...iscp.RequestID) { const traceInOut = false -func (m *Mempool) traceIn(req iscp.Request) { +func (m *mempool) traceIn(req iscp.Request) { rotateStr := "" if rotate.IsRotateStateControllerRequest(req) { rotateStr = "(rotate) " @@ -224,7 +224,7 @@ func (m *Mempool) traceIn(req iscp.Request) { } } -func (m *Mempool) traceOut(reqid iscp.RequestID) { +func (m *mempool) traceOut(reqid iscp.RequestID) { if traceInOut { m.log.Infof("OUT MEMPOOL %s (+%d / -%d)", reqid, m.inPoolCounter, m.outPoolCounter) } else { @@ -258,7 +258,7 @@ func isRequestReady(ref *requestRef, nowis time.Time) (isReady, shouldBeRemoved // Note that later status of request may change due to the time change and time constraints // If there's at least one committee rotation request in the mempool, the ReadyNow returns // batch with only one request, the oldest committee rotation request -func (m *Mempool) ReadyNow(now ...time.Time) []iscp.Request { +func (m *mempool) ReadyNow(now ...time.Time) []iscp.Request { m.poolMutex.RLock() nowis := time.Now() @@ -316,7 +316,7 @@ func (m *Mempool) ReadyNow(now ...time.Time) []iscp.Request { // - (a list of processable requests), true if the list can be deterministically calculated // Note that (a list of processable requests) can be empty if none satisfies nowis time constraint (timelock, fallback) // For requests which are known and solidified, the result is deterministic -func (m *Mempool) ReadyFromIDs(nowis time.Time, reqIDs ...iscp.RequestID) ([]iscp.Request, []int, bool) { +func (m *mempool) ReadyFromIDs(nowis time.Time, reqIDs ...iscp.RequestID) ([]iscp.Request, []int, bool) { requests := make([]iscp.Request, 0, len(reqIDs)) missingRequestIndexes := []int{} toRemove := []iscp.RequestID{} @@ -344,7 +344,7 @@ func (m *Mempool) ReadyFromIDs(nowis time.Time, reqIDs ...iscp.RequestID) ([]isc } // HasRequest checks if the request is in the pool -func (m *Mempool) HasRequest(id iscp.RequestID) bool { +func (m *mempool) HasRequest(id iscp.RequestID) bool { m.poolMutex.RLock() defer m.poolMutex.RUnlock() @@ -352,7 +352,7 @@ func (m *Mempool) HasRequest(id iscp.RequestID) bool { return ok } -func (m *Mempool) GetRequest(id iscp.RequestID) iscp.Request { +func (m *mempool) GetRequest(id iscp.RequestID) iscp.Request { m.poolMutex.RLock() defer m.poolMutex.RUnlock() @@ -365,7 +365,7 @@ func (m *Mempool) GetRequest(id iscp.RequestID) iscp.Request { const waitRequestInPoolTimeoutDefault = 2 * time.Second // WaitRequestInPool waits until the request appears in the pool but no longer than timeout -func (m *Mempool) WaitRequestInPool(reqid iscp.RequestID, timeout ...time.Duration) bool { +func (m *mempool) WaitRequestInPool(reqid iscp.RequestID, timeout ...time.Duration) bool { nowis := time.Now() deadline := nowis.Add(waitRequestInPoolTimeoutDefault) if len(timeout) > 0 { @@ -382,7 +382,7 @@ func (m *Mempool) WaitRequestInPool(reqid iscp.RequestID, timeout ...time.Durati } } -func (m *Mempool) inBufferLen() int { +func (m *mempool) inBufferLen() int { m.inMutex.RLock() defer m.inMutex.RUnlock() return len(m.inBuffer) @@ -392,7 +392,7 @@ const waitInBufferEmptyTimeoutDefault = 5 * time.Second // WaitAllRequestsIn waits until in buffer becomes empty. Used in synchronous situations when the caller // want to be sure all requests were fed into the pool. May create nondeterminism when used from goroutines -func (m *Mempool) WaitInBufferEmpty(timeout ...time.Duration) bool { +func (m *mempool) WaitInBufferEmpty(timeout ...time.Duration) bool { nowis := time.Now() deadline := nowis.Add(waitInBufferEmptyTimeoutDefault) if len(timeout) > 0 { @@ -410,7 +410,7 @@ func (m *Mempool) WaitInBufferEmpty(timeout ...time.Duration) bool { } // Stats collects mempool stats -func (m *Mempool) Info() chain.MempoolInfo { +func (m *mempool) Info() chain.MempoolInfo { m.poolMutex.RLock() defer m.poolMutex.RUnlock() @@ -431,12 +431,12 @@ func (m *Mempool) Info() chain.MempoolInfo { return ret } -func (m *Mempool) Close() { +func (m *mempool) Close() { close(m.chStop) } // the loop validates and moves request from inBuffer to the pool -func (m *Mempool) moveToPoolLoop() { +func (m *mempool) moveToPoolLoop() { buf := make([]iscp.Request, 0, 100) for { select { @@ -458,7 +458,7 @@ func (m *Mempool) moveToPoolLoop() { } // the loop solidifies requests -func (m *Mempool) solidificationLoop() { +func (m *mempool) solidificationLoop() { for { select { case <-m.chStop: @@ -469,7 +469,7 @@ func (m *Mempool) solidificationLoop() { } } -func (m *Mempool) doSolidifyRequests() { +func (m *mempool) doSolidifyRequests() { m.poolMutex.Lock() defer m.poolMutex.Unlock() diff --git a/packages/chain/mempool/mempool_test.go b/packages/chain/mempool/mempool_test.go index e1d5672dea..3870b44f84 100644 --- a/packages/chain/mempool/mempool_test.go +++ b/packages/chain/mempool/mempool_test.go @@ -458,7 +458,7 @@ func TestFallbackOptions(t *testing.T) { // request with the invalid deadline should have been removed from the mempool time.Sleep(500 * time.Millisecond) // just to let the `RemoveRequests` go routine get the pool mutex before we look into it require.Nil(t, pool.GetRequest(requests[2].ID())) - require.Len(t, pool.pool, 2) + require.Len(t, pool.(*mempool).pool, 2) } // Test if ReadyFromIDs function correctly handle non-existing or removed IDs diff --git a/packages/chain/messages/missing_req_msg.go b/packages/chain/messages/missing_req_msg.go deleted file mode 100644 index 1cc3285c05..0000000000 --- a/packages/chain/messages/missing_req_msg.go +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -package messages - -import ( - "github.com/iotaledger/hive.go/marshalutil" - "github.com/iotaledger/wasp/packages/iscp" - "github.com/iotaledger/wasp/packages/iscp/request" -) - -// region MissingRequestIDsMsg /////////////////////////////////////////////////// - -type MissingRequestIDsMsg struct { - IDs []iscp.RequestID -} - -func NewMissingRequestIDsMsg(missingIDs []iscp.RequestID) *MissingRequestIDsMsg { - return &MissingRequestIDsMsg{ - IDs: missingIDs, - } -} - -func (msg *MissingRequestIDsMsg) Bytes() []byte { - mu := marshalutil.New() - mu.WriteUint16(uint16(len(msg.IDs))) - for i := range msg.IDs { - mu.WriteBytes(msg.IDs[i].Bytes()) - } - return mu.Bytes() -} - -func MissingRequestIDsMsgFromBytes(data []byte) (*MissingRequestIDsMsg, error) { - mu := marshalutil.New(data) - num, err := mu.ReadUint16() - if err != nil { - return nil, err - } - ret := &MissingRequestIDsMsg{ - IDs: make([]iscp.RequestID, num), - } - for i := range ret.IDs { - if ret.IDs[i], err = iscp.RequestIDFromMarshalUtil(mu); err != nil { - return nil, err - } - } - return ret, nil -} - -// endregion /////////////////////////////////////////////////////////////////// - -// region MissingRequestMsg /////////////////////////////////////////////////// - -type MissingRequestMsg struct { - Request iscp.Request -} - -func NewMissingRequestMsg(req iscp.Request) *MissingRequestMsg { - return &MissingRequestMsg{ - Request: req, - } -} - -func (msg *MissingRequestMsg) Bytes() []byte { - return msg.Request.Bytes() -} - -func MissingRequestMsgFromBytes(data []byte) (*MissingRequestMsg, error) { - msg := &MissingRequestMsg{} - var err error - msg.Request, err = request.FromMarshalUtil(marshalutil.New(data)) - if err != nil { - return nil, err - } - return msg, nil -} - -// endregion /////////////////////////////////////////////////////////////////// diff --git a/packages/chain/messages/peer_block_msg.go b/packages/chain/messages/peer_block_msg.go new file mode 100644 index 0000000000..452b0bdc34 --- /dev/null +++ b/packages/chain/messages/peer_block_msg.go @@ -0,0 +1,36 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +package messages + +import ( + "bytes" + "io" + + "github.com/iotaledger/wasp/packages/util" +) + +// BlockMsg StateManager in response to GetBlockMsg sends block data to the querying node's StateManager +// StateManager -> StateManager +type BlockMsg struct { + BlockBytes []byte +} + +type BlockMsgIn struct { + BlockMsg + SenderNetID string +} + +func NewBlockMsg(data []byte) (*BlockMsg, error) { + msg := &BlockMsg{} + r := bytes.NewReader(data) + var err error + if msg.BlockBytes, err = util.ReadBytes32(r); err != nil { + return nil, err + } + return msg, nil +} + +func (msg *BlockMsg) Write(w io.Writer) error { + return util.WriteBytes32(w, msg.BlockBytes) +} diff --git a/packages/chain/messages/peer_get_block_msg.go b/packages/chain/messages/peer_get_block_msg.go new file mode 100644 index 0000000000..435ff0f700 --- /dev/null +++ b/packages/chain/messages/peer_get_block_msg.go @@ -0,0 +1,36 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +package messages + +import ( + "bytes" + "io" + + "github.com/iotaledger/wasp/packages/util" +) + +// GetBlockMsg StateManager queries specific block data from another peer (access node) +// StateManager -> StateManager +type GetBlockMsg struct { + BlockIndex uint32 +} + +type GetBlockMsgIn struct { + GetBlockMsg + SenderNetID string +} + +func NewGetBlockMsg(data []byte) (*GetBlockMsg, error) { + msg := &GetBlockMsg{} + r := bytes.NewReader(data) + var err error + if err = util.ReadUint32(r, &msg.BlockIndex); err != nil { + return nil, err + } + return msg, nil +} + +func (msg *GetBlockMsg) Write(w io.Writer) error { + return util.WriteUint32(w, msg.BlockIndex) +} diff --git a/packages/chain/messages/peer_missing_request_ids_msg.go b/packages/chain/messages/peer_missing_request_ids_msg.go new file mode 100644 index 0000000000..ed32285b4e --- /dev/null +++ b/packages/chain/messages/peer_missing_request_ids_msg.go @@ -0,0 +1,44 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +package messages + +import ( + "github.com/iotaledger/hive.go/marshalutil" + "github.com/iotaledger/wasp/packages/iscp" +) + +type MissingRequestIDsMsg struct { + IDs []iscp.RequestID +} + +type MissingRequestIDsMsgIn struct { + MissingRequestIDsMsg + SenderNetID string +} + +func (msg *MissingRequestIDsMsg) Bytes() []byte { + mu := marshalutil.New() + mu.WriteUint16(uint16(len(msg.IDs))) + for i := range msg.IDs { + mu.WriteBytes(msg.IDs[i].Bytes()) + } + return mu.Bytes() +} + +func NewMissingRequestIDsMsg(data []byte) (*MissingRequestIDsMsg, error) { + mu := marshalutil.New(data) + num, err := mu.ReadUint16() + if err != nil { + return nil, err + } + ret := &MissingRequestIDsMsg{ + IDs: make([]iscp.RequestID, num), + } + for i := range ret.IDs { + if ret.IDs[i], err = iscp.RequestIDFromMarshalUtil(mu); err != nil { + return nil, err + } + } + return ret, nil +} diff --git a/packages/chain/messages/peer_missing_request_msg.go b/packages/chain/messages/peer_missing_request_msg.go new file mode 100644 index 0000000000..8bdf1fdbb2 --- /dev/null +++ b/packages/chain/messages/peer_missing_request_msg.go @@ -0,0 +1,28 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +package messages + +import ( + "github.com/iotaledger/hive.go/marshalutil" + "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/iscp/request" +) + +type MissingRequestMsg struct { + Request iscp.Request +} + +func (msg *MissingRequestMsg) Bytes() []byte { + return msg.Request.Bytes() +} + +func NewMissingRequestMsg(data []byte) (*MissingRequestMsg, error) { + msg := &MissingRequestMsg{} + var err error + msg.Request, err = request.FromMarshalUtil(marshalutil.New(data)) + if err != nil { + return nil, err + } + return msg, nil +} diff --git a/packages/chain/messages/offledger_req_msg.go b/packages/chain/messages/peer_offledger_request_msg.go similarity index 66% rename from packages/chain/messages/offledger_req_msg.go rename to packages/chain/messages/peer_offledger_request_msg.go index 8bfd84c594..672a7e3414 100644 --- a/packages/chain/messages/offledger_req_msg.go +++ b/packages/chain/messages/peer_offledger_request_msg.go @@ -10,26 +10,17 @@ import ( "golang.org/x/xerrors" ) -type OffLedgerRequestPeerMsg struct { +type OffLedgerRequestMsg struct { ChainID *iscp.ChainID Req *request.OffLedger } -func NewOffLedgerRequestPeerMsg(chainID *iscp.ChainID, req *request.OffLedger) *OffLedgerRequestPeerMsg { - return &OffLedgerRequestPeerMsg{ - ChainID: chainID, - Req: req, - } -} - -func (msg *OffLedgerRequestPeerMsg) Bytes() []byte { - return marshalutil.New(). - Write(msg.ChainID). - Write(msg.Req). - Bytes() +type OffLedgerRequestMsgIn struct { + OffLedgerRequestMsg + SenderNetID string } -func OffLedgerRequestPeerMsgFromBytes(data []byte) (*OffLedgerRequestPeerMsg, error) { +func NewOffLedgerRequestMsg(data []byte) (*OffLedgerRequestMsg, error) { mu := marshalutil.New(data) chainID, err := iscp.ChainIDFromMarshalUtil(mu) if err != nil { @@ -43,8 +34,15 @@ func OffLedgerRequestPeerMsgFromBytes(data []byte) (*OffLedgerRequestPeerMsg, er if !ok { return nil, xerrors.New("OffLedgerRequestMsgFromBytes: wrong type of request data") } - return &OffLedgerRequestPeerMsg{ + return &OffLedgerRequestMsg{ ChainID: chainID, Req: reqCasted, }, nil } + +func (msg *OffLedgerRequestMsg) Bytes() []byte { + return marshalutil.New(). + Write(msg.ChainID). + Write(msg.Req). + Bytes() +} diff --git a/packages/chain/messages/offledger_req_msg_test.go b/packages/chain/messages/peer_offledger_request_msg_test.go similarity index 83% rename from packages/chain/messages/offledger_req_msg_test.go rename to packages/chain/messages/peer_offledger_request_msg_test.go index cf59918018..dd59558c2c 100644 --- a/packages/chain/messages/offledger_req_msg_test.go +++ b/packages/chain/messages/peer_offledger_request_msg_test.go @@ -24,16 +24,16 @@ func TestMarshalling(t *testing.T) { dict.Dict{foo: []byte("bar")}, ) - msg := NewOffLedgerRequestPeerMsg( - iscp.RandomChainID(), - request.NewOffLedger(contract, entrypoint, args), - ) + msg := &OffLedgerRequestMsg{ + ChainID: iscp.RandomChainID(), + Req: request.NewOffLedger(contract, entrypoint, args), + } // marshall the msg msgBytes := msg.Bytes() // unmashal the message from bytes and ensure everything checks out - unmarshalledMsg, err := OffLedgerRequestPeerMsgFromBytes(msgBytes) + unmarshalledMsg, err := NewOffLedgerRequestMsg(msgBytes) require.NoError(t, err) require.True(t, unmarshalledMsg.ChainID.AliasAddress.Equals(msg.ChainID.AliasAddress)) diff --git a/packages/chain/messages/req_ack_msg.go b/packages/chain/messages/peer_request_ack_msg.go similarity index 64% rename from packages/chain/messages/req_ack_msg.go rename to packages/chain/messages/peer_request_ack_msg.go index f0f7e8c664..35bbbba2a2 100644 --- a/packages/chain/messages/req_ack_msg.go +++ b/packages/chain/messages/peer_request_ack_msg.go @@ -11,30 +11,36 @@ import ( "golang.org/x/xerrors" ) -type RequestAckPeerMsg struct { +type RequestAckMsg struct { ReqID *iscp.RequestID } -func NewRequestAckMsg(reqID iscp.RequestID) *RequestAckPeerMsg { - return &RequestAckPeerMsg{ - ReqID: &reqID, - } +type RequestAckMsgIn struct { + RequestAckMsg + SenderNetID string +} + +func NewRequestAckMsg(buf []byte) (*RequestAckMsg, error) { + r := bytes.NewReader(buf) + msg := &RequestAckMsg{} + err := msg.read(r) + return msg, err } -func (msg *RequestAckPeerMsg) write(w io.Writer) error { +func (msg *RequestAckMsg) write(w io.Writer) error { if _, err := w.Write(msg.ReqID.Bytes()); err != nil { return xerrors.Errorf("failed to write requestIDs: %w", err) } return nil } -func (msg *RequestAckPeerMsg) Bytes() []byte { +func (msg *RequestAckMsg) Bytes() []byte { var buf bytes.Buffer _ = msg.write(&buf) return buf.Bytes() } -func (msg *RequestAckPeerMsg) read(r io.Reader) error { +func (msg *RequestAckMsg) read(r io.Reader) error { b, err := io.ReadAll(r) if err != nil { return xerrors.Errorf("failed to read requestIDs: %w", err) @@ -46,10 +52,3 @@ func (msg *RequestAckPeerMsg) read(r io.Reader) error { msg.ReqID = &reqID return nil } - -func RequestAckPeerMsgFromBytes(buf []byte) (RequestAckPeerMsg, error) { - r := bytes.NewReader(buf) - msg := RequestAckPeerMsg{} - err := msg.read(r) - return msg, err -} diff --git a/packages/chain/messages/peer_signed_result_msg.go b/packages/chain/messages/peer_signed_result_msg.go new file mode 100644 index 0000000000..7a7a0ba64f --- /dev/null +++ b/packages/chain/messages/peer_signed_result_msg.go @@ -0,0 +1,55 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +package messages + +import ( + "bytes" + "io" + + "github.com/iotaledger/goshimmer/packages/ledgerstate" + "github.com/iotaledger/wasp/packages/hashing" + "github.com/iotaledger/wasp/packages/util" + "go.dedis.ch/kyber/v3/sign/tbls" +) + +// Consensus -> Consensus +type SignedResultMsg struct { + ChainInputID ledgerstate.OutputID + EssenceHash hashing.HashValue + SigShare tbls.SigShare +} + +type SignedResultMsgIn struct { + SignedResultMsg + SenderIndex uint16 +} + +func NewSignedResultMsg(data []byte) (*SignedResultMsg, error) { + msg := &SignedResultMsg{} + r := bytes.NewReader(data) + var err error + if err = util.ReadHashValue(r, &msg.EssenceHash); err != nil { + return nil, err + } + if msg.SigShare, err = util.ReadBytes16(r); err != nil { + return nil, err + } + if err = util.ReadOutputID(r, &msg.ChainInputID); /* nolint:revive */ err != nil { + return nil, err + } + return msg, nil +} + +func (msg *SignedResultMsg) Write(w io.Writer) error { + if _, err := w.Write(msg.EssenceHash[:]); err != nil { + return err + } + if err := util.WriteBytes16(w, msg.SigShare); err != nil { + return err + } + if _, err := w.Write(msg.ChainInputID[:]); err != nil { + return err + } + return nil +} diff --git a/packages/chain/messages/peer_signed_result_msg_ack.go b/packages/chain/messages/peer_signed_result_msg_ack.go new file mode 100644 index 0000000000..590be3080d --- /dev/null +++ b/packages/chain/messages/peer_signed_result_msg_ack.go @@ -0,0 +1,47 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +package messages + +import ( + "bytes" + "io" + + "github.com/iotaledger/goshimmer/packages/ledgerstate" + "github.com/iotaledger/wasp/packages/hashing" + "github.com/iotaledger/wasp/packages/util" +) + +// Consensus -> Consensus +type SignedResultAckMsg struct { + ChainInputID ledgerstate.OutputID + EssenceHash hashing.HashValue +} + +type SignedResultAckMsgIn struct { + SignedResultAckMsg + SenderIndex uint16 +} + +func NewSignedResultAckMsg(data []byte) (*SignedResultAckMsg, error) { + msg := &SignedResultAckMsg{} + r := bytes.NewReader(data) + var err error + if err = util.ReadHashValue(r, &msg.EssenceHash); err != nil { + return nil, err + } + if err = util.ReadOutputID(r, &msg.ChainInputID); err != nil { + return nil, err + } + return msg, nil +} + +func (msg *SignedResultAckMsg) Write(w io.Writer) error { + if _, err := w.Write(msg.EssenceHash[:]); err != nil { + return err + } + if _, err := w.Write(msg.ChainInputID[:]); err != nil { + return err + } + return nil +} diff --git a/packages/chain/messages/peermsg.go b/packages/chain/messages/peermsg.go index 803239ecc9..118a3709c2 100644 --- a/packages/chain/messages/peermsg.go +++ b/packages/chain/messages/peermsg.go @@ -4,16 +4,12 @@ package messages import ( - "io" "time" "github.com/iotaledger/goshimmer/packages/ledgerstate" - "github.com/iotaledger/wasp/packages/hashing" "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/state" - "github.com/iotaledger/wasp/packages/util" "github.com/iotaledger/wasp/packages/vm" - "go.dedis.ch/kyber/v3/sign/tbls" ) // Message types for the committee communications. @@ -30,31 +26,6 @@ const ( type TimerTick int -type SignedResultMsg struct { - SenderIndex uint16 - ChainInputID ledgerstate.OutputID - EssenceHash hashing.HashValue - SigShare tbls.SigShare -} - -type SignedResultAckMsg struct { - SenderIndex uint16 - ChainInputID ledgerstate.OutputID - EssenceHash hashing.HashValue -} - -// GetBlockMsg StateManager queries specific block data from another peer (access node) -type GetBlockMsg struct { - SenderNetID string - BlockIndex uint32 -} - -// BlockMsg StateManager in response to GetBlockMsg sends block data to the querying node's StateManager -type BlockMsg struct { - SenderNetID string - BlockBytes []byte -} - // StateTransitionMsg Notifies chain about changed state type StateTransitionMsg struct { // new variable state @@ -93,67 +64,3 @@ type StateMsg struct { ChainOutput *ledgerstate.AliasOutput Timestamp time.Time } - -func (msg *GetBlockMsg) Write(w io.Writer) error { - return util.WriteUint32(w, msg.BlockIndex) -} - -func (msg *GetBlockMsg) Read(r io.Reader) error { - return util.ReadUint32(r, &msg.BlockIndex) -} - -func (msg *BlockMsg) Write(w io.Writer) error { - return util.WriteBytes32(w, msg.BlockBytes) -} - -func (msg *BlockMsg) Read(r io.Reader) error { - var err error - if msg.BlockBytes, err = util.ReadBytes32(r); err != nil { - return err - } - return nil -} - -func (msg *SignedResultMsg) Write(w io.Writer) error { - if _, err := w.Write(msg.EssenceHash[:]); err != nil { - return err - } - if err := util.WriteBytes16(w, msg.SigShare); err != nil { - return err - } - if _, err := w.Write(msg.ChainInputID[:]); err != nil { - return err - } - return nil -} - -func (msg *SignedResultMsg) Read(r io.Reader) error { - if err := util.ReadHashValue(r, &msg.EssenceHash); err != nil { - return err - } - var err error - if msg.SigShare, err = util.ReadBytes16(r); err != nil { - return err - } - if err := util.ReadOutputID(r, &msg.ChainInputID); /* nolint:revive */ err != nil { - return err - } - return nil -} - -func (msg *SignedResultAckMsg) Write(w io.Writer) error { - if _, err := w.Write(msg.EssenceHash[:]); err != nil { - return err - } - if _, err := w.Write(msg.ChainInputID[:]); err != nil { - return err - } - return nil -} - -func (msg *SignedResultAckMsg) Read(r io.Reader) error { - if err := util.ReadHashValue(r, &msg.EssenceHash); err != nil { - return err - } - return util.ReadOutputID(r, &msg.ChainInputID) -} diff --git a/packages/chain/statemgr/eventproc.go b/packages/chain/statemgr/eventproc.go index fe558b7f02..0dc2d346e7 100644 --- a/packages/chain/statemgr/eventproc.go +++ b/packages/chain/statemgr/eventproc.go @@ -13,59 +13,60 @@ import ( ) // EventGetBlockMsg is a request for a block while syncing -func (sm *stateManager) EventGetBlockMsg(msg *messages.GetBlockMsg) { +func (sm *stateManager) EnqueueGetBlockMsg(msg *messages.GetBlockMsgIn) { sm.eventGetBlockMsgCh <- msg } -func (sm *stateManager) eventGetBlockMsg(msg *messages.GetBlockMsg) { - sm.log.Debugw("EventGetBlockMsg received: ", +func (sm *stateManager) handleGetBlockMsg(msg *messages.GetBlockMsgIn) { + sm.log.Debugw("handleGetBlockMsg: ", "sender", msg.SenderNetID, "block index", msg.BlockIndex, ) if sm.stateOutput == nil { // Not a necessary check, only for optimization. - sm.log.Debugf("EventGetBlockMsg ignored: stateOutput is nil") + sm.log.Debugf("handleGetBlockMsg: message ignored: stateOutput is nil") return } if msg.BlockIndex > sm.stateOutput.GetStateIndex() { // Not a necessary check, only for optimization. - sm.log.Debugf("EventGetBlockMsg ignored 1: block #%d not found. Current state index: #%d", + sm.log.Debugf("handleGetBlockMsg: message ignored 1: block #%d not found. Current state index: #%d", msg.BlockIndex, sm.stateOutput.GetStateIndex()) return } blockBytes, err := state.LoadBlockBytes(sm.store, msg.BlockIndex) if err != nil { - sm.log.Errorf("EventGetBlockMsg: LoadBlockBytes: %v", err) + sm.log.Errorf("handleGetBlockMsg: LoadBlockBytes error: %v", err) return } if blockBytes == nil { - sm.log.Debugf("EventGetBlockMsg ignored 2: block #%d not found. Current state index: #%d", + sm.log.Debugf("handleGetBlockMsg message ignored 2: block #%d not found. Current state index: #%d", msg.BlockIndex, sm.stateOutput.GetStateIndex()) return } - sm.log.Debugf("EventGetBlockMsg for state index #%d --> responding to peer %s", msg.BlockIndex, msg.SenderNetID) + sm.log.Debugf("handleGetBlockMsg: responding to peer %s by block %v", msg.SenderNetID, msg.BlockIndex) - sm.peers.SendSimple(msg.SenderNetID, messages.MsgBlock, util.MustBytes(&messages.BlockMsg{ - BlockBytes: blockBytes, - })) + blockMsg := &messages.BlockMsg{BlockBytes: blockBytes} + sm.chain.SendPeerMsgByNetID(msg.SenderNetID, peerMessageReceiverStateManager, peerMsgTypeBlock, util.MustBytes(blockMsg)) } // EventBlockMsg -func (sm *stateManager) EventBlockMsg(msg *messages.BlockMsg) { +func (sm *stateManager) EnqueueBlockMsg(msg *messages.BlockMsgIn) { sm.eventBlockMsgCh <- msg } -func (sm *stateManager) eventBlockMsg(msg *messages.BlockMsg) { - sm.log.Debugf("EventBlockMsg received from %v", msg.SenderNetID) +func (sm *stateManager) handleBlockMsg(msg *messages.BlockMsgIn) { + sm.log.Debugw("handleBlockMsg: ", + "sender", msg.SenderNetID, + ) if sm.stateOutput == nil { - sm.log.Debugf("EventBlockMsg ignored: stateOutput is nil") + sm.log.Debugf("handleBlockMsg: message ignored: stateOutput is nil") return } block, err := state.BlockFromBytes(msg.BlockBytes) if err != nil { - sm.log.Warnf("EventBlockMsg ignored: wrong block received from peer %s. Err: %v", msg.SenderNetID, err) + sm.log.Warnf("handleBlockMsg: message ignored: wrong block received from peer %s. Err: %v", msg.SenderNetID, err) return } - sm.log.Debugw("EventBlockMsg from ", + sm.log.Debugw("handleBlockMsg: adding block from peer ", "sender", msg.SenderNetID, "block index", block.BlockIndex(), "approving output", iscp.OID(block.ApprovingOutputID()), diff --git a/packages/chain/statemgr/statemgr.go b/packages/chain/statemgr/statemgr.go index 399f3e2b46..3844969919 100644 --- a/packages/chain/statemgr/statemgr.go +++ b/packages/chain/statemgr/statemgr.go @@ -6,7 +6,6 @@ package statemgr import ( - "bytes" "fmt" "time" @@ -38,8 +37,8 @@ type stateManager struct { log *logger.Logger // Channels for accepting external events. - eventGetBlockMsgCh chan *messages.GetBlockMsg - eventBlockMsgCh chan *messages.BlockMsg + eventGetBlockMsgCh chan *messages.GetBlockMsgIn + eventBlockMsgCh chan *messages.BlockMsgIn eventStateOutputMsgCh chan *messages.StateMsg eventOutputMsgCh chan ledgerstate.Output eventStateCandidateMsgCh chan *messages.StateCandidateMsg @@ -47,9 +46,16 @@ type stateManager struct { closeCh chan bool } +var _ chain.StateManager = &stateManager{} + const ( numberOfNodesToRequestBlockFromConst = 5 maxBlocksToCommitConst = 10000 // 10k + + peerMessageReceiverStateManager = byte(0) + + peerMsgTypeGetBlock = iota + peerMsgTypeBlock ) func New(store kvstore.KVStore, c chain.ChainCore, peers peering.PeerDomainProvider, nodeconn chain.NodeConnection, timersOpt ...StateManagerTimers) chain.StateManager { @@ -69,43 +75,46 @@ func New(store kvstore.KVStore, c chain.ChainCore, peers peering.PeerDomainProvi timers: timers, log: c.Log().Named("s"), pullStateRetryTime: time.Now(), - eventGetBlockMsgCh: make(chan *messages.GetBlockMsg), - eventBlockMsgCh: make(chan *messages.BlockMsg), + eventGetBlockMsgCh: make(chan *messages.GetBlockMsgIn), + eventBlockMsgCh: make(chan *messages.BlockMsgIn), eventStateOutputMsgCh: make(chan *messages.StateMsg), eventOutputMsgCh: make(chan ledgerstate.Output), eventStateCandidateMsgCh: make(chan *messages.StateCandidateMsg), eventTimerMsgCh: make(chan messages.TimerTick), closeCh: make(chan bool), } - c.AttachToPeerMessages(ret.receiveChainPeerMessages) + c.AttachToPeerMessages(peerMessageReceiverStateManager, ret.receiveChainPeerMessages) go ret.initLoadState() return ret } -func (sm *stateManager) receiveChainPeerMessages(event *peering.RecvEvent) { - msg := event.Msg - switch msg.MsgType { - case messages.MsgGetBlock: - msgt := &messages.GetBlockMsg{} - rdr := bytes.NewReader(msg.MsgData) - if err := msgt.Read(rdr); err != nil { +func (sm *stateManager) receiveChainPeerMessages(peerMsg *peering.PeerMessageIn) { + if peerMsg.MsgReceiver != peerMessageReceiverStateManager { + panic(fmt.Errorf("State manager does not accept peer messages of other receiver type %v, message type=%v", + peerMsg.MsgReceiver, peerMsg.MsgType)) + } + switch peerMsg.MsgType { + case peerMsgTypeGetBlock: + msg, err := messages.NewGetBlockMsg(peerMsg.MsgData) + if err != nil { sm.log.Error(err) return } - msgt.SenderNetID = msg.SenderNetID - sm.EventGetBlockMsg(msgt) - case messages.MsgBlock: - msgt := &messages.BlockMsg{} - rdr := bytes.NewReader(msg.MsgData) - if err := msgt.Read(rdr); err != nil { + sm.EnqueueGetBlockMsg(&messages.GetBlockMsgIn{ + GetBlockMsg: *msg, + SenderNetID: peerMsg.SenderNetID, + }) + case peerMsgTypeBlock: + msg, err := messages.NewBlockMsg(peerMsg.MsgData) + if err != nil { sm.log.Error(err) return } - msgt.SenderNetID = msg.SenderNetID - sm.EventBlockMsg(msgt) - default: - return + sm.EnqueueBlockMsg(&messages.BlockMsgIn{ + BlockMsg: *msg, + SenderNetID: peerMsg.SenderNetID, + }) } } @@ -166,11 +175,11 @@ func (sm *stateManager) recvLoop() { select { case msg, ok := <-sm.eventGetBlockMsgCh: if ok { - sm.eventGetBlockMsg(msg) + sm.handleGetBlockMsg(msg) } case msg, ok := <-sm.eventBlockMsgCh: if ok { - sm.eventBlockMsg(msg) + sm.handleBlockMsg(msg) } case msg, ok := <-sm.eventStateOutputMsgCh: if ok { diff --git a/packages/chain/statemgr/syncmgr.go b/packages/chain/statemgr/syncmgr.go index ae6bc91d5c..99d7b8e47e 100644 --- a/packages/chain/statemgr/syncmgr.go +++ b/packages/chain/statemgr/syncmgr.go @@ -86,10 +86,8 @@ func (sm *stateManager) doSyncActionIfNeeded() { if nowis.After(requestBlockRetryTime) { // have to pull sm.log.Debugf("doSyncAction: requesting block index %v from %v random peers", i, numberOfNodesToRequestBlockFromConst) - data := util.MustBytes(&messages.GetBlockMsg{ - BlockIndex: i, - }) - sm.peers.SendMsgToRandomPeersSimple(numberOfNodesToRequestBlockFromConst, messages.MsgGetBlock, data) + getBlockMsg := &messages.GetBlockMsg{BlockIndex: i} + sm.chain.SendPeerMsgToRandomPeers(numberOfNodesToRequestBlockFromConst, peerMessageReceiverStateManager, peerMsgTypeGetBlock, util.MustBytes(getBlockMsg)) sm.syncingBlocks.startSyncingIfNeeded(i) sm.syncingBlocks.setRequestBlockRetryTime(i, nowis.Add(sm.timers.GetBlockRetry)) if blockCandidatesCount == 0 { diff --git a/packages/dkg/messages.go b/packages/dkg/messages.go index 3499059d09..5c5bd4ff09 100644 --- a/packages/dkg/messages.go +++ b/packages/dkg/messages.go @@ -11,6 +11,7 @@ package dkg import ( "bytes" "errors" + "fmt" "io" "time" @@ -55,8 +56,13 @@ const ( // in response to duplicated messages from other peers. They should be treated // in a special way to avoid infinite message loops. rabinEcho byte = peering.FirstUserMsgCode + 44 + + peerMessageReceiverDkg = byte(4) + peerMessageReceiverDkgInit = byte(5) ) +var initPeeringID peering.PeeringID + // Checks if that's a Initiator -> PeerNode message. func isDkgInitNodeMsg(msgType byte) bool { //nolint:unused,deadcode return msgType == initiatorInitMsgType @@ -111,12 +117,12 @@ type msgByteCoder interface { Read(io.Reader) error } -func makePeerMessage(peeringID peering.PeeringID, step byte, msg msgByteCoder) *peering.PeerMessage { +func makePeerMessage(peeringID peering.PeeringID, receiver byte, step byte, msg msgByteCoder) *peering.PeerMessageData { msg.SetStep(step) - return &peering.PeerMessage{ + return &peering.PeerMessageData{ PeeringID: peeringID, - SenderIndex: 0, // This is resolved on the receiving side. Timestamp: 0, // We do not use it in the DKG. + MsgReceiver: receiver, MsgType: msg.MsgType(), MsgData: util.MustBytes(msg), } @@ -134,7 +140,7 @@ type initiatorMsg interface { IsResponse() bool } -func readInitiatorMsg(peerMessage *peering.PeerMessage, blsSuite kyber.Group) (bool, initiatorMsg, error) { +func readInitiatorMsg(peerMessage *peering.PeerMessageData, blsSuite kyber.Group) (bool, initiatorMsg, error) { switch peerMessage.MsgType { case initiatorInitMsgType: msg := initiatorInitMsg{} @@ -180,6 +186,7 @@ func readInitiatorMsg(peerMessage *peering.PeerMessage, blsSuite kyber.Group) (b type initiatorInitMsg struct { step byte dkgRef string // Some unique string to identify duplicate initialization. + peeringID peering.PeeringID peerNetIDs []string peerPubs []ed25519.PublicKey initiatorPub ed25519.PublicKey @@ -188,6 +195,11 @@ type initiatorInitMsg struct { roundRetry time.Duration } +type initiatorInitMsgIn struct { + initiatorInitMsg + SenderNetID string +} + func (m *initiatorInitMsg) MsgType() byte { return initiatorInitMsgType } @@ -209,6 +221,9 @@ func (m *initiatorInitMsg) Write(w io.Writer) error { if err = util.WriteString16(w, m.dkgRef); err != nil { return err } + if _, err = w.Write(m.peeringID[:]); err != nil { + return err + } if err = util.WriteStrings16(w, m.peerNetIDs); err != nil { return err } @@ -235,12 +250,20 @@ func (m *initiatorInitMsg) Write(w io.Writer) error { //nolint:gocritic func (m *initiatorInitMsg) Read(r io.Reader) error { var err error + var n int if m.step, err = util.ReadByte(r); err != nil { return err } if m.dkgRef, err = util.ReadString16(r); err != nil { return err } + if n, err = r.Read(m.peeringID[:]); err != nil { + return err + } + if n != ledgerstate.AddressLength { + return fmt.Errorf("error while reading peering ID: read %v bytes, expected %v bytes", + n, ledgerstate.AddressLength) + } if m.peerNetIDs, err = util.ReadStrings16(r); err != nil { return err } diff --git a/packages/dkg/node.go b/packages/dkg/node.go index 73e6746623..4c0d94e9f8 100644 --- a/packages/dkg/node.go +++ b/packages/dkg/node.go @@ -27,19 +27,19 @@ type NodeProvider func() *Node // It receives commands from the initiator as a dkg.NodeProvider, // and communicates with other DKG nodes via the peering network. type Node struct { - identity *ed25519.KeyPair // Keys of the current node. - secKey kyber.Scalar // Derived from the identity. - pubKey kyber.Point // Derived from the identity. - blsSuite Suite // Cryptography to use for the Pairing based operations. - edSuite rabin_dkg.Suite // Cryptography to use for the Ed25519 based operations. - netProvider peering.NetworkProvider // Network to communicate through. - registry registry.DKShareRegistryProvider // Where to store the generated keys. - processes map[string]*proc // Only for introspection. - procLock *sync.RWMutex // To guard access to the process pool. - recvQueue chan *peering.RecvEvent // Incoming events processed async. - recvStopCh chan bool // To coordinate shutdown. - attachID interface{} // Peering attach ID - log *logger.Logger + identity *ed25519.KeyPair // Keys of the current node. + secKey kyber.Scalar // Derived from the identity. + pubKey kyber.Point // Derived from the identity. + blsSuite Suite // Cryptography to use for the Pairing based operations. + edSuite rabin_dkg.Suite // Cryptography to use for the Ed25519 based operations. + netProvider peering.NetworkProvider // Network to communicate through. + registry registry.DKShareRegistryProvider // Where to store the generated keys. + processes map[string]*proc // Only for introspection. + procLock *sync.RWMutex // To guard access to the process pool. + initMsgQueue chan *initiatorInitMsgIn // Incoming events processed async. + recvStopCh chan bool // To coordinate shutdown. + attachID interface{} // Peering attach ID + log *logger.Logger } // Init creates new node, that can participate in the DKG procedure. @@ -55,29 +55,46 @@ func NewNode( return nil, err } n := Node{ - identity: identity, - secKey: kyberEdDSSA.Secret, - pubKey: kyberEdDSSA.Public, - blsSuite: tcrypto.DefaultSuite(), - edSuite: edwards25519.NewBlakeSHA256Ed25519(), - netProvider: netProvider, - registry: reg, - processes: make(map[string]*proc), - procLock: &sync.RWMutex{}, - recvQueue: make(chan *peering.RecvEvent), - recvStopCh: make(chan bool), - log: log, + identity: identity, + secKey: kyberEdDSSA.Secret, + pubKey: kyberEdDSSA.Public, + blsSuite: tcrypto.DefaultSuite(), + edSuite: edwards25519.NewBlakeSHA256Ed25519(), + netProvider: netProvider, + registry: reg, + processes: make(map[string]*proc), + procLock: &sync.RWMutex{}, + initMsgQueue: make(chan *initiatorInitMsgIn), + recvStopCh: make(chan bool), + log: log, } - n.attachID = netProvider.Attach(nil, func(recv *peering.RecvEvent) { - n.recvQueue <- recv - }) + n.attachID = netProvider.Attach(&initPeeringID, peerMessageReceiverDkgInit, n.receiveInitMessage) go n.recvLoop() return &n, nil } +func (n *Node) receiveInitMessage(peerMsg *peering.PeerMessageIn) { + if peerMsg.MsgReceiver != peerMessageReceiverDkgInit { + panic(fmt.Errorf("DKG init handler does not accept peer messages of other receiver type %v, message type=%v", + peerMsg.MsgReceiver, peerMsg.MsgType)) + } + if peerMsg.MsgType != initiatorInitMsgType { + panic(fmt.Errorf("Wrong type of DKG init message: %v", peerMsg.MsgType)) + } + msg := &initiatorInitMsg{} + if err := msg.fromBytes(peerMsg.MsgData); err != nil { + n.log.Warnf("Dropping unknown message: %v", peerMsg) + return + } + n.initMsgQueue <- &initiatorInitMsgIn{ + initiatorInitMsg: *msg, + SenderNetID: peerMsg.SenderNetID, + } +} + func (n *Node) Close() { close(n.recvStopCh) - close(n.recvQueue) + close(n.initMsgQueue) n.netProvider.Detach(n.attachID) } @@ -113,8 +130,8 @@ func (n *Node) GenerateDistributedKey( } defer netGroup.Close() dkgID := peering.RandomPeeringID() - recvCh := make(chan *peering.RecvEvent, peerCount*2) - attachID := n.netProvider.Attach(&dkgID, func(recv *peering.RecvEvent) { + recvCh := make(chan *peering.PeerMessageIn, peerCount*2) + attachID := n.netProvider.Attach(&dkgID, peerMessageReceiverDkg, func(recv *peering.PeerMessageIn) { recvCh <- recv }) defer n.netProvider.Detach(attachID) @@ -139,15 +156,16 @@ func (n *Node) GenerateDistributedKey( if err = n.exchangeInitiatorAcks(netGroup, netGroup.AllNodes(), recvCh, rTimeout, gTimeout, rabinStep0Initialize, func(peerIdx uint16, peer peering.PeerSender) { n.log.Debugf("Initiator sends step=%v command to %v", rabinStep0Initialize, peer.NetID()) - peer.SendMsg(makePeerMessage(dkgID, rabinStep0Initialize, &initiatorInitMsg{ + peer.SendMsg(&peering.PeerMessageNet{PeerMessageData: *makePeerMessage(initPeeringID, peerMessageReceiverDkgInit, rabinStep0Initialize, &initiatorInitMsg{ dkgRef: dkgID.String(), // It could be some other identifier. + peeringID: dkgID, peerNetIDs: peerNetIDs, peerPubs: peerPubs, initiatorPub: n.identity.PublicKey, threshold: threshold, timeout: timeout, roundRetry: roundRetry, - })) + })}) }, ); err != nil { return nil, err @@ -179,12 +197,12 @@ func (n *Node) GenerateDistributedKey( if err = n.exchangeInitiatorMsgs(netGroup, netGroup.AllNodes(), recvCh, rTimeout, gTimeout, rabinStep6R6SendReconstructCommits, func(peerIdx uint16, peer peering.PeerSender) { n.log.Debugf("Initiator sends step=%v command to %v", rabinStep6R6SendReconstructCommits, peer.NetID()) - peer.SendMsg(makePeerMessage(dkgID, rabinStep6R6SendReconstructCommits, &initiatorStepMsg{})) + peer.SendMsg(&peering.PeerMessageNet{PeerMessageData: *makePeerMessage(dkgID, peerMessageReceiverDkg, rabinStep6R6SendReconstructCommits, &initiatorStepMsg{})}) }, - func(recv *peering.RecvEvent, initMsg initiatorMsg) (bool, error) { + func(recv *peering.PeerMessageGroupIn, initMsg initiatorMsg) (bool, error) { switch msg := initMsg.(type) { case *initiatorPubShareMsg: - pubShareResponses[int(recv.Msg.SenderIndex)] = msg + pubShareResponses[int(recv.SenderIndex)] = msg return true, nil default: n.log.Errorf("unexpected message type instead of initiatorPubShareMsg: %V", msg) @@ -227,9 +245,9 @@ func (n *Node) GenerateDistributedKey( if err = n.exchangeInitiatorAcks(netGroup, netGroup.AllNodes(), recvCh, rTimeout, gTimeout, rabinStep7CommitAndTerminate, func(peerIdx uint16, peer peering.PeerSender) { n.log.Debugf("Initiator sends step=%v command to %v", rabinStep7CommitAndTerminate, peer.NetID()) - peer.SendMsg(makePeerMessage(dkgID, rabinStep7CommitAndTerminate, &initiatorDoneMsg{ + peer.SendMsg(&peering.PeerMessageNet{PeerMessageData: *makePeerMessage(dkgID, peerMessageReceiverDkg, rabinStep7CommitAndTerminate, &initiatorDoneMsg{ pubShares: publicShares, - })) + })}) }, ); err != nil { return nil, err @@ -253,7 +271,7 @@ func (n *Node) recvLoop() { select { case <-n.recvStopCh: return - case recv, ok := <-n.recvQueue: + case recv, ok := <-n.initMsgQueue: if ok { n.onInitMsg(recv) } @@ -262,22 +280,15 @@ func (n *Node) recvLoop() { } // onInitMsg is a callback to handle the DKG initialization messages. -func (n *Node) onInitMsg(recv *peering.RecvEvent) { - if recv.Msg.MsgType != initiatorInitMsgType { - return - } +func (n *Node) onInitMsg(msg *initiatorInitMsgIn) { var err error var p *proc - req := initiatorInitMsg{} - if err = req.fromBytes(recv.Msg.MsgData); err != nil { - n.log.Warnf("Dropping unknown message: %v", recv) - } n.procLock.RLock() - if _, ok := n.processes[req.dkgRef]; ok { + if _, ok := n.processes[msg.dkgRef]; ok { // To have idempotence for retries, we need to consider duplicate // messages as success, if process is already created. n.procLock.RUnlock() - recv.From.SendMsg(makePeerMessage(recv.Msg.PeeringID, req.step, &initiatorStatusMsg{ + n.netProvider.SendMsgByNetID(msg.SenderNetID, makePeerMessage(msg.peeringID, peerMessageReceiverDkg, msg.step, &initiatorStatusMsg{ error: nil, })) return @@ -287,11 +298,11 @@ func (n *Node) onInitMsg(recv *peering.RecvEvent) { // This part should be executed async, because it accesses the network again, and can // be locked because of the naive implementation of `events.Event`. It locks on all the callbacks. n.procLock.Lock() - if p, err = onInitiatorInit(recv.Msg.PeeringID, &req, n); err == nil { + if p, err = onInitiatorInit(msg.peeringID, &msg.initiatorInitMsg, n); err == nil { n.processes[p.dkgRef] = p } n.procLock.Unlock() - recv.From.SendMsg(makePeerMessage(recv.Msg.PeeringID, req.step, &initiatorStatusMsg{ + n.netProvider.SendMsgByNetID(msg.SenderNetID, makePeerMessage(msg.peeringID, peerMessageReceiverDkg, msg.step, &initiatorStatusMsg{ error: err, })) }() @@ -311,7 +322,7 @@ func (n *Node) dropProcess(p *proc) bool { func (n *Node) exchangeInitiatorStep( netGroup peering.GroupProvider, peers map[uint16]peering.PeerSender, - recvCh chan *peering.RecvEvent, + recvCh chan *peering.PeerMessageIn, retryTimeout time.Duration, giveUpTimeout time.Duration, dkgID peering.PeeringID, @@ -319,7 +330,7 @@ func (n *Node) exchangeInitiatorStep( ) error { sendCB := func(peerIdx uint16, peer peering.PeerSender) { n.log.Debugf("Initiator sends step=%v command to %v", step, peer.NetID()) - peer.SendMsg(makePeerMessage(dkgID, step, &initiatorStepMsg{})) + peer.SendMsg(&peering.PeerMessageNet{PeerMessageData: *makePeerMessage(dkgID, peerMessageReceiverDkg, step, &initiatorStepMsg{})}) } return n.exchangeInitiatorAcks(netGroup, peers, recvCh, retryTimeout, giveUpTimeout, step, sendCB) } @@ -327,14 +338,14 @@ func (n *Node) exchangeInitiatorStep( func (n *Node) exchangeInitiatorAcks( netGroup peering.GroupProvider, peers map[uint16]peering.PeerSender, - recvCh chan *peering.RecvEvent, + recvCh chan *peering.PeerMessageIn, retryTimeout time.Duration, giveUpTimeout time.Duration, step byte, sendCB func(peerIdx uint16, peer peering.PeerSender), ) error { - recvCB := func(recv *peering.RecvEvent, msg initiatorMsg) (bool, error) { - n.log.Debugf("Initiator recv. step=%v response %v from %v", step, msg, recv.From.NetID()) + recvCB := func(recv *peering.PeerMessageGroupIn, msg initiatorMsg) (bool, error) { + n.log.Debugf("Initiator recv. step=%v response %v from %v", step, msg, recv.SenderNetID) return true, nil } return n.exchangeInitiatorMsgs(netGroup, peers, recvCh, retryTimeout, giveUpTimeout, step, sendCB, recvCB) @@ -343,23 +354,23 @@ func (n *Node) exchangeInitiatorAcks( func (n *Node) exchangeInitiatorMsgs( netGroup peering.GroupProvider, peers map[uint16]peering.PeerSender, - recvCh chan *peering.RecvEvent, + recvCh chan *peering.PeerMessageIn, retryTimeout time.Duration, giveUpTimeout time.Duration, step byte, sendCB func(peerIdx uint16, peer peering.PeerSender), - recvCB func(recv *peering.RecvEvent, initMsg initiatorMsg) (bool, error), + recvCB func(recv *peering.PeerMessageGroupIn, initMsg initiatorMsg) (bool, error), ) error { - recvInitCB := func(recv *peering.RecvEvent) (bool, error) { + recvInitCB := func(recv *peering.PeerMessageGroupIn) (bool, error) { var err error var initMsg initiatorMsg var isInitMsg bool - isInitMsg, initMsg, err = readInitiatorMsg(recv.Msg, n.blsSuite) + isInitMsg, initMsg, err = readInitiatorMsg(&recv.PeerMessageData, n.blsSuite) if !isInitMsg { return false, nil } if err != nil { - n.log.Warnf("Failed to read message from %v: %v", recv.From.NetID(), recv.Msg) + n.log.Warnf("Failed to read message from %v: %v", recv.SenderNetID, recv.PeerMessageData) return false, err } if !initMsg.IsResponse() { diff --git a/packages/dkg/proc.go b/packages/dkg/proc.go index 3f969c0319..dbe0a1882f 100644 --- a/packages/dkg/proc.go +++ b/packages/dkg/proc.go @@ -46,15 +46,15 @@ type proc struct { nodeIndex uint16 // Index of this node. initiatorPub ed25519.PublicKey threshold uint16 - roundRetry time.Duration // Retry period for the Peer <-> Peer communication. - netGroup peering.GroupProvider // A group for which the distributed key is generated. - dkgImpl *rabin_dkg.DistKeyGenerator // The cryptographic implementation to use. - dkgLock *sync.RWMutex // Guard access to dkgImpl - attachID interface{} // We keep it here to be able to detach from the network. - peerMsgCh chan *peering.RecvEvent // A buffer for the received peer messages. - log *logger.Logger // A logger to use. - myNetID string // Just to make logging easier. - steps map[byte]*procStep // All the steps for the procedure. + roundRetry time.Duration // Retry period for the Peer <-> Peer communication. + netGroup peering.GroupProvider // A group for which the distributed key is generated. + dkgImpl *rabin_dkg.DistKeyGenerator // The cryptographic implementation to use. + dkgLock *sync.RWMutex // Guard access to dkgImpl + attachID interface{} // We keep it here to be able to detach from the network. + peerMsgCh chan *peering.PeerMessageGroupIn // A buffer for the received peer messages. + log *logger.Logger // A logger to use. + myNetID string // Just to make logging easier. + steps map[byte]*procStep // All the steps for the procedure. } func onInitiatorInit(dkgID peering.PeeringID, msg *initiatorInitMsg, node *Node) (*proc, error) { @@ -90,12 +90,12 @@ func onInitiatorInit(dkgID peering.PeeringID, msg *initiatorInitMsg, node *Node) netGroup: netGroup, dkgImpl: dkgImpl, dkgLock: &sync.RWMutex{}, - peerMsgCh: make(chan *peering.RecvEvent, len(msg.peerPubs)), + peerMsgCh: make(chan *peering.PeerMessageGroupIn, len(msg.peerPubs)), log: log, myNetID: node.netProvider.Self().NetID(), } p.log.Infof("Starting DKG Peer process at %v for DkgID=%v", p.myNetID, p.dkgID.String()) - stepsStart := make(chan map[uint16]*peering.PeerMessage) + stepsStart := make(chan map[uint16]*peering.PeerMessageData) p.steps = make(map[byte]*procStep) if p.dkgImpl == nil { p.steps[rabinStep6R6SendReconstructCommits] = newProcStep(rabinStep6R6SendReconstructCommits, &p, @@ -146,26 +146,26 @@ func onInitiatorInit(dkgID peering.PeeringID, msg *initiatorInitMsg, node *Node) ) } go p.processLoop(msg.timeout, p.steps[rabinStep7CommitAndTerminate].doneCh) - p.attachID = p.netGroup.Attach(&dkgID, p.onPeerMessage) - stepsStart <- make(map[uint16]*peering.PeerMessage) + p.attachID = p.netGroup.Attach(&dkgID, peerMessageReceiverDkg, p.onPeerMessage) + stepsStart <- make(map[uint16]*peering.PeerMessageData) return &p, nil } // Handles a message from a peer and pass it to the main thread. -func (p *proc) onPeerMessage(recv *peering.RecvEvent) { - p.peerMsgCh <- recv +func (p *proc) onPeerMessage(peerMsg *peering.PeerMessageGroupIn) { + p.peerMsgCh <- peerMsg } // That's the main thread executing all the procedure steps. // We use a single process to make all the actions sequential. -func (p *proc) processLoop(timeout time.Duration, doneCh chan map[uint16]*peering.PeerMessage) { +func (p *proc) processLoop(timeout time.Duration, doneCh chan map[uint16]*peering.PeerMessageData) { done := false timeoutCh := time.After(timeout) for { select { case recv := <-p.peerMsgCh: - if isDkgInitProcRecvMsg(recv.Msg.MsgType) || isDkgRabinRoundMsg(recv.Msg.MsgType) || isDkgRabinEchoMsg(recv.Msg.MsgType) { - step := readDkgMessageStep(recv.Msg.MsgData) + if isDkgInitProcRecvMsg(recv.MsgType) || isDkgRabinRoundMsg(recv.MsgType) || isDkgRabinEchoMsg(recv.MsgType) { + step := readDkgMessageStep(recv.MsgData) if s := p.steps[step]; s != nil { s.recv(recv) } else { @@ -197,7 +197,7 @@ func (p *proc) processLoop(timeout time.Duration, doneCh chan map[uint16]*peerin // // rabinStep1R21SendDeals // -func (p *proc) rabinStep1R21SendDealsMakeSent(step byte, initRecv *peering.RecvEvent, prevMsgs map[uint16]*peering.PeerMessage) (map[uint16]*peering.PeerMessage, error) { +func (p *proc) rabinStep1R21SendDealsMakeSent(step byte, initRecv *peering.PeerMessageGroupIn, prevMsgs map[uint16]*peering.PeerMessageData) (map[uint16]*peering.PeerMessageData, error) { var err error if p.dkgImpl == nil { return nil, errors.New("unexpected step for n=1") @@ -210,23 +210,23 @@ func (p *proc) rabinStep1R21SendDealsMakeSent(step byte, initRecv *peering.RecvE return nil, err } p.dkgLock.Unlock() - sentMsgs := make(map[uint16]*peering.PeerMessage) + sentMsgs := make(map[uint16]*peering.PeerMessageData) for i := range deals { - sentMsgs[uint16(i)] = makePeerMessage(p.dkgID, step, &rabinDealMsg{ + sentMsgs[uint16(i)] = makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &rabinDealMsg{ deal: deals[i], }) } return sentMsgs, nil } -func (p *proc) rabinStep1R21SendDealsMakeResp(step byte, initRecv *peering.RecvEvent, recvMsgs map[uint16]*peering.PeerMessage) (*peering.PeerMessage, error) { - return makePeerMessage(p.dkgID, step, &initiatorStatusMsg{error: nil}), nil +func (p *proc) rabinStep1R21SendDealsMakeResp(step byte, initRecv *peering.PeerMessageGroupIn, recvMsgs map[uint16]*peering.PeerMessageData) (*peering.PeerMessageData, error) { + return makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &initiatorStatusMsg{error: nil}), nil } // // rabinStep2R22SendResponses // -func (p *proc) rabinStep2R22SendResponsesMakeSent(step byte, initRecv *peering.RecvEvent, prevMsgs map[uint16]*peering.PeerMessage) (map[uint16]*peering.PeerMessage, error) { +func (p *proc) rabinStep2R22SendResponsesMakeSent(step byte, initRecv *peering.PeerMessageGroupIn, prevMsgs map[uint16]*peering.PeerMessageData) (map[uint16]*peering.PeerMessageData, error) { var err error if p.dkgImpl == nil { return nil, errors.New("unexpected step for n=1") @@ -258,23 +258,23 @@ func (p *proc) rabinStep2R22SendResponsesMakeSent(step byte, initRecv *peering.R } // // Produce the sent messages. - sentMsgs := make(map[uint16]*peering.PeerMessage) + sentMsgs := make(map[uint16]*peering.PeerMessageData) for i := range prevMsgs { // Use peerIdx from the previous round. - sentMsgs[i] = makePeerMessage(p.dkgID, step, &rabinResponseMsg{ + sentMsgs[i] = makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &rabinResponseMsg{ responses: ourResponses, }) } return sentMsgs, nil } -func (p *proc) rabinStep2R22SendResponsesMakeResp(step byte, initRecv *peering.RecvEvent, recvMsgs map[uint16]*peering.PeerMessage) (*peering.PeerMessage, error) { - return makePeerMessage(p.dkgID, step, &initiatorStatusMsg{error: nil}), nil +func (p *proc) rabinStep2R22SendResponsesMakeResp(step byte, initRecv *peering.PeerMessageGroupIn, recvMsgs map[uint16]*peering.PeerMessageData) (*peering.PeerMessageData, error) { + return makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &initiatorStatusMsg{error: nil}), nil } // // rabinStep3R23SendJustifications // -func (p *proc) rabinStep3R23SendJustificationsMakeSent(step byte, initRecv *peering.RecvEvent, prevMsgs map[uint16]*peering.PeerMessage) (map[uint16]*peering.PeerMessage, error) { +func (p *proc) rabinStep3R23SendJustificationsMakeSent(step byte, initRecv *peering.PeerMessageGroupIn, prevMsgs map[uint16]*peering.PeerMessageData) (map[uint16]*peering.PeerMessageData, error) { var err error if p.dkgImpl == nil { return nil, errors.New("unexpected step for n=1") @@ -311,23 +311,23 @@ func (p *proc) rabinStep3R23SendJustificationsMakeSent(step byte, initRecv *peer } // // Produce the sent messages. - sentMsgs := make(map[uint16]*peering.PeerMessage) + sentMsgs := make(map[uint16]*peering.PeerMessageData) for i := range prevMsgs { // Use peerIdx from the previous round. - sentMsgs[i] = makePeerMessage(p.dkgID, step, &rabinJustificationMsg{ + sentMsgs[i] = makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &rabinJustificationMsg{ justifications: ourJustifications, }) } return sentMsgs, nil } -func (p *proc) rabinStep3R23SendJustificationsMakeResp(step byte, initRecv *peering.RecvEvent, recvMsgs map[uint16]*peering.PeerMessage) (*peering.PeerMessage, error) { - return makePeerMessage(p.dkgID, step, &initiatorStatusMsg{error: nil}), nil +func (p *proc) rabinStep3R23SendJustificationsMakeResp(step byte, initRecv *peering.PeerMessageGroupIn, recvMsgs map[uint16]*peering.PeerMessageData) (*peering.PeerMessageData, error) { + return makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &initiatorStatusMsg{error: nil}), nil } // // rabinStep4R4SendSecretCommits // -func (p *proc) rabinStep4R4SendSecretCommitsMakeSent(step byte, initRecv *peering.RecvEvent, prevMsgs map[uint16]*peering.PeerMessage) (map[uint16]*peering.PeerMessage, error) { +func (p *proc) rabinStep4R4SendSecretCommitsMakeSent(step byte, initRecv *peering.PeerMessageGroupIn, prevMsgs map[uint16]*peering.PeerMessageData) (map[uint16]*peering.PeerMessageData, error) { var err error if p.dkgImpl == nil { return nil, errors.New("unexpected step for n=1") @@ -376,14 +376,14 @@ func (p *proc) rabinStep4R4SendSecretCommitsMakeSent(step byte, initRecv *peerin } // // Produce the sent messages. - sentMsgs := make(map[uint16]*peering.PeerMessage) + sentMsgs := make(map[uint16]*peering.PeerMessageData) for i := range prevMsgs { // Use peerIdx from the previous round. if thisInQual && p.nodeInQUAL(i) { - sentMsgs[i] = makePeerMessage(p.dkgID, step, &rabinSecretCommitsMsg{ + sentMsgs[i] = makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &rabinSecretCommitsMsg{ secretCommits: ourSecretCommits, }) } else { - sentMsgs[i] = makePeerMessage(p.dkgID, step, &rabinSecretCommitsMsg{ + sentMsgs[i] = makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &rabinSecretCommitsMsg{ secretCommits: nil, }) } @@ -391,14 +391,14 @@ func (p *proc) rabinStep4R4SendSecretCommitsMakeSent(step byte, initRecv *peerin return sentMsgs, nil } -func (p *proc) rabinStep4R4SendSecretCommitsMakeResp(step byte, initRecv *peering.RecvEvent, recvMsgs map[uint16]*peering.PeerMessage) (*peering.PeerMessage, error) { - return makePeerMessage(p.dkgID, step, &initiatorStatusMsg{error: nil}), nil +func (p *proc) rabinStep4R4SendSecretCommitsMakeResp(step byte, initRecv *peering.PeerMessageGroupIn, recvMsgs map[uint16]*peering.PeerMessageData) (*peering.PeerMessageData, error) { + return makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &initiatorStatusMsg{error: nil}), nil } // // rabinStep5R5SendComplaintCommits // -func (p *proc) rabinStep5R5SendComplaintCommitsMakeSent(step byte, initRecv *peering.RecvEvent, prevMsgs map[uint16]*peering.PeerMessage) (map[uint16]*peering.PeerMessage, error) { +func (p *proc) rabinStep5R5SendComplaintCommitsMakeSent(step byte, initRecv *peering.PeerMessageGroupIn, prevMsgs map[uint16]*peering.PeerMessageData) (map[uint16]*peering.PeerMessageData, error) { var err error if p.dkgImpl == nil { return nil, errors.New("unexpected step for n=1") @@ -435,14 +435,14 @@ func (p *proc) rabinStep5R5SendComplaintCommitsMakeSent(step byte, initRecv *pee } // // Produce the sent messages. - sentMsgs := make(map[uint16]*peering.PeerMessage) + sentMsgs := make(map[uint16]*peering.PeerMessageData) for i := range prevMsgs { // Use peerIdx from the previous round. if p.nodeInQUAL(i) { - sentMsgs[i] = makePeerMessage(p.dkgID, step, &rabinComplaintCommitsMsg{ + sentMsgs[i] = makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &rabinComplaintCommitsMsg{ complaintCommits: ourComplaintCommits, }) } else { - sentMsgs[i] = makePeerMessage(p.dkgID, step, &rabinComplaintCommitsMsg{ + sentMsgs[i] = makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &rabinComplaintCommitsMsg{ complaintCommits: []*rabin_dkg.ComplaintCommits{}, }) } @@ -450,18 +450,18 @@ func (p *proc) rabinStep5R5SendComplaintCommitsMakeSent(step byte, initRecv *pee return sentMsgs, nil } -func (p *proc) rabinStep5R5SendComplaintCommitsMakeResp(step byte, initRecv *peering.RecvEvent, recvMsgs map[uint16]*peering.PeerMessage) (*peering.PeerMessage, error) { - return makePeerMessage(p.dkgID, step, &initiatorStatusMsg{error: nil}), nil +func (p *proc) rabinStep5R5SendComplaintCommitsMakeResp(step byte, initRecv *peering.PeerMessageGroupIn, recvMsgs map[uint16]*peering.PeerMessageData) (*peering.PeerMessageData, error) { + return makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &initiatorStatusMsg{error: nil}), nil } // // rabinStep6R6SendReconstructCommits // -func (p *proc) rabinStep6R6SendReconstructCommitsMakeSent(step byte, initRecv *peering.RecvEvent, prevMsgs map[uint16]*peering.PeerMessage) (map[uint16]*peering.PeerMessage, error) { +func (p *proc) rabinStep6R6SendReconstructCommitsMakeSent(step byte, initRecv *peering.PeerMessageGroupIn, prevMsgs map[uint16]*peering.PeerMessageData) (map[uint16]*peering.PeerMessageData, error) { var err error if p.dkgImpl == nil { // Nothing to exchange in the round, if N=1 - return make(map[uint16]*peering.PeerMessage), nil + return make(map[uint16]*peering.PeerMessageData), nil } // // Decode and process the received secret commits. @@ -494,14 +494,14 @@ func (p *proc) rabinStep6R6SendReconstructCommitsMakeSent(step byte, initRecv *p } // // Produce the sent messages. - sentMsgs := make(map[uint16]*peering.PeerMessage) + sentMsgs := make(map[uint16]*peering.PeerMessageData) for i := range prevMsgs { // Use peerIdx from the previous round. if p.nodeInQUAL(i) { - sentMsgs[i] = makePeerMessage(p.dkgID, step, &rabinReconstructCommitsMsg{ + sentMsgs[i] = makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &rabinReconstructCommitsMsg{ reconstructCommits: ourReconstructCommits, }) } else { - sentMsgs[i] = makePeerMessage(p.dkgID, step, &rabinReconstructCommitsMsg{ + sentMsgs[i] = makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &rabinReconstructCommitsMsg{ reconstructCommits: []*rabin_dkg.ReconstructCommits{}, }) } @@ -509,7 +509,7 @@ func (p *proc) rabinStep6R6SendReconstructCommitsMakeSent(step byte, initRecv *p return sentMsgs, nil } -func (p *proc) rabinStep6R6SendReconstructCommitsMakeResp(step byte, initRecv *peering.RecvEvent, recvMsgs map[uint16]*peering.PeerMessage) (*peering.PeerMessage, error) { +func (p *proc) rabinStep6R6SendReconstructCommitsMakeResp(step byte, initRecv *peering.PeerMessageGroupIn, recvMsgs map[uint16]*peering.PeerMessageData) (*peering.PeerMessageData, error) { var err error if p.dkgImpl == nil { // This is the case for N=1, just use simple BLS key pair. @@ -583,16 +583,16 @@ func (p *proc) rabinStep6R6SendReconstructCommitsMakeResp(step byte, initRecv *p if pubShareMsg, err = p.makeInitiatorPubShareMsg(step); err != nil { return nil, err } - return makePeerMessage(p.dkgID, step, pubShareMsg), nil + return makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, pubShareMsg), nil } // // rabinStep7CommitAndTerminate // -func (p *proc) rabinStep7CommitAndTerminateMakeSent(step byte, initRecv *peering.RecvEvent, prevMsgs map[uint16]*peering.PeerMessage) (map[uint16]*peering.PeerMessage, error) { +func (p *proc) rabinStep7CommitAndTerminateMakeSent(step byte, initRecv *peering.PeerMessageGroupIn, prevMsgs map[uint16]*peering.PeerMessageData) (map[uint16]*peering.PeerMessageData, error) { var err error doneMsg := initiatorDoneMsg{} - if err = doneMsg.fromBytes(initRecv.Msg.MsgData, p.node.blsSuite); err != nil { + if err = doneMsg.fromBytes(initRecv.MsgData, p.node.blsSuite); err != nil { p.log.Warnf("Dropping message, failed to decode: %v", initRecv) return nil, err } @@ -603,11 +603,11 @@ func (p *proc) rabinStep7CommitAndTerminateMakeSent(step byte, initRecv *peering if err := p.node.registry.SaveDKShare(p.dkShare); err != nil { return nil, err } - return make(map[uint16]*peering.PeerMessage), nil + return make(map[uint16]*peering.PeerMessageData), nil } -func (p *proc) rabinStep7CommitAndTerminateMakeResp(step byte, initRecv *peering.RecvEvent, recvMsgs map[uint16]*peering.PeerMessage) (*peering.PeerMessage, error) { - return makePeerMessage(p.dkgID, step, &initiatorStatusMsg{error: nil}), nil +func (p *proc) rabinStep7CommitAndTerminateMakeResp(step byte, initRecv *peering.PeerMessageGroupIn, recvMsgs map[uint16]*peering.PeerMessageData) (*peering.PeerMessageData, error) { + return makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &initiatorStatusMsg{error: nil}), nil } func (p *proc) nodeInQUAL(nodeIdx uint16) bool { @@ -646,18 +646,18 @@ func (p *proc) makeInitiatorPubShareMsg(step byte) (*initiatorPubShareMsg, error type procStep struct { step byte - startCh <-chan map[uint16]*peering.PeerMessage // Gives a signal to start the current step. - prevMsgs map[uint16]*peering.PeerMessage // Messages received from other peers in the previous step. - sentMsgs map[uint16]*peering.PeerMessage // Messages produced by this peer in this step and sent to others. - recvMsgs map[uint16]*peering.PeerMessage // Messages received from other peers in this step. - initRecv *peering.RecvEvent // Initiator that activated this step. - initResp *peering.PeerMessage // Step response to the initiator. - recvCh chan *peering.RecvEvent // Channel to receive messages for this step (from initiator and peers). - doneCh chan map[uint16]*peering.PeerMessage // Indicates, that this step is done. - closeCh chan bool // For terminating this process. - makeSent func(step byte, initRecv *peering.RecvEvent, prevMsgs map[uint16]*peering.PeerMessage) (map[uint16]*peering.PeerMessage, error) + startCh <-chan map[uint16]*peering.PeerMessageData // Gives a signal to start the current step. + prevMsgs map[uint16]*peering.PeerMessageData // Messages received from other peers in the previous step. + sentMsgs map[uint16]*peering.PeerMessageData // Messages produced by this peer in this step and sent to others. + recvMsgs map[uint16]*peering.PeerMessageData // Messages received from other peers in this step. + initRecv *peering.PeerMessageGroupIn // Initiator that activated this step. + initResp *peering.PeerMessageData // Step response to the initiator. + recvCh chan *peering.PeerMessageGroupIn // Channel to receive messages for this step (from initiator and peers). + doneCh chan map[uint16]*peering.PeerMessageData // Indicates, that this step is done. + closeCh chan bool // For terminating this process. + makeSent func(step byte, initRecv *peering.PeerMessageGroupIn, prevMsgs map[uint16]*peering.PeerMessageData) (map[uint16]*peering.PeerMessageData, error) onceSent *sync.Once - makeResp func(step byte, initRecv *peering.RecvEvent, recvMsgs map[uint16]*peering.PeerMessage) (*peering.PeerMessage, error) + makeResp func(step byte, initRecv *peering.PeerMessageGroupIn, recvMsgs map[uint16]*peering.PeerMessageData) (*peering.PeerMessageData, error) onceResp *sync.Once retryCh <-chan time.Time proc *proc @@ -667,19 +667,19 @@ type procStep struct { func newProcStep( step byte, proc *proc, - startCh <-chan map[uint16]*peering.PeerMessage, - makeSent func(step byte, initRecv *peering.RecvEvent, prevMsgs map[uint16]*peering.PeerMessage) (map[uint16]*peering.PeerMessage, error), - makeResp func(step byte, initRecv *peering.RecvEvent, recvMsgs map[uint16]*peering.PeerMessage) (*peering.PeerMessage, error), + startCh <-chan map[uint16]*peering.PeerMessageData, + makeSent func(step byte, initRecv *peering.PeerMessageGroupIn, prevMsgs map[uint16]*peering.PeerMessageData) (map[uint16]*peering.PeerMessageData, error), + makeResp func(step byte, initRecv *peering.PeerMessageGroupIn, recvMsgs map[uint16]*peering.PeerMessageData) (*peering.PeerMessageData, error), ) *procStep { s := procStep{ step: step, startCh: startCh, prevMsgs: nil, sentMsgs: nil, - recvMsgs: make(map[uint16]*peering.PeerMessage), + recvMsgs: make(map[uint16]*peering.PeerMessageData), initResp: nil, - recvCh: make(chan *peering.RecvEvent, 1000), // NOTE: The channel depth is nor necessary, just for performance. - doneCh: make(chan map[uint16]*peering.PeerMessage), + recvCh: make(chan *peering.PeerMessageGroupIn, 1000), // NOTE: The channel depth is not necessary, just for performance. + doneCh: make(chan map[uint16]*peering.PeerMessageData), closeCh: make(chan bool), makeSent: makeSent, onceSent: &sync.Once{}, @@ -697,7 +697,7 @@ func (s *procStep) close() { close(s.closeCh) } -func (s *procStep) recv(msg *peering.RecvEvent) { +func (s *procStep) recv(msg *peering.PeerMessageGroupIn) { s.recvCh <- msg } @@ -724,38 +724,38 @@ func (s *procStep) run() { // The following is for the case, when we already completed our step, but receiving // messages from others. Maybe our messages were lost, so we just resend the same messages. if s.initResp != nil { - if isDkgInitProcRecvMsg(recv.Msg.MsgType) { - s.log.Debugf("[%v -%v-> %v] Resending initiator response.", s.proc.myNetID, s.initResp.MsgType, recv.From.NetID()) - recv.From.SendMsg(s.initResp) + if isDkgInitProcRecvMsg(recv.MsgType) { + s.log.Debugf("[%v -%v-> %v] Resending initiator response.", s.proc.myNetID, s.initResp.MsgType, recv.SenderNetID) + s.proc.netGroup.SendMsgByIndex(recv.SenderIndex, s.initResp) continue } - if isDkgRabinEchoMsg(recv.Msg.MsgType) { + if isDkgRabinEchoMsg(recv.MsgType) { // Do not respond to echo messages, a resend loop will be initiated otherwise. continue } - if isDkgRabinRoundMsg(recv.Msg.MsgType) { + if isDkgRabinRoundMsg(recv.MsgType) { // Resend the peer messages as echo messages, because we don't need the responses anymore. s.sendEcho(recv) continue } - s.log.Warnf("[%v -%v-> %v] Dropping unknown message.", recv.From.NetID(), recv.Msg.MsgType, s.proc.myNetID) + s.log.Warnf("[%v -%v-> %v] Dropping unknown message.", recv.SenderNetID, recv.MsgType, s.proc.myNetID) continue } // // The following processes te messages while this step is active. - if isDkgInitProcRecvMsg(recv.Msg.MsgType) { + if isDkgInitProcRecvMsg(recv.MsgType) { s.onceSent.Do(func() { s.initRecv = recv s.retryCh = time.After(s.proc.roundRetry) // Check the retries. if s.sentMsgs, err = s.makeSent(s.step, s.initRecv, s.prevMsgs); err != nil { s.log.Errorf("Step %v failed to make round messages, reason=%v", s.step, err) - s.sentMsgs = make(map[uint16]*peering.PeerMessage) // No messages will be sent on error. - s.markDone(makePeerMessage(s.proc.dkgID, s.step, &initiatorStatusMsg{error: err})) + s.sentMsgs = make(map[uint16]*peering.PeerMessageData) // No messages will be sent on error. + s.markDone(makePeerMessage(s.proc.dkgID, peerMessageReceiverDkg, s.step, &initiatorStatusMsg{error: err})) } for i := range s.sentMsgs { - sendPeer := s.proc.netGroup.AllNodes()[i] - s.log.Debugf("[%v -%v-> %v] Sending peer message (first).", s.proc.myNetID, s.sentMsgs[i].MsgType, sendPeer.NetID()) - sendPeer.SendMsg(s.sentMsgs[i]) + netID, _ := s.proc.netGroup.NetIDByIndex(i) + s.log.Debugf("[%v -%v-> %v] Sending peer message (first).", s.proc.myNetID, s.sentMsgs[i].MsgType, netID) + s.proc.netGroup.SendMsgByIndex(i, s.sentMsgs[i]) } if s.haveAll() { s.makeDone() @@ -763,12 +763,12 @@ func (s *procStep) run() { }) continue } - if isDkgRabinRoundMsg(recv.Msg.MsgType) || isDkgRabinEchoMsg(recv.Msg.MsgType) { + if isDkgRabinRoundMsg(recv.MsgType) || isDkgRabinEchoMsg(recv.MsgType) { // in the current step we consider echo messages as ordinary round messages, // because it is possible that we have requested for them. - if s.recvMsgs[recv.Msg.SenderIndex] == nil { - s.recvMsgs[recv.Msg.SenderIndex] = recv.Msg - } else if s.sentMsgs != nil && isDkgRabinRoundMsg(recv.Msg.MsgType) { + if s.recvMsgs[recv.SenderIndex] == nil { + s.recvMsgs[recv.SenderIndex] = &recv.PeerMessageData + } else if s.sentMsgs != nil && isDkgRabinRoundMsg(recv.MsgType) { // If that's a repeated message from the peer, maybe our message has been // lost, so we repeat it as an echo, to avoid resend loops. s.sendEcho(recv) @@ -778,16 +778,16 @@ func (s *procStep) run() { } continue } - s.log.Warnf("[%v -%v-> %v] Dropping unknown message.", recv.From.NetID(), recv.Msg.MsgType, s.proc.myNetID) + s.log.Warnf("[%v -%v-> %v] Dropping unknown message.", recv.SenderNetID, recv.MsgType, s.proc.myNetID) continue case <-s.retryCh: // Resend all the messages, from who we haven't received. s.retryCh = time.After(s.proc.roundRetry) // Repeat the timer. for i := range s.sentMsgs { if s.recvMsgs[i] == nil { - sendPeer := s.proc.netGroup.AllNodes()[i] - s.log.Debugf("[%v -%v-> %v] Resending peer message (retry).", s.proc.myNetID, s.sentMsgs[i].MsgType, sendPeer.NetID()) - sendPeer.SendMsg(s.sentMsgs[i]) + netID, _ := s.proc.netGroup.NetIDByIndex(i) + s.log.Debugf("[%v -%v-> %v] Resending peer message (retry).", s.proc.myNetID, s.sentMsgs[i].MsgType, netID) + s.proc.netGroup.SendMsgByIndex(i, s.sentMsgs[i]) } } continue @@ -797,19 +797,19 @@ func (s *procStep) run() { } } -func (s *procStep) sendEcho(recv *peering.RecvEvent) { +func (s *procStep) sendEcho(recv *peering.PeerMessageGroupIn) { var err error - if sentMsg, sentMsgOK := s.sentMsgs[recv.Msg.SenderIndex]; sentMsgOK { + if sentMsg, sentMsgOK := s.sentMsgs[recv.SenderIndex]; sentMsgOK { echoMsg := *sentMsg // Make a copy. if echoMsg.MsgType, err = makeDkgRoundEchoMsg(echoMsg.MsgType); err != nil { - s.log.Warnf("[%v -%v-> %v] Unable to send echo message, reason=%v", s.proc.myNetID, recv.Msg.MsgType, recv.From.NetID(), err) + s.log.Warnf("[%v -%v-> %v] Unable to send echo message, reason=%v", s.proc.myNetID, recv.MsgType, recv.SenderNetID, err) return } - s.log.Debugf("[%v -%v-> %v] Resending peer message (echo).", s.proc.myNetID, echoMsg.MsgType, recv.From.NetID()) - recv.From.SendMsg(&echoMsg) + s.log.Debugf("[%v -%v-> %v] Resending peer message (echo).", s.proc.myNetID, echoMsg.MsgType, recv.SenderNetID) + s.proc.netGroup.SendMsgByIndex(recv.SenderIndex, &echoMsg) return } - s.log.Warnf("[%v -%v-> %v] Unable to send echo message, is was not produced yet.", s.proc.myNetID, recv.Msg.MsgType, recv.From.NetID()) + s.log.Warnf("[%v -%v-> %v] Unable to send echo message, is was not produced yet.", s.proc.myNetID, recv.MsgType, recv.SenderNetID) } func (s *procStep) haveAll() bool { @@ -824,21 +824,21 @@ func (s *procStep) haveAll() bool { func (s *procStep) makeDone() { var err error s.onceResp.Do(func() { - var initResp *peering.PeerMessage + var initResp *peering.PeerMessageData if initResp, err = s.makeResp(s.step, s.initRecv, s.recvMsgs); err != nil { s.log.Errorf("Step failed to make round response, reason=%v", err) - s.markDone(makePeerMessage(s.proc.dkgID, s.step, &initiatorStatusMsg{error: err})) + s.markDone(makePeerMessage(s.proc.dkgID, peerMessageReceiverDkg, s.step, &initiatorStatusMsg{error: err})) } else { s.markDone(initResp) } }) } -func (s *procStep) markDone(initResp *peering.PeerMessage) { +func (s *procStep) markDone(initResp *peering.PeerMessageData) { s.doneCh <- s.recvMsgs // Activate the next step. s.initResp = initResp // Store the response for later resends. if s.initRecv != nil { - s.initRecv.From.SendMsg(initResp) // Send response to the initiator. + s.proc.netGroup.SendMsgByIndex(s.initRecv.SenderIndex, initResp) // Send response to the initiator. } else { s.log.Panicf("Step %v/%v closed with no initiator message.", s.proc.myNetID, s.step) } diff --git a/packages/peering/group/group.go b/packages/peering/group/group.go index 10d32aa31b..f585ed5f3d 100644 --- a/packages/peering/group/group.go +++ b/packages/peering/group/group.go @@ -75,6 +75,13 @@ func (g *groupImpl) PeerIndexByNetID(peerNetID string) (uint16, error) { return NotInGroup, errors.New("peer_not_found_by_net_id") } +func (g *groupImpl) NetIDByIndex(index uint16) (string, error) { + if index < uint16(len(g.nodes)) { + return g.nodes[index].NetID(), nil + } + return "", errors.New("peer_index_out_of_scope") +} + // SendMsgByIndex implements peering.GroupProvider. func (g *groupImpl) SendMsgByIndex(peerIdx uint16, msg *peering.PeerMessageData) { g.nodes[peerIdx].SendMsg(&peering.PeerMessageNet{PeerMessageData: *msg}) @@ -97,13 +104,12 @@ func (g *groupImpl) SendMsgBroadcast(msg *peering.PeerMessageData, includingSelf // Resends the messages if acks are not received for some time. func (g *groupImpl) ExchangeRound( peers map[uint16]peering.PeerSender, - recvCh chan *peering.PeerMessageGroupIn, + recvCh chan *peering.PeerMessageIn, retryTimeout time.Duration, giveUpTimeout time.Duration, sendCB func(peerIdx uint16, peer peering.PeerSender), recvCB func(recv *peering.PeerMessageGroupIn) (bool, error), ) error { - var err error acks := make(map[uint16]bool) errs := make(map[uint16]error) retryCh := time.After(retryTimeout) @@ -122,18 +128,23 @@ func (g *groupImpl) ExchangeRound( } for !haveAllAcks() { select { - case recvMsg, ok := <-recvCh: + case recvMsgNoIndex, ok := <-recvCh: if !ok { return errors.New("recv_channel_closed") } - /*if recvMsg.Msg.SenderIndex, err = g.PeerIndex(recvMsg.From); err != nil { + senderIndex, err := g.PeerIndexByNetID(recvMsgNoIndex.SenderNetID) + if err != nil { g.log.Warnf( "Dropping message %v -> %v, MsgType=%v because of %v", - recvMsg.From.NetID(), g.netProvider.Self().NetID(), - recvMsg.Msg.MsgType, err, + recvMsgNoIndex.SenderNetID, g.netProvider.Self().NetID(), + recvMsgNoIndex.MsgType, err, ) continue - }*/ + } + recvMsg := peering.PeerMessageGroupIn{ + PeerMessageIn: *recvMsgNoIndex, + SenderIndex: senderIndex, + } if acks[recvMsg.SenderIndex] { // Only consider first successful message. g.log.Warnf( "Dropping duplicate message %v -> %v, receiver=%v, MsgType=%v", @@ -142,7 +153,7 @@ func (g *groupImpl) ExchangeRound( ) continue } - if acks[recvMsg.SenderIndex], err = recvCB(recvMsg); err != nil { + if acks[recvMsg.SenderIndex], err = recvCB(&recvMsg); err != nil { errs[recvMsg.SenderIndex] = err continue } diff --git a/packages/peering/peering.go b/packages/peering/peering.go index 3d6a3462ec..5c301a74df 100644 --- a/packages/peering/peering.go +++ b/packages/peering/peering.go @@ -66,13 +66,14 @@ type GroupProvider interface { SelfIndex() uint16 PeerIndex(peer PeerSender) (uint16, error) PeerIndexByNetID(peerNetID string) (uint16, error) + NetIDByIndex(index uint16) (string, error) Attach(peeringID *PeeringID, receiver byte, callback func(recv *PeerMessageGroupIn)) interface{} Detach(attachID interface{}) SendMsgByIndex(peerIdx uint16, msg *PeerMessageData) SendMsgBroadcast(msg *PeerMessageData, includingSelf bool, except ...uint16) ExchangeRound( peers map[uint16]PeerSender, - recvCh chan *PeerMessageGroupIn, + recvCh chan *PeerMessageIn, retryTimeout time.Duration, giveUpTimeout time.Duration, sendCB func(peerIdx uint16, peer PeerSender), diff --git a/packages/webapi/request/request.go b/packages/webapi/request/request.go index 585dc616f6..c94c72bc32 100644 --- a/packages/webapi/request/request.go +++ b/packages/webapi/request/request.go @@ -10,6 +10,7 @@ import ( "github.com/iotaledger/hive.go/logger" "github.com/iotaledger/hive.go/marshalutil" "github.com/iotaledger/wasp/packages/chain" + "github.com/iotaledger/wasp/packages/chain/messages" "github.com/iotaledger/wasp/packages/chains" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/colored" @@ -106,7 +107,13 @@ func (o *offLedgerReqAPI) handleNewRequest(c echo.Context) error { if len(balances) == 0 { return httperrors.BadRequest(fmt.Sprintf("No balance on account %s", offLedgerReq.SenderAccount().Base58())) } - ch.EnqueueOffLedgerRequestPeerMsg(offLedgerReq, "") + ch.EnqueueOffLedgerRequestMsg(&messages.OffLedgerRequestMsgIn{ + OffLedgerRequestMsg: messages.OffLedgerRequestMsg{ + ChainID: ch.ID(), + Req: offLedgerReq, + }, + SenderNetID: "", + }) return c.NoContent(http.StatusAccepted) } From 2cf0e2300b8bf7833f739c9ac5062dfe5341f3e5 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Mon, 15 Nov 2021 20:08:18 +0200 Subject: [PATCH 067/198] Short tests fixed, except chain package --- packages/chain/chain.go | 4 + packages/chain/chainimpl/chainimpl.go | 6 +- packages/chain/chainimpl/eventproc.go | 8 +- packages/chain/chainimpl/interface.go | 2 +- packages/peering/domain/domain_test.go | 20 +- packages/peering/group/group_test.go | 10 +- packages/peering/lpp/lppNetImpl_test.go | 13 +- packages/peering/peer_message.go | 6 + packages/peering/peering.go | 2 +- packages/peering/peering_test.go | 20 +- packages/testutil/peeringNetBehaviour.go | 4 +- .../testutil/peeringNetBehaviourDynamic.go | 14 +- .../peeringNetBehaviourDynamic_test.go | 4 +- packages/testutil/peeringNetBehaviour_test.go | 6 +- packages/testutil/peeringNetworkProvider.go | 38 ++-- .../testutil/peeringNetworkProvider_test.go | 10 +- packages/testutil/testchain/mock_acs.go | 5 - .../testutil/testchain/mock_chain_core.go | 204 +++++++++++------- packages/webapi/request/request_test.go | 9 +- 19 files changed, 227 insertions(+), 158 deletions(-) diff --git a/packages/chain/chain.go b/packages/chain/chain.go index 478c0415c7..bee623c883 100644 --- a/packages/chain/chain.go +++ b/packages/chain/chain.go @@ -38,6 +38,10 @@ type ChainCore interface { EnqueueDismissChain(reason string) // This one should really be public EnqueueLedgerState(chainOutput *ledgerstate.AliasOutput, timestamp time.Time) EnqueueOffLedgerRequestMsg(msg *messages.OffLedgerRequestMsgIn) + EnqueueRequestAckMsg(msg *messages.RequestAckMsgIn) + EnqueueMissingRequestIDsMsg(msg *messages.MissingRequestIDsMsgIn) + EnqueueMissingRequestMsg(msg *messages.MissingRequestMsg) + EnqueueTimerTick(tick int) } // ChainEntry interface to access chain from the chain registry side diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index cc9da0e962..9dccaad29a 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -176,7 +176,7 @@ func (c *chainObj) receiveCommitteePeerMessages(peerMsg *peering.PeerMessageGrou c.log.Error(err) return } - c.enqueueMissingRequestIDsMsg(&messages.MissingRequestIDsMsgIn{ + c.EnqueueMissingRequestIDsMsg(&messages.MissingRequestIDsMsgIn{ MissingRequestIDsMsg: *msg, SenderNetID: peerMsg.SenderNetID, }) @@ -204,7 +204,7 @@ func (c *chainObj) receiveChainPeerMessages(peerMsg *peering.PeerMessageIn) { c.log.Error(err) return } - c.enqueueRequestAckMsg(&messages.RequestAckMsgIn{ + c.EnqueueRequestAckMsg(&messages.RequestAckMsgIn{ RequestAckMsg: *msg, SenderNetID: peerMsg.SenderNetID, }) @@ -214,7 +214,7 @@ func (c *chainObj) receiveChainPeerMessages(peerMsg *peering.PeerMessageIn) { c.log.Error(err) return } - c.enqueueMissingRequestMsg(msg) + c.EnqueueMissingRequestMsg(msg) default: } } diff --git a/packages/chain/chainimpl/eventproc.go b/packages/chain/chainimpl/eventproc.go index 72f09c37c2..2239936703 100644 --- a/packages/chain/chainimpl/eventproc.go +++ b/packages/chain/chainimpl/eventproc.go @@ -137,7 +137,7 @@ func (c *chainObj) handleOffLedgerRequestMsg(msg *messages.OffLedgerRequestMsgIn c.broadcastOffLedgerRequest(req) } -func (c *chainObj) enqueueRequestAckMsg(msg *messages.RequestAckMsgIn) { +func (c *chainObj) EnqueueRequestAckMsg(msg *messages.RequestAckMsgIn) { c.requestAckPeerMsgPipe.In() <- msg } @@ -149,7 +149,7 @@ func (c *chainObj) handleRequestAckPeerMsg(msg *messages.RequestAckMsgIn) { c.chainMetrics.CountRequestAckMessages() } -func (c *chainObj) enqueueMissingRequestIDsMsg(msg *messages.MissingRequestIDsMsgIn) { +func (c *chainObj) EnqueueMissingRequestIDsMsg(msg *messages.MissingRequestIDsMsgIn) { c.missingRequestIDsPeerMsgPipe.In() <- msg } @@ -167,7 +167,7 @@ func (c *chainObj) handleMissingRequestIDsMsg(msg *messages.MissingRequestIDsMsg } } -func (c *chainObj) enqueueMissingRequestMsg(msg *messages.MissingRequestMsg) { +func (c *chainObj) EnqueueMissingRequestMsg(msg *messages.MissingRequestMsg) { c.missingRequestPeerMsgPipe.In() <- msg } @@ -180,7 +180,7 @@ func (c *chainObj) handleMissingRequestMsg(msg *messages.MissingRequestMsg) { } } -func (c *chainObj) enqueueTimerTick(tick int) { +func (c *chainObj) EnqueueTimerTick(tick int) { c.timerTickMsgPipe.In() <- messages.TimerTick(tick) } diff --git a/packages/chain/chainimpl/interface.go b/packages/chain/chainimpl/interface.go index 60f6c29d41..1ed57651e3 100644 --- a/packages/chain/chainimpl/interface.go +++ b/packages/chain/chainimpl/interface.go @@ -51,7 +51,7 @@ func (c *chainObj) startTimer() { tick := 0 for !c.IsDismissed() { time.Sleep(chain.TimerTickPeriod) - c.enqueueTimerTick(tick) + c.EnqueueTimerTick(tick) tick++ } }() diff --git a/packages/peering/domain/domain_test.go b/packages/peering/domain/domain_test.go index e3cb259c33..0db2d478fd 100644 --- a/packages/peering/domain/domain_test.go +++ b/packages/peering/domain/domain_test.go @@ -24,18 +24,20 @@ func TestDomainProvider(t *testing.T) { // // Listen for messages on all the nodes. + peeringID := peering.RandomPeeringID() + receiver := byte(16) doneCh0 := make(chan bool) doneCh1 := make(chan bool) doneCh2 := make(chan bool) - nodes[0].Attach(nil, func(recv *peering.RecvEvent) { + nodes[0].Attach(&peeringID, receiver, func(recv *peering.PeerMessageIn) { t.Logf("0 received") doneCh0 <- true }) - nodes[1].Attach(nil, func(recv *peering.RecvEvent) { + nodes[1].Attach(&peeringID, receiver, func(recv *peering.PeerMessageIn) { t.Logf("1 received") doneCh1 <- true }) - nodes[2].Attach(nil, func(recv *peering.RecvEvent) { + nodes[2].Attach(&peeringID, receiver, func(recv *peering.PeerMessageIn) { t.Logf("2 received") doneCh2 <- true }) @@ -46,7 +48,7 @@ func TestDomainProvider(t *testing.T) { require.Nil(t, err) require.NotNil(t, d) - msg := &peering.PeerMessage{PeeringID: peering.RandomPeeringID(), MsgType: 125} + msg := &peering.PeerMessageData{PeeringID: peeringID, MsgReceiver: receiver, MsgType: 125} d.SendMsgByNetID(netIDs[0], msg) d.SendMsgByNetID(netIDs[2], msg) <-doneCh0 @@ -81,14 +83,16 @@ func TestRandom(t *testing.T) { // Listen for messages on all the nodes. var wg sync.WaitGroup var r1, r2 int + peeringID := peering.RandomPeeringID() + receiver := byte(8) for i := range nodes { ii := i - nodes[i].Attach(nil, func(recv *peering.RecvEvent) { + nodes[i].Attach(&peeringID, receiver, func(recv *peering.PeerMessageIn) { t.Logf("%d received", ii) - if netIDs[1] == recv.From.NetID() { + if netIDs[1] == recv.SenderNetID { r1++ } - if netIDs[2] == recv.From.NetID() { + if netIDs[2] == recv.SenderNetID { r2++ } wg.Done() @@ -99,7 +103,7 @@ func TestRandom(t *testing.T) { for i := 0; i < 5; i++ { wg.Add(sendTo * 2) t.Log("----------------------------------") - msg := &peering.PeerMessage{PeeringID: peering.RandomPeeringID(), MsgType: 125} + msg := &peering.PeerMessageData{PeeringID: peeringID, MsgReceiver: receiver, MsgType: 125} d1.SendMsgToRandomPeers(sendTo, msg) d2.SendMsgToRandomPeers(sendTo, msg) wg.Wait() diff --git a/packages/peering/group/group_test.go b/packages/peering/group/group_test.go index f40057b50b..8a2c6ee284 100644 --- a/packages/peering/group/group_test.go +++ b/packages/peering/group/group_test.go @@ -23,16 +23,18 @@ func TestGroupProvider(t *testing.T) { // // Listen for messages on all the nodes. + peeringID := peering.RandomPeeringID() + receiver := byte(4) doneCh0 := make(chan bool) doneCh1 := make(chan bool) doneCh2 := make(chan bool) - nodes[0].Attach(nil, func(recv *peering.RecvEvent) { + nodes[0].Attach(&peeringID, receiver, func(recv *peering.PeerMessageIn) { doneCh0 <- true }) - nodes[1].Attach(nil, func(recv *peering.RecvEvent) { + nodes[1].Attach(&peeringID, receiver, func(recv *peering.PeerMessageIn) { doneCh1 <- true }) - nodes[2].Attach(nil, func(recv *peering.RecvEvent) { + nodes[2].Attach(&peeringID, receiver, func(recv *peering.PeerMessageIn) { doneCh2 <- true }) // @@ -42,7 +44,7 @@ func TestGroupProvider(t *testing.T) { require.Nil(t, err) // // Broadcast a message and wait until it will be received on all the nodes. - g.Broadcast(&peering.PeerMessage{PeeringID: peering.RandomPeeringID(), MsgType: 125}, true) + g.SendMsgBroadcast(&peering.PeerMessageData{PeeringID: peeringID, MsgReceiver: receiver, MsgType: 125}, true) <-doneCh0 <-doneCh1 <-doneCh2 diff --git a/packages/peering/lpp/lppNetImpl_test.go b/packages/peering/lpp/lppNetImpl_test.go index ce81f1185b..8d091da17f 100644 --- a/packages/peering/lpp/lppNetImpl_test.go +++ b/packages/peering/lpp/lppNetImpl_test.go @@ -53,15 +53,16 @@ func TestLPPPeeringImpl(t *testing.T) { n2p0, err := nodes[2].PeerByNetID(netIDs[0]) require.NoError(t, err) - nodes[0].Attach(nil, func(recv *peering.RecvEvent) { + chain1 := peering.RandomPeeringID() + chain2 := peering.RandomPeeringID() + receiver := byte(3) + nodes[0].Attach(&chain2, receiver, func(recv *peering.PeerMessageIn) { doneCh <- true }) - chain1 := peering.RandomPeeringID() - chain2 := peering.RandomPeeringID() - n0p2.SendMsg(&peering.PeerMessage{PeeringID: chain1, MsgType: 125}) - n1p1.SendMsg(&peering.PeerMessage{PeeringID: chain1, MsgType: 125}) - n2p0.SendMsg(&peering.PeerMessage{PeeringID: chain2, MsgType: 125}) + n0p2.SendMsg(&peering.PeerMessageNet{PeerMessageData: peering.PeerMessageData{PeeringID: chain1, MsgReceiver: receiver, MsgType: 125}}) + n1p1.SendMsg(&peering.PeerMessageNet{PeerMessageData: peering.PeerMessageData{PeeringID: chain1, MsgReceiver: receiver, MsgType: 125}}) + n2p0.SendMsg(&peering.PeerMessageNet{PeerMessageData: peering.PeerMessageData{PeeringID: chain2, MsgReceiver: receiver, MsgType: 125}}) <-doneCh time.Sleep(100 * time.Millisecond) diff --git a/packages/peering/peer_message.go b/packages/peering/peer_message.go index a9866b8f6d..247895bdb3 100644 --- a/packages/peering/peer_message.go +++ b/packages/peering/peer_message.go @@ -60,6 +60,9 @@ func NewPeerMessageDataFromBytes(buf []byte) (*PeerMessageData, error) { if err = util.ReadInt64(r, &m.Timestamp); err != nil { return nil, err } + if m.MsgReceiver, err = util.ReadByte(r); err != nil { + return nil, err + } if m.MsgType, err = util.ReadByte(r); err != nil { return nil, err } @@ -99,6 +102,9 @@ func (m *PeerMessageData) bytes() ([]byte, error) { if err := util.WriteInt64(&buf, m.Timestamp); err != nil { return nil, err } + if err := util.WriteByte(&buf, m.MsgReceiver); err != nil { + return nil, err + } if err := util.WriteByte(&buf, m.MsgType); err != nil { return nil, err } diff --git a/packages/peering/peering.go b/packages/peering/peering.go index 5c301a74df..f168587701 100644 --- a/packages/peering/peering.go +++ b/packages/peering/peering.go @@ -51,7 +51,7 @@ type TrustedNetworkManager interface { } type PeerCollection interface { - Attach(peeringID *PeeringID, reveiver byte, callback func(recv *PeerMessageIn)) interface{} + Attach(peeringID *PeeringID, receiver byte, callback func(recv *PeerMessageIn)) interface{} Detach(attachID interface{}) SendMsgByNetID(netID string, msg *PeerMessageData) } diff --git a/packages/peering/peering_test.go b/packages/peering/peering_test.go index 0e80610716..626556cda9 100644 --- a/packages/peering/peering_test.go +++ b/packages/peering/peering_test.go @@ -11,24 +11,26 @@ import ( func TestPeerMessageCodec(t *testing.T) { var err error - var src, dst *peering.PeerMessage - src = &peering.PeerMessage{ - PeeringID: peering.RandomPeeringID(), - SenderIndex: uint16(123), - Timestamp: time.Now().UnixNano(), - MsgType: peering.FirstUserMsgCode + 17, - MsgData: []byte{1, 2, 3, 4, 5}, + var src, dst *peering.PeerMessageNet + src = &peering.PeerMessageNet{ + PeerMessageData: peering.PeerMessageData{ + PeeringID: peering.RandomPeeringID(), + Timestamp: time.Now().UnixNano(), + MsgReceiver: byte(10), + MsgType: peering.FirstUserMsgCode + 17, + MsgData: []byte{1, 2, 3, 4, 5}, + }, } var bin []byte bin, err = src.Bytes() require.Nil(t, err) require.NotNil(t, bin) - dst, err = peering.NewPeerMessageFromBytes(bin) + dst, err = peering.NewPeerMessageNetFromBytes(bin) require.Nil(t, err) require.NotNil(t, dst) require.EqualValues(t, src.PeeringID, dst.PeeringID) - require.Equal(t, src.SenderIndex, dst.SenderIndex) require.Equal(t, src.Timestamp, dst.Timestamp) + require.Equal(t, src.MsgReceiver, dst.MsgReceiver) require.Equal(t, src.MsgType, dst.MsgType) require.True(t, bytes.Equal(src.MsgData, dst.MsgData)) } diff --git a/packages/testutil/peeringNetBehaviour.go b/packages/testutil/peeringNetBehaviour.go index 8436a7f219..5e1f52fb8c 100644 --- a/packages/testutil/peeringNetBehaviour.go +++ b/packages/testutil/peeringNetBehaviour.go @@ -106,7 +106,7 @@ func (n *peeringNetUnreliable) recvLoop(inCh, outCh chan *peeringMsg, closeCh ch return } if rand.Intn(100) > n.deliverPct { - n.log.Debugf("Network dropped message %v -%v-> %v", recv.from.netID, recv.msg.MsgType, dstNetID) + n.log.Debugf("Network dropped message %v -%v-> %v", recv.from, recv.msg.MsgType, dstNetID) continue // Drop the message. } // @@ -137,7 +137,7 @@ func (n *peeringNetUnreliable) sendDelayed(recv *peeringMsg, outCh chan *peering } n.log.Debugf( "Network delivers message %v -%v-> %v (duplicate %v/%v, delay=%vms)", - recv.from.netID, recv.msg.MsgType, dstNetID, dupNum, dupCount, delay.Milliseconds(), + recv.from, recv.msg.MsgType, dstNetID, dupNum, dupCount, delay.Milliseconds(), ) safeSendPeeringMsg(outCh, recv, n.log) } diff --git a/packages/testutil/peeringNetBehaviourDynamic.go b/packages/testutil/peeringNetBehaviourDynamic.go index cd4ccaeeeb..f3765d54c4 100644 --- a/packages/testutil/peeringNetBehaviourDynamic.go +++ b/packages/testutil/peeringNetBehaviourDynamic.go @@ -141,7 +141,7 @@ func (pndT *PeeringNetDynamic) recvLoop(inCh, outCh chan *peeringMsg, closeCh ch if len(nextHandlers) > 0 { nextHandlers[0].handleSendMessage(recv, dstNetID, nextHandlers[1:], callHandlersAndSendFun, pndT.log) } else { - pndT.log.Debugf("Network delivers message %v -%v-> %v", recv.from.netID, recv.msg.MsgType, dstNetID) + pndT.log.Debugf("Network delivers message %v -%v-> %v", recv.from, recv.msg.MsgType, dstNetID) safeSendPeeringMsg(outCh, recv, pndT.log) } } @@ -170,7 +170,7 @@ func (lcT *peeringNetDynamicHandlerLosingChannel) handleSendMessage( log *logger.Logger, ) { if rand.Intn(100) > lcT.probability { - log.Debugf("Network dropped message %v -%v-> %v", msg.from.netID, msg.msg.MsgType, dstNetID) + log.Debugf("Network dropped message %v -%v-> %v", msg.from, msg.msg.MsgType, dstNetID) return } callHandlersAndSendFun(nextHandlers) @@ -191,7 +191,7 @@ func (rcT *peeringNetDynamicHandlerRepeatingChannel) handleSendMessage( if rand.Intn(100) < rcT.probability%100 { numRepeat++ } - log.Debugf("Network repeated message %v -%v-> %v %v times", msg.from.netID, msg.msg.MsgType, dstNetID, numRepeat) + log.Debugf("Network repeated message %v -%v-> %v %v times", msg.from, msg.msg.MsgType, dstNetID, numRepeat) for i := 0; i < numRepeat; i++ { callHandlersAndSendFun(nextHandlers) } @@ -219,7 +219,7 @@ func (dcT *peeringNetDynamicHandlerDelayingChannel) handleSendMessage( } else { delay = time.Duration(fromMS) * time.Millisecond } - log.Debugf("Network delayed message %v -%v-> %v for %v", msg.from.netID, msg.msg.MsgType, dstNetID, delay) + log.Debugf("Network delayed message %v -%v-> %v for %v", msg.from, msg.msg.MsgType, dstNetID, delay) <-time.After(delay) } callHandlersAndSendFun(nextHandlers) @@ -238,11 +238,11 @@ func (pdT *peeringNetDynamicHandlerPeerDisconnected) handleSendMessage( log *logger.Logger, ) { if dstNetID == pdT.peerName { - log.Debugf("Network dropped message %v -%v-> %v, because destination is disconnected", msg.from.netID, msg.msg.MsgType, dstNetID) + log.Debugf("Network dropped message %v -%v-> %v, because destination is disconnected", msg.from, msg.msg.MsgType, dstNetID) return } - if msg.from.netID == pdT.peerName { - log.Debugf("Network dropped message %v -%v-> %v, because source is disconnected", msg.from.netID, msg.msg.MsgType, dstNetID) + if msg.from == pdT.peerName { + log.Debugf("Network dropped message %v -%v-> %v, because source is disconnected", msg.from, msg.msg.MsgType, dstNetID) return } callHandlersAndSendFun(nextHandlers) diff --git a/packages/testutil/peeringNetBehaviourDynamic_test.go b/packages/testutil/peeringNetBehaviourDynamic_test.go index 1eeb92fe07..a164672bb0 100644 --- a/packages/testutil/peeringNetBehaviourDynamic_test.go +++ b/packages/testutil/peeringNetBehaviourDynamic_test.go @@ -257,8 +257,8 @@ func averageDuration(durations []time.Duration) int64 { func sendMessage(from *peeringNode, inCh chan *peeringMsg) { inCh <- &peeringMsg{ - from: from, - msg: peering.PeerMessage{ + from: from.netID, + msg: peering.PeerMessageData{ Timestamp: time.Now().UnixNano(), }, } diff --git a/packages/testutil/peeringNetBehaviour_test.go b/packages/testutil/peeringNetBehaviour_test.go index 17b47a44a4..bd50d544a3 100644 --- a/packages/testutil/peeringNetBehaviour_test.go +++ b/packages/testutil/peeringNetBehaviour_test.go @@ -26,7 +26,7 @@ func TestPeeringNetReliable(t *testing.T) { behavior := NewPeeringNetReliable(testlogger.WithLevel(testlogger.NewLogger(t), logger.LevelError, false)) behavior.AddLink(inCh, outCh, "dst") for i := 0; i < 10; i++ { - inCh <- &peeringMsg{from: &someNode} + inCh <- &peeringMsg{from: someNode.netID} } <-doneCh behavior.Close() @@ -58,7 +58,7 @@ func TestPeeringNetUnreliable(t *testing.T) { behavior := NewPeeringNetUnreliable(50, 50, 50*time.Millisecond, 100*time.Millisecond, testlogger.WithLevel(testlogger.NewLogger(t), logger.LevelError, false)) behavior.AddLink(inCh, outCh, "dst") for i := 0; i < 1000; i++ { - inCh <- &peeringMsg{from: &someNode} + inCh <- &peeringMsg{from: someNode.netID} } time.Sleep(500 * time.Millisecond) // @@ -106,7 +106,7 @@ func TestPeeringNetGoodQuality(t *testing.T) { behavior := NewPeeringNetUnreliable(100, 0, 0*time.Microsecond, 0*time.Millisecond, testlogger.WithLevel(testlogger.NewLogger(t), logger.LevelError, false)) // NOTE: No drops, duplicates, delays. behavior.AddLink(inCh, outCh, "dst") for i := 0; i < 1000; i++ { - inCh <- &peeringMsg{from: &someNode} + inCh <- &peeringMsg{from: someNode.netID} } time.Sleep(500 * time.Millisecond) // diff --git a/packages/testutil/peeringNetworkProvider.go b/packages/testutil/peeringNetworkProvider.go index 8c2211860d..c53e151fb6 100644 --- a/packages/testutil/peeringNetworkProvider.go +++ b/packages/testutil/peeringNetworkProvider.go @@ -108,14 +108,15 @@ type peeringNode struct { } type peeringMsg struct { - from *peeringNode - msg peering.PeerMessage + from string + msg peering.PeerMessageData } type peeringCb struct { - callback func(recv *peering.RecvEvent) // Receive callback. - destNP *peeringNetworkProvider // Destination node. - peeringID *peering.PeeringID // Only listen for specific chain msgs. + callback func(recv *peering.PeerMessageIn) // Receive callback. + destNP *peeringNetworkProvider // Destination node. + peeringID *peering.PeeringID // Only listen for specific chain msgs. + receiver byte } func newPeeringNode(netID string, identity *ed25519.KeyPair, network *PeeringNetwork) *peeringNode { @@ -140,17 +141,17 @@ func (n *peeringNode) recvLoop() { for pm := range n.recvCh { msgPeeringID := pm.msg.PeeringID.String() for _, cb := range n.recvCbs { - if cb.peeringID == nil || cb.peeringID.String() == msgPeeringID { - cb.callback(&peering.RecvEvent{ - From: cb.destNP.senderByNetID(pm.from.netID), - Msg: &pm.msg, + if cb.peeringID.String() == msgPeeringID && cb.receiver == pm.msg.MsgReceiver { + cb.callback(&peering.PeerMessageIn{ + PeerMessageData: pm.msg, + SenderNetID: pm.from, }) } } } } -func (n *peeringNode) sendMsg(from *peeringNode, msg *peering.PeerMessage) { +func (n *peeringNode) sendMsg(from string, msg *peering.PeerMessageData) { n.sendCh <- &peeringMsg{ from: from, msg: *msg, @@ -171,6 +172,8 @@ type peeringNetworkProvider struct { senders []*peeringSender // Senders for all the nodes. } +var _ peering.NetworkProvider = &peeringNetworkProvider{} + // NewpeeringNetworkProvider initializes new network provider (a local view). func newPeeringNetworkProvider(self *peeringNode, network *PeeringNetwork) *peeringNetworkProvider { senders := make([]*peeringSender, len(network.nodes)) @@ -216,12 +219,14 @@ func (p *peeringNetworkProvider) PeerDomain(peerNetIDs []string) (peering.PeerDo // Attach implements peering.NetworkProvider. func (p *peeringNetworkProvider) Attach( peeringID *peering.PeeringID, - callback func(recv *peering.RecvEvent), + receiver byte, + callback func(recv *peering.PeerMessageIn), ) interface{} { p.self.recvCbs = append(p.self.recvCbs, &peeringCb{ callback: callback, destNP: p, peeringID: peeringID, + receiver: receiver, }) return nil // We don't care on the attachIDs for now. } @@ -231,6 +236,13 @@ func (p *peeringNetworkProvider) Detach(attachID interface{}) { // Detach is not important in tests. } +func (p *peeringNetworkProvider) SendMsgByNetID(netID string, msg *peering.PeerMessageData) { + s, err := p.PeerByNetID(netID) + if err == nil { + s.SendMsg(&peering.PeerMessageNet{PeerMessageData: *msg}) + } +} + // PeerByNetID implements peering.NetworkProvider. func (p *peeringNetworkProvider) PeerByNetID(peerNetID string) (peering.PeerSender, error) { if s := p.senderByNetID(peerNetID); s != nil { @@ -294,8 +306,8 @@ func (p *peeringSender) PubKey() *ed25519.PublicKey { } // Send implements peering.PeerSender. -func (p *peeringSender) SendMsg(msg *peering.PeerMessage) { - p.node.sendMsg(p.netProvider.self, msg) +func (p *peeringSender) SendMsg(msg *peering.PeerMessageNet) { + p.node.sendMsg(p.netProvider.self.netID, &msg.PeerMessageData) } // IsAlive implements peering.PeerSender. diff --git a/packages/testutil/peeringNetworkProvider_test.go b/packages/testutil/peeringNetworkProvider_test.go index e1757086f0..7ab31d27c9 100644 --- a/packages/testutil/peeringNetworkProvider_test.go +++ b/packages/testutil/peeringNetworkProvider_test.go @@ -19,11 +19,12 @@ func TestFakeNetwork(t *testing.T) { doneCh := make(chan bool) chain1 := peering.RandomPeeringID() chain2 := peering.RandomPeeringID() + receiver := byte(0) network := testutil.NewPeeringNetworkForLocs([]string{"a", "b", "c"}, 100, log) var netProviders []peering.NetworkProvider = network.NetworkProviders() // // Node "a" listens for chain1 messages. - netProviders[0].Attach(&chain1, func(recv *peering.RecvEvent) { + netProviders[0].Attach(&chain1, receiver, func(recv *peering.PeerMessageIn) { doneCh <- true }) // @@ -31,9 +32,10 @@ func TestFakeNetwork(t *testing.T) { var a, c peering.PeerSender a, _ = netProviders[1].PeerByNetID("a") c, _ = netProviders[1].PeerByNetID("c") - a.SendMsg(&peering.PeerMessage{PeeringID: chain1, MsgType: 1}) // Will be delivered. - a.SendMsg(&peering.PeerMessage{PeeringID: chain2, MsgType: 2}) // Will be dropped. - c.SendMsg(&peering.PeerMessage{PeeringID: chain1, MsgType: 3}) // Will be dropped. + a.SendMsg(&peering.PeerMessageNet{PeerMessageData: peering.PeerMessageData{PeeringID: chain1, MsgReceiver: receiver, MsgType: 1}}) // Will be delivered. + a.SendMsg(&peering.PeerMessageNet{PeerMessageData: peering.PeerMessageData{PeeringID: chain2, MsgReceiver: receiver, MsgType: 2}}) // Will be dropped. + a.SendMsg(&peering.PeerMessageNet{PeerMessageData: peering.PeerMessageData{PeeringID: chain1, MsgReceiver: byte(5), MsgType: 3}}) // Will be dropped. + c.SendMsg(&peering.PeerMessageNet{PeerMessageData: peering.PeerMessageData{PeeringID: chain1, MsgReceiver: receiver, MsgType: 4}}) // Will be dropped. // // Wait for the result. select { diff --git a/packages/testutil/testchain/mock_acs.go b/packages/testutil/testchain/mock_acs.go index 3b231f83f5..f011178f70 100644 --- a/packages/testutil/testchain/mock_acs.go +++ b/packages/testutil/testchain/mock_acs.go @@ -4,7 +4,6 @@ import ( "sync" "github.com/iotaledger/hive.go/logger" - "github.com/iotaledger/wasp/packages/peering" ) type MockedACSRunner struct { @@ -55,10 +54,6 @@ func (acs *MockedACSRunner) RunACSConsensus(value []byte, sessionID uint64, stat } } -func (acs *MockedACSRunner) TryHandleMessage(recv *peering.RecvEvent) bool { - return false -} - func (acs *MockedACSRunner) Close() { // Nothing. } diff --git a/packages/testutil/testchain/mock_chain_core.go b/packages/testutil/testchain/mock_chain_core.go index 1b590c830e..1a6aefa37b 100644 --- a/packages/testutil/testchain/mock_chain_core.go +++ b/packages/testutil/testchain/mock_chain_core.go @@ -1,7 +1,9 @@ package testchain import ( + "math/rand" "testing" + "time" "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/hive.go/events" @@ -19,27 +21,30 @@ import ( ) type MockedChainCore struct { - T *testing.T - chainID *iscp.ChainID - processors *processors.Cache - eventStateTransition *events.Event - eventRequestProcessed *events.Event - onGlobalStateSync func() coreutil.ChainStateSync - onGetStateReader func() state.OptimisticStateReader - onEventStateTransition func(data *chain.ChainTransitionEventData) - onEventRequestProcessed func(id iscp.RequestID) - onReceivePeerMessage func(*peering.PeerMessage) - onReceiveDismissChainMsg func(*messages.DismissChainMsg) - onReceiveStateTransitionMsg func(*messages.StateTransitionMsg) - onReceiveStateCandidateMsg func(*messages.StateCandidateMsg) - onReceiveInclusionStateMsg func(*messages.InclusionStateMsg) - onReceiveStateMsg func(*messages.StateMsg) - onReceiveVMResultMsg func(*messages.VMResultMsg) - onReceiveAsynchronousCommonSubsetMsg func(*messages.AsynchronousCommonSubsetMsg) - onReceiveTimerTick func(messages.TimerTick) - onSync func(out ledgerstate.OutputID, blockIndex uint32) //nolint:structcheck,unused - log *logger.Logger -} + T *testing.T + chainID *iscp.ChainID + processors *processors.Cache + eventStateTransition *events.Event + eventRequestProcessed *events.Event + getNetIDsFun func() []string + onGlobalStateSync func() coreutil.ChainStateSync + onGetStateReader func() state.OptimisticStateReader + onEventStateTransition func(data *chain.ChainTransitionEventData) + onEventRequestProcessed func(id iscp.RequestID) + onSendPeerMsg func(netID string, msgReceiver byte, msgType byte, msgData []byte) + onStateCandidate func(state state.VirtualStateAccess, outputID ledgerstate.OutputID) + onDismissChain func(reason string) + onLedgerState func(chainOutput *ledgerstate.AliasOutput, timestamp time.Time) + onOffLedgerRequest func(msg *messages.OffLedgerRequestMsgIn) + onRequestAck func(msg *messages.RequestAckMsgIn) + onMissingRequestIDs func(msg *messages.MissingRequestIDsMsgIn) + onMissingRequest func(msg *messages.MissingRequestMsg) + onTimerTick func(tick int) + onSync func(out ledgerstate.OutputID, blockIndex uint32) //nolint:structcheck,unused + log *logger.Logger +} + +var _ chain.ChainCore = &MockedChainCore{} func NewMockedChainCore(t *testing.T, chainID *iscp.ChainID, log *logger.Logger) *MockedChainCore { receiveFailFun := func(typee string, msg interface{}) { @@ -50,6 +55,10 @@ func NewMockedChainCore(t *testing.T, chainID *iscp.ChainID, log *logger.Logger) chainID: chainID, processors: processors.MustNew(processors.NewConfig(inccounter.Processor)), log: log, + getNetIDsFun: func() []string { + t.Fatalf("List of netIDs is not known") + return []string{} + }, eventStateTransition: events.NewEvent(func(handler interface{}, params ...interface{}) { handler.(func(_ *chain.ChainTransitionEventData))(params[0].(*chain.ChainTransitionEventData)) }), @@ -59,17 +68,21 @@ func NewMockedChainCore(t *testing.T, chainID *iscp.ChainID, log *logger.Logger) onEventRequestProcessed: func(id iscp.RequestID) { log.Infof("onEventRequestProcessed: %s", id) }, - onReceivePeerMessage: func(msg *peering.PeerMessage) { receiveFailFun("*peering.PeerMessage", msg) }, - onReceiveDismissChainMsg: func(msg *messages.DismissChainMsg) { receiveFailFun("*messages.DismissChainMs", msg) }, - onReceiveStateTransitionMsg: func(msg *messages.StateTransitionMsg) { receiveFailFun("*messages.StateTransitionMsg", msg) }, - onReceiveStateCandidateMsg: func(msg *messages.StateCandidateMsg) { receiveFailFun("*messages.StateCandidateMsg", msg) }, - onReceiveInclusionStateMsg: func(msg *messages.InclusionStateMsg) { receiveFailFun("*messages.InclusionStateMsg", msg) }, - onReceiveStateMsg: func(msg *messages.StateMsg) { receiveFailFun("*messages.StateMsg", msg) }, - onReceiveVMResultMsg: func(msg *messages.VMResultMsg) { receiveFailFun("*messages.VMResultMsg", msg) }, - onReceiveAsynchronousCommonSubsetMsg: func(msg *messages.AsynchronousCommonSubsetMsg) { - receiveFailFun("*messages.AsynchronousCommonSubsetMsg", msg) + onSendPeerMsg: func(netID string, msgReceiver byte, msgType byte, msgData []byte) { + t.Fatalf("Sending to peer msg not implemented, netID=%v, receiver=%v, msgType=%v", netID, msgReceiver, msgType) + }, + onStateCandidate: func(state state.VirtualStateAccess, outputID ledgerstate.OutputID) { + t.Fatalf("Receiving state candidate not implemented, outputID=%v", outputID) }, - onReceiveTimerTick: func(msg messages.TimerTick) { receiveFailFun("messages.TimerTick", msg) }, + onDismissChain: func(reason string) { t.Fatalf("Dismissing chain not implemented, reason=%v", reason) }, + onLedgerState: func(chainOutput *ledgerstate.AliasOutput, timestamp time.Time) { + t.Fatalf("Receiving ledger state not implemented, chain output=%v", chainOutput) + }, + onOffLedgerRequest: func(msg *messages.OffLedgerRequestMsgIn) { receiveFailFun("*messages.OffLedgerRequestMsgIn", msg) }, + onRequestAck: func(msg *messages.RequestAckMsgIn) { receiveFailFun("*messages.RequestAckMsgIn", msg) }, + onMissingRequestIDs: func(msg *messages.MissingRequestIDsMsgIn) { receiveFailFun("*messages.MissingRequestIDsMsgIn", msg) }, + onMissingRequest: func(msg *messages.MissingRequestMsg) { receiveFailFun("*messages.MissingRequestMsg", msg) }, + onTimerTick: func(tick int) { t.Fatalf("Receiving timer tick not implemented: index=%v", tick) }, } ret.onEventStateTransition = func(msg *chain.ChainTransitionEventData) { chain.LogStateTransition(msg, nil, log) @@ -103,34 +116,59 @@ func (m *MockedChainCore) GetCommitteeInfo() *chain.CommitteeInfo { panic("implement me") } -func (m *MockedChainCore) AttachToPeerMessages(fun func(recv *peering.RecvEvent)) {} // TODO - -func (m *MockedChainCore) EnqueDismissChain(reason string) {} // TODO - -func (m *MockedChainCore) StateCandidateToStateManager(state.VirtualStateAccess, ledgerstate.OutputID) { -} // TODO - -func (m *MockedChainCore) ReceiveMessage(msg interface{}) { - switch msgTypecasted := msg.(type) { - case *peering.PeerMessage: - m.onReceivePeerMessage(msgTypecasted) - case *messages.DismissChainMsg: - m.onReceiveDismissChainMsg(msgTypecasted) - case *messages.StateTransitionMsg: - m.onReceiveStateTransitionMsg(msgTypecasted) - case *messages.StateCandidateMsg: - m.onReceiveStateCandidateMsg(msgTypecasted) - case *messages.InclusionStateMsg: - m.onReceiveInclusionStateMsg(msgTypecasted) - case *messages.StateMsg: - m.onReceiveStateMsg(msgTypecasted) - case *messages.VMResultMsg: - m.onReceiveVMResultMsg(msgTypecasted) - case *messages.AsynchronousCommonSubsetMsg: - m.onReceiveAsynchronousCommonSubsetMsg(msgTypecasted) - case messages.TimerTick: - m.onReceiveTimerTick(msgTypecasted) +func (m *MockedChainCore) AttachToPeerMessages(receiver byte, fun func(recv *peering.PeerMessageIn)) { + // Attach not needed; send is direct through mocking SendPeerMsg* methods +} + +func (m *MockedChainCore) SendPeerMsgByNetID(netID string, msgReceiver byte, msgType byte, msgData []byte) { + m.onSendPeerMsg(netID, msgReceiver, msgType, msgData) +} + +func (m *MockedChainCore) SendPeerMsgToRandomPeers(upToNumPeers uint16, msgReceiver byte, msgType byte, msgData []byte) { + netIDs := m.getNetIDsFun() + var sendPeers []string + if upToNumPeers < uint16(len(netIDs)) { + rand.Seed(time.Now().UnixNano()) + rand.Shuffle(len(netIDs), func(i int, j int) { netIDs[i], netIDs[j] = netIDs[j], netIDs[i] }) + sendPeers = netIDs[:upToNumPeers] + } else { + sendPeers = netIDs } + for _, netID := range sendPeers { + m.SendPeerMsgByNetID(netID, msgReceiver, msgType, msgData) + } +} + +func (m *MockedChainCore) StateCandidateToStateManager(state state.VirtualStateAccess, outputID ledgerstate.OutputID) { + m.onStateCandidate(state, outputID) +} + +func (m *MockedChainCore) EnqueueDismissChain(reason string) { + m.onDismissChain(reason) +} + +func (m *MockedChainCore) EnqueueLedgerState(chainOutput *ledgerstate.AliasOutput, timestamp time.Time) { + m.onLedgerState(chainOutput, timestamp) +} + +func (m *MockedChainCore) EnqueueOffLedgerRequestMsg(msg *messages.OffLedgerRequestMsgIn) { + m.onOffLedgerRequest(msg) +} + +func (m *MockedChainCore) EnqueueRequestAckMsg(msg *messages.RequestAckMsgIn) { + m.onRequestAck(msg) +} + +func (m *MockedChainCore) EnqueueMissingRequestIDsMsg(msg *messages.MissingRequestIDsMsgIn) { + m.onMissingRequestIDs(msg) +} + +func (m *MockedChainCore) EnqueueMissingRequestMsg(msg *messages.MissingRequestMsg) { + m.onMissingRequest(msg) +} + +func (m *MockedChainCore) EnqueueTimerTick(tick int) { + m.onTimerTick(tick) } func (m *MockedChainCore) Events() chain.ChainEvents { @@ -157,53 +195,53 @@ func (m *MockedChainCore) OnRequestProcessed(f func(id iscp.RequestID)) { m.onEventRequestProcessed = f } -func (m *MockedChainCore) OnReceivePeerMessage(f func(*peering.PeerMessage)) { - m.onReceivePeerMessage = f +func (m *MockedChainCore) OnGetStateReader(f func() state.OptimisticStateReader) { + m.onGetStateReader = f } -func (m *MockedChainCore) OnReceiveDismissChainMsg(f func(*messages.DismissChainMsg)) { - m.onReceiveDismissChainMsg = f +func (m *MockedChainCore) OnGlobalStateSync(f func() coreutil.ChainStateSync) { + m.onGlobalStateSync = f } -func (m *MockedChainCore) OnReceiveStateTransitionMsg(f func(*messages.StateTransitionMsg)) { - m.onReceiveStateTransitionMsg = f +func (m *MockedChainCore) GlobalSolidIndex() *atomic.Uint32 { + return nil } -func (m *MockedChainCore) OnReceiveStateCandidateMsg(f func(*messages.StateCandidateMsg)) { - m.onReceiveStateCandidateMsg = f +func (m *MockedChainCore) ReceiveOffLedgerRequest(_ *request.OffLedger, _ string) { } -func (m *MockedChainCore) OnReceiveInclusionStateMsg(f func(*messages.InclusionStateMsg)) { - m.onReceiveInclusionStateMsg = f +func (m *MockedChainCore) OnSendPeerMsg(fun func(netID string, msgReceiver byte, msgType byte, msgData []byte)) { + m.onSendPeerMsg = fun } -func (m *MockedChainCore) OnReceiveStateMsg(f func(*messages.StateMsg)) { - m.onReceiveStateMsg = f +func (m *MockedChainCore) OnStateCandidate(fun func(state state.VirtualStateAccess, outputID ledgerstate.OutputID)) { + m.onStateCandidate = fun } -func (m *MockedChainCore) OnReceiveVMResultMsg(f func(*messages.VMResultMsg)) { - m.onReceiveVMResultMsg = f +func (m *MockedChainCore) OnDismissChain(fun func(reason string)) { + m.onDismissChain = fun } -func (m *MockedChainCore) OnReceiveAsynchronousCommonSubsetMsg(f func(*messages.AsynchronousCommonSubsetMsg)) { - m.onReceiveAsynchronousCommonSubsetMsg = f +func (m *MockedChainCore) OnLedgerState(fun func(chainOutput *ledgerstate.AliasOutput, timestamp time.Time)) { + m.onLedgerState = fun } -func (m *MockedChainCore) OnReceiveTimerTick(f func(messages.TimerTick)) { - m.onReceiveTimerTick = f +func (m *MockedChainCore) OnOffLedgerRequest(fun func(msg *messages.OffLedgerRequestMsgIn)) { + m.onOffLedgerRequest = fun } -func (m *MockedChainCore) OnGetStateReader(f func() state.OptimisticStateReader) { - m.onGetStateReader = f +func (m *MockedChainCore) OnRequestAck(fun func(msg *messages.RequestAckMsgIn)) { + m.onRequestAck = fun } -func (m *MockedChainCore) OnGlobalStateSync(f func() coreutil.ChainStateSync) { - m.onGlobalStateSync = f +func (m *MockedChainCore) OnMissingRequestIDs(fun func(msg *messages.MissingRequestIDsMsgIn)) { + m.onMissingRequestIDs = fun } -func (m *MockedChainCore) GlobalSolidIndex() *atomic.Uint32 { - return nil +func (m *MockedChainCore) OnMissingRequest(fun func(msg *messages.MissingRequestMsg)) { + m.onMissingRequest = fun } -func (m *MockedChainCore) ReceiveOffLedgerRequest(_ *request.OffLedger, _ string) { +func (m *MockedChainCore) OnTimerTick(fun func(tick int)) { + m.onTimerTick = fun } diff --git a/packages/webapi/request/request_test.go b/packages/webapi/request/request_test.go index 1924ea0e91..55e3cd718d 100644 --- a/packages/webapi/request/request_test.go +++ b/packages/webapi/request/request_test.go @@ -8,6 +8,7 @@ import ( "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/hive.go/events" "github.com/iotaledger/wasp/packages/chain" + "github.com/iotaledger/wasp/packages/chain/messages" "github.com/iotaledger/wasp/packages/chains" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/colored" @@ -61,9 +62,11 @@ func (m *mockedChain) IsDismissed() bool { func createMockedGetChain(t *testing.T) chains.ChainProvider { return func(chainID *iscp.ChainID) chain.Chain { - return &mockedChain{ - testchain.NewMockedChainCore(t, chainID, testlogger.NewLogger(t)), - } + chainCore := testchain.NewMockedChainCore(t, chainID, testlogger.NewLogger(t)) + chainCore.OnOffLedgerRequest(func(msg *messages.OffLedgerRequestMsgIn) { + t.Logf("Offledger request %v received", msg) + }) + return &mockedChain{chainCore} } } From f64d8fd3070874b01afa8a0327d6d303dfca57cd Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Mon, 15 Nov 2021 18:43:46 -0800 Subject: [PATCH 068/198] Proper instantiation of WasmTime VM --- .../wasm/inccounter/test/inccounter_test.go | 16 +-- contracts/wasm/testcore/test/call_test.go | 14 --- .../wasm/testcore/test/concurrency_test.go | 8 +- contracts/wasm/testcore/test/spawn_test.go | 6 - .../wasm/testcore/ts/testcore/testcore.ts | 2 +- .../core/testcore/sbtests/concurrency_test.go | 4 +- packages/vm/wasmhost/wasmedgevm.go | 18 ++- packages/vm/wasmhost/wasmervm.go | 10 +- packages/vm/wasmhost/wasmgovm.go | 8 +- packages/vm/wasmhost/wasmhost.go | 12 ++ packages/vm/wasmhost/wasmtimevm.go | 18 ++- packages/vm/wasmhost/wasmvm.go | 24 ++++ packages/vm/wasmproc/wasmprocessor.go | 108 ++++++++++++++---- packages/vm/wasmsolo/solocontext.go | 14 ++- 14 files changed, 181 insertions(+), 81 deletions(-) diff --git a/contracts/wasm/inccounter/test/inccounter_test.go b/contracts/wasm/inccounter/test/inccounter_test.go index fc44b3f16a..91eef4e3d5 100644 --- a/contracts/wasm/inccounter/test/inccounter_test.go +++ b/contracts/wasm/inccounter/test/inccounter_test.go @@ -108,11 +108,6 @@ func TestIncrementLocalStateInternalCall(t *testing.T) { } func TestIncrementLocalStateSandboxCall(t *testing.T) { - // TODO need to save globals for TypeScript Wasm for this to succeed - if *wasmsolo.TsWasm { - t.SkipNow() - } - ctx := setupTest(t) localStateSandboxCall := inccounter.ScFuncs.LocalStateSandboxCall(ctx) @@ -131,11 +126,6 @@ func TestIncrementLocalStateSandboxCall(t *testing.T) { } func TestIncrementLocalStatePost(t *testing.T) { - // TODO need to save globals for TypeScript Wasm for this to succeed - if *wasmsolo.TsWasm { - t.SkipNow() - } - ctx := setupTest(t) localStatePost := inccounter.ScFuncs.LocalStatePost(ctx) @@ -179,9 +169,9 @@ func TestLeb128(t *testing.T) { } func TestLoop(t *testing.T) { - if *wasmsolo.GoDebug || wasmhost.DisableWasmTimeout { - // no timeout possible with WasmGoVM - // because goroutines cannot be killed + if *wasmsolo.GoDebug || *wasmsolo.GoWasmEdge || wasmhost.DisableWasmTimeout { + // no timeout possible with WasmGoVM because goroutines cannot be killed + // or because there is no way to interrupt the Wasm code t.SkipNow() } diff --git a/contracts/wasm/testcore/test/call_test.go b/contracts/wasm/testcore/test/call_test.go index 8adb54bf94..1d7967d635 100644 --- a/contracts/wasm/testcore/test/call_test.go +++ b/contracts/wasm/testcore/test/call_test.go @@ -4,7 +4,6 @@ import ( "testing" "github.com/iotaledger/wasp/contracts/wasm/testcore/go/testcore" - "github.com/iotaledger/wasp/packages/vm/wasmsolo" "github.com/stretchr/testify/require" ) @@ -19,10 +18,6 @@ func fibo(n int64) int64 { func TestCallFibonacci(t *testing.T) { run2(t, func(t *testing.T, w bool) { - if *wasmsolo.TsWasm { - t.SkipNow() - } - ctx := deployTestCore(t, w) f := testcore.ScFuncs.Fibonacci(ctx) @@ -37,10 +32,6 @@ func TestCallFibonacci(t *testing.T) { func TestCallFibonacciIndirect(t *testing.T) { run2(t, func(t *testing.T, w bool) { - if *wasmsolo.TsWasm { - t.SkipNow() - } - ctx := deployTestCore(t, w) f := testcore.ScFuncs.CallOnChain(ctx) @@ -64,11 +55,6 @@ func TestCallFibonacciIndirect(t *testing.T) { func TestCallRecursive(t *testing.T) { run2(t, func(t *testing.T, w bool) { - // TODO need to adjust stack size for Go Wasm for this to succeed - if *wasmsolo.GoWasm || *wasmsolo.TsWasm { - t.SkipNow() - } - ctx := deployTestCore(t, w) f := testcore.ScFuncs.CallOnChain(ctx) diff --git a/contracts/wasm/testcore/test/concurrency_test.go b/contracts/wasm/testcore/test/concurrency_test.go index f380b86a1a..d1f69c9f7f 100644 --- a/contracts/wasm/testcore/test/concurrency_test.go +++ b/contracts/wasm/testcore/test/concurrency_test.go @@ -33,7 +33,7 @@ func TestCounter(t *testing.T) { func TestSynchronous(t *testing.T) { run2(t, func(t *testing.T, w bool) { // TODO fails with 999 instead of 1000 at WaitForPendingRequests - if *wasmsolo.GoDebug { + if *wasmsolo.GoDebug || *wasmsolo.GoWasmEdge { t.SkipNow() } ctx := deployTestCore(t, w) @@ -58,7 +58,7 @@ func TestSynchronous(t *testing.T) { if w { reqs++ } - require.True(t, ctx.WaitForPendingRequests(-reqs, 60*time.Second)) + require.True(t, ctx.WaitForPendingRequests(-reqs, 180*time.Second)) v := testcore.ScFuncs.GetCounter(ctx) v.Func.Call() @@ -98,7 +98,7 @@ func TestConcurrency(t *testing.T) { } }(r, n) } - require.True(t, ctx.WaitForPendingRequests(sum, 60*time.Second)) + require.True(t, ctx.WaitForPendingRequests(sum, 180*time.Second)) v := testcore.ScFuncs.GetCounter(ctx) v.Func.Call() @@ -141,7 +141,7 @@ func TestConcurrency2(t *testing.T) { }(r, n) } - require.True(t, ctx.WaitForPendingRequests(sum, 60*time.Second)) + require.True(t, ctx.WaitForPendingRequests(sum, 180*time.Second)) v := testcore.ScFuncs.GetCounter(ctx) v.Func.Call() diff --git a/contracts/wasm/testcore/test/spawn_test.go b/contracts/wasm/testcore/test/spawn_test.go index 71d11c0256..7be97ab57e 100644 --- a/contracts/wasm/testcore/test/spawn_test.go +++ b/contracts/wasm/testcore/test/spawn_test.go @@ -5,17 +5,11 @@ import ( "github.com/iotaledger/wasp/contracts/wasm/testcore/go/testcore" "github.com/iotaledger/wasp/packages/vm/core" - "github.com/iotaledger/wasp/packages/vm/wasmsolo" "github.com/stretchr/testify/require" ) func TestSpawn(t *testing.T) { run2(t, func(t *testing.T, w bool) { - // TODO need to save globals for TypeScript Wasm for this to succeed - if *wasmsolo.TsWasm { - t.SkipNow() - } - ctx := deployTestCore(t, w) f := testcore.ScFuncs.Spawn(ctx) diff --git a/contracts/wasm/testcore/ts/testcore/testcore.ts b/contracts/wasm/testcore/ts/testcore/testcore.ts index 2d72873ae3..58e7e960ed 100644 --- a/contracts/wasm/testcore/ts/testcore/testcore.ts +++ b/contracts/wasm/testcore/ts/testcore/testcore.ts @@ -107,7 +107,7 @@ export function funcSetInt(ctx: wasmlib.ScFuncContext, f: sc.SetIntContext): voi } export function funcSpawn(ctx: wasmlib.ScFuncContext, f: sc.SpawnContext): void { - let spawnName = sc.ScName + "Spawned"; + let spawnName = sc.ScName + "_spawned"; let spawnDescr = "spawned contract description"; ctx.deploy(f.params.progHash().value(), spawnName, spawnDescr, null); diff --git a/packages/vm/core/testcore/sbtests/concurrency_test.go b/packages/vm/core/testcore/sbtests/concurrency_test.go index 441cc1b453..0e94f6f3fd 100644 --- a/packages/vm/core/testcore/sbtests/concurrency_test.go +++ b/packages/vm/core/testcore/sbtests/concurrency_test.go @@ -57,7 +57,7 @@ func testConcurrency(t *testing.T, w bool) { } }(r, n) } - require.True(t, chain.WaitForRequestsThrough(sum+3+extra, 20*time.Second)) + require.True(t, chain.WaitForRequestsThrough(sum+3+extra, 180*time.Second)) ret, err := chain.CallView(ScName, sbtestsc.FuncGetCounter.Name) require.NoError(t, err) @@ -105,7 +105,7 @@ func testConcurrency2(t *testing.T, w bool) { }(r, n) } - require.True(t, chain.WaitForRequestsThrough(sum+3+extra, 20*time.Second)) + require.True(t, chain.WaitForRequestsThrough(sum+3+extra, 180*time.Second)) ret, err := chain.CallView(ScName, sbtestsc.FuncGetCounter.Name) require.NoError(t, err) diff --git a/packages/vm/wasmhost/wasmedgevm.go b/packages/vm/wasmhost/wasmedgevm.go index 560db9f327..b432226a9b 100644 --- a/packages/vm/wasmhost/wasmedgevm.go +++ b/packages/vm/wasmhost/wasmedgevm.go @@ -20,15 +20,13 @@ type WasmEdgeVM struct { importers []*wasmedge.ImportObject } -var _ WasmVM = &WasmEdgeVM{} - type HostFunction func(params []interface{}) []interface{} const I32 = wasmedge.ValType_I32 var i32 = []wasmedge.ValType{I32, I32, I32, I32, I32} -func NewWasmEdgeVM() *WasmEdgeVM { +func NewWasmEdgeVM() WasmVM { vm := &WasmEdgeVM{} wasmedge.SetLogErrorLevel() @@ -41,6 +39,10 @@ func NewWasmEdgeVM() *WasmEdgeVM { return vm } +func (vm *WasmEdgeVM) NewInstance() WasmVM { + return NewWasmEdgeVM() +} + //TODO func (vm *WasmEdgeVM) Interrupt() { panic("implement me") @@ -102,7 +104,11 @@ func (vm *WasmEdgeVM) LoadWasm(wasmData []byte) error { if err != nil { return err } - err = vm.edge.Instantiate() + return vm.Instantiate() +} + +func (vm *WasmEdgeVM) Instantiate() error { + err := vm.edge.Instantiate() if err != nil { return err } @@ -113,6 +119,10 @@ func (vm *WasmEdgeVM) LoadWasm(wasmData []byte) error { return nil } +func (vm *WasmEdgeVM) PoolSize() int { + return 10 +} + func (vm *WasmEdgeVM) RunFunction(functionName string, args ...interface{}) error { return vm.Run(func() (err error) { _,err = vm.edge.Execute(functionName, args...) diff --git a/packages/vm/wasmhost/wasmervm.go b/packages/vm/wasmhost/wasmervm.go index 36f0fe269a..a826be74f7 100644 --- a/packages/vm/wasmhost/wasmervm.go +++ b/packages/vm/wasmhost/wasmervm.go @@ -18,23 +18,25 @@ type WasmerVM struct { store *wasmer.Store } -var _ WasmVM = &WasmerVM{} - var i32 = []wasmer.ValueKind{wasmer.I32, wasmer.I32, wasmer.I32, wasmer.I32, wasmer.I32} -func NewWasmerVM() *WasmerVM { +func NewWasmerVM() WasmVM { vm := &WasmerVM{} vm.store = wasmer.NewStore(wasmer.NewEngine()) - vm.linker = wasmer.NewImportObject() return vm } +func (vm *WasmerVM) NewInstance() WasmVM { + return &WasmerVM{ store: vm.store } +} + //TODO func (vm *WasmerVM) Interrupt() { panic("implement me") } func (vm *WasmerVM) LinkHost(impl WasmVM, host *WasmHost) error { + vm.linker = wasmer.NewImportObject() _ = vm.WasmVMBase.LinkHost(impl, host) funcs := map[string]wasmer.IntoExtern{ diff --git a/packages/vm/wasmhost/wasmgovm.go b/packages/vm/wasmhost/wasmgovm.go index 29aebccafe..1a72d9de47 100644 --- a/packages/vm/wasmhost/wasmgovm.go +++ b/packages/vm/wasmhost/wasmgovm.go @@ -16,12 +16,14 @@ type WasmGoVM struct { onLoad func() } -var _ WasmVM = &WasmGoVM{} - -func NewWasmGoVM(scName string, onLoad func()) *WasmGoVM { +func NewWasmGoVM(scName string, onLoad func()) WasmVM { return &WasmGoVM{scName: scName, onLoad: onLoad} } +func (vm *WasmGoVM) NewInstance() WasmVM { + return NewWasmGoVM(vm.scName, vm.onLoad) +} + func Connect(h wasmlib.ScHost) wasmlib.ScHost { return wasmlib.ConnectHost(h) } diff --git a/packages/vm/wasmhost/wasmhost.go b/packages/vm/wasmhost/wasmhost.go index 8e6296291d..38c52586da 100644 --- a/packages/vm/wasmhost/wasmhost.go +++ b/packages/vm/wasmhost/wasmhost.go @@ -57,6 +57,10 @@ func (host *WasmHost) FunctionFromCode(code uint32) string { return host.codeToFunc[code] } +func (host *WasmHost) Instantiate() error { + return host.vm.Instantiate() +} + func (host *WasmHost) IsView(function string) bool { return (host.funcToIndex[function] & 0x8000) != 0 } @@ -74,6 +78,14 @@ func (host *WasmHost) LoadWasm(wasmData []byte) error { return nil } +func (host *WasmHost) NewInstance() WasmVM { + return host.vm.NewInstance() +} + +func (host *WasmHost) PoolSize() int { + return host.vm.PoolSize() +} + func (host *WasmHost) RunFunction(functionName string, args ...interface{}) (err error) { return host.vm.RunFunction(functionName, args...) } diff --git a/packages/vm/wasmhost/wasmtimevm.go b/packages/vm/wasmhost/wasmtimevm.go index 09948c1d50..2ff3dc0086 100644 --- a/packages/vm/wasmhost/wasmtimevm.go +++ b/packages/vm/wasmhost/wasmtimevm.go @@ -19,23 +19,25 @@ type WasmTimeVM struct { store *wasmtime.Store } -var _ WasmVM = &WasmTimeVM{} - -func NewWasmTimeVM() *WasmTimeVM { +func NewWasmTimeVM() WasmVM { vm := &WasmTimeVM{} config := wasmtime.NewConfig() config.SetInterruptable(true) vm.store = wasmtime.NewStore(wasmtime.NewEngineWithConfig(config)) vm.interrupt, _ = vm.store.InterruptHandle() - vm.linker = wasmtime.NewLinker(vm.store) return vm } +func (vm *WasmTimeVM) NewInstance() WasmVM { + return &WasmTimeVM{store: vm.store, module: vm.module, interrupt: vm.interrupt} +} + func (vm *WasmTimeVM) Interrupt() { vm.interrupt.Interrupt() } func (vm *WasmTimeVM) LinkHost(impl WasmVM, host *WasmHost) error { + vm.linker = wasmtime.NewLinker(vm.store) _ = vm.WasmVMBase.LinkHost(impl, host) err := vm.linker.DefineFunc("WasmLib", "hostGetBytes", vm.HostGetBytes) @@ -74,6 +76,10 @@ func (vm *WasmTimeVM) LoadWasm(wasmData []byte) (err error) { if err != nil { return err } + return vm.Instantiate() +} + +func (vm *WasmTimeVM) Instantiate() (err error) { vm.instance, err = vm.linker.Instantiate(vm.module) if err != nil { return err @@ -89,6 +95,10 @@ func (vm *WasmTimeVM) LoadWasm(wasmData []byte) (err error) { return nil } +func (vm *WasmTimeVM) PoolSize() int { + return 10 +} + func (vm *WasmTimeVM) RunFunction(functionName string, args ...interface{}) error { export := vm.instance.GetExport(functionName) if export == nil { diff --git a/packages/vm/wasmhost/wasmvm.go b/packages/vm/wasmhost/wasmvm.go index c7afeaa96c..31fc6657c5 100644 --- a/packages/vm/wasmhost/wasmvm.go +++ b/packages/vm/wasmhost/wasmvm.go @@ -5,6 +5,7 @@ package wasmhost import ( "encoding/binary" + "errors" "fmt" "time" ) @@ -26,9 +27,12 @@ var ( ) type WasmVM interface { + Instantiate() error Interrupt() LinkHost(impl WasmVM, host *WasmHost) error LoadWasm(wasmData []byte) error + NewInstance() WasmVM + PoolSize() int RunFunction(functionName string, args ...interface{}) error RunScFunction(index int32) error SaveMemory() @@ -164,6 +168,10 @@ func (vm *WasmVMBase) HostSetBytes(objID, keyID, typeID, stringRef, size int32) host.SetBytes(objID, keyID, typeID, bytes) } +func (vm *WasmVMBase) Instantiate() error { + return errors.New("cannot be cloned") +} + func (vm *WasmVMBase) LinkHost(impl WasmVM, host *WasmHost) error { // trick vm into thinking it doesn't have to start the timeout timer // useful when debugging to prevent timing out on breakpoints @@ -175,7 +183,15 @@ func (vm *WasmVMBase) LinkHost(impl WasmVM, host *WasmHost) error { return nil } +func (vm *WasmVMBase) PoolSize() int { + return 0 +} + func (vm *WasmVMBase) PreCall() []byte { + if vm.PoolSize() != 0 { + return nil + } + bytes := vm.impl.VMGetSize() frame := vm.impl.VMGetBytes(0, bytes) if vm.memoryDirty { @@ -189,6 +205,10 @@ func (vm *WasmVMBase) PreCall() []byte { } func (vm *WasmVMBase) PostCall(frame []byte) { + if vm.PoolSize() != 0 { + return + } + vm.impl.VMSetBytes(0, int32(len(frame)), frame) } @@ -226,6 +246,10 @@ func (vm *WasmVMBase) Run(runner func() error) (err error) { } func (vm *WasmVMBase) SaveMemory() { + if vm.PoolSize() != 0 { + return + } + // find initialized data range in memory bytes := vm.impl.VMGetSize() ptr := vm.impl.VMGetBytes(0, bytes) diff --git a/packages/vm/wasmproc/wasmprocessor.go b/packages/vm/wasmproc/wasmprocessor.go index 511d3d53ef..143425c6b3 100644 --- a/packages/vm/wasmproc/wasmprocessor.go +++ b/packages/vm/wasmproc/wasmprocessor.go @@ -18,24 +18,31 @@ type WasmProcessor struct { currentContextID int32 instanceLock sync.Mutex log *logger.Logger + mainProcessor *WasmProcessor nextContextID int32 - scContext *WasmContext + // procesorPool *WasmProcessor + scContext *WasmContext + wasmBytes []byte + wasmVM func() wasmhost.WasmVM } var _ iscp.VMProcessor = &WasmProcessor{} -var GoWasmVM wasmhost.WasmVM +var GoWasmVM func() wasmhost.WasmVM // GetProcessor creates a new Wasm VM processor. -func GetProcessor(binaryCode []byte, log *logger.Logger) (iscp.VMProcessor, error) { +func GetProcessor(wasmBytes []byte, log *logger.Logger) (iscp.VMProcessor, error) { + // By default we will use WasmTimeVM, but this can be overruled by setting GoWasmVm + // This setting will be propagated to all the sub-processors of this processor vm := GoWasmVM GoWasmVM = nil if vm == nil { - vm = wasmhost.NewWasmTimeVM() + vm = wasmhost.NewWasmTimeVM } - proc := &WasmProcessor{log: log, contexts: make(map[int32]*WasmContext)} - err := proc.InitVM(vm, proc) + // run setup on main processor, because we will be sharing stuff with the sub-processors + proc := &WasmProcessor{log: log, contexts: make(map[int32]*WasmContext), wasmBytes: wasmBytes, wasmVM: vm} + err := proc.InitVM(vm(), proc) if err != nil { return nil, err } @@ -45,7 +52,7 @@ func GetProcessor(binaryCode []byte, log *logger.Logger) (iscp.VMProcessor, erro // proc.SetExport(0x8fff, ViewCopyAllState) proc.scContext = NewWasmContext("", proc) wasmhost.Connect(proc.scContext) - err = proc.LoadWasm(binaryCode) + err = proc.LoadWasm(proc.wasmBytes) if err != nil { return nil, err } @@ -68,18 +75,6 @@ func (proc *WasmProcessor) GetDefaultEntryPoint() iscp.VMProcessorEntryPoint { return proc.wasmContext(FuncDefault) } -func (proc *WasmProcessor) wasmContext(function string) *WasmContext { - wc := NewWasmContext(function, proc) - - proc.contextLock.Lock() - defer proc.contextLock.Unlock() - - proc.nextContextID++ - wc.id = proc.nextContextID - proc.contexts[wc.id] = wc - return wc -} - func (proc *WasmProcessor) GetKvStore(id int32) *wasmhost.KvStoreHost { if id == 0 { id = proc.currentContextID @@ -89,15 +84,84 @@ func (proc *WasmProcessor) GetKvStore(id int32) *wasmhost.KvStoreHost { return &proc.scContext.KvStoreHost } - proc.contextLock.Lock() - defer proc.contextLock.Unlock() + mainProcessor := proc + if proc.mainProcessor != nil { + mainProcessor = proc.mainProcessor + } + mainProcessor.contextLock.Lock() + defer mainProcessor.contextLock.Unlock() - return &proc.contexts[id].KvStoreHost + return &mainProcessor.contexts[id].KvStoreHost } func (proc *WasmProcessor) KillContext(id int32) { proc.contextLock.Lock() defer proc.contextLock.Unlock() + // TODO release processor to pool? In that case, when taking it out, don't forget to reset its data + + // owner := proc.proc + // proc.proc = owner.pool + // owner.pool = proc + delete(proc.contexts, id) } + +func (proc *WasmProcessor) wasmContext(function string) *WasmContext { + // clone and setup processor for each context + processor := proc + if proc.WasmHost.PoolSize() != 0 { + processor = proc.getProcessor() + } + wc := NewWasmContext(function, processor) + + proc.contextLock.Lock() + defer proc.contextLock.Unlock() + + proc.nextContextID++ + wc.id = proc.nextContextID + proc.contexts[wc.id] = wc + return wc +} + +func (proc *WasmProcessor) getProcessor() *WasmProcessor { + //processor = proc.fromPool() + //if processor != nil { + // err := processor.WasmHost.Instantiate() + // if err != nil { + // panic("Cannot instantiate processor: " + err.Error()) + // } + // return processor + //} + + processor := &WasmProcessor{log: proc.log, mainProcessor: proc, wasmBytes: proc.wasmBytes, wasmVM: proc.wasmVM} + err := processor.InitVM(proc.NewInstance(), processor) + if err != nil { + panic("Cannot clone processor: " + err.Error()) + } + processor.Init() + // TODO decide if we want be able to examine state directly from tests + // proc.SetExport(0x8fff, ViewCopyAllState) + processor.scContext = NewWasmContext("", processor) + wasmhost.Connect(processor.scContext) + err = processor.Instantiate() + if err != nil { + panic("Cannot instantiate: " + err.Error()) + } + err = processor.RunFunction("on_load") + if err != nil { + panic("Cannot run on_load: " + err.Error()) + } + return processor +} + +//func (proc *WasmProcessor) fromPool() *WasmProcessor { +// proc.contextLock.Lock() +// defer proc.contextLock.Unlock() +// processor := proc.procesorPool +// if processor != nil { +// proc.procesorPool = processor.mainProcessor +// processor.mainProcessor = proc +// } +// return processor +//} diff --git a/packages/vm/wasmsolo/solocontext.go b/packages/vm/wasmsolo/solocontext.go index 3cec105f40..2cf04136d5 100644 --- a/packages/vm/wasmsolo/solocontext.go +++ b/packages/vm/wasmsolo/solocontext.go @@ -30,9 +30,10 @@ const ( ) var ( - GoDebug = flag.Bool("godebug", false, "debug go smart contract code") - GoWasm = flag.Bool("gowasm", false, "prefer go wasm smart contract code") - TsWasm = flag.Bool("tswasm", false, "prefer typescript wasm smart contract code") + GoDebug = flag.Bool("godebug", false, "debug go smart contract code") + GoWasm = flag.Bool("gowasm", false, "prefer go wasm smart contract code") + GoWasmEdge = flag.Bool("gowasmedge", false, "use WasmEdge instead of WasmTime") + TsWasm = flag.Bool("tswasm", false, "prefer typescript wasm smart contract code") ) type SoloContext struct { @@ -96,8 +97,13 @@ func NewSoloContextForChain(t *testing.T, chain *solo.Chain, creator *SoloAgent, params = init[0].Params() } if *GoDebug { - wasmproc.GoWasmVM = wasmhost.NewWasmGoVM(ctx.scName, onLoad) + wasmproc.GoWasmVM = func() wasmhost.WasmVM { + return wasmhost.NewWasmGoVM(ctx.scName, onLoad) + } } + //if *GoWasmEdge && wasmproc.GoWasmVM == nil { + // wasmproc.GoWasmVM = wasmhost.NewWasmEdgeVM + //} ctx.Err = ctx.Chain.DeployContract(keyPair, ctx.scName, ctx.Hprog, params...) if *GoDebug { // just in case deploy failed we don't want to leave this around From a9f70ae90eb5bfb58884983e3dc59c61a84bb0d2 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 16 Nov 2021 10:49:55 +0200 Subject: [PATCH 069/198] State manager tests fixed --- packages/chain/statemgr/setup_test.go | 51 ++++++++++--------- .../testutil/testchain/mock_chain_core.go | 26 +++++----- 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/packages/chain/statemgr/setup_test.go b/packages/chain/statemgr/setup_test.go index 3b054405fb..9fc5680702 100644 --- a/packages/chain/statemgr/setup_test.go +++ b/packages/chain/statemgr/setup_test.go @@ -4,7 +4,6 @@ package statemgr import ( - "bytes" "io" "sync" "testing" @@ -181,6 +180,7 @@ func (env *MockedEnv) PullConfirmedOutputFromLedger(addr ledgerstate.Address, ou } func (env *MockedEnv) NewMockedNode(nodeIndex int, timers StateManagerTimers) *MockedNode { + var peeringID peering.PeeringID = env.ChainID.Array() nodeID := env.NodeIDs[nodeIndex] log := env.Log.Named(nodeID) peers, err := env.NetworkProviders[nodeIndex].PeerDomain(env.NodeIDs) @@ -191,7 +191,7 @@ func (env *MockedEnv) NewMockedNode(nodeIndex int, timers StateManagerTimers) *M NodeConn: testchain.NewMockedNodeConnection("Node_" + nodeID), store: mapdb.NewMapDB(), stateSync: coreutil.NewChainStateSync(), - ChainCore: testchain.NewMockedChainCore(env.T, env.ChainID, log), + ChainCore: testchain.NewMockedChainCore(env.T, env.ChainID, peeringID, peers, log), Peers: peers, Log: log, } @@ -205,7 +205,9 @@ func (env *MockedEnv) NewMockedNode(nodeIndex int, timers StateManagerTimers) *M ret.StateTransition = testchain.NewMockedStateTransition(env.T, env.OriginatorKeyPair) ret.StateTransition.OnNextState(func(vstate state.VirtualStateAccess, tx *ledgerstate.Transaction) { log.Debugf("MockedEnv.onNextState: state index %d", vstate.BlockIndex()) - go ret.StateManager.EventStateCandidateMsg(&messages.StateCandidateMsg{State: vstate}) + stateOutput, err := utxoutil.GetSingleChainedAliasOutput(tx) + require.NoError(env.T, err) + go ret.StateManager.EventStateCandidateMsg(vstate, stateOutput.ID()) go ret.NodeConn.PostTransaction(tx) }) ret.NodeConn.OnPostTransaction(func(tx *ledgerstate.Transaction) { @@ -224,34 +226,33 @@ func (env *MockedEnv) NewMockedNode(nodeIndex int, timers StateManagerTimers) *M log.Debugf("MockedNode.OnPullConfirmedOutput call EventOutputMsg") go ret.StateManager.EventOutputMsg(response) }) - var peeringID peering.PeeringID = env.ChainID.Array() - peers.Attach(&peeringID, func(recvEvent *peering.RecvEvent) { - log.Debugf("MockedChain recvEvent from %v of type %v", recvEvent.From.NetID(), recvEvent.Msg.MsgType) - rdr := bytes.NewReader(recvEvent.Msg.MsgData) - - switch recvEvent.Msg.MsgType { - case messages.MsgGetBlock: - msgt := &messages.GetBlockMsg{} - if err := msgt.Read(rdr); err != nil { + peers.Attach(&peeringID, peerMessageReceiverStateManager, func(peerMsg *peering.PeerMessageIn) { + log.Debugf("State manager recvEvent from %v of type %v", peerMsg.SenderNetID, peerMsg.MsgType) + if peerMsg.MsgReceiver != peerMessageReceiverStateManager { + env.T.Fatalf("State manager does not accept peer messages of other receiver type %v, message type=%v", + peerMsg.MsgReceiver, peerMsg.MsgType) + } + switch peerMsg.MsgType { + case peerMsgTypeGetBlock: + msg, err := messages.NewGetBlockMsg(peerMsg.MsgData) + if err != nil { log.Error(err) return } - - msgt.SenderNetID = recvEvent.Msg.SenderNetID - ret.StateManager.EventGetBlockMsg(msgt) - - case messages.MsgBlock: - msgt := &messages.BlockMsg{} - if err := msgt.Read(rdr); err != nil { + ret.StateManager.EnqueueGetBlockMsg(&messages.GetBlockMsgIn{ + GetBlockMsg: *msg, + SenderNetID: peerMsg.SenderNetID, + }) + case peerMsgTypeBlock: + msg, err := messages.NewBlockMsg(peerMsg.MsgData) + if err != nil { log.Error(err) return } - - msgt.SenderNetID = recvEvent.Msg.SenderNetID - ret.StateManager.EventBlockMsg(msgt) - - default: - log.Errorf("MockedChain recvEvent: wrong msg type") + ret.StateManager.EnqueueBlockMsg(&messages.BlockMsgIn{ + BlockMsg: *msg, + SenderNetID: peerMsg.SenderNetID, + }) } }) diff --git a/packages/testutil/testchain/mock_chain_core.go b/packages/testutil/testchain/mock_chain_core.go index 1a6aefa37b..8fb0eb0439 100644 --- a/packages/testutil/testchain/mock_chain_core.go +++ b/packages/testutil/testchain/mock_chain_core.go @@ -1,7 +1,6 @@ package testchain import ( - "math/rand" "testing" "time" @@ -24,6 +23,8 @@ type MockedChainCore struct { T *testing.T chainID *iscp.ChainID processors *processors.Cache + peeringID peering.PeeringID + peers peering.PeerDomainProvider eventStateTransition *events.Event eventRequestProcessed *events.Event getNetIDsFun func() []string @@ -46,7 +47,7 @@ type MockedChainCore struct { var _ chain.ChainCore = &MockedChainCore{} -func NewMockedChainCore(t *testing.T, chainID *iscp.ChainID, log *logger.Logger) *MockedChainCore { +func NewMockedChainCore(t *testing.T, chainID *iscp.ChainID, peeringID peering.PeeringID, peers peering.PeerDomainProvider, log *logger.Logger) *MockedChainCore { receiveFailFun := func(typee string, msg interface{}) { t.Fatalf("Receiving of %s is not implemented, but %v is received", typee, msg) } @@ -54,6 +55,8 @@ func NewMockedChainCore(t *testing.T, chainID *iscp.ChainID, log *logger.Logger) T: t, chainID: chainID, processors: processors.MustNew(processors.NewConfig(inccounter.Processor)), + peeringID: peeringID, + peers: peers, log: log, getNetIDsFun: func() []string { t.Fatalf("List of netIDs is not known") @@ -117,23 +120,20 @@ func (m *MockedChainCore) GetCommitteeInfo() *chain.CommitteeInfo { } func (m *MockedChainCore) AttachToPeerMessages(receiver byte, fun func(recv *peering.PeerMessageIn)) { - // Attach not needed; send is direct through mocking SendPeerMsg* methods + m.peers.Attach(&m.peeringID, receiver, fun) } func (m *MockedChainCore) SendPeerMsgByNetID(netID string, msgReceiver byte, msgType byte, msgData []byte) { - m.onSendPeerMsg(netID, msgReceiver, msgType, msgData) + m.peers.SendMsgByNetID(netID, &peering.PeerMessageData{ + PeeringID: m.peeringID, + MsgReceiver: msgReceiver, + MsgType: msgType, + MsgData: msgData, + }) } func (m *MockedChainCore) SendPeerMsgToRandomPeers(upToNumPeers uint16, msgReceiver byte, msgType byte, msgData []byte) { - netIDs := m.getNetIDsFun() - var sendPeers []string - if upToNumPeers < uint16(len(netIDs)) { - rand.Seed(time.Now().UnixNano()) - rand.Shuffle(len(netIDs), func(i int, j int) { netIDs[i], netIDs[j] = netIDs[j], netIDs[i] }) - sendPeers = netIDs[:upToNumPeers] - } else { - sendPeers = netIDs - } + sendPeers := m.peers.GetRandomPeers(int(upToNumPeers)) for _, netID := range sendPeers { m.SendPeerMsgByNetID(netID, msgReceiver, msgType, msgData) } From 9a5119ed15645ea767b5a3389c82afab8299dff9 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 16 Nov 2021 10:56:44 +0200 Subject: [PATCH 070/198] Peering id is kept at mocked chain --- packages/chain/statemgr/setup_test.go | 55 +++++++++---------- .../testutil/testchain/mock_chain_core.go | 4 +- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/packages/chain/statemgr/setup_test.go b/packages/chain/statemgr/setup_test.go index 9fc5680702..923d8411ab 100644 --- a/packages/chain/statemgr/setup_test.go +++ b/packages/chain/statemgr/setup_test.go @@ -180,7 +180,6 @@ func (env *MockedEnv) PullConfirmedOutputFromLedger(addr ledgerstate.Address, ou } func (env *MockedEnv) NewMockedNode(nodeIndex int, timers StateManagerTimers) *MockedNode { - var peeringID peering.PeeringID = env.ChainID.Array() nodeID := env.NodeIDs[nodeIndex] log := env.Log.Named(nodeID) peers, err := env.NetworkProviders[nodeIndex].PeerDomain(env.NodeIDs) @@ -191,7 +190,7 @@ func (env *MockedEnv) NewMockedNode(nodeIndex int, timers StateManagerTimers) *M NodeConn: testchain.NewMockedNodeConnection("Node_" + nodeID), store: mapdb.NewMapDB(), stateSync: coreutil.NewChainStateSync(), - ChainCore: testchain.NewMockedChainCore(env.T, env.ChainID, peeringID, peers, log), + ChainCore: testchain.NewMockedChainCore(env.T, env.ChainID, peers, log), Peers: peers, Log: log, } @@ -201,32 +200,7 @@ func (env *MockedEnv) NewMockedNode(nodeIndex int, timers StateManagerTimers) *M ret.ChainCore.OnGetStateReader(func() state.OptimisticStateReader { return state.NewOptimisticStateReader(ret.store, ret.stateSync) }) - ret.StateManager = New(ret.store, ret.ChainCore, ret.Peers, ret.NodeConn, timers) - ret.StateTransition = testchain.NewMockedStateTransition(env.T, env.OriginatorKeyPair) - ret.StateTransition.OnNextState(func(vstate state.VirtualStateAccess, tx *ledgerstate.Transaction) { - log.Debugf("MockedEnv.onNextState: state index %d", vstate.BlockIndex()) - stateOutput, err := utxoutil.GetSingleChainedAliasOutput(tx) - require.NoError(env.T, err) - go ret.StateManager.EventStateCandidateMsg(vstate, stateOutput.ID()) - go ret.NodeConn.PostTransaction(tx) - }) - ret.NodeConn.OnPostTransaction(func(tx *ledgerstate.Transaction) { - log.Debugf("MockedNode.OnPostTransaction: transaction %v posted", tx.ID().Base58()) - env.PostTransactionToLedger(tx) - }) - ret.NodeConn.OnPullState(func(addr *ledgerstate.AliasAddress) { - log.Debugf("MockedNode.OnPullState request received for address %v", addr.Base58) - response := env.PullStateFromLedger(addr) - log.Debugf("MockedNode.OnPullState call EventStateMsg: chain output %s", iscp.OID(response.ChainOutput.ID())) - go ret.StateManager.EventStateMsg(response) - }) - ret.NodeConn.OnPullConfirmedOutput(func(addr ledgerstate.Address, outputID ledgerstate.OutputID) { - log.Debugf("MockedNode.OnPullConfirmedOutput %v", iscp.OID(outputID)) - response := env.PullConfirmedOutputFromLedger(addr, outputID) - log.Debugf("MockedNode.OnPullConfirmedOutput call EventOutputMsg") - go ret.StateManager.EventOutputMsg(response) - }) - peers.Attach(&peeringID, peerMessageReceiverStateManager, func(peerMsg *peering.PeerMessageIn) { + ret.ChainCore.AttachToPeerMessages(peerMessageReceiverStateManager, func(peerMsg *peering.PeerMessageIn) { log.Debugf("State manager recvEvent from %v of type %v", peerMsg.SenderNetID, peerMsg.MsgType) if peerMsg.MsgReceiver != peerMessageReceiverStateManager { env.T.Fatalf("State manager does not accept peer messages of other receiver type %v, message type=%v", @@ -255,6 +229,31 @@ func (env *MockedEnv) NewMockedNode(nodeIndex int, timers StateManagerTimers) *M }) } }) + ret.StateManager = New(ret.store, ret.ChainCore, ret.Peers, ret.NodeConn, timers) + ret.StateTransition = testchain.NewMockedStateTransition(env.T, env.OriginatorKeyPair) + ret.StateTransition.OnNextState(func(vstate state.VirtualStateAccess, tx *ledgerstate.Transaction) { + log.Debugf("MockedEnv.onNextState: state index %d", vstate.BlockIndex()) + stateOutput, err := utxoutil.GetSingleChainedAliasOutput(tx) + require.NoError(env.T, err) + go ret.StateManager.EventStateCandidateMsg(vstate, stateOutput.ID()) + go ret.NodeConn.PostTransaction(tx) + }) + ret.NodeConn.OnPostTransaction(func(tx *ledgerstate.Transaction) { + log.Debugf("MockedNode.OnPostTransaction: transaction %v posted", tx.ID().Base58()) + env.PostTransactionToLedger(tx) + }) + ret.NodeConn.OnPullState(func(addr *ledgerstate.AliasAddress) { + log.Debugf("MockedNode.OnPullState request received for address %v", addr.Base58) + response := env.PullStateFromLedger(addr) + log.Debugf("MockedNode.OnPullState call EventStateMsg: chain output %s", iscp.OID(response.ChainOutput.ID())) + go ret.StateManager.EventStateMsg(response) + }) + ret.NodeConn.OnPullConfirmedOutput(func(addr ledgerstate.Address, outputID ledgerstate.OutputID) { + log.Debugf("MockedNode.OnPullConfirmedOutput %v", iscp.OID(outputID)) + response := env.PullConfirmedOutputFromLedger(addr, outputID) + log.Debugf("MockedNode.OnPullConfirmedOutput call EventOutputMsg") + go ret.StateManager.EventOutputMsg(response) + }) return ret } diff --git a/packages/testutil/testchain/mock_chain_core.go b/packages/testutil/testchain/mock_chain_core.go index 8fb0eb0439..eabbf8d148 100644 --- a/packages/testutil/testchain/mock_chain_core.go +++ b/packages/testutil/testchain/mock_chain_core.go @@ -47,7 +47,7 @@ type MockedChainCore struct { var _ chain.ChainCore = &MockedChainCore{} -func NewMockedChainCore(t *testing.T, chainID *iscp.ChainID, peeringID peering.PeeringID, peers peering.PeerDomainProvider, log *logger.Logger) *MockedChainCore { +func NewMockedChainCore(t *testing.T, chainID *iscp.ChainID, peers peering.PeerDomainProvider, log *logger.Logger) *MockedChainCore { receiveFailFun := func(typee string, msg interface{}) { t.Fatalf("Receiving of %s is not implemented, but %v is received", typee, msg) } @@ -55,7 +55,7 @@ func NewMockedChainCore(t *testing.T, chainID *iscp.ChainID, peeringID peering.P T: t, chainID: chainID, processors: processors.MustNew(processors.NewConfig(inccounter.Processor)), - peeringID: peeringID, + peeringID: chainID.Array(), peers: peers, log: log, getNetIDsFun: func() []string { From 1972edb31378117020f7308f42a6ae9de42c126b Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 16 Nov 2021 15:57:20 +0200 Subject: [PATCH 071/198] Commonsubset tests fixed --- .../commonsubset/commonsubset_test.go | 81 ++++++++-------- .../consensus/commonsubset/setup_test.go | 92 +++++++++++++++++++ 2 files changed, 135 insertions(+), 38 deletions(-) create mode 100644 packages/chain/consensus/commonsubset/setup_test.go diff --git a/packages/chain/consensus/commonsubset/commonsubset_test.go b/packages/chain/consensus/commonsubset/commonsubset_test.go index f64a7304bb..a7c26bdfdb 100644 --- a/packages/chain/consensus/commonsubset/commonsubset_test.go +++ b/packages/chain/consensus/commonsubset/commonsubset_test.go @@ -1,7 +1,7 @@ // Copyright 2020 IOTA Stiftung // SPDX-License-Identifier: Apache-2.0 -package commonsubset_test +package commonsubset import ( "bytes" @@ -11,7 +11,6 @@ import ( "time" "github.com/iotaledger/hive.go/logger" - "github.com/iotaledger/wasp/packages/chain/consensus/commonsubset" "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/tcrypto" "github.com/iotaledger/wasp/packages/testutil" @@ -59,20 +58,29 @@ func testBasic(t *testing.T, peerCount, threshold uint16, allRandom bool) { dkShares[i] = dkShare } - acsPeers := make([]*commonsubset.CommonSubset, peerCount) - for i := range acsPeers { - ii := i // Use a local copy in the callback. - networkProviders[ii].Attach(&peeringID, func(recv *peering.RecvEvent) { - if acsPeers[ii] != nil { - require.True(t, acsPeers[ii].TryHandleMessage(recv)) - } - }) - } + acsPeers := make([]*CommonSubset, peerCount) for a := range acsPeers { + ii := a // Use a local copy in the callback. group, err := networkProviders[a].PeerGroup(peerNetIDs) require.Nil(t, err) + cmt := NewCommitteeMock(peeringID, group, t) + cmt.AttachToPeerMessages(peerMessageReceiverCommonSubset, func(peerMsg *peering.PeerMessageGroupIn) { + if peerMsg.MsgReceiver != peerMessageReceiverCommonSubset { + panic(fmt.Errorf("Committee does not accept peer messages of other receiver type %v, message type=%v", + peerMsg.MsgReceiver, peerMsg.MsgType)) + } + if peerMsg.MsgType != peerMsgTypeBatch { + panic(fmt.Errorf("Wrong type of committee message: %v", peerMsg.MsgType)) + } + mb, err := newMsgBatch(peerMsg.MsgData) + if err != nil { + log.Error(err) + return + } + acsPeers[ii].HandleMsgBatch(mb) + }) acsLog := testlogger.WithLevel(log.Named(fmt.Sprintf("ACS[%02d]", a)), logger.LevelInfo, false) - acsPeers[a], err = commonsubset.NewCommonSubset(0, 0, peeringID, group, dkShares[a], allRandom, nil, acsLog) + acsPeers[a], err = NewCommonSubset(0, 0, cmt, group, dkShares[a], allRandom, nil, acsLog) require.Nil(t, err) } t.Logf("ACS Nodes created.") @@ -115,20 +123,29 @@ func TestRandomized(t *testing.T) { dkShares[i] = dkShare } - acsPeers := make([]*commonsubset.CommonSubset, peerCount) - for i := range acsPeers { - ii := i // Use a local copy in the callback. - networkProviders[ii].Attach(&peeringID, func(recv *peering.RecvEvent) { - if acsPeers[ii] != nil { - require.True(t, acsPeers[ii].TryHandleMessage(recv)) - } - }) - } + acsPeers := make([]*CommonSubset, peerCount) for a := range acsPeers { + ii := a // Use a local copy in the callback. group, err := networkProviders[a].PeerGroup(peerNetIDs) require.Nil(t, err) + cmt := NewCommitteeMock(peeringID, group, t) + cmt.AttachToPeerMessages(peerMessageReceiverCommonSubset, func(peerMsg *peering.PeerMessageGroupIn) { + if peerMsg.MsgReceiver != peerMessageReceiverCommonSubset { + panic(fmt.Errorf("Committee does not accept peer messages of other receiver type %v, message type=%v", + peerMsg.MsgReceiver, peerMsg.MsgType)) + } + if peerMsg.MsgType != peerMsgTypeBatch { + panic(fmt.Errorf("Wrong type of committee message: %v", peerMsg.MsgType)) + } + mb, err := newMsgBatch(peerMsg.MsgData) + if err != nil { + log.Error(err) + return + } + acsPeers[ii].HandleMsgBatch(mb) + }) acsLog := testlogger.WithLevel(log.Named(fmt.Sprintf("ACS[%02d]", a)), logger.LevelInfo, false) - acsPeers[a], err = commonsubset.NewCommonSubset(0, 0, peeringID, group, dkShares[a], true, nil, acsLog) + acsPeers[a], err = NewCommonSubset(0, 0, cmt, group, dkShares[a], true, nil, acsLog) require.Nil(t, err) } t.Logf("ACS Nodes created.") @@ -202,18 +219,12 @@ func testCoordinator(t *testing.T, peerCount, threshold uint16) { dkShares[i] = dkShare } - acsCoords := make([]*commonsubset.CommonSubsetCoordinator, peerCount) + acsCoords := make([]*CommonSubsetCoordinator, peerCount) for i := range acsCoords { - ii := i // Use a local copy in the callback. group, err := networkProviders[i].PeerGroup(peerNetIDs) require.Nil(t, err) acsLog := testlogger.WithLevel(log.Named(fmt.Sprintf("CSC[%02d]", i)), logger.LevelInfo, false) - acsCoords[i] = commonsubset.NewCommonSubsetCoordinator(peeringID, networkProviders[i], group, dkShares[i], acsLog) - networkProviders[ii].Attach(&peeringID, func(recv *peering.RecvEvent) { - if acsCoords[ii] != nil { - require.True(t, acsCoords[ii].TryHandleMessage(recv)) - } - }) + acsCoords[i] = NewCommonSubsetCoordinator(NewCommitteeMock(peeringID, group, t), networkProviders[i], group, dkShares[i], acsLog) } t.Logf("ACS Nodes created.") @@ -268,19 +279,13 @@ func testRandomizedWithCC(t *testing.T, peerCount, threshold uint16) { } dkAddress, dkShares := testpeers.SetupDkgPregenerated(t, threshold, peerNetIDs, tcrypto.DefaultSuite()) - acsCoords := make([]*commonsubset.CommonSubsetCoordinator, peerCount) + acsCoords := make([]*CommonSubsetCoordinator, peerCount) for i := range acsCoords { - ii := i // Use a local copy in the callback. group, err := networkProviders[i].PeerGroup(peerNetIDs) require.Nil(t, err) dkShare, err := dkShares[i].LoadDKShare(dkAddress) require.Nil(t, err) - acsCoords[i] = commonsubset.NewCommonSubsetCoordinator(peeringID, networkProviders[i], group, dkShare, logs[i]) - networkProviders[ii].Attach(&peeringID, func(recv *peering.RecvEvent) { - if acsCoords[ii] != nil { - acsCoords[ii].TryHandleMessage(recv) - } - }) + acsCoords[i] = NewCommonSubsetCoordinator(NewCommitteeMock(peeringID, group, t), networkProviders[i], group, dkShare, logs[i]) } t.Logf("ACS Nodes created.") diff --git a/packages/chain/consensus/commonsubset/setup_test.go b/packages/chain/consensus/commonsubset/setup_test.go new file mode 100644 index 0000000000..e610493c17 --- /dev/null +++ b/packages/chain/consensus/commonsubset/setup_test.go @@ -0,0 +1,92 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +package commonsubset + +import ( + "fmt" + "testing" + "time" + + "github.com/iotaledger/goshimmer/packages/ledgerstate" + "github.com/iotaledger/wasp/packages/chain" + "github.com/iotaledger/wasp/packages/peering" + "github.com/iotaledger/wasp/packages/tcrypto" +) + +type committeeMock struct { + peeringID peering.PeeringID + group peering.GroupProvider + t *testing.T +} + +var _ chain.Committee = &committeeMock{} + +func NewCommitteeMock(peeringID peering.PeeringID, group peering.GroupProvider, t *testing.T) *committeeMock { + return &committeeMock{ + peeringID: peeringID, + group: group, + t: t, + } +} + +func (cmT *committeeMock) Address() ledgerstate.Address { + panic("Not implemented") +} +func (cmT *committeeMock) Size() uint16 { + panic("Not implemented") +} +func (cmT *committeeMock) Quorum() uint16 { + panic("Not implemented") +} +func (cmT *committeeMock) OwnPeerIndex() uint16 { + panic("Not implemented") +} +func (cmT *committeeMock) DKShare() *tcrypto.DKShare { + panic("Not implemented") +} +func (cmT *committeeMock) SendMsgByIndex(peerIdx uint16, msgReceiver byte, msgType byte, msgData []byte) error { + if peer, ok := cmT.group.OtherNodes()[peerIdx]; ok { + peer.SendMsg(&peering.PeerMessageNet{ + PeerMessageData: peering.PeerMessageData{ + PeeringID: cmT.peeringID, + Timestamp: time.Now().UnixNano(), + MsgReceiver: msgReceiver, + MsgType: msgType, + MsgData: msgData, + }, + }) + return nil + } + return fmt.Errorf("SendMsg: wrong peer index") +} +func (cmT *committeeMock) SendMsgBroadcast(msgReceiver byte, msgType byte, msgData []byte, except ...uint16) { + panic("Not implemented") +} +func (cmT *committeeMock) IsAlivePeer(peerIndex uint16) bool { + panic("Not implemented") +} +func (cmT *committeeMock) QuorumIsAlive(quorum ...uint16) bool { + panic("Not implemented") +} +func (cmT *committeeMock) PeerStatus() []*chain.PeerStatus { + panic("Not implemented") +} +func (cmT *committeeMock) AttachToPeerMessages(peerMsgReceiver byte, fun func(peerMsg *peering.PeerMessageGroupIn)) { + cmT.group.Attach(&cmT.peeringID, peerMsgReceiver, fun) +} +func (cmT *committeeMock) IsReady() bool { + panic("Not implemented") +} +func (cmT *committeeMock) Close() { + panic("Not implemented") +} +func (cmT *committeeMock) RunACSConsensus(value []byte, sessionID uint64, stateIndex uint32, callback func(sessionID uint64, acs [][]byte)) { + panic("Not implemented") +} +func (cmT *committeeMock) GetOtherValidatorsPeerIDs() []string { + panic("Not implemented") +} +func (cmT *committeeMock) GetRandomValidators(upToN int) []string { + panic("Not implemented") +} From 2bebd8e92900cfe26b02ceaf6f4baa5ac2a38cfa Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 16 Nov 2021 16:30:39 +0200 Subject: [PATCH 072/198] Consensus tests fixed --- packages/chain/consensus/action.go | 1 + packages/chain/consensus/setup_test.go | 97 ++++++++++++++------------ 2 files changed, 52 insertions(+), 46 deletions(-) diff --git a/packages/chain/consensus/action.go b/packages/chain/consensus/action.go index f303b82074..92a4da001f 100644 --- a/packages/chain/consensus/action.go +++ b/packages/chain/consensus/action.go @@ -56,6 +56,7 @@ func (c *consensus) proposeBatchIfNeeded() { return } if time.Now().Before(c.stateTimestamp.Add(c.timers.ProposeBatchDelayForNewState)) { + c.log.Debugf("proposeBatch not needed: delayed for %v from %v", c.timers.ProposeBatchDelayForNewState, c.stateTimestamp) return } reqs := c.mempool.ReadyNow() diff --git a/packages/chain/consensus/setup_test.go b/packages/chain/consensus/setup_test.go index f1ca5bd4fb..30dc46837d 100644 --- a/packages/chain/consensus/setup_test.go +++ b/packages/chain/consensus/setup_test.go @@ -4,7 +4,6 @@ package consensus import ( - "bytes" "fmt" "io" "math/rand" @@ -156,12 +155,14 @@ func (env *MockedEnv) CreateNodes(timers ConsensusTimers) { func (env *MockedEnv) NewNode(nodeIndex uint16, timers ConsensusTimers) *mockedNode { //nolint:revive nodeID := env.NodeIDs[nodeIndex] log := env.Log.Named(nodeID) + peers, err := env.NetworkProviders[nodeIndex].PeerDomain(env.NodeIDs) + require.NoError(env.T, err) ret := &mockedNode{ NodeID: nodeID, Env: env, NodeConn: testchain.NewMockedNodeConnection("Node_" + nodeID), store: mapdb.NewMapDB(), - ChainCore: testchain.NewMockedChainCore(env.T, env.ChainID, log), + ChainCore: testchain.NewMockedChainCore(env.T, env.ChainID, peers, log), stateSync: coreutil.NewChainStateSync(), Log: log, } @@ -198,10 +199,7 @@ func (env *MockedEnv) NewNode(nodeIndex uint16, timers ConsensusTimers) *mockedN }) ret.NodeConn.OnPullTransactionInclusionState(func(addr ledgerstate.Address, txid ledgerstate.TransactionID) { if _, already := env.Ledger.GetTransaction(txid); already { - go ret.ChainCore.ReceiveMessage(&messages.InclusionStateMsg{ - TxID: txid, - State: ledgerstate.Confirmed, - }) + go ret.Consensus.EventInclusionsStateMsg(txid, ledgerstate.Confirmed) } }) mempoolMetrics := metrics.DefaultChainMetrics() @@ -231,7 +229,35 @@ func (env *MockedEnv) NewNode(nodeIndex uint16, timers ConsensusTimers) *mockedN acs..., ) require.NoError(env.T, err) - //TODO cmt.Attach(ret.ChainCore) + cmt.AttachToPeerMessages(peerMessageReceiverConsensus, func(peerMsg *peering.PeerMessageGroupIn) { + log.Debugf("Consensus received peer message from %v of type %v", peerMsg.SenderNetID, peerMsg.MsgType) + if peerMsg.MsgReceiver != peerMessageReceiverConsensus { + env.T.Fatalf("Consensus does not accept peer messages of other receiver type %v, message type=%v", + peerMsg.MsgReceiver, peerMsg.MsgType) + } + switch peerMsg.MsgType { + case peerMsgTypeSignedResult: + msg, err := messages.NewSignedResultMsg(peerMsg.MsgData) + if err != nil { + log.Error(err) + return + } + ret.Consensus.EnqueueSignedResultMsg(&messages.SignedResultMsgIn{ + SignedResultMsg: *msg, + SenderIndex: peerMsg.SenderIndex, + }) + case peerMsgTypeSignedResultAck: + msg, err := messages.NewSignedResultAckMsg(peerMsg.MsgData) + if err != nil { + log.Error(err) + return + } + ret.Consensus.EnqueueSignedResultAckMsg(&messages.SignedResultAckMsgIn{ + SignedResultAckMsg: *msg, + SenderIndex: peerMsg.SenderIndex, + }) + } + }) ret.StateOutput = env.InitStateOutput ret.SolidState, err = state.CreateOriginState(ret.store, env.ChainID) @@ -239,49 +265,28 @@ func (env *MockedEnv) NewNode(nodeIndex uint16, timers ConsensusTimers) *mockedN require.NoError(env.T, err) cons := New(ret.ChainCore, ret.Mempool, cmt, ret.NodeConn, true, metrics.DefaultChainMetrics(), timers) - cons.vmRunner = testchain.NewMockedVMRunner(env.T, log) + cons.(*consensus).vmRunner = testchain.NewMockedVMRunner(env.T, log) ret.Consensus = cons - ret.ChainCore.OnReceiveAsynchronousCommonSubsetMsg(func(msg *messages.AsynchronousCommonSubsetMsg) { - ret.Consensus.EventAsynchronousCommonSubsetMsg(msg) - }) - ret.ChainCore.OnReceiveVMResultMsg(func(msg *messages.VMResultMsg) { - ret.Consensus.EventVMResultMsg(msg) - }) - ret.ChainCore.OnReceiveInclusionStateMsg(func(msg *messages.InclusionStateMsg) { - //ret.Consensus.EventInclusionsStateMsg(msg) TODO - }) - ret.ChainCore.OnReceiveStateCandidateMsg(func(msg *messages.StateCandidateMsg) { - ret.mutex.Lock() - defer ret.mutex.Unlock() - newState := msg.State - ret.Log.Infof("chainCore.StateCandidateMsg: state hash: %s, approving output: %s", - msg.State.StateCommitment(), iscp.OID(msg.ApprovingOutputID)) - - if ret.SolidState != nil && ret.SolidState.BlockIndex() == newState.BlockIndex() { - ret.Log.Debugf("new state already committed for index %d", newState.BlockIndex()) - return - } - err := newState.Commit() - require.NoError(env.T, err) - - ret.SolidState = newState - ret.Log.Debugf("committed new state for index %d", newState.BlockIndex()) + ret.ChainCore.OnStateCandidate(func(newState state.VirtualStateAccess, approvingOutputID ledgerstate.OutputID) { + go func() { + ret.mutex.Lock() + defer ret.mutex.Unlock() + ret.Log.Infof("chainCore.StateCandidateMsg: state hash: %s, approving output: %s", + newState.StateCommitment(), iscp.OID(approvingOutputID)) - ret.checkStateApproval() - }) - ret.ChainCore.OnReceivePeerMessage(func(msg *peering.PeerMessage) { - var err error - if msg.MsgType == messages.MsgSignedResult { - decoded := messages.SignedResultMsg{} - if err = decoded.Read(bytes.NewReader(msg.MsgData)); err == nil { - decoded.SenderIndex = msg.SenderIndex - ret.Consensus.EventSignedResultMsg(&decoded) + if ret.SolidState != nil && ret.SolidState.BlockIndex() == newState.BlockIndex() { + ret.Log.Debugf("new state already committed for index %d", newState.BlockIndex()) + return } - } - if err != nil { - ret.Log.Errorf("unexpected peer message type = %d", msg.MsgType) - } + err := newState.Commit() + require.NoError(env.T, err) + + ret.SolidState = newState + ret.Log.Debugf("committed new state for index %d", newState.BlockIndex()) + + ret.checkStateApproval() + }() }) return ret } From 28b2b3e062e1f4380ad37fa0bd830d832dfeca0a Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 16 Nov 2021 16:33:56 +0200 Subject: [PATCH 073/198] Final touch. All short tests work. --- packages/webapi/request/request_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webapi/request/request_test.go b/packages/webapi/request/request_test.go index 55e3cd718d..7d865f7f47 100644 --- a/packages/webapi/request/request_test.go +++ b/packages/webapi/request/request_test.go @@ -62,7 +62,7 @@ func (m *mockedChain) IsDismissed() bool { func createMockedGetChain(t *testing.T) chains.ChainProvider { return func(chainID *iscp.ChainID) chain.Chain { - chainCore := testchain.NewMockedChainCore(t, chainID, testlogger.NewLogger(t)) + chainCore := testchain.NewMockedChainCore(t, chainID, nil, testlogger.NewLogger(t)) chainCore.OnOffLedgerRequest(func(msg *messages.OffLedgerRequestMsgIn) { t.Logf("Offledger request %v received", msg) }) From 4432ee63e15976ef3ce7e5d25510461071f83e02 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Wed, 17 Nov 2021 09:54:49 +0200 Subject: [PATCH 074/198] Spelling --- packages/chain/committee/committee.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/chain/committee/committee.go b/packages/chain/committee/committee.go index 4ec7f1883c..f7a8db868e 100644 --- a/packages/chain/committee/committee.go +++ b/packages/chain/committee/committee.go @@ -92,7 +92,7 @@ func New( ret.acsRunner = acsRunner[0] } else { // That's the default implementation of the ACS. - // We use it, of the mocked variant was not passed. + // We use it, if the mocked variant was not passed. ret.acsRunner = commonsubset.NewCommonSubsetCoordinator( ret, netProvider, From f7da05b753ec38e174bb710b56d83c8f992e270b Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Wed, 17 Nov 2021 09:55:07 +0200 Subject: [PATCH 075/198] BugFix: null pointer exception avoided --- packages/chain/chainimpl/chainimpl.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index 9dccaad29a..6db9b2321b 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -155,8 +155,8 @@ func NewChain( log.Errorf("NewChain: %v", err) return nil } - ret.stateMgr = statemgr.New(db, ret, peers, ret.nodeConn) ret.peers = &peers + ret.stateMgr = statemgr.New(db, ret, peers, ret.nodeConn) ret.AttachToPeerMessages(chain.PeerMessageReceiverChain, ret.receiveChainPeerMessages) go ret.handleMessagesLoop() ret.startTimer() From caab6e33933f6cc918b5712e97ede00e8605c5bf Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Wed, 17 Nov 2021 10:32:38 +0200 Subject: [PATCH 076/198] Consensus messages use pipes instead of channels --- packages/chain/consensus/consensus.go | 106 ++++++++++++++++++-------- packages/chain/consensus/eventproc.go | 14 ++-- 2 files changed, 80 insertions(+), 40 deletions(-) diff --git a/packages/chain/consensus/consensus.go b/packages/chain/consensus/consensus.go index 30c439b239..e0494ea87a 100644 --- a/packages/chain/consensus/consensus.go +++ b/packages/chain/consensus/consensus.go @@ -18,6 +18,7 @@ import ( "github.com/iotaledger/wasp/packages/metrics" "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/state" + "github.com/iotaledger/wasp/packages/util/pipe" "github.com/iotaledger/wasp/packages/vm" "github.com/iotaledger/wasp/packages/vm/runvm" "go.uber.org/atomic" @@ -54,14 +55,13 @@ type consensus struct { consensusInfoSnapshot atomic.Value timers ConsensusTimers log *logger.Logger - eventStateTransitionMsgCh chan *messages.StateTransitionMsg - eventSignedResultMsgCh chan *messages.SignedResultMsgIn - eventSignedResultAckMsgCh chan *messages.SignedResultAckMsgIn - eventInclusionStateMsgCh chan *messages.InclusionStateMsg - eventACSMsgCh chan *messages.AsynchronousCommonSubsetMsg - eventVMResultMsgCh chan *messages.VMResultMsg - eventTimerMsgCh chan messages.TimerTick - closeCh chan struct{} + eventStateTransitionMsgPipe pipe.Pipe + eventSignedResultMsgPipe pipe.Pipe + eventSignedResultAckMsgPipe pipe.Pipe + eventInclusionStateMsgPipe pipe.Pipe + eventACSMsgPipe pipe.Pipe + eventVMResultMsgPipe pipe.Pipe + eventTimerMsgPipe pipe.Pipe assert assert.Assert missingRequestsFromBatch map[iscp.RequestID][32]byte missingRequestsMutex sync.Mutex @@ -88,6 +88,8 @@ const ( peerMsgTypeSignedResult = iota peerMsgTypeSignedResultAck + + maxMsgBuffer = 1000 ) func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Committee, nodeConn chain.NodeConnection, pullMissingRequestsFromCommittee bool, consensusMetrics metrics.ConsensusMetrics, timersOpt ...ConsensusTimers) chain.Consensus { @@ -108,14 +110,13 @@ func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Commi resultSigAck: make([]uint16, 0, committee.Size()), timers: timers, log: log, - eventStateTransitionMsgCh: make(chan *messages.StateTransitionMsg), - eventSignedResultMsgCh: make(chan *messages.SignedResultMsgIn), - eventSignedResultAckMsgCh: make(chan *messages.SignedResultAckMsgIn), - eventInclusionStateMsgCh: make(chan *messages.InclusionStateMsg), - eventACSMsgCh: make(chan *messages.AsynchronousCommonSubsetMsg), - eventVMResultMsgCh: make(chan *messages.VMResultMsg), - eventTimerMsgCh: make(chan messages.TimerTick), - closeCh: make(chan struct{}), + eventStateTransitionMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), + eventSignedResultMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), + eventSignedResultAckMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), + eventInclusionStateMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), + eventACSMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), + eventVMResultMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), + eventTimerMsgPipe: pipe.NewLimitInfinitePipe(1), assert: assert.NewAssert(log), pullMissingRequestsFromCommittee: pullMissingRequestsFromCommittee, consensusMetrics: consensusMetrics, @@ -160,15 +161,39 @@ func (c *consensus) IsReady() bool { } func (c *consensus) Close() { - close(c.closeCh) + c.eventStateTransitionMsgPipe.Close() + c.eventSignedResultMsgPipe.Close() + c.eventSignedResultAckMsgPipe.Close() + c.eventInclusionStateMsgPipe.Close() + c.eventACSMsgPipe.Close() + c.eventVMResultMsgPipe.Close() + c.eventTimerMsgPipe.Close() } func (c *consensus) recvLoop() { + eventStateTransitionMsgCh := c.eventStateTransitionMsgPipe.Out() + eventSignedResultMsgCh := c.eventSignedResultMsgPipe.Out() + eventSignedResultAckMsgCh := c.eventSignedResultAckMsgPipe.Out() + eventInclusionStateMsgCh := c.eventInclusionStateMsgPipe.Out() + eventACSMsgCh := c.eventACSMsgPipe.Out() + eventVMResultMsgCh := c.eventVMResultMsgPipe.Out() + eventTimerMsgCh := c.eventTimerMsgPipe.Out() + isClosedFun := func() bool { + return eventStateTransitionMsgCh == nil && + eventSignedResultMsgCh == nil && + eventSignedResultAckMsgCh == nil && + eventInclusionStateMsgCh == nil && + eventACSMsgCh == nil && + eventVMResultMsgCh == nil && + eventTimerMsgCh == nil + } + // wait at startup for !c.committee.IsReady() { select { case <-time.After(100 * time.Millisecond): - case <-c.closeCh: + } + if isClosedFun() { return } } @@ -176,49 +201,64 @@ func (c *consensus) recvLoop() { c.isReady.Store(true) for { select { - case msg, ok := <-c.eventStateTransitionMsgCh: + case msg, ok := <-eventStateTransitionMsgCh: if ok { c.log.Debugf("Consensus::recvLoop, eventStateTransitionMsg...") - c.eventStateTransitionMsg(msg) + c.eventStateTransitionMsg(msg.(*messages.StateTransitionMsg)) c.log.Debugf("Consensus::recvLoop, eventStateTransitionMsg... Done") + } else { + eventStateTransitionMsgCh = nil } - case msg, ok := <-c.eventSignedResultMsgCh: + case msg, ok := <-eventSignedResultMsgCh: if ok { c.log.Debugf("Consensus::recvLoop, handleSignedResultMsg...") - c.handleSignedResultMsg(msg) + c.handleSignedResultMsg(msg.(*messages.SignedResultMsgIn)) c.log.Debugf("Consensus::recvLoop, handleSignedResultMsg... Done") + } else { + eventSignedResultMsgCh = nil } - case msg, ok := <-c.eventSignedResultAckMsgCh: + case msg, ok := <-eventSignedResultAckMsgCh: if ok { c.log.Debugf("Consensus::recvLoop, handleSignedResultAckMsg...") - c.handleSignedResultAckMsg(msg) + c.handleSignedResultAckMsg(msg.(*messages.SignedResultAckMsgIn)) c.log.Debugf("Consensus::recvLoop, handleSignedResultAckMsg... Done") + } else { + eventSignedResultAckMsgCh = nil } - case msg, ok := <-c.eventInclusionStateMsgCh: + case msg, ok := <-eventInclusionStateMsgCh: if ok { c.log.Debugf("Consensus::recvLoop, eventInclusionState...") - c.eventInclusionState(msg) + c.eventInclusionState(msg.(*messages.InclusionStateMsg)) c.log.Debugf("Consensus::recvLoop, eventInclusionState... Done") + } else { + eventInclusionStateMsgCh = nil } - case msg, ok := <-c.eventACSMsgCh: + case msg, ok := <-eventACSMsgCh: if ok { c.log.Debugf("Consensus::recvLoop, eventAsynchronousCommonSubset...") - c.eventAsynchronousCommonSubset(msg) + c.eventAsynchronousCommonSubset(msg.(*messages.AsynchronousCommonSubsetMsg)) c.log.Debugf("Consensus::recvLoop, eventAsynchronousCommonSubset... Done") + } else { + eventACSMsgCh = nil } - case msg, ok := <-c.eventVMResultMsgCh: + case msg, ok := <-eventVMResultMsgCh: if ok { c.log.Debugf("Consensus::recvLoop, eventVMResultMsg...") - c.eventVMResultMsg(msg) + c.eventVMResultMsg(msg.(*messages.VMResultMsg)) c.log.Debugf("Consensus::recvLoop, eventVMResultMsg... Done") + } else { + eventVMResultMsgCh = nil } - case msg, ok := <-c.eventTimerMsgCh: + case msg, ok := <-eventTimerMsgCh: if ok { c.log.Debugf("Consensus::recvLoop, eventTimerMsg...") - c.eventTimerMsg(msg) + c.eventTimerMsg(msg.(messages.TimerTick)) c.log.Debugf("Consensus::recvLoop, eventTimerMsg... Done") + } else { + eventTimerMsgCh = nil } - case <-c.closeCh: + } + if isClosedFun() { return } } diff --git a/packages/chain/consensus/eventproc.go b/packages/chain/consensus/eventproc.go index 71c3c6e2e0..09fa03eea3 100644 --- a/packages/chain/consensus/eventproc.go +++ b/packages/chain/consensus/eventproc.go @@ -15,7 +15,7 @@ import ( ) func (c *consensus) EventStateTransitionMsg(state state.VirtualStateAccess, stateOutput *ledgerstate.AliasOutput, stateTimestamp time.Time) { - c.eventStateTransitionMsgCh <- &messages.StateTransitionMsg{ + c.eventStateTransitionMsgPipe.In() <- &messages.StateTransitionMsg{ State: state, StateOutput: stateOutput, StateTimestamp: stateTimestamp, @@ -30,7 +30,7 @@ func (c *consensus) eventStateTransitionMsg(msg *messages.StateTransitionMsg) { } func (c *consensus) EnqueueSignedResultMsg(msg *messages.SignedResultMsgIn) { - c.eventSignedResultMsgCh <- msg + c.eventSignedResultMsgPipe.In() <- msg } func (c *consensus) handleSignedResultMsg(msg *messages.SignedResultMsgIn) { @@ -41,7 +41,7 @@ func (c *consensus) handleSignedResultMsg(msg *messages.SignedResultMsgIn) { } func (c *consensus) EnqueueSignedResultAckMsg(msg *messages.SignedResultAckMsgIn) { - c.eventSignedResultAckMsgCh <- msg + c.eventSignedResultAckMsgPipe.In() <- msg } func (c *consensus) handleSignedResultAckMsg(msg *messages.SignedResultAckMsgIn) { @@ -52,7 +52,7 @@ func (c *consensus) handleSignedResultAckMsg(msg *messages.SignedResultAckMsgIn) } func (c *consensus) EventInclusionsStateMsg(txID ledgerstate.TransactionID, state ledgerstate.InclusionState) { - c.eventInclusionStateMsgCh <- &messages.InclusionStateMsg{ + c.eventInclusionStateMsgPipe.In() <- &messages.InclusionStateMsg{ TxID: txID, State: state, } @@ -66,7 +66,7 @@ func (c *consensus) eventInclusionState(msg *messages.InclusionStateMsg) { } func (c *consensus) EventAsynchronousCommonSubsetMsg(msg *messages.AsynchronousCommonSubsetMsg) { - c.eventACSMsgCh <- msg + c.eventACSMsgPipe.In() <- msg } func (c *consensus) eventAsynchronousCommonSubset(msg *messages.AsynchronousCommonSubsetMsg) { @@ -77,7 +77,7 @@ func (c *consensus) eventAsynchronousCommonSubset(msg *messages.AsynchronousComm } func (c *consensus) EventVMResultMsg(msg *messages.VMResultMsg) { - c.eventVMResultMsgCh <- msg + c.eventVMResultMsgPipe.In() <- msg } func (c *consensus) eventVMResultMsg(msg *messages.VMResultMsg) { @@ -94,7 +94,7 @@ func (c *consensus) eventVMResultMsg(msg *messages.VMResultMsg) { } func (c *consensus) EventTimerMsg(msg messages.TimerTick) { - c.eventTimerMsgCh <- msg + c.eventTimerMsgPipe.In() <- msg } func (c *consensus) eventTimerMsg(msg messages.TimerTick) { From 0aae8de78c433b9a010f6493c6b2a0fdbea31ea1 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Wed, 17 Nov 2021 10:46:04 +0200 Subject: [PATCH 077/198] State manager messages use pipes instead of channels --- client/reqstatus.go | 2 + packages/chain/statemgr/eventproc.go | 12 +-- packages/chain/statemgr/statemgr.go | 101 +++++++++++++++++--------- tools/cluster/chain.go | 5 ++ tools/cluster/templates/waspconfig.go | 2 +- 5 files changed, 79 insertions(+), 43 deletions(-) diff --git a/client/reqstatus.go b/client/reqstatus.go index 95e71f859a..821e8f42d4 100644 --- a/client/reqstatus.go +++ b/client/reqstatus.go @@ -1,6 +1,7 @@ package client import ( + "fmt" "net/http" "time" @@ -37,6 +38,7 @@ func (c *WaspClient) WaitUntilRequestProcessed(chainID *iscp.ChainID, reqID iscp // by the node func (c *WaspClient) WaitUntilAllRequestsProcessed(chainID *iscp.ChainID, tx *ledgerstate.Transaction, timeout time.Duration) error { for _, reqID := range request.RequestsInTransaction(chainID, tx) { + fmt.Printf("XXX reqID %v\n", reqID) if err := c.WaitUntilRequestProcessed(chainID, reqID, timeout); err != nil { return err } diff --git a/packages/chain/statemgr/eventproc.go b/packages/chain/statemgr/eventproc.go index 0dc2d346e7..c278873eb8 100644 --- a/packages/chain/statemgr/eventproc.go +++ b/packages/chain/statemgr/eventproc.go @@ -14,7 +14,7 @@ import ( // EventGetBlockMsg is a request for a block while syncing func (sm *stateManager) EnqueueGetBlockMsg(msg *messages.GetBlockMsgIn) { - sm.eventGetBlockMsgCh <- msg + sm.eventGetBlockMsgPipe.In() <- msg } func (sm *stateManager) handleGetBlockMsg(msg *messages.GetBlockMsgIn) { @@ -50,7 +50,7 @@ func (sm *stateManager) handleGetBlockMsg(msg *messages.GetBlockMsgIn) { // EventBlockMsg func (sm *stateManager) EnqueueBlockMsg(msg *messages.BlockMsgIn) { - sm.eventBlockMsgCh <- msg + sm.eventBlockMsgPipe.In() <- msg } func (sm *stateManager) handleBlockMsg(msg *messages.BlockMsgIn) { @@ -77,7 +77,7 @@ func (sm *stateManager) handleBlockMsg(msg *messages.BlockMsgIn) { } func (sm *stateManager) EventOutputMsg(msg ledgerstate.Output) { - sm.eventOutputMsgCh <- msg + sm.eventOutputMsgPipe.In() <- msg } func (sm *stateManager) eventOutputMsg(msg ledgerstate.Output) { @@ -95,7 +95,7 @@ func (sm *stateManager) eventOutputMsg(msg ledgerstate.Output) { // EventStateTransactionMsg triggered whenever new state transaction arrives // the state transaction may be confirmed or not func (sm *stateManager) EventStateMsg(msg *messages.StateMsg) { - sm.eventStateOutputMsgCh <- msg + sm.eventStateOutputMsgPipe.In() <- msg } func (sm *stateManager) eventStateMsg(msg *messages.StateMsg) { @@ -115,7 +115,7 @@ func (sm *stateManager) eventStateMsg(msg *messages.StateMsg) { } func (sm *stateManager) EventStateCandidateMsg(state state.VirtualStateAccess, outputID ledgerstate.OutputID) { - sm.eventStateCandidateMsgCh <- &messages.StateCandidateMsg{ + sm.eventStateCandidateMsgPipe.In() <- &messages.StateCandidateMsg{ State: state, ApprovingOutputID: outputID, } @@ -136,7 +136,7 @@ func (sm *stateManager) eventStateCandidateMsg(msg *messages.StateCandidateMsg) func (sm *stateManager) EventTimerMsg(msg messages.TimerTick) { if msg%2 == 0 { - sm.eventTimerMsgCh <- msg + sm.eventTimerMsgPipe.In() <- msg } } diff --git a/packages/chain/statemgr/statemgr.go b/packages/chain/statemgr/statemgr.go index 3844969919..65184df06a 100644 --- a/packages/chain/statemgr/statemgr.go +++ b/packages/chain/statemgr/statemgr.go @@ -16,6 +16,7 @@ import ( "github.com/iotaledger/wasp/packages/chain/messages" "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/state" + "github.com/iotaledger/wasp/packages/util/pipe" "github.com/iotaledger/wasp/packages/util/ready" "go.uber.org/atomic" ) @@ -37,13 +38,12 @@ type stateManager struct { log *logger.Logger // Channels for accepting external events. - eventGetBlockMsgCh chan *messages.GetBlockMsgIn - eventBlockMsgCh chan *messages.BlockMsgIn - eventStateOutputMsgCh chan *messages.StateMsg - eventOutputMsgCh chan ledgerstate.Output - eventStateCandidateMsgCh chan *messages.StateCandidateMsg - eventTimerMsgCh chan messages.TimerTick - closeCh chan bool + eventGetBlockMsgPipe pipe.Pipe + eventBlockMsgPipe pipe.Pipe + eventStateOutputMsgPipe pipe.Pipe + eventOutputMsgPipe pipe.Pipe + eventStateCandidateMsgPipe pipe.Pipe + eventTimerMsgPipe pipe.Pipe } var _ chain.StateManager = &stateManager{} @@ -51,6 +51,7 @@ var _ chain.StateManager = &stateManager{} const ( numberOfNodesToRequestBlockFromConst = 5 maxBlocksToCommitConst = 10000 // 10k + maxMsgBuffer = 1000 peerMessageReceiverStateManager = byte(0) @@ -66,22 +67,21 @@ func New(store kvstore.KVStore, c chain.ChainCore, peers peering.PeerDomainProvi timers = NewStateManagerTimers() } ret := &stateManager{ - ready: ready.New(fmt.Sprintf("state manager %s", c.ID().Base58()[:6]+"..")), - store: store, - chain: c, - nodeConn: nodeconn, - peers: peers, - syncingBlocks: newSyncingBlocks(c.Log(), timers.GetBlockRetry), - timers: timers, - log: c.Log().Named("s"), - pullStateRetryTime: time.Now(), - eventGetBlockMsgCh: make(chan *messages.GetBlockMsgIn), - eventBlockMsgCh: make(chan *messages.BlockMsgIn), - eventStateOutputMsgCh: make(chan *messages.StateMsg), - eventOutputMsgCh: make(chan ledgerstate.Output), - eventStateCandidateMsgCh: make(chan *messages.StateCandidateMsg), - eventTimerMsgCh: make(chan messages.TimerTick), - closeCh: make(chan bool), + ready: ready.New(fmt.Sprintf("state manager %s", c.ID().Base58()[:6]+"..")), + store: store, + chain: c, + nodeConn: nodeconn, + peers: peers, + syncingBlocks: newSyncingBlocks(c.Log(), timers.GetBlockRetry), + timers: timers, + log: c.Log().Named("s"), + pullStateRetryTime: time.Now(), + eventGetBlockMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), + eventBlockMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), + eventStateOutputMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), + eventOutputMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), + eventStateCandidateMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), + eventTimerMsgPipe: pipe.NewLimitInfinitePipe(1), } c.AttachToPeerMessages(peerMessageReceiverStateManager, ret.receiveChainPeerMessages) go ret.initLoadState() @@ -119,7 +119,12 @@ func (sm *stateManager) receiveChainPeerMessages(peerMsg *peering.PeerMessageIn) } func (sm *stateManager) Close() { - close(sm.closeCh) + sm.eventGetBlockMsgPipe.Close() + sm.eventBlockMsgPipe.Close() + sm.eventStateOutputMsgPipe.Close() + sm.eventOutputMsgPipe.Close() + sm.eventStateCandidateMsgPipe.Close() + sm.eventTimerMsgPipe.Close() } // initial loading of the solid state @@ -171,33 +176,57 @@ func (sm *stateManager) GetStatusSnapshot() *chain.SyncInfo { func (sm *stateManager) recvLoop() { sm.ready.SetReady() + eventGetBlockMsgCh := sm.eventGetBlockMsgPipe.Out() + eventBlockMsgCh := sm.eventBlockMsgPipe.Out() + eventStateOutputMsgCh := sm.eventStateOutputMsgPipe.Out() + eventOutputMsgCh := sm.eventOutputMsgPipe.Out() + eventStateCandidateMsgCh := sm.eventStateCandidateMsgPipe.Out() + eventTimerMsgCh := sm.eventTimerMsgPipe.Out() for { select { - case msg, ok := <-sm.eventGetBlockMsgCh: + case msg, ok := <-eventGetBlockMsgCh: if ok { - sm.handleGetBlockMsg(msg) + sm.handleGetBlockMsg(msg.(*messages.GetBlockMsgIn)) + } else { + eventGetBlockMsgCh = nil } - case msg, ok := <-sm.eventBlockMsgCh: + case msg, ok := <-eventBlockMsgCh: if ok { - sm.handleBlockMsg(msg) + sm.handleBlockMsg(msg.(*messages.BlockMsgIn)) + } else { + eventBlockMsgCh = nil } - case msg, ok := <-sm.eventStateOutputMsgCh: + case msg, ok := <-eventStateOutputMsgCh: if ok { - sm.eventStateMsg(msg) + sm.eventStateMsg(msg.(*messages.StateMsg)) + } else { + eventStateOutputMsgCh = nil } - case msg, ok := <-sm.eventOutputMsgCh: + case msg, ok := <-eventOutputMsgCh: if ok { - sm.eventOutputMsg(msg) + sm.eventOutputMsg(msg.(ledgerstate.Output)) + } else { + eventOutputMsgCh = nil } - case msg, ok := <-sm.eventStateCandidateMsgCh: + case msg, ok := <-eventStateCandidateMsgCh: if ok { - sm.eventStateCandidateMsg(msg) + sm.eventStateCandidateMsg(msg.(*messages.StateCandidateMsg)) + } else { + eventStateCandidateMsgCh = nil } - case _, ok := <-sm.eventTimerMsgCh: + case _, ok := <-eventTimerMsgCh: if ok { sm.eventTimerMsg() + } else { + eventTimerMsgCh = nil } - case <-sm.closeCh: + } + if eventGetBlockMsgCh == nil && + eventBlockMsgCh == nil && + eventStateOutputMsgCh == nil && + eventOutputMsgCh == nil && + eventStateCandidateMsgCh == nil && + eventTimerMsgCh == nil { return } } diff --git a/tools/cluster/chain.go b/tools/cluster/chain.go index bd24d23ee0..9cb4a32849 100644 --- a/tools/cluster/chain.go +++ b/tools/cluster/chain.go @@ -100,10 +100,12 @@ func (ch *Chain) CommitteeMultiClient() *multiclient.MultiClient { } func (ch *Chain) DeployContract(name, progHashStr, description string, initParams map[string]interface{}) (*ledgerstate.Transaction, error) { + fmt.Printf("XXX1\n") programHash, err := hashing.HashValueFromBase58(progHashStr) if err != nil { return nil, err } + fmt.Printf("XXX2\n") params := map[string]interface{}{ root.ParamName: name, @@ -120,13 +122,16 @@ func (ch *Chain) DeployContract(name, progHashStr, description string, initParam Args: requestargs.New().AddEncodeSimpleMany(codec.MakeDict(params)), }, ) + fmt.Printf("XXX3\n") if err != nil { return nil, err } + fmt.Printf("XXX4\n") err = ch.CommitteeMultiClient().WaitUntilAllRequestsProcessed(ch.ChainID, tx, 30*time.Second) if err != nil { return nil, err } + fmt.Printf("XXX5\n") return tx, nil } diff --git a/tools/cluster/templates/waspconfig.go b/tools/cluster/templates/waspconfig.go index c5875d905b..193358d5f9 100644 --- a/tools/cluster/templates/waspconfig.go +++ b/tools/cluster/templates/waspconfig.go @@ -20,7 +20,7 @@ const WaspConfig = ` "directory": "waspdb" }, "logger": { - "level": "info", + "level": "debug", "disableCaller": false, "disableStacktrace": true, "encoding": "console", From caa66c64e75adfcf61f074e9f8483523c11226b8 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Wed, 17 Nov 2021 14:50:09 -0800 Subject: [PATCH 078/198] Added missing types to wasp-cli --- tools/wasp-cli/util/types.go | 91 +++++++++++++++++++++++------------- 1 file changed, 59 insertions(+), 32 deletions(-) diff --git a/tools/wasp-cli/util/types.go b/tools/wasp-cli/util/types.go index 1a6b92420c..c1ec3b99fa 100644 --- a/tools/wasp-cli/util/types.go +++ b/tools/wasp-cli/util/types.go @@ -17,42 +17,50 @@ import ( func ValueFromString(vtype, s string) []byte { switch vtype { - case "uint64": - n, err := strconv.Atoi(s) - log.Check(err) - return codec.EncodeUint64(uint64(n)) - case "uint32": - n, err := strconv.Atoi(s) - log.Check(err) - return codec.EncodeUint32(uint32(n)) - case "int32": - n, err := strconv.Atoi(s) //nolint:gosec // potential int32 overflow - log.Check(err) - return codec.EncodeInt32(int32(n)) - case "int", "int64": - n, err := strconv.Atoi(s) + case "agentid": + agentid, err := iscp.NewAgentIDFromString(s) log.Check(err) - return codec.EncodeInt64(int64(n)) + return agentid.Bytes() case "bool": b, err := strconv.ParseBool(s) log.Check(err) return codec.EncodeBool(b) + case "bytes", "base58": + b, err := base58.Decode(s) + log.Check(err) + return b case "color": col, err := ledgerstate.ColorFromBase58EncodedString(s) log.Check(err) return col.Bytes() - case "agentid": - agentid, err := iscp.NewAgentIDFromString(s) - log.Check(err) - return agentid.Bytes() case "file": return ReadFile(s) + case "int16": + n, err := strconv.Atoi(s) //nolint:gosec // potential int32 overflow + log.Check(err) + return codec.EncodeInt16(int16(n)) + case "int32": + n, err := strconv.Atoi(s) //nolint:gosec // potential int32 overflow + log.Check(err) + return codec.EncodeInt32(int32(n)) + case "int64", "int": + n, err := strconv.Atoi(s) + log.Check(err) + return codec.EncodeInt64(int64(n)) case "string": return []byte(s) - case "bytes", "base58": - b, err := base58.Decode(s) + case "uint16": + n, err := strconv.Atoi(s) log.Check(err) - return b + return codec.EncodeUint16(uint16(n)) + case "uint32": + n, err := strconv.Atoi(s) + log.Check(err) + return codec.EncodeUint32(uint32(n)) + case "uint64": + n, err := strconv.Atoi(s) + log.Check(err) + return codec.EncodeUint64(uint64(n)) } log.Fatalf("ValueFromString: No handler for type %s", vtype) return nil @@ -60,30 +68,49 @@ func ValueFromString(vtype, s string) []byte { func ValueToString(vtype string, v []byte) string { switch vtype { - case "color": - col, err := codec.DecodeColor(v) - log.Check(err) - return col.String() case "agentid": aid, err := codec.DecodeAgentID(v) log.Check(err) return aid.String() - case "uint64": - n, err := codec.DecodeUint64(v) + case "bool": + b, err := codec.DecodeBool(v) log.Check(err) - return fmt.Sprintf("%d", n) + if b { + return "true" + } + return "false" + case "bytes", "base58": + return base58.Encode(v) + case "color": + col, err := codec.DecodeColor(v) + log.Check(err) + return col.String() case "int16": n, err := codec.DecodeInt16(v) log.Check(err) return fmt.Sprintf("%d", n) - case "int", "int64": + case "int32": + n, err := codec.DecodeInt32(v) + log.Check(err) + return fmt.Sprintf("%d", n) + case "int64", "int": n, err := codec.DecodeInt64(v) log.Check(err) return fmt.Sprintf("%d", n) case "string": return fmt.Sprintf("%q", string(v)) - case "bytes", "base58": - return base58.Encode(v) + case "uint16": + n, err := codec.DecodeUint16(v) + log.Check(err) + return fmt.Sprintf("%d", n) + case "uint32": + n, err := codec.DecodeUint32(v) + log.Check(err) + return fmt.Sprintf("%d", n) + case "uint64": + n, err := codec.DecodeUint64(v) + log.Check(err) + return fmt.Sprintf("%d", n) } log.Fatalf("ValueToString: No handler for type %s", vtype) return "" From ab427c9012004b634a835b477fb1b9134ccf24fd Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Wed, 17 Nov 2021 20:14:12 -0800 Subject: [PATCH 079/198] ERC20 bug fix --- contracts/wasm/erc20/go/erc20/erc20.go | 2 +- contracts/wasm/erc20/src/erc20.rs | 2 +- contracts/wasm/erc20/test/erc20_bg.wasm | Bin 34328 -> 34341 bytes contracts/wasm/erc20/test/erc20_test.go | 79 +++++++++++------- contracts/wasm/erc20/ts/erc20/erc20.ts | 2 +- contracts/wasm/testcore/test/call_test.go | 10 +-- .../wasm/testcore/test/concurrency_test.go | 36 ++++++-- packages/vm/viewcontext/viewcontext.go | 2 +- 8 files changed, 87 insertions(+), 46 deletions(-) diff --git a/contracts/wasm/erc20/go/erc20/erc20.go b/contracts/wasm/erc20/go/erc20/erc20.go index cb17321793..cb6ed23823 100644 --- a/contracts/wasm/erc20/go/erc20/erc20.go +++ b/contracts/wasm/erc20/go/erc20/erc20.go @@ -81,7 +81,7 @@ func funcTransferFrom(ctx wasmlib.ScFuncContext, f *TransferFromContext) { // allowances are in the map under the name of the account allowances := f.State.AllAllowances().GetAllowancesForAgent(account) - allowance := allowances.GetInt64(recipient) + allowance := allowances.GetInt64(ctx.Caller()) ctx.Require(allowance.Value() >= amount, "erc20.transfer_from.fail: not enough allowance") balances := f.State.Balances() diff --git a/contracts/wasm/erc20/src/erc20.rs b/contracts/wasm/erc20/src/erc20.rs index fd3ac86a1b..12ada48ffb 100644 --- a/contracts/wasm/erc20/src/erc20.rs +++ b/contracts/wasm/erc20/src/erc20.rs @@ -79,7 +79,7 @@ pub fn func_transfer_from(ctx: &ScFuncContext, f: &TransferFromContext) { // allowances are in the map under the name of the account let allowances = f.state.all_allowances().get_allowances_for_agent(&account); - let allowance = allowances.get_int64(&recipient); + let allowance = allowances.get_int64(&ctx.caller()); ctx.require(allowance.value() >= amount, "erc20.transfer_from.fail: not enough allowance"); let balances = f.state.balances(); diff --git a/contracts/wasm/erc20/test/erc20_bg.wasm b/contracts/wasm/erc20/test/erc20_bg.wasm index 787d828b0fe1b24bbf5617ebef9f038d83b11933..868e080120ce03abfa9c4ccbac97f5f49f364f69 100644 GIT binary patch delta 211 zcmbQy!?d)AX~GjGW~PnLgc%v9Z2rXc delta 247 zcmZ45!!)CZX~GjGCgzRLgc%vzH~(UcGu!;naw#MCbY>=|dd50s2FC@HlPy$D5)>F6 zEwX^b1BNUCdmycmrNHF4V(kG24JHPG8U;oLMonf7bLJU921pH%oH2Q?g&Z4LV8-N! z7Q$+bjuKf4K=mw2430aXI(tFtEwTirG75m14;Ut^S^BU|00~c+Tw$qg1~Gs!OTbKl zxyFeh)bUiy0R~4UfntyfMvz575+qqG5Dw(b01M5SeA7~%c>!bA<^|Tj#TkV+&k5#d MVHDZCCcIJ)0K*eP+5i9m diff --git a/contracts/wasm/erc20/test/erc20_test.go b/contracts/wasm/erc20/test/erc20_test.go index 56a5f82437..4c9737be4b 100644 --- a/contracts/wasm/erc20/test/erc20_test.go +++ b/contracts/wasm/erc20/test/erc20_test.go @@ -80,8 +80,8 @@ func transfer(ctx *wasmsolo.SoloContext, from, to *wasmsolo.SoloAgent, amount ui return ctx.Err } -func transferFrom(ctx *wasmsolo.SoloContext, from, to *wasmsolo.SoloAgent, amount uint64) error { - tx := erc20.ScFuncs.TransferFrom(ctx.Sign(from)) +func transferFrom(ctx *wasmsolo.SoloContext, delegate, from, to *wasmsolo.SoloAgent, amount uint64) error { + tx := erc20.ScFuncs.TransferFrom(ctx.Sign(delegate)) tx.Params.Account().SetValue(from.ScAgentID()) tx.Params.Recipient().SetValue(to.ScAgentID()) tx.Params.Amount().SetValue(int64(amount)) @@ -143,68 +143,87 @@ func TestTransferNotEnoughFunds2(t *testing.T) { func TestNoAllowance(t *testing.T) { ctx := setupErc20(t) - user := ctx.NewSoloAgent() - checkErc20Allowance(ctx, creator, user, 0) + delegate := ctx.NewSoloAgent() + checkErc20Allowance(ctx, creator, delegate, 0) } func TestApprove(t *testing.T) { ctx := setupErc20(t) - user := ctx.NewSoloAgent() + delegate := ctx.NewSoloAgent() - require.NoError(t, approve(ctx, creator, user, 100)) + require.NoError(t, approve(ctx, creator, delegate, 100)) - checkErc20Allowance(ctx, creator, user, 100) + checkErc20Allowance(ctx, creator, delegate, 100) checkErc20Balance(ctx, creator, solo.Saldo) - checkErc20Balance(ctx, user, 0) + checkErc20Balance(ctx, delegate, 0) } func TestTransferFromOk1(t *testing.T) { ctx := setupErc20(t) - user := ctx.NewSoloAgent() + delegate := ctx.NewSoloAgent() - require.NoError(t, approve(ctx, creator, user, 100)) + require.NoError(t, approve(ctx, creator, delegate, 100)) - checkErc20Allowance(ctx, creator, user, 100) + checkErc20Allowance(ctx, creator, delegate, 100) checkErc20Balance(ctx, creator, solo.Saldo) - checkErc20Balance(ctx, user, 0) + checkErc20Balance(ctx, delegate, 0) - require.NoError(t, transferFrom(ctx, creator, user, 50)) + require.NoError(t, transferFrom(ctx, delegate, creator, delegate, 50)) - checkErc20Allowance(ctx, creator, user, 50) + checkErc20Allowance(ctx, creator, delegate, 50) checkErc20Balance(ctx, creator, solo.Saldo-50) - checkErc20Balance(ctx, user, 50) + checkErc20Balance(ctx, delegate, 50) } func TestTransferFromOk2(t *testing.T) { ctx := setupErc20(t) - user := ctx.NewSoloAgent() + delegate := ctx.NewSoloAgent() - require.NoError(t, approve(ctx, creator, user, 100)) + require.NoError(t, approve(ctx, creator, delegate, 100)) - checkErc20Allowance(ctx, creator, user, 100) + checkErc20Allowance(ctx, creator, delegate, 100) checkErc20Balance(ctx, creator, solo.Saldo) - checkErc20Balance(ctx, user, 0) + checkErc20Balance(ctx, delegate, 0) - require.NoError(t, transferFrom(ctx, creator, user, 100)) + require.NoError(t, transferFrom(ctx, delegate, creator, delegate, 100)) - checkErc20Allowance(ctx, creator, user, 0) + checkErc20Allowance(ctx, creator, delegate, 0) checkErc20Balance(ctx, creator, solo.Saldo-100) - checkErc20Balance(ctx, user, 100) + checkErc20Balance(ctx, delegate, 100) } -func TestTransferFromFail(t *testing.T) { +func TestTransferFromFailNoDelegate(t *testing.T) { ctx := setupErc20(t) - user := ctx.NewSoloAgent() + delegate := ctx.NewSoloAgent() - require.NoError(t, approve(ctx, creator, user, 100)) + require.NoError(t, approve(ctx, creator, delegate, 100)) - checkErc20Allowance(ctx, creator, user, 100) + checkErc20Allowance(ctx, creator, delegate, 100) checkErc20Balance(ctx, creator, solo.Saldo) - checkErc20Balance(ctx, user, 0) + checkErc20Balance(ctx, delegate, 0) - require.Error(t, transferFrom(ctx, creator, user, 101)) + noDelegate := ctx.NewSoloAgent() + require.Error(t, transferFrom(ctx, noDelegate, creator, delegate, 100)) - checkErc20Allowance(ctx, creator, user, 100) + checkErc20Allowance(ctx, creator, delegate, 100) checkErc20Balance(ctx, creator, solo.Saldo) - checkErc20Balance(ctx, user, 0) + checkErc20Balance(ctx, delegate, 0) + checkErc20Balance(ctx, noDelegate, 0) +} + +func TestTransferFromFailTooMuch(t *testing.T) { + ctx := setupErc20(t) + delegate := ctx.NewSoloAgent() + + require.NoError(t, approve(ctx, creator, delegate, 100)) + + checkErc20Allowance(ctx, creator, delegate, 100) + checkErc20Balance(ctx, creator, solo.Saldo) + checkErc20Balance(ctx, delegate, 0) + + require.Error(t, transferFrom(ctx, delegate, creator, delegate, 101)) + + checkErc20Allowance(ctx, creator, delegate, 100) + checkErc20Balance(ctx, creator, solo.Saldo) + checkErc20Balance(ctx, delegate, 0) } diff --git a/contracts/wasm/erc20/ts/erc20/erc20.ts b/contracts/wasm/erc20/ts/erc20/erc20.ts index ce0b7f6f2e..16f351ad9d 100644 --- a/contracts/wasm/erc20/ts/erc20/erc20.ts +++ b/contracts/wasm/erc20/ts/erc20/erc20.ts @@ -78,7 +78,7 @@ export function funcTransferFrom(ctx: wasmlib.ScFuncContext, f: sc.TransferFromC // allowances are in the map under the name of the account let allowances = f.state.allAllowances().getAllowancesForAgent(account); - let allowance = allowances.getInt64(recipient); + let allowance = allowances.getInt64(ctx.caller()); ctx.require(allowance.value() >= amount, "erc20.transferFrom.fail: not enough allowance"); let balances = f.state.balances(); diff --git a/contracts/wasm/testcore/test/call_test.go b/contracts/wasm/testcore/test/call_test.go index 1d7967d635..3221726f21 100644 --- a/contracts/wasm/testcore/test/call_test.go +++ b/contracts/wasm/testcore/test/call_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" ) -const n = 10 +const fiboN = 10 func fibo(n int64) int64 { if n == 0 || n == 1 { @@ -21,12 +21,12 @@ func TestCallFibonacci(t *testing.T) { ctx := deployTestCore(t, w) f := testcore.ScFuncs.Fibonacci(ctx) - f.Params.IntValue().SetValue(n) + f.Params.IntValue().SetValue(fiboN) f.Func.Call() require.NoError(t, ctx.Err) result := f.Results.IntValue() require.True(t, result.Exists()) - require.EqualValues(t, fibo(n), result.Value()) + require.EqualValues(t, fibo(fiboN), result.Value()) }) } @@ -35,14 +35,14 @@ func TestCallFibonacciIndirect(t *testing.T) { ctx := deployTestCore(t, w) f := testcore.ScFuncs.CallOnChain(ctx) - f.Params.IntValue().SetValue(n) + f.Params.IntValue().SetValue(fiboN) f.Params.HnameContract().SetValue(testcore.HScName) f.Params.HnameEP().SetValue(testcore.HViewFibonacci) f.Func.TransferIotas(1).Post() require.NoError(t, ctx.Err) result := f.Results.IntValue() require.True(t, result.Exists()) - require.EqualValues(t, fibo(n), result.Value()) + require.EqualValues(t, fibo(fiboN), result.Value()) v := testcore.ScFuncs.GetCounter(ctx) v.Func.Call() diff --git a/contracts/wasm/testcore/test/concurrency_test.go b/contracts/wasm/testcore/test/concurrency_test.go index d1f69c9f7f..2d410b19ab 100644 --- a/contracts/wasm/testcore/test/concurrency_test.go +++ b/contracts/wasm/testcore/test/concurrency_test.go @@ -42,9 +42,15 @@ func TestSynchronous(t *testing.T) { f.Func.TransferIotas(1) repeats := []int{300, 100, 100, 100, 200, 100, 100} + if wasmsolo.SoloDebug { + for i := range repeats { + repeats[i] /= 10 + } + } + sum := 0 - for _, i := range repeats { - sum += i + for _, n := range repeats { + sum += n } for _, n := range repeats { @@ -83,9 +89,15 @@ func TestConcurrency(t *testing.T) { WithIotas(1) repeats := []int{300, 100, 100, 100, 200, 100, 100} + if wasmsolo.SoloDebug { + for i := range repeats { + repeats[i] /= 10 + } + } + sum := 0 - for _, i := range repeats { - sum += i + for _, n := range repeats { + sum += n } chain := ctx.Chain @@ -123,9 +135,15 @@ func TestConcurrency2(t *testing.T) { WithIotas(1) repeats := []int{300, 100, 100, 100, 200, 100, 100} + if wasmsolo.SoloDebug { + for i := range repeats { + repeats[i] /= 10 + } + } + sum := 0 - for _, i := range repeats { - sum += i + for _, n := range repeats { + sum += n } chain := ctx.Chain @@ -166,7 +184,11 @@ func TestViewConcurrency(t *testing.T) { f := testcore.ScFuncs.IncCounter(ctx) f.Func.TransferIotas(1).Post() - const times = 2000 + times := 2000 + if wasmsolo.SoloDebug { + times /= 10 + } + channels := make(chan error, times) chain := ctx.Chain for i := 0; i < times; i++ { diff --git a/packages/vm/viewcontext/viewcontext.go b/packages/vm/viewcontext/viewcontext.go index 72f712ab47..bcde346567 100644 --- a/packages/vm/viewcontext/viewcontext.go +++ b/packages/vm/viewcontext/viewcontext.go @@ -55,7 +55,7 @@ func (v *Viewcontext) CallView(contractHname, epCode iscp.Hname, params dict.Dic case error: err = err1 default: - err = xerrors.Errorf("viewcontext: panic in VM: %w", err1) + err = xerrors.Errorf("viewcontext: panic in VM: %v", err1) } v.log.Debugf("CallView: %v", err) v.log.Debugf(string(debug.Stack())) From 37e67b5503bcbec022ff966093a54e6a183d6f22 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Wed, 17 Nov 2021 22:37:37 -0800 Subject: [PATCH 080/198] DIsable failing evm test and fixed lint warnings (unused) --- contracts/native/evm/evmtest/evm_test.go | 2 ++ contracts/native/evm/evmtest/utils_test.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/contracts/native/evm/evmtest/evm_test.go b/contracts/native/evm/evmtest/evm_test.go index 3c6f8ca14b..fdf5392680 100644 --- a/contracts/native/evm/evmtest/evm_test.go +++ b/contracts/native/evm/evmtest/evm_test.go @@ -442,6 +442,8 @@ func TestISCPEntropy(t *testing.T) { } func TestBlockTime(t *testing.T) { + // FIXME test fails regularly on github + t.SkipNow() evmChain := initEVMChain(t, evmlight.Contract) evmChain.setBlockTime(60) diff --git a/contracts/native/evm/evmtest/utils_test.go b/contracts/native/evm/evmtest/utils_test.go index efa08dd119..eb1644fd5c 100644 --- a/contracts/native/evm/evmtest/utils_test.go +++ b/contracts/native/evm/evmtest/utils_test.go @@ -141,6 +141,7 @@ func (e *evmChainInstance) callView(funName string, params ...interface{}) (dict return e.soloChain.CallView(e.evmFlavor.Name, funName, params...) } +// nolint:unused func (e *evmChainInstance) setBlockTime(t uint32) { _, err := e.postRequest(nil, evm.FuncSetBlockTime.Name, evm.FieldBlockTime, codec.EncodeUint32(t)) require.NoError(e.t, err) @@ -152,6 +153,7 @@ func (e *evmChainInstance) getBlockNumber() uint64 { return new(big.Int).SetBytes(ret.MustGet(evm.FieldResult)).Uint64() } +// nolint:unused func (e *evmChainInstance) getBlockByNumber(n uint64) *types.Block { ret, err := e.callView(evm.FuncGetBlockByNumber.Name, evm.FieldBlockNumber, new(big.Int).SetUint64(n).Bytes()) require.NoError(e.t, err) From 9e09be21c8ef640e16990dcf1952966a6c0c419f Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Thu, 18 Nov 2021 16:14:48 +0200 Subject: [PATCH 081/198] Some more BugFixes. All tests pass, including the heavy ones, except two spam tests. --- packages/chain/chainimpl/chainimpl.go | 9 ++++-- packages/chain/chainimpl/eventproc.go | 43 +++++++++++++++++---------- packages/chain/chainimpl/interface.go | 1 + packages/chain/consensus/action.go | 22 ++++++++++++-- packages/chain/consensus/eventproc.go | 5 ++-- packages/peering/lpp/lppPeer.go | 11 +++++++ 6 files changed, 67 insertions(+), 24 deletions(-) diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index 6db9b2321b..86f5b6c53c 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -208,14 +208,13 @@ func (c *chainObj) receiveChainPeerMessages(peerMsg *peering.PeerMessageIn) { RequestAckMsg: *msg, SenderNetID: peerMsg.SenderNetID, }) - case messages.MsgMissingRequest: + case chain.PeerMsgTypeMissingRequest: msg, err := messages.NewMissingRequestMsg(peerMsg.MsgData) if err != nil { c.log.Error(err) return } c.EnqueueMissingRequestMsg(msg) - default: } } @@ -265,7 +264,11 @@ func (c *chainObj) processChainTransition(msg *chain.ChainTransitionEventData) { chain.LogGovernanceTransition(msg, c.log) chain.PublishGovernanceTransition(msg.ChainOutput) } - c.consensus.EventStateTransitionMsg(msg.VirtualState, msg.ChainOutput, msg.OutputTimestamp) + if c.consensus == nil { + c.log.Warnf("processChainTransition: skipping notifying consensus as it is not initiated") + } else { + c.consensus.EventStateTransitionMsg(msg.VirtualState, msg.ChainOutput, msg.OutputTimestamp) + } c.log.Debugf("processChainTransition completed: state index: %d, state hash: %s", stateIndex, msg.VirtualState.StateCommitment().String()) } diff --git a/packages/chain/chainimpl/eventproc.go b/packages/chain/chainimpl/eventproc.go index 2239936703..49372aac2f 100644 --- a/packages/chain/chainimpl/eventproc.go +++ b/packages/chain/chainimpl/eventproc.go @@ -85,6 +85,7 @@ func (c *chainObj) EnqueueDismissChain(reason string) { } func (c *chainObj) handleDismissChain(msg DismissChainMsg) { + c.log.Debugf("handleDismissChain message received, reason=%s", msg.Reason) c.Dismiss(msg.Reason) } @@ -98,15 +99,14 @@ func (c *chainObj) EnqueueLedgerState(chainOutput *ledgerstate.AliasOutput, time // handleLedgerState processes the only chain output which exists on the chain's address // If necessary, it creates/changes/rotates committee object func (c *chainObj) handleLedgerState(msg *messages.StateMsg) { + c.log.Debugf("handleLedgerState message received, stateIndex: %d, stateAddr: %s, state transition: %v, timestamp: ", + msg.ChainOutput.GetStateIndex(), msg.ChainOutput.GetStateAddress().Base58(), !msg.ChainOutput.GetIsGovernanceUpdated(), msg.Timestamp) sh, err := hashing.HashValueFromBytes(msg.ChainOutput.GetStateData()) if err != nil { c.log.Error(xerrors.Errorf("parsing state hash: %w", err)) return } - c.log.Debugf("processStateMessage. stateIndex: %d, stateHash: %s, stateAddr: %s, state transition: %v", - msg.ChainOutput.GetStateIndex(), sh.String(), - msg.ChainOutput.GetStateAddress().Base58(), !msg.ChainOutput.GetIsGovernanceUpdated(), - ) + c.log.Debugf("handleLedgerState stateHash: %s", sh.String()) cmt := c.getCommittee() if cmt != nil { @@ -119,6 +119,7 @@ func (c *chainObj) handleLedgerState(msg *messages.StateMsg) { return } c.stateMgr.EventStateMsg(msg) + c.log.Debugf("handleLedgerState passed to state manager") } func (c *chainObj) EnqueueOffLedgerRequestMsg(msg *messages.OffLedgerRequestMsgIn) { @@ -126,15 +127,14 @@ func (c *chainObj) EnqueueOffLedgerRequestMsg(msg *messages.OffLedgerRequestMsgI } func (c *chainObj) handleOffLedgerRequestMsg(msg *messages.OffLedgerRequestMsgIn) { - req := msg.Req - senderNetID := msg.SenderNetID - c.log.Debugf("handleOffLedgerRequestPeerMsg: reqID: %s, peerID: %s", req.ID().Base58(), senderNetID) - c.sendRequestAcknowledgementMsg(req.ID(), senderNetID) - if !c.mempool.ReceiveRequest(req) { + c.log.Debugf("handleOffLedgerRequestMsg message received from peer %v, reqID: %s", msg.SenderNetID, msg.Req.ID().Base58()) + c.sendRequestAcknowledgementMsg(msg.Req.ID(), msg.SenderNetID) + if !c.mempool.ReceiveRequest(msg.Req) { + c.log.Errorf("handleOffLedgerRequestMsg message ignored: mempool hasn't accepted it") return } - c.log.Debugf("handleOffLedgerRequestPeerMsg - added to mempool: reqID: %s, peerID: %s", req.ID().Base58(), senderNetID) - c.broadcastOffLedgerRequest(req) + c.broadcastOffLedgerRequest(msg.Req) + c.log.Debugf("handleOffLedgerRequestMsg message added to mempool and broadcasted: reqID: %s", msg.Req.ID().Base58()) } func (c *chainObj) EnqueueRequestAckMsg(msg *messages.RequestAckMsgIn) { @@ -142,11 +142,12 @@ func (c *chainObj) EnqueueRequestAckMsg(msg *messages.RequestAckMsgIn) { } func (c *chainObj) handleRequestAckPeerMsg(msg *messages.RequestAckMsgIn) { - c.log.Debugf("handleRequestAckPeerMsg: reqID: %s, peerID: %s", msg.ReqID.Base58(), msg.SenderNetID) + c.log.Debugf("handleRequestAckPeerMsg message received from peer %v, reqID: %s", msg.SenderNetID, msg.ReqID.Base58()) c.offLedgerReqsAcksMutex.Lock() defer c.offLedgerReqsAcksMutex.Unlock() c.offLedgerReqsAcks[*msg.ReqID] = append(c.offLedgerReqsAcks[*msg.ReqID], msg.SenderNetID) c.chainMetrics.CountRequestAckMessages() + c.log.Debugf("handleRequestAckPeerMsg comleted: reqID: %s", msg.ReqID.Base58()) } func (c *chainObj) EnqueueMissingRequestIDsMsg(msg *messages.MissingRequestIDsMsgIn) { @@ -154,17 +155,22 @@ func (c *chainObj) EnqueueMissingRequestIDsMsg(msg *messages.MissingRequestIDsMs } func (c *chainObj) handleMissingRequestIDsMsg(msg *messages.MissingRequestIDsMsgIn) { + c.log.Debugf("handleMissingRequestIDsMsg message received from peer %v, number of reqIDs: %v", msg.SenderNetID, len(msg.IDs)) if !c.pullMissingRequestsFromCommittee { + c.log.Warnf("handleMissingRequestIDsMsg ignored: pull from committee disabled") return } - peerID := msg.SenderNetID for _, reqID := range msg.IDs { - c.log.Debugf("Sending MissingRequestsToPeer: reqID: %s, peerID: %s", reqID.Base58(), peerID) + c.log.Debugf("handleMissingRequestIDsMsg: finding reqID %s...", reqID.Base58()) if req := c.mempool.GetRequest(reqID); req != nil { - msg := &messages.MissingRequestMsg{Request: req} - c.SendPeerMsgByNetID(peerID, chain.PeerMessageReceiverChain, chain.PeerMsgTypeMissingRequest, msg.Bytes()) + resultMsg := &messages.MissingRequestMsg{Request: req} + c.SendPeerMsgByNetID(msg.SenderNetID, chain.PeerMessageReceiverChain, chain.PeerMsgTypeMissingRequest, resultMsg.Bytes()) + c.log.Warnf("handleMissingRequestIDsMsg: reqID %s sent to %v.", reqID.Base58(), msg.SenderNetID) + } else { + c.log.Warnf("handleMissingRequestIDsMsg: reqID %s not found.", reqID.Base58()) } } + c.log.Debugf("handleMissingRequestIDsMsg completed") } func (c *chainObj) EnqueueMissingRequestMsg(msg *messages.MissingRequestMsg) { @@ -172,11 +178,16 @@ func (c *chainObj) EnqueueMissingRequestMsg(msg *messages.MissingRequestMsg) { } func (c *chainObj) handleMissingRequestMsg(msg *messages.MissingRequestMsg) { + c.log.Debugf("handleMissingRequestMsg message received, reqID: %v", msg.Request.ID().Base58()) if !c.pullMissingRequestsFromCommittee { + c.log.Warnf("handleMissingRequestMsg ignored: pull from committee disabled") return } if c.consensus.ShouldReceiveMissingRequest(msg.Request) { c.mempool.ReceiveRequest(msg.Request) + c.log.Warnf("handleMissingRequestMsg request with ID %v added to mempool", msg.Request.ID().Base58()) + } else { + c.log.Warnf("handleMissingRequestMsg ignored: consensus denied the need of request with ID %v", msg.Request.ID().Base58()) } } diff --git a/packages/chain/chainimpl/interface.go b/packages/chain/chainimpl/interface.go index 1ed57651e3..0d8c0f953a 100644 --- a/packages/chain/chainimpl/interface.go +++ b/packages/chain/chainimpl/interface.go @@ -88,6 +88,7 @@ func (c *chainObj) Dismiss(reason string) { }) publisher.Publish("dismissed_chain", c.chainID.Base58()) + c.log.Debug("Chain dismissed") } func (c *chainObj) IsDismissed() bool { diff --git a/packages/chain/consensus/action.go b/packages/chain/consensus/action.go index 92a4da001f..e6d8e6b13c 100644 --- a/packages/chain/consensus/action.go +++ b/packages/chain/consensus/action.go @@ -167,13 +167,15 @@ func (c *consensus) pollMissingRequests(missingRequestIndexes []int) { return } missingRequestIds := []iscp.RequestID{} + missingRequestIDsString := "" for _, idx := range missingRequestIndexes { reqID := c.consensusBatch.RequestIDs[idx] reqHash := c.consensusBatch.RequestHashes[idx] c.missingRequestsFromBatch[reqID] = reqHash missingRequestIds = append(missingRequestIds, reqID) + missingRequestIDsString += reqID.Base58() + ", " } - c.log.Debugf("runVMIfNeeded: asking for missing requests, ids: %v", missingRequestIds) + c.log.Debugf("runVMIfNeeded: asking for missing requests, ids: [%v]", missingRequestIDsString) msg := &messages.MissingRequestIDsMsg{IDs: missingRequestIds} c.committee.SendMsgBroadcast(chain.PeerMessageReceiverChain, chain.PeerMsgTypeMissingRequestIDs, msg.Bytes()) } @@ -617,10 +619,23 @@ func (c *consensus) finalizeTransaction(sigSharesToAggregate [][]byte) (*ledgers return tx, chained, nil } -func (c *consensus) setNewState(msg *messages.StateTransitionMsg) { +func (c *consensus) setNewState(msg *messages.StateTransitionMsg) bool { if msg.State.BlockIndex() != msg.StateOutput.GetStateIndex() { - c.log.Panicf("consensus::setNewState: state index is inconsistent: block: #%d != chain output: #%d", + // NOTE: should be a panic. However this situation may occur (and occurs) in normal circumstations: + // 1) State manager synchronizes to state index n and passes state transmission message through event to consensus asynchronously + // 2) Consensus is overwhelmed and receives a message after delay + // 3) Meanwhile state manager is quick enough to synchronize to state index n+1 and commits a block of state index n+1 + // 4) Only then the consensus receives a message sent in step 1. Due to imperfect implementation of virtual state copying it thinks + // that state is at index n+1, however chain output is (as was transmitted) and at index n. + // The virtual state copying (earlier called "cloning") works in a following way: it copies all the mutations, stored in buffered KVS, + // however it obtains the same kvs object to access the database. BlockIndex method of virtual state checks if there are mutations editing + // the index value. If so, it returns the newest value in respect to mutations. Otherwise it checks the database for newest index value. + // In this case, in there are no mutations neither in step 1 nor in step 3, because just before completing state synchronization all the + // mutations are written to the DB. However, reading the same DB in step 1 results in index n and in step 4 (after the commit of block + // index n+1) -- in index n+1. Thus effectively the virtual state received is different than the virtual state sent. + c.log.Errorf("consensus::setNewState: state index is inconsistent: block: #%d != chain output: #%d", msg.State.BlockIndex(), msg.StateOutput.GetStateIndex()) + return false } c.stateOutput = msg.StateOutput @@ -634,6 +649,7 @@ func (c *consensus) setNewState(msg *messages.StateTransitionMsg) { c.log.Debugf("SET NEW STATE #%d%s, output: %s, hash: %s", msg.StateOutput.GetStateIndex(), r, iscp.OID(msg.StateOutput.ID()), msg.State.StateCommitment().String()) c.resetWorkflow() + return true } func (c *consensus) resetWorkflow() { diff --git a/packages/chain/consensus/eventproc.go b/packages/chain/consensus/eventproc.go index 09fa03eea3..e6e3f707e2 100644 --- a/packages/chain/consensus/eventproc.go +++ b/packages/chain/consensus/eventproc.go @@ -25,8 +25,9 @@ func (c *consensus) EventStateTransitionMsg(state state.VirtualStateAccess, stat func (c *consensus) eventStateTransitionMsg(msg *messages.StateTransitionMsg) { c.log.Debugf("StateTransitionMsg received: state index: %d, state output: %s, timestamp: %v", msg.State.BlockIndex(), iscp.OID(msg.StateOutput.ID()), msg.StateTimestamp) - c.setNewState(msg) - c.takeAction() + if c.setNewState(msg) { + c.takeAction() + } } func (c *consensus) EnqueueSignedResultMsg(msg *messages.SignedResultMsgIn) { diff --git a/packages/peering/lpp/lppPeer.go b/packages/peering/lpp/lppPeer.go index 22d4acaed5..d3f846a756 100644 --- a/packages/peering/lpp/lppPeer.go +++ b/packages/peering/lpp/lppPeer.go @@ -138,6 +138,8 @@ func (p *peer) SendMsg(msg *peering.PeerMessageNet) { } func (p *peer) RecvMsg(msg *peering.PeerMessageNet) { + // p.log.Debugf("Peer message received from peer %v, peeringID %v, receiver %v, type %v, length %v, first bytes %v", + // p.NetID(), msg.PeeringID, msg.MsgReceiver, msg.MsgType, len(msg.MsgData), firstBytes(16, msg.MsgData)) p.noteReceived() p.recvPipe.In() <- msg } @@ -177,8 +179,17 @@ func (p *peer) sendMsgDirect(msg *peering.PeerMessageNet) { p.accessLock.Lock() p.lastMsgSent = time.Now() p.accessLock.Unlock() + // p.log.Debugf("Peer message sent to peer %v, peeringID %v, receiver %v, type %v, length %v, first bytes %v", + // p.NetID(), msg.PeeringID, msg.MsgReceiver, msg.MsgType, len(msg.MsgData), firstBytes(16, msg.MsgData)) } +/*func firstBytes(maxCount int, array []byte) []byte { + if len(array) <= maxCount { + return array + } + return array[:maxCount] +}*/ + // IsAlive implements peering.PeerSender and peering.PeerStatusProvider interfaces for the remote peers. // Return true if is alive and average latencyRingBuf in nanosec. func (p *peer) IsAlive() bool { From f32454945932324ba4be3fc722f6e226182b0ef2 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Thu, 18 Nov 2021 16:22:35 +0200 Subject: [PATCH 082/198] Documentation fix --- packages/chain/consensus/action.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/chain/consensus/action.go b/packages/chain/consensus/action.go index e6d8e6b13c..5b20c20f65 100644 --- a/packages/chain/consensus/action.go +++ b/packages/chain/consensus/action.go @@ -630,8 +630,8 @@ func (c *consensus) setNewState(msg *messages.StateTransitionMsg) bool { // The virtual state copying (earlier called "cloning") works in a following way: it copies all the mutations, stored in buffered KVS, // however it obtains the same kvs object to access the database. BlockIndex method of virtual state checks if there are mutations editing // the index value. If so, it returns the newest value in respect to mutations. Otherwise it checks the database for newest index value. - // In this case, in there are no mutations neither in step 1 nor in step 3, because just before completing state synchronization all the - // mutations are written to the DB. However, reading the same DB in step 1 results in index n and in step 4 (after the commit of block + // In the described scenario, there are no mutations neither in step 1, nor in step 3, because just before completing state synchronization + // all the mutations are written to the DB. However, reading the same DB in step 1 results in index n and in step 4 (after the commit of block // index n+1) -- in index n+1. Thus effectively the virtual state received is different than the virtual state sent. c.log.Errorf("consensus::setNewState: state index is inconsistent: block: #%d != chain output: #%d", msg.State.BlockIndex(), msg.StateOutput.GetStateIndex()) From cdf9a9d2a401c60f631ccdcf6a73bcf2543c4c88 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Thu, 18 Nov 2021 16:24:33 +0200 Subject: [PATCH 083/198] Wrong type of peering message should not crash the node --- packages/chain/chainimpl/chainimpl.go | 5 ++++- .../chain/consensus/commonsubset/commonsubsetcoordinator.go | 3 ++- packages/chain/consensus/consensus.go | 2 ++ packages/chain/statemgr/statemgr.go | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index 86f5b6c53c..b3460b87ab 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -169,7 +169,8 @@ func (c *chainObj) receiveCommitteePeerMessages(peerMsg *peering.PeerMessageGrou peerMsg.MsgReceiver, peerMsg.MsgType)) } if peerMsg.MsgType != chain.PeerMsgTypeMissingRequestIDs { - panic(fmt.Errorf("Wrong type of chain message: %v", peerMsg.MsgType)) + c.log.Warnf("Wrong type of chain message (with committee peering ID): %v, ignoring it", peerMsg.MsgType) + return } msg, err := messages.NewMissingRequestIDsMsg(peerMsg.MsgData) if err != nil { @@ -215,6 +216,8 @@ func (c *chainObj) receiveChainPeerMessages(peerMsg *peering.PeerMessageIn) { return } c.EnqueueMissingRequestMsg(msg) + default: + c.log.Warnf("Wrong type of chain message (with chain peering ID): %v, ignoring it", peerMsg.MsgType) } } diff --git a/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go b/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go index 3b11bd89fa..9ce72d9052 100644 --- a/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go +++ b/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go @@ -118,7 +118,8 @@ func (csc *CommonSubsetCoordinator) receiveCommitteePeerMessages(peerMsg *peerin peerMsg.MsgReceiver, peerMsg.MsgType)) } if peerMsg.MsgType != peerMsgTypeBatch { - panic(fmt.Errorf("Wrong type of committee message: %v", peerMsg.MsgType)) + csc.log.Warnf("Wrong type of committee message: %v, ignoring it", peerMsg.MsgType) + return } mb, err := newMsgBatch(peerMsg.MsgData) if err != nil { diff --git a/packages/chain/consensus/consensus.go b/packages/chain/consensus/consensus.go index e0494ea87a..bc85809444 100644 --- a/packages/chain/consensus/consensus.go +++ b/packages/chain/consensus/consensus.go @@ -153,6 +153,8 @@ func (c *consensus) receiveCommitteePeerMessages(peerMsg *peering.PeerMessageGro SignedResultAckMsg: *msg, SenderIndex: peerMsg.SenderIndex, }) + default: + c.log.Warnf("Wrong type of consensus message: %v, ignoring it", peerMsg.MsgType) } } diff --git a/packages/chain/statemgr/statemgr.go b/packages/chain/statemgr/statemgr.go index 65184df06a..71a9b17f1e 100644 --- a/packages/chain/statemgr/statemgr.go +++ b/packages/chain/statemgr/statemgr.go @@ -115,6 +115,8 @@ func (sm *stateManager) receiveChainPeerMessages(peerMsg *peering.PeerMessageIn) BlockMsg: *msg, SenderNetID: peerMsg.SenderNetID, }) + default: + sm.log.Warnf("Wrong type of state manager message: %v, ignoring it", peerMsg.MsgType) } } From 9cfb9483beb28669d167113063d60e3efd126e2a Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Thu, 18 Nov 2021 17:27:58 +0200 Subject: [PATCH 084/198] Appeasing linter --- packages/chain/chain.go | 1 - packages/chain/chainimpl/interface.go | 6 +-- packages/chain/committee/committee.go | 4 +- .../consensus/commonsubset/commonsubset.go | 5 +- .../commonsubset/commonsubset_test.go | 52 +++++++------------ .../consensus/commonsubset/setup_test.go | 21 ++++++-- packages/chain/consensus/consensus.go | 4 +- packages/chain/consensus/eventproc.go | 8 +-- packages/chain/mempool/mempool.go | 10 ++-- packages/chain/messages/peer_get_block_msg.go | 3 +- .../chain/messages/peer_signed_result_msg.go | 4 +- .../messages/peer_signed_result_msg_ack.go | 4 +- packages/chain/statemgr/eventproc.go | 4 +- packages/dkg/messages.go | 2 +- packages/peering/lpp/lppNetImpl.go | 7 +-- .../testutil/testchain/mock_chain_core.go | 8 +-- 16 files changed, 72 insertions(+), 71 deletions(-) diff --git a/packages/chain/chain.go b/packages/chain/chain.go index bee623c883..8190487cef 100644 --- a/packages/chain/chain.go +++ b/packages/chain/chain.go @@ -143,7 +143,6 @@ type Mempool interface { type AsynchronousCommonSubsetRunner interface { RunACSConsensus(value []byte, sessionID uint64, stateIndex uint32, callback func(sessionID uint64, acs [][]byte)) - //TryHandleMessage(recv *peering.PeerMessageGroupIn) bool Close() } diff --git a/packages/chain/chainimpl/interface.go b/packages/chain/chainimpl/interface.go index be2525c51e..039a8e1e0a 100644 --- a/packages/chain/chainimpl/interface.go +++ b/packages/chain/chainimpl/interface.go @@ -99,7 +99,7 @@ func (c *chainObj) AttachToPeerMessages(msgReceiver byte, fun func(recv *peering c.attachIDs = append(c.attachIDs, (*c.peers).Attach(&c.peeringID, msgReceiver, fun)) } -func (c *chainObj) SendPeerMsgByNetID(netID string, msgReceiver byte, msgType byte, msgData []byte) { +func (c *chainObj) SendPeerMsgByNetID(netID string, msgReceiver, msgType byte, msgData []byte) { (*c.peers).SendMsgByNetID(netID, &peering.PeerMessageData{ PeeringID: c.peeringID, Timestamp: time.Now().UnixNano(), @@ -107,9 +107,9 @@ func (c *chainObj) SendPeerMsgByNetID(netID string, msgReceiver byte, msgType by MsgType: msgType, MsgData: msgData, }) - } +} -func (c *chainObj) SendPeerMsgToRandomPeers(upToNumPeers uint16, msgReceiver byte, msgType byte, msgData []byte) { +func (c *chainObj) SendPeerMsgToRandomPeers(upToNumPeers uint16, msgReceiver, msgType byte, msgData []byte) { (*c.peers).SendMsgToRandomPeers(upToNumPeers, &peering.PeerMessageData{ PeeringID: c.peeringID, Timestamp: time.Now().UnixNano(), diff --git a/packages/chain/committee/committee.go b/packages/chain/committee/committee.go index f7a8db868e..9b1f771581 100644 --- a/packages/chain/committee/committee.go +++ b/packages/chain/committee/committee.go @@ -130,7 +130,7 @@ func (c *committee) DKShare() *tcrypto.DKShare { return c.dkshare } -func (c *committee) SendMsgByIndex(targetPeerIndex uint16, msgReceiver byte, msgType byte, msgData []byte) error { +func (c *committee) SendMsgByIndex(targetPeerIndex uint16, msgReceiver, msgType byte, msgData []byte) error { if peer, ok := c.validatorNodes.OtherNodes()[targetPeerIndex]; ok { peer.SendMsg(&peering.PeerMessageNet{ PeerMessageData: peering.PeerMessageData{ @@ -146,7 +146,7 @@ func (c *committee) SendMsgByIndex(targetPeerIndex uint16, msgReceiver byte, msg return fmt.Errorf("SendMsg: wrong peer index") } -func (c *committee) SendMsgBroadcast(msgReceiver byte, msgType byte, msgData []byte, except ...uint16) { +func (c *committee) SendMsgBroadcast(msgReceiver, msgType byte, msgData []byte, except ...uint16) { msg := &peering.PeerMessageData{ PeeringID: c.peeringID, Timestamp: time.Now().UnixNano(), diff --git a/packages/chain/consensus/commonsubset/commonsubset.go b/packages/chain/consensus/commonsubset/commonsubset.go index 9c87df2d99..bef1bfafab 100644 --- a/packages/chain/consensus/commonsubset/commonsubset.go +++ b/packages/chain/consensus/commonsubset/commonsubset.go @@ -47,7 +47,6 @@ import ( ) const ( - acsMsgType = 50 + peering.FirstUserMsgCode resendPeriod = 500 * time.Millisecond ) @@ -379,7 +378,9 @@ func (cs *CommonSubset) send(msgBatch *msgBatch) { return } cs.log.Debugf("ACS::IO - Sending a msgBatch=%+v", msgBatch) - cs.committee.SendMsgByIndex(msgBatch.dst, peerMessageReceiverCommonSubset, peerMsgTypeBatch, msgBatch.Bytes()) + if err := cs.committee.SendMsgByIndex(msgBatch.dst, peerMessageReceiverCommonSubset, peerMsgTypeBatch, msgBatch.Bytes()); err != nil { + cs.log.Errorf("Error sending message batch %+v: %v", msgBatch, err) + } } // endregion /////////////////////////////////////////////////////////////////// diff --git a/packages/chain/consensus/commonsubset/commonsubset_test.go b/packages/chain/consensus/commonsubset/commonsubset_test.go index a7c26bdfdb..15e90c1184 100644 --- a/packages/chain/consensus/commonsubset/commonsubset_test.go +++ b/packages/chain/consensus/commonsubset/commonsubset_test.go @@ -60,27 +60,12 @@ func testBasic(t *testing.T, peerCount, threshold uint16, allRandom bool) { acsPeers := make([]*CommonSubset, peerCount) for a := range acsPeers { - ii := a // Use a local copy in the callback. group, err := networkProviders[a].PeerGroup(peerNetIDs) require.Nil(t, err) cmt := NewCommitteeMock(peeringID, group, t) - cmt.AttachToPeerMessages(peerMessageReceiverCommonSubset, func(peerMsg *peering.PeerMessageGroupIn) { - if peerMsg.MsgReceiver != peerMessageReceiverCommonSubset { - panic(fmt.Errorf("Committee does not accept peer messages of other receiver type %v, message type=%v", - peerMsg.MsgReceiver, peerMsg.MsgType)) - } - if peerMsg.MsgType != peerMsgTypeBatch { - panic(fmt.Errorf("Wrong type of committee message: %v", peerMsg.MsgType)) - } - mb, err := newMsgBatch(peerMsg.MsgData) - if err != nil { - log.Error(err) - return - } - acsPeers[ii].HandleMsgBatch(mb) - }) acsLog := testlogger.WithLevel(log.Named(fmt.Sprintf("ACS[%02d]", a)), logger.LevelInfo, false) acsPeers[a], err = NewCommonSubset(0, 0, cmt, group, dkShares[a], allRandom, nil, acsLog) + cmt.AttachToPeerMessages(peerMessageReceiverCommonSubset, makeReceiveCommitteePeerMessagesFun(acsPeers[a], log)) require.Nil(t, err) } t.Logf("ACS Nodes created.") @@ -125,27 +110,12 @@ func TestRandomized(t *testing.T) { acsPeers := make([]*CommonSubset, peerCount) for a := range acsPeers { - ii := a // Use a local copy in the callback. group, err := networkProviders[a].PeerGroup(peerNetIDs) require.Nil(t, err) cmt := NewCommitteeMock(peeringID, group, t) - cmt.AttachToPeerMessages(peerMessageReceiverCommonSubset, func(peerMsg *peering.PeerMessageGroupIn) { - if peerMsg.MsgReceiver != peerMessageReceiverCommonSubset { - panic(fmt.Errorf("Committee does not accept peer messages of other receiver type %v, message type=%v", - peerMsg.MsgReceiver, peerMsg.MsgType)) - } - if peerMsg.MsgType != peerMsgTypeBatch { - panic(fmt.Errorf("Wrong type of committee message: %v", peerMsg.MsgType)) - } - mb, err := newMsgBatch(peerMsg.MsgData) - if err != nil { - log.Error(err) - return - } - acsPeers[ii].HandleMsgBatch(mb) - }) acsLog := testlogger.WithLevel(log.Named(fmt.Sprintf("ACS[%02d]", a)), logger.LevelInfo, false) acsPeers[a], err = NewCommonSubset(0, 0, cmt, group, dkShares[a], true, nil, acsLog) + cmt.AttachToPeerMessages(peerMessageReceiverCommonSubset, makeReceiveCommitteePeerMessagesFun(acsPeers[a], log)) require.Nil(t, err) } t.Logf("ACS Nodes created.") @@ -193,6 +163,24 @@ func TestRandomized(t *testing.T) { require.NoError(t, networkCloser.Close()) } +func makeReceiveCommitteePeerMessagesFun(peer *CommonSubset, log *logger.Logger) func(peerMsg *peering.PeerMessageGroupIn) { + return func(peerMsg *peering.PeerMessageGroupIn) { + if peerMsg.MsgReceiver != peerMessageReceiverCommonSubset { + panic(fmt.Errorf("Committee does not accept peer messages of other receiver type %v, message type=%v", + peerMsg.MsgReceiver, peerMsg.MsgType)) + } + if peerMsg.MsgType != peerMsgTypeBatch { + panic(fmt.Errorf("Wrong type of committee message: %v", peerMsg.MsgType)) + } + mb, err := newMsgBatch(peerMsg.MsgData) + if err != nil { + log.Error(err) + return + } + peer.HandleMsgBatch(mb) + } +} + func TestCoordinator(t *testing.T) { t.Run("N=1/T=1", func(tt *testing.T) { testCoordinator(tt, 1, 1) }) t.Run("N=4/T=3", func(tt *testing.T) { testCoordinator(tt, 4, 3) }) diff --git a/packages/chain/consensus/commonsubset/setup_test.go b/packages/chain/consensus/commonsubset/setup_test.go index e610493c17..a7978f3f55 100644 --- a/packages/chain/consensus/commonsubset/setup_test.go +++ b/packages/chain/consensus/commonsubset/setup_test.go @@ -22,7 +22,7 @@ type committeeMock struct { var _ chain.Committee = &committeeMock{} -func NewCommitteeMock(peeringID peering.PeeringID, group peering.GroupProvider, t *testing.T) *committeeMock { +func NewCommitteeMock(peeringID peering.PeeringID, group peering.GroupProvider, t *testing.T) chain.Committee { return &committeeMock{ peeringID: peeringID, group: group, @@ -33,19 +33,24 @@ func NewCommitteeMock(peeringID peering.PeeringID, group peering.GroupProvider, func (cmT *committeeMock) Address() ledgerstate.Address { panic("Not implemented") } + func (cmT *committeeMock) Size() uint16 { panic("Not implemented") } + func (cmT *committeeMock) Quorum() uint16 { panic("Not implemented") } + func (cmT *committeeMock) OwnPeerIndex() uint16 { panic("Not implemented") } + func (cmT *committeeMock) DKShare() *tcrypto.DKShare { panic("Not implemented") } -func (cmT *committeeMock) SendMsgByIndex(peerIdx uint16, msgReceiver byte, msgType byte, msgData []byte) error { + +func (cmT *committeeMock) SendMsgByIndex(peerIdx uint16, msgReceiver, msgType byte, msgData []byte) error { if peer, ok := cmT.group.OtherNodes()[peerIdx]; ok { peer.SendMsg(&peering.PeerMessageNet{ PeerMessageData: peering.PeerMessageData{ @@ -60,33 +65,43 @@ func (cmT *committeeMock) SendMsgByIndex(peerIdx uint16, msgReceiver byte, msgTy } return fmt.Errorf("SendMsg: wrong peer index") } -func (cmT *committeeMock) SendMsgBroadcast(msgReceiver byte, msgType byte, msgData []byte, except ...uint16) { + +func (cmT *committeeMock) SendMsgBroadcast(msgReceiver, msgType byte, msgData []byte, except ...uint16) { panic("Not implemented") } + func (cmT *committeeMock) IsAlivePeer(peerIndex uint16) bool { panic("Not implemented") } + func (cmT *committeeMock) QuorumIsAlive(quorum ...uint16) bool { panic("Not implemented") } + func (cmT *committeeMock) PeerStatus() []*chain.PeerStatus { panic("Not implemented") } + func (cmT *committeeMock) AttachToPeerMessages(peerMsgReceiver byte, fun func(peerMsg *peering.PeerMessageGroupIn)) { cmT.group.Attach(&cmT.peeringID, peerMsgReceiver, fun) } + func (cmT *committeeMock) IsReady() bool { panic("Not implemented") } + func (cmT *committeeMock) Close() { panic("Not implemented") } + func (cmT *committeeMock) RunACSConsensus(value []byte, sessionID uint64, stateIndex uint32, callback func(sessionID uint64, acs [][]byte)) { panic("Not implemented") } + func (cmT *committeeMock) GetOtherValidatorsPeerIDs() []string { panic("Not implemented") } + func (cmT *committeeMock) GetRandomValidators(upToN int) []string { panic("Not implemented") } diff --git a/packages/chain/consensus/consensus.go b/packages/chain/consensus/consensus.go index bc85809444..19c9160a04 100644 --- a/packages/chain/consensus/consensus.go +++ b/packages/chain/consensus/consensus.go @@ -192,9 +192,7 @@ func (c *consensus) recvLoop() { // wait at startup for !c.committee.IsReady() { - select { - case <-time.After(100 * time.Millisecond): - } + time.Sleep(100 * time.Millisecond) if isClosedFun() { return } diff --git a/packages/chain/consensus/eventproc.go b/packages/chain/consensus/eventproc.go index e6e3f707e2..eef6e9c712 100644 --- a/packages/chain/consensus/eventproc.go +++ b/packages/chain/consensus/eventproc.go @@ -14,9 +14,9 @@ import ( "github.com/iotaledger/wasp/packages/state" ) -func (c *consensus) EventStateTransitionMsg(state state.VirtualStateAccess, stateOutput *ledgerstate.AliasOutput, stateTimestamp time.Time) { +func (c *consensus) EventStateTransitionMsg(virtualState state.VirtualStateAccess, stateOutput *ledgerstate.AliasOutput, stateTimestamp time.Time) { c.eventStateTransitionMsgPipe.In() <- &messages.StateTransitionMsg{ - State: state, + State: virtualState, StateOutput: stateOutput, StateTimestamp: stateTimestamp, } @@ -52,10 +52,10 @@ func (c *consensus) handleSignedResultAckMsg(msg *messages.SignedResultAckMsgIn) c.takeAction() } -func (c *consensus) EventInclusionsStateMsg(txID ledgerstate.TransactionID, state ledgerstate.InclusionState) { +func (c *consensus) EventInclusionsStateMsg(txID ledgerstate.TransactionID, inclusionState ledgerstate.InclusionState) { c.eventInclusionStateMsgPipe.In() <- &messages.InclusionStateMsg{ TxID: txID, - State: state, + State: inclusionState, } } diff --git a/packages/chain/mempool/mempool.go b/packages/chain/mempool/mempool.go index da1955e52d..e9a3f10fc8 100644 --- a/packages/chain/mempool/mempool.go +++ b/packages/chain/mempool/mempool.go @@ -147,11 +147,11 @@ func (m *mempool) addToPool(req iscp.Request) bool { func (m *mempool) countRequestInMetrics(req iscp.Request) { // TODO refactor, this should be part of metrics logic. - if req.IsOffLedger() { - m.mempoolMetrics.CountOffLedgerRequestIn() - } else { - m.mempoolMetrics.CountOnLedgerRequestIn() - } + if req.IsOffLedger() { + m.mempoolMetrics.CountOffLedgerRequestIn() + } else { + m.mempoolMetrics.CountOnLedgerRequestIn() + } } // ReceiveRequests places requests into the inBuffer. InBuffer is unordered and non-deterministic diff --git a/packages/chain/messages/peer_get_block_msg.go b/packages/chain/messages/peer_get_block_msg.go index 435ff0f700..48d4a500c6 100644 --- a/packages/chain/messages/peer_get_block_msg.go +++ b/packages/chain/messages/peer_get_block_msg.go @@ -24,8 +24,7 @@ type GetBlockMsgIn struct { func NewGetBlockMsg(data []byte) (*GetBlockMsg, error) { msg := &GetBlockMsg{} r := bytes.NewReader(data) - var err error - if err = util.ReadUint32(r, &msg.BlockIndex); err != nil { + if err := util.ReadUint32(r, &msg.BlockIndex); err != nil { return nil, err } return msg, nil diff --git a/packages/chain/messages/peer_signed_result_msg.go b/packages/chain/messages/peer_signed_result_msg.go index 7a7a0ba64f..ed06e74498 100644 --- a/packages/chain/messages/peer_signed_result_msg.go +++ b/packages/chain/messages/peer_signed_result_msg.go @@ -29,13 +29,13 @@ func NewSignedResultMsg(data []byte) (*SignedResultMsg, error) { msg := &SignedResultMsg{} r := bytes.NewReader(data) var err error - if err = util.ReadHashValue(r, &msg.EssenceHash); err != nil { + if err = util.ReadHashValue(r, &msg.EssenceHash); err != nil { // nolint:gocritic // - ignore sloppyReassign return nil, err } if msg.SigShare, err = util.ReadBytes16(r); err != nil { return nil, err } - if err = util.ReadOutputID(r, &msg.ChainInputID); /* nolint:revive */ err != nil { + if err = util.ReadOutputID(r, &msg.ChainInputID); err != nil { // nolint:gocritic // - ignore sloppyReassign return nil, err } return msg, nil diff --git a/packages/chain/messages/peer_signed_result_msg_ack.go b/packages/chain/messages/peer_signed_result_msg_ack.go index 590be3080d..f069d410f5 100644 --- a/packages/chain/messages/peer_signed_result_msg_ack.go +++ b/packages/chain/messages/peer_signed_result_msg_ack.go @@ -27,10 +27,10 @@ func NewSignedResultAckMsg(data []byte) (*SignedResultAckMsg, error) { msg := &SignedResultAckMsg{} r := bytes.NewReader(data) var err error - if err = util.ReadHashValue(r, &msg.EssenceHash); err != nil { + if err = util.ReadHashValue(r, &msg.EssenceHash); err != nil { // nolint:gocritic // - ignore sloppyReassign return nil, err } - if err = util.ReadOutputID(r, &msg.ChainInputID); err != nil { + if err = util.ReadOutputID(r, &msg.ChainInputID); err != nil { // nolint:gocritic // - ignore sloppyReassign return nil, err } return msg, nil diff --git a/packages/chain/statemgr/eventproc.go b/packages/chain/statemgr/eventproc.go index c278873eb8..e010ee63b2 100644 --- a/packages/chain/statemgr/eventproc.go +++ b/packages/chain/statemgr/eventproc.go @@ -114,9 +114,9 @@ func (sm *stateManager) eventStateMsg(msg *messages.StateMsg) { } } -func (sm *stateManager) EventStateCandidateMsg(state state.VirtualStateAccess, outputID ledgerstate.OutputID) { +func (sm *stateManager) EventStateCandidateMsg(virtualState state.VirtualStateAccess, outputID ledgerstate.OutputID) { sm.eventStateCandidateMsgPipe.In() <- &messages.StateCandidateMsg{ - State: state, + State: virtualState, ApprovingOutputID: outputID, } } diff --git a/packages/dkg/messages.go b/packages/dkg/messages.go index 5c5bd4ff09..42ac4939ef 100644 --- a/packages/dkg/messages.go +++ b/packages/dkg/messages.go @@ -117,7 +117,7 @@ type msgByteCoder interface { Read(io.Reader) error } -func makePeerMessage(peeringID peering.PeeringID, receiver byte, step byte, msg msgByteCoder) *peering.PeerMessageData { +func makePeerMessage(peeringID peering.PeeringID, receiver, step byte, msg msgByteCoder) *peering.PeerMessageData { msg.SetStep(step) return &peering.PeerMessageData{ PeeringID: peeringID, diff --git a/packages/peering/lpp/lppNetImpl.go b/packages/peering/lpp/lppNetImpl.go index facf1f390e..fd51149891 100644 --- a/packages/peering/lpp/lppNetImpl.go +++ b/packages/peering/lpp/lppNetImpl.go @@ -70,8 +70,10 @@ type netImpl struct { log *logger.Logger } -var _ peering.NetworkProvider = &netImpl{} -var _ peering.PeerSender = &netImpl{} +var ( + _ peering.NetworkProvider = &netImpl{} + _ peering.PeerSender = &netImpl{} +) // NewNetworkProvider is a constructor for the TCP based // peering network implementation. @@ -356,7 +358,6 @@ func (n *netImpl) SendMsgByNetID(netID string, msg *peering.PeerMessageData) { // Attach implements peering.NetworkProvider. func (n *netImpl) Attach(peeringID *peering.PeeringID, receiver byte, callback func(recv *peering.PeerMessageIn)) interface{} { closure := events.NewClosure(func(recv *peering.PeerMessageIn) { - //if peeringID == nil || *peeringID == recv.Msg.PeeringID { if *peeringID == recv.PeeringID && receiver == recv.MsgReceiver { callback(recv) } diff --git a/packages/testutil/testchain/mock_chain_core.go b/packages/testutil/testchain/mock_chain_core.go index eabbf8d148..48a35bf74d 100644 --- a/packages/testutil/testchain/mock_chain_core.go +++ b/packages/testutil/testchain/mock_chain_core.go @@ -123,7 +123,7 @@ func (m *MockedChainCore) AttachToPeerMessages(receiver byte, fun func(recv *pee m.peers.Attach(&m.peeringID, receiver, fun) } -func (m *MockedChainCore) SendPeerMsgByNetID(netID string, msgReceiver byte, msgType byte, msgData []byte) { +func (m *MockedChainCore) SendPeerMsgByNetID(netID string, msgReceiver, msgType byte, msgData []byte) { m.peers.SendMsgByNetID(netID, &peering.PeerMessageData{ PeeringID: m.peeringID, MsgReceiver: msgReceiver, @@ -132,15 +132,15 @@ func (m *MockedChainCore) SendPeerMsgByNetID(netID string, msgReceiver byte, msg }) } -func (m *MockedChainCore) SendPeerMsgToRandomPeers(upToNumPeers uint16, msgReceiver byte, msgType byte, msgData []byte) { +func (m *MockedChainCore) SendPeerMsgToRandomPeers(upToNumPeers uint16, msgReceiver, msgType byte, msgData []byte) { sendPeers := m.peers.GetRandomPeers(int(upToNumPeers)) for _, netID := range sendPeers { m.SendPeerMsgByNetID(netID, msgReceiver, msgType, msgData) } } -func (m *MockedChainCore) StateCandidateToStateManager(state state.VirtualStateAccess, outputID ledgerstate.OutputID) { - m.onStateCandidate(state, outputID) +func (m *MockedChainCore) StateCandidateToStateManager(virtualState state.VirtualStateAccess, outputID ledgerstate.OutputID) { + m.onStateCandidate(virtualState, outputID) } func (m *MockedChainCore) EnqueueDismissChain(reason string) { From 5da49df5b654786f1cf4b95861af66e4fb81c938 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Thu, 18 Nov 2021 18:56:33 +0200 Subject: [PATCH 085/198] Accidental commits clean up --- client/reqstatus.go | 2 - packages/chain/chainimpl/eventproc.go | 133 -------------------------- packages/chain/chainimpl/interface.go | 6 -- tools/cluster/chain.go | 5 - tools/cluster/templates/waspconfig.go | 2 +- 5 files changed, 1 insertion(+), 147 deletions(-) diff --git a/client/reqstatus.go b/client/reqstatus.go index 821e8f42d4..95e71f859a 100644 --- a/client/reqstatus.go +++ b/client/reqstatus.go @@ -1,7 +1,6 @@ package client import ( - "fmt" "net/http" "time" @@ -38,7 +37,6 @@ func (c *WaspClient) WaitUntilRequestProcessed(chainID *iscp.ChainID, reqID iscp // by the node func (c *WaspClient) WaitUntilAllRequestsProcessed(chainID *iscp.ChainID, tx *ledgerstate.Transaction, timeout time.Duration) error { for _, reqID := range request.RequestsInTransaction(chainID, tx) { - fmt.Printf("XXX reqID %v\n", reqID) if err := c.WaitUntilRequestProcessed(chainID, reqID, timeout); err != nil { return err } diff --git a/packages/chain/chainimpl/eventproc.go b/packages/chain/chainimpl/eventproc.go index 8027e40a2b..e839d5d9a7 100644 --- a/packages/chain/chainimpl/eventproc.go +++ b/packages/chain/chainimpl/eventproc.go @@ -216,136 +216,3 @@ func (c *chainObj) handleTimerTick(msg messages.TimerTick) { c.log.Debugf("mempool total = %d, ready = %d, in = %d, out = %d", stats.TotalPool, stats.ReadyCounter, stats.InPoolCounter, stats.OutPoolCounter) } } - -/*// EventGetBlockMsg is a request for a block while syncing -func (sm *stateManager) EventGetBlockMsg(msg *messages.GetBlockMsg) { - sm.eventGetBlockMsgCh <- msg -} - -func (sm *stateManager) eventGetBlockMsg(msg *messages.GetBlockMsg) { - sm.log.Debugw("EventGetBlockMsg received: ", - "sender", msg.SenderNetID, - "block index", msg.BlockIndex, - ) - if sm.stateOutput == nil { // Not a necessary check, only for optimization. - sm.log.Debugf("EventGetBlockMsg ignored: stateOutput is nil") - return - } - if msg.BlockIndex > sm.stateOutput.GetStateIndex() { // Not a necessary check, only for optimization. - sm.log.Debugf("EventGetBlockMsg ignored 1: block #%d not found. Current state index: #%d", - msg.BlockIndex, sm.stateOutput.GetStateIndex()) - return - } - blockBytes, err := state.LoadBlockBytes(sm.store, msg.BlockIndex) - if err != nil { - sm.log.Errorf("EventGetBlockMsg: LoadBlockBytes: %v", err) - return - } - if blockBytes == nil { - sm.log.Debugf("EventGetBlockMsg ignored 2: block #%d not found. Current state index: #%d", - msg.BlockIndex, sm.stateOutput.GetStateIndex()) - return - } - - sm.log.Debugf("EventGetBlockMsg for state index #%d --> responding to peer %s", msg.BlockIndex, msg.SenderNetID) - - sm.peers.SendSimple(msg.SenderNetID, messages.MsgBlock, util.MustBytes(&messages.BlockMsg{ - BlockBytes: blockBytes, - })) -} - -// EventBlockMsg -func (sm *stateManager) EventBlockMsg(msg *messages.BlockMsg) { - sm.eventBlockMsgCh <- msg -} - -func (sm *stateManager) eventBlockMsg(msg *messages.BlockMsg) { - sm.log.Debugf("EventBlockMsg received from %v", msg.SenderNetID) - if sm.stateOutput == nil { - sm.log.Debugf("EventBlockMsg ignored: stateOutput is nil") - return - } - block, err := state.BlockFromBytes(msg.BlockBytes) - if err != nil { - sm.log.Warnf("EventBlockMsg ignored: wrong block received from peer %s. Err: %v", msg.SenderNetID, err) - return - } - sm.log.Debugw("EventBlockMsg from ", - "sender", msg.SenderNetID, - "block index", block.BlockIndex(), - "approving output", iscp.OID(block.ApprovingOutputID()), - ) - if sm.addBlockFromPeer(block) { - sm.takeAction() - } -} - -func (sm *stateManager) EventOutputMsg(msg ledgerstate.Output) { - sm.eventOutputMsgCh <- msg -} - -func (sm *stateManager) eventOutputMsg(msg ledgerstate.Output) { - sm.log.Debugf("EventOutputMsg received: %s", iscp.OID(msg.ID())) - chainOutput, ok := msg.(*ledgerstate.AliasOutput) - if !ok { - sm.log.Debugf("EventOutputMsg ignored: output is of type %t, expecting *ledgerstate.AliasOutput", msg) - return - } - if sm.outputPulled(chainOutput) { - sm.takeAction() - } -} - -// EventStateTransactionMsg triggered whenever new state transaction arrives -// the state transaction may be confirmed or not -func (sm *stateManager) EventStateMsg(msg *messages.StateMsg) { - sm.eventStateOutputMsgCh <- msg -} - -func (sm *stateManager) eventStateMsg(msg *messages.StateMsg) { - sm.log.Debugw("EventStateMsg received: ", - "state index", msg.ChainOutput.GetStateIndex(), - "chainOutput", iscp.OID(msg.ChainOutput.ID()), - ) - stateHash, err := hashing.HashValueFromBytes(msg.ChainOutput.GetStateData()) - if err != nil { - sm.log.Errorf("EventStateMsg ignored: failed to parse state hash: %v", err) - return - } - sm.log.Debugf("EventStateMsg state hash is %v", stateHash.String()) - if sm.stateOutputReceived(msg.ChainOutput, msg.Timestamp) { - sm.takeAction() - } -} - -func (sm *stateManager) EventStateCandidateMsg(state state.VirtualStateAccess, outputID ledgerstate.OutputID) { - sm.eventStateCandidateMsgCh <- &messages.StateCandidateMsg{ - State: state, - ApprovingOutputID: outputID, - } -} - -func (sm *stateManager) eventStateCandidateMsg(msg *messages.StateCandidateMsg) { - sm.log.Debugf("EventStateCandidateMsg received: state index: %d, timestamp: %v", - msg.State.BlockIndex(), msg.State.Timestamp(), - ) - if sm.stateOutput == nil { - sm.log.Debugf("EventStateCandidateMsg ignored: stateOutput is nil") - return - } - if sm.addStateCandidateFromConsensus(msg.State, msg.ApprovingOutputID) { - sm.takeAction() - } -} - -func (sm *stateManager) EventTimerMsg(msg messages.TimerTick) { - if msg%2 == 0 { - sm.eventTimerMsgCh <- msg - } -} - -func (sm *stateManager) eventTimerMsg() { - sm.log.Debugf("EventTimerMsg received") - sm.takeAction() -} -*/ diff --git a/packages/chain/chainimpl/interface.go b/packages/chain/chainimpl/interface.go index 039a8e1e0a..e2d73d8eff 100644 --- a/packages/chain/chainimpl/interface.go +++ b/packages/chain/chainimpl/interface.go @@ -123,12 +123,6 @@ func (c *chainObj) StateCandidateToStateManager(virtualState state.VirtualStateA c.stateMgr.EventStateCandidateMsg(virtualState, outputID) } -// ReceiveMessage accepts an incoming message asynchronously. -/*func (c *chainObj) ReceiveMessage(msg interface{}) { - c.receiveMessage(msg) - c.chainMetrics.CountMessages() TODO -}*/ - func shouldSendToPeer(peerID string, ackPeers []string) bool { for _, p := range ackPeers { if p == peerID { diff --git a/tools/cluster/chain.go b/tools/cluster/chain.go index 9cb4a32849..bd24d23ee0 100644 --- a/tools/cluster/chain.go +++ b/tools/cluster/chain.go @@ -100,12 +100,10 @@ func (ch *Chain) CommitteeMultiClient() *multiclient.MultiClient { } func (ch *Chain) DeployContract(name, progHashStr, description string, initParams map[string]interface{}) (*ledgerstate.Transaction, error) { - fmt.Printf("XXX1\n") programHash, err := hashing.HashValueFromBase58(progHashStr) if err != nil { return nil, err } - fmt.Printf("XXX2\n") params := map[string]interface{}{ root.ParamName: name, @@ -122,16 +120,13 @@ func (ch *Chain) DeployContract(name, progHashStr, description string, initParam Args: requestargs.New().AddEncodeSimpleMany(codec.MakeDict(params)), }, ) - fmt.Printf("XXX3\n") if err != nil { return nil, err } - fmt.Printf("XXX4\n") err = ch.CommitteeMultiClient().WaitUntilAllRequestsProcessed(ch.ChainID, tx, 30*time.Second) if err != nil { return nil, err } - fmt.Printf("XXX5\n") return tx, nil } diff --git a/tools/cluster/templates/waspconfig.go b/tools/cluster/templates/waspconfig.go index 193358d5f9..c5875d905b 100644 --- a/tools/cluster/templates/waspconfig.go +++ b/tools/cluster/templates/waspconfig.go @@ -20,7 +20,7 @@ const WaspConfig = ` "directory": "waspdb" }, "logger": { - "level": "debug", + "level": "info", "disableCaller": false, "disableStacktrace": true, "encoding": "console", From 6200f567fd71be8017a4400cf6c7242a1bf38320 Mon Sep 17 00:00:00 2001 From: Diego Essaya Date: Thu, 18 Nov 2021 17:21:56 -0300 Subject: [PATCH 086/198] fix(evm): fix flaky TestBlockTime --- contracts/native/evm/evmtest/evm_test.go | 24 +++++++++++++++------- contracts/native/evm/evmtest/utils_test.go | 2 -- packages/solo/req.go | 18 ++++++++++------ 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/contracts/native/evm/evmtest/evm_test.go b/contracts/native/evm/evmtest/evm_test.go index fdf5392680..c19ecdd059 100644 --- a/contracts/native/evm/evmtest/evm_test.go +++ b/contracts/native/evm/evmtest/evm_test.go @@ -14,6 +14,7 @@ import ( "github.com/iotaledger/wasp/contracts/native/evm" "github.com/iotaledger/wasp/contracts/native/evm/evmchain" "github.com/iotaledger/wasp/contracts/native/evm/evmlight" + "github.com/iotaledger/wasp/packages/chain" "github.com/iotaledger/wasp/packages/evm/evmflavors" "github.com/iotaledger/wasp/packages/evm/evmtest" "github.com/iotaledger/wasp/packages/iscp" @@ -442,8 +443,6 @@ func TestISCPEntropy(t *testing.T) { } func TestBlockTime(t *testing.T) { - // FIXME test fails regularly on github - t.SkipNow() evmChain := initEVMChain(t, evmlight.Contract) evmChain.setBlockTime(60) @@ -458,17 +457,28 @@ func TestBlockTime(t *testing.T) { require.EqualValues(t, 43, storage.retrieve()) require.EqualValues(t, 0, evmChain.getBlockNumber()) + // there is 1 timelocked request + mempoolInfo := evmChain.soloChain.MempoolInfo() + require.EqualValues(t, 1, mempoolInfo.InBufCounter-mempoolInfo.OutPoolCounter) + // first block gets minted evmChain.solo.AdvanceClockBy(61 * time.Second) - evmChain.soloChain.Sync() + evmChain.soloChain.WaitUntil(func(mstats chain.MempoolInfo) bool { + return mstats.OutPoolCounter == mempoolInfo.InBufCounter + }) require.EqualValues(t, 1, evmChain.getBlockNumber()) block := evmChain.getBlockByNumber(1) require.EqualValues(t, 2, len(block.Transactions())) + // there is 1 timelocked request + mempoolInfo = evmChain.soloChain.MempoolInfo() + require.EqualValues(t, 1, mempoolInfo.InBufCounter-mempoolInfo.OutPoolCounter) + // second (empty) block gets minted evmChain.solo.AdvanceClockBy(61 * time.Second) - evmChain.soloChain.Sync() - time.Sleep(100 * time.Millisecond) // TODO this shouldn't be necessary? + evmChain.soloChain.WaitUntil(func(mstats chain.MempoolInfo) bool { + return mstats.OutPoolCounter == mempoolInfo.InBufCounter + }) require.EqualValues(t, 2, evmChain.getBlockNumber()) block = evmChain.getBlockByNumber(2) require.EqualValues(t, 0, len(block.Transactions())) @@ -502,8 +512,8 @@ func initBenchmark(b *testing.B, evmFlavor *coreutil.ContractInfo) (*solo.Chain, // run benchmarks with: go test -benchmem -cpu=1 -run=' ' -bench='Bench.*' func doBenchmark(b *testing.B, evmFlavor *coreutil.ContractInfo, f solobench.Func) { - chain, reqs := initBenchmark(b, evmFlavor) - f(b, chain, reqs, nil) + ch, reqs := initBenchmark(b, evmFlavor) + f(b, ch, reqs, nil) } func BenchmarkEVMChainSync(b *testing.B) { diff --git a/contracts/native/evm/evmtest/utils_test.go b/contracts/native/evm/evmtest/utils_test.go index eb1644fd5c..efa08dd119 100644 --- a/contracts/native/evm/evmtest/utils_test.go +++ b/contracts/native/evm/evmtest/utils_test.go @@ -141,7 +141,6 @@ func (e *evmChainInstance) callView(funName string, params ...interface{}) (dict return e.soloChain.CallView(e.evmFlavor.Name, funName, params...) } -// nolint:unused func (e *evmChainInstance) setBlockTime(t uint32) { _, err := e.postRequest(nil, evm.FuncSetBlockTime.Name, evm.FieldBlockTime, codec.EncodeUint32(t)) require.NoError(e.t, err) @@ -153,7 +152,6 @@ func (e *evmChainInstance) getBlockNumber() uint64 { return new(big.Int).SetBytes(ret.MustGet(evm.FieldResult)).Uint64() } -// nolint:unused func (e *evmChainInstance) getBlockByNumber(n uint64) *types.Block { ret, err := e.callView(evm.FuncGetBlockByNumber.Name, evm.FieldBlockNumber, new(big.Int).SetUint64(n).Bytes()) require.NoError(e.t, err) diff --git a/packages/solo/req.go b/packages/solo/req.go index 76e3a11b56..b760c740cc 100644 --- a/packages/solo/req.go +++ b/packages/solo/req.go @@ -278,9 +278,8 @@ func (ch *Chain) CallView(scName, funName string, params ...interface{}) (dict.D return vctx.CallView(iscp.Hn(scName), iscp.Hn(funName), p) } -// WaitForRequestsThrough waits for the moment when counters for incoming requests and removed -// requests in the mempool of the chain both become equal to the specified number -func (ch *Chain) WaitForRequestsThrough(numReq int, maxWait ...time.Duration) bool { +// WaitUntil waits until the condition specified by the given predicate yields true +func (ch *Chain) WaitUntil(p func(chain.MempoolInfo) bool, maxWait ...time.Duration) bool { maxw := 5 * time.Second var deadline time.Time if len(maxWait) > 0 { @@ -289,18 +288,25 @@ func (ch *Chain) WaitForRequestsThrough(numReq int, maxWait ...time.Duration) bo deadline = time.Now().Add(maxw) for { mstats := ch.mempool.Info() - if mstats.InBufCounter == numReq && mstats.OutPoolCounter == numReq { + if p(mstats) { return true } if time.Now().After(deadline) { - ch.Log.Errorf("WaitForRequestsThrough. failed waiting max %v for %d requests through . Current IN: %d, OUT: %d", - maxw, numReq, mstats.InBufCounter, mstats.OutPoolCounter) + ch.Log.Errorf("WaitUntil failed waiting max %v", maxw) return false } time.Sleep(10 * time.Millisecond) } } +// WaitForRequestsThrough waits for the moment when counters for incoming requests and removed +// requests in the mempool of the chain both become equal to the specified number +func (ch *Chain) WaitForRequestsThrough(numReq int, maxWait ...time.Duration) bool { + return ch.WaitUntil(func(mstats chain.MempoolInfo) bool { + return mstats.InBufCounter == numReq && mstats.OutPoolCounter == numReq + }, maxWait...) +} + // MempoolInfo returns stats about the chain mempool func (ch *Chain) MempoolInfo() chain.MempoolInfo { return ch.mempool.Info() From 1d45fc7635071c64080816304a8c62070bd0aecd Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Thu, 18 Nov 2021 16:57:16 -0800 Subject: [PATCH 087/198] Cleanup, preparation for upgrade to new WasmTime version --- .../wasm/inccounter/test/inccounter_test.go | 13 ---- .../wasm/testwasmlib/test/testwasmlib_test.go | 33 ++++---- packages/vm/wasmhost/wasmedgevm.go | 4 - packages/vm/wasmhost/wasmgovm.go | 20 +++-- packages/vm/wasmhost/wasmhost.go | 15 +--- packages/vm/wasmhost/wasmtimevm.go | 25 +++--- packages/vm/wasmhost/wasmvm.go | 67 ---------------- packages/vm/wasmproc/wasmcontext.go | 15 +--- packages/vm/wasmproc/wasmprocessor.go | 78 +++++++------------ packages/vm/wasmsolo/solocontext.go | 4 +- 10 files changed, 71 insertions(+), 203 deletions(-) diff --git a/contracts/wasm/inccounter/test/inccounter_test.go b/contracts/wasm/inccounter/test/inccounter_test.go index 91eef4e3d5..737be142aa 100644 --- a/contracts/wasm/inccounter/test/inccounter_test.go +++ b/contracts/wasm/inccounter/test/inccounter_test.go @@ -153,19 +153,6 @@ func TestLeb128(t *testing.T) { testLeb128 := inccounter.ScFuncs.TestLeb128(ctx) testLeb128.Func.TransferIotas(1).Post() require.NoError(t, ctx.Err) - - //res, err := chain.CallView( - // ScName, wasmproc.ViewCopyAllState, - //) - //require.NoError(t, err) - //keys := make([]string, 0) - //for key := range res { - // keys = append(keys, string(key)) - //} - //sort.Strings(keys) - //for _, key := range keys { - // fmt.Printf("%s: %v\n", key, res[kv.Key(key)]) - //} } func TestLoop(t *testing.T) { diff --git a/contracts/wasm/testwasmlib/test/testwasmlib_test.go b/contracts/wasm/testwasmlib/test/testwasmlib_test.go index 08c6920b6e..fc8692eb82 100644 --- a/contracts/wasm/testwasmlib/test/testwasmlib_test.go +++ b/contracts/wasm/testwasmlib/test/testwasmlib_test.go @@ -6,6 +6,7 @@ import ( "strings" "testing" + "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/wasp/contracts/wasm/testwasmlib/go/testwasmlib" "github.com/iotaledger/wasp/packages/solo" "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" @@ -15,16 +16,16 @@ import ( var ( allParams = []string{ - string(testwasmlib.ParamAddress), - string(testwasmlib.ParamAgentID), - string(testwasmlib.ParamChainID), - string(testwasmlib.ParamColor), - string(testwasmlib.ParamHash), - string(testwasmlib.ParamHname), - string(testwasmlib.ParamInt16), - string(testwasmlib.ParamInt32), - string(testwasmlib.ParamInt64), - string(testwasmlib.ParamRequestID), + testwasmlib.ParamAddress, + testwasmlib.ParamAgentID, + testwasmlib.ParamChainID, + testwasmlib.ParamColor, + testwasmlib.ParamHash, + testwasmlib.ParamHname, + testwasmlib.ParamInt16, + testwasmlib.ParamInt32, + testwasmlib.ParamInt64, + testwasmlib.ParamRequestID, } allLengths = []int{33, 37, 33, 32, 32, 4, 2, 4, 8, 34} invalidValues = map[wasmlib.Key][][]byte{ @@ -98,14 +99,14 @@ func TestValidSizeParams(t *testing.T) { for index, param := range allParams { t.Run("ValidSize "+param, func(t *testing.T) { pt := testwasmlib.ScFuncs.ParamTypes(ctx) - pt.Params.Param().GetBytes(param).SetValue(make([]byte, allLengths[index])) + bytes := make([]byte, allLengths[index]) + if param == testwasmlib.ParamChainID { + bytes[0] = byte(ledgerstate.AliasAddressType) + } + pt.Params.Param().GetBytes(param).SetValue(bytes) pt.Func.TransferIotas(1).Post() require.Error(t, ctx.Err) - if param == string(testwasmlib.ParamChainID) { - require.Contains(t, ctx.Err.Error(), "invalid ") - } else { - require.Contains(t, ctx.Err.Error(), "mismatch: ") - } + require.Contains(t, ctx.Err.Error(), "mismatch: ") }) } } diff --git a/packages/vm/wasmhost/wasmedgevm.go b/packages/vm/wasmhost/wasmedgevm.go index b432226a9b..4b96c0361f 100644 --- a/packages/vm/wasmhost/wasmedgevm.go +++ b/packages/vm/wasmhost/wasmedgevm.go @@ -119,10 +119,6 @@ func (vm *WasmEdgeVM) Instantiate() error { return nil } -func (vm *WasmEdgeVM) PoolSize() int { - return 10 -} - func (vm *WasmEdgeVM) RunFunction(functionName string, args ...interface{}) error { return vm.Run(func() (err error) { _,err = vm.edge.Execute(functionName, args...) diff --git a/packages/vm/wasmhost/wasmgovm.go b/packages/vm/wasmhost/wasmgovm.go index 1a72d9de47..6e0a7e64ab 100644 --- a/packages/vm/wasmhost/wasmgovm.go +++ b/packages/vm/wasmhost/wasmgovm.go @@ -10,6 +10,11 @@ import ( "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" ) +// provide implementation for Wasm-only function +func Connect(h wasmlib.ScHost) wasmlib.ScHost { + return wasmlib.ConnectHost(h) +} + type WasmGoVM struct { WasmVMBase scName string @@ -21,11 +26,11 @@ func NewWasmGoVM(scName string, onLoad func()) WasmVM { } func (vm *WasmGoVM) NewInstance() WasmVM { - return NewWasmGoVM(vm.scName, vm.onLoad) + return nil } -func Connect(h wasmlib.ScHost) wasmlib.ScHost { - return wasmlib.ConnectHost(h) +func (vm *WasmGoVM) Instantiate() error { + return nil } func (vm *WasmGoVM) Interrupt() { @@ -41,16 +46,15 @@ func (vm *WasmGoVM) LoadWasm(wasmData []byte) error { if scName[3:] != vm.scName { return errors.New("WasmGoVM: unknown contract: " + scName) } - vm.onLoad() return nil } func (vm *WasmGoVM) RunFunction(functionName string, args ...interface{}) error { - // already ran on_load in LoadWasm, other functions are not supported - if functionName != "on_load" { - return errors.New("WasmGoVM: cannot run function: " + functionName) + if functionName == "on_load" { + vm.onLoad() + return nil } - return nil + return errors.New("WasmGoVM: cannot run function: " + functionName) } func (vm *WasmGoVM) RunScFunction(index int32) error { diff --git a/packages/vm/wasmhost/wasmhost.go b/packages/vm/wasmhost/wasmhost.go index 38c52586da..7e5145eacb 100644 --- a/packages/vm/wasmhost/wasmhost.go +++ b/packages/vm/wasmhost/wasmhost.go @@ -66,26 +66,13 @@ func (host *WasmHost) IsView(function string) bool { } func (host *WasmHost) LoadWasm(wasmData []byte) error { - err := host.vm.LoadWasm(wasmData) - if err != nil { - return err - } - err = host.RunFunction("on_load") - if err != nil { - return err - } - host.vm.SaveMemory() - return nil + return host.vm.LoadWasm(wasmData) } func (host *WasmHost) NewInstance() WasmVM { return host.vm.NewInstance() } -func (host *WasmHost) PoolSize() int { - return host.vm.PoolSize() -} - func (host *WasmHost) RunFunction(functionName string, args ...interface{}) (err error) { return host.vm.RunFunction(functionName, args...) } diff --git a/packages/vm/wasmhost/wasmtimevm.go b/packages/vm/wasmhost/wasmtimevm.go index 2ff3dc0086..18e9d18655 100644 --- a/packages/vm/wasmhost/wasmtimevm.go +++ b/packages/vm/wasmhost/wasmtimevm.go @@ -11,6 +11,7 @@ import ( type WasmTimeVM struct { WasmVMBase + engine *wasmtime.Engine instance *wasmtime.Instance interrupt *wasmtime.InterruptHandle linker *wasmtime.Linker @@ -23,24 +24,29 @@ func NewWasmTimeVM() WasmVM { vm := &WasmTimeVM{} config := wasmtime.NewConfig() config.SetInterruptable(true) - vm.store = wasmtime.NewStore(wasmtime.NewEngineWithConfig(config)) - vm.interrupt, _ = vm.store.InterruptHandle() + vm.engine = wasmtime.NewEngineWithConfig(config) return vm } func (vm *WasmTimeVM) NewInstance() WasmVM { - return &WasmTimeVM{store: vm.store, module: vm.module, interrupt: vm.interrupt} + return &WasmTimeVM{engine: vm.engine, module: vm.module} } func (vm *WasmTimeVM) Interrupt() { vm.interrupt.Interrupt() } -func (vm *WasmTimeVM) LinkHost(impl WasmVM, host *WasmHost) error { +func (vm *WasmTimeVM) LinkHost(impl WasmVM, host *WasmHost) (err error) { + vm.store = wasmtime.NewStore(vm.engine) + vm.interrupt, err = vm.store.InterruptHandle() + if err != nil { + return err + } + vm.linker = wasmtime.NewLinker(vm.store) _ = vm.WasmVMBase.LinkHost(impl, host) - err := vm.linker.DefineFunc("WasmLib", "hostGetBytes", vm.HostGetBytes) + err = vm.linker.DefineFunc("WasmLib", "hostGetBytes", vm.HostGetBytes) if err != nil { return err } @@ -72,7 +78,7 @@ func (vm *WasmTimeVM) LinkHost(impl WasmVM, host *WasmHost) error { } func (vm *WasmTimeVM) LoadWasm(wasmData []byte) (err error) { - vm.module, err = wasmtime.NewModule(vm.store.Engine, wasmData) + vm.module, err = wasmtime.NewModule(vm.engine, wasmData) if err != nil { return err } @@ -95,10 +101,6 @@ func (vm *WasmTimeVM) Instantiate() (err error) { return nil } -func (vm *WasmTimeVM) PoolSize() int { - return 10 -} - func (vm *WasmTimeVM) RunFunction(functionName string, args ...interface{}) error { export := vm.instance.GetExport(functionName) if export == nil { @@ -116,9 +118,6 @@ func (vm *WasmTimeVM) RunScFunction(index int32) error { return errors.New("unknown export function: 'on_call'") } - frame := vm.PreCall() - defer vm.PostCall(frame) - return vm.Run(func() (err error) { _, err = export.Func().Call(index) return err diff --git a/packages/vm/wasmhost/wasmvm.go b/packages/vm/wasmhost/wasmvm.go index 31fc6657c5..f539949779 100644 --- a/packages/vm/wasmhost/wasmvm.go +++ b/packages/vm/wasmhost/wasmvm.go @@ -32,10 +32,8 @@ type WasmVM interface { LinkHost(impl WasmVM, host *WasmHost) error LoadWasm(wasmData []byte) error NewInstance() WasmVM - PoolSize() int RunFunction(functionName string, args ...interface{}) error RunScFunction(index int32) error - SaveMemory() UnsafeMemory() []byte VMGetBytes(offset int32, size int32) []byte VMGetSize() int32 @@ -45,9 +43,6 @@ type WasmVM interface { type WasmVMBase struct { impl WasmVM host *WasmHost - memoryCopy []byte - memoryDirty bool - memoryNonZero int32 result []byte resultKeyID int32 timeoutStarted bool @@ -183,35 +178,6 @@ func (vm *WasmVMBase) LinkHost(impl WasmVM, host *WasmHost) error { return nil } -func (vm *WasmVMBase) PoolSize() int { - return 0 -} - -func (vm *WasmVMBase) PreCall() []byte { - if vm.PoolSize() != 0 { - return nil - } - - bytes := vm.impl.VMGetSize() - frame := vm.impl.VMGetBytes(0, bytes) - if vm.memoryDirty { - // clear memory and restore initialized data range - vm.impl.VMSetBytes(0, bytes, make([]byte, bytes)) - size := int32(len(vm.memoryCopy)) - vm.impl.VMSetBytes(vm.memoryNonZero, size, vm.memoryCopy) - } - vm.memoryDirty = true - return frame -} - -func (vm *WasmVMBase) PostCall(frame []byte) { - if vm.PoolSize() != 0 { - return - } - - vm.impl.VMSetBytes(0, int32(len(frame)), frame) -} - func (vm *WasmVMBase) Run(runner func() error) (err error) { if vm.timeoutStarted { // no need to wrap nested calls in timeout code @@ -245,39 +211,6 @@ func (vm *WasmVMBase) Run(runner func() error) (err error) { return err } -func (vm *WasmVMBase) SaveMemory() { - if vm.PoolSize() != 0 { - return - } - - // find initialized data range in memory - bytes := vm.impl.VMGetSize() - ptr := vm.impl.VMGetBytes(0, bytes) - if ptr == nil { - // this vm implementation does not communicate via mem pool - return - } - firstNonZero := -1 - lastNonZero := 0 - for i, b := range ptr { - if b != 0 { - if firstNonZero < 0 { - firstNonZero = i - } - lastNonZero = i - } - } - - // save copy of initialized data range - vm.memoryNonZero = bytes - if firstNonZero >= 0 { - vm.memoryNonZero = int32(firstNonZero) - size := lastNonZero + 1 - firstNonZero - vm.memoryCopy = make([]byte, size) - copy(vm.memoryCopy, ptr[vm.memoryNonZero:]) - } -} - func (vm *WasmVMBase) VMGetBytes(offset, size int32) []byte { ptr := vm.impl.UnsafeMemory() bytes := make([]byte, size) diff --git a/packages/vm/wasmproc/wasmcontext.go b/packages/vm/wasmproc/wasmcontext.go index 326193746d..20b416e657 100644 --- a/packages/vm/wasmproc/wasmcontext.go +++ b/packages/vm/wasmproc/wasmcontext.go @@ -9,8 +9,7 @@ import ( ) const ( - FuncDefault = "_default" - ViewCopyAllState = "copy_all_state" + FuncDefault = "_default" ) type WasmContext struct { @@ -88,18 +87,6 @@ func (wc *WasmContext) Call(ctx interface{}) (dict.Dict, error) { return nil, nil } - // TODO decide if we want be able to examine state directly from tests - //if wc.function == ViewCopyAllState { - // // dump copy of entire state into result - // state := wc.ctxView.State() - // results := dict.New() - // state.MustIterate("", func(key kv.Key, value []byte) bool { - // results.Set(key, value) - // return true - // }) - // return results, nil - //} - wc.Tracef("Calling " + wc.function) err := wc.callFunction() if err != nil { diff --git a/packages/vm/wasmproc/wasmprocessor.go b/packages/vm/wasmproc/wasmprocessor.go index 143425c6b3..d06e8db726 100644 --- a/packages/vm/wasmproc/wasmprocessor.go +++ b/packages/vm/wasmproc/wasmprocessor.go @@ -20,10 +20,8 @@ type WasmProcessor struct { log *logger.Logger mainProcessor *WasmProcessor nextContextID int32 - // procesorPool *WasmProcessor - scContext *WasmContext - wasmBytes []byte - wasmVM func() wasmhost.WasmVM + scContext *WasmContext + wasmVM func() wasmhost.WasmVM } var _ iscp.VMProcessor = &WasmProcessor{} @@ -32,27 +30,29 @@ var GoWasmVM func() wasmhost.WasmVM // GetProcessor creates a new Wasm VM processor. func GetProcessor(wasmBytes []byte, log *logger.Logger) (iscp.VMProcessor, error) { + proc := &WasmProcessor{log: log, contexts: make(map[int32]*WasmContext), wasmVM: wasmhost.NewWasmTimeVM} + proc.Init() + // By default we will use WasmTimeVM, but this can be overruled by setting GoWasmVm - // This setting will be propagated to all the sub-processors of this processor - vm := GoWasmVM - GoWasmVM = nil - if vm == nil { - vm = wasmhost.NewWasmTimeVM + // This setting will also be propagated to all the sub-processors of this processor + if GoWasmVM != nil { + proc.wasmVM = GoWasmVM + GoWasmVM = nil } - // run setup on main processor, because we will be sharing stuff with the sub-processors - proc := &WasmProcessor{log: log, contexts: make(map[int32]*WasmContext), wasmBytes: wasmBytes, wasmVM: vm} - err := proc.InitVM(vm(), proc) + // Run setup on main processor, because we will be sharing stuff with the sub-processors + err := proc.InitVM(proc.wasmVM(), proc) if err != nil { return nil, err } - proc.Init() - // TODO decide if we want be able to examine state directly from tests - // proc.SetExport(0x8fff, ViewCopyAllState) proc.scContext = NewWasmContext("", proc) wasmhost.Connect(proc.scContext) - err = proc.LoadWasm(proc.wasmBytes) + err = proc.LoadWasm(wasmBytes) + if err != nil { + return nil, err + } + err = proc.RunFunction("on_load") if err != nil { return nil, err } @@ -97,21 +97,14 @@ func (proc *WasmProcessor) GetKvStore(id int32) *wasmhost.KvStoreHost { func (proc *WasmProcessor) KillContext(id int32) { proc.contextLock.Lock() defer proc.contextLock.Unlock() - - // TODO release processor to pool? In that case, when taking it out, don't forget to reset its data - - // owner := proc.proc - // proc.proc = owner.pool - // owner.pool = proc - delete(proc.contexts, id) } func (proc *WasmProcessor) wasmContext(function string) *WasmContext { - // clone and setup processor for each context processor := proc - if proc.WasmHost.PoolSize() != 0 { - processor = proc.getProcessor() + vmInstance := proc.NewInstance() + if vmInstance != nil { + processor = proc.getSubProcessor(vmInstance) } wc := NewWasmContext(function, processor) @@ -124,44 +117,25 @@ func (proc *WasmProcessor) wasmContext(function string) *WasmContext { return wc } -func (proc *WasmProcessor) getProcessor() *WasmProcessor { - //processor = proc.fromPool() - //if processor != nil { - // err := processor.WasmHost.Instantiate() - // if err != nil { - // panic("Cannot instantiate processor: " + err.Error()) - // } - // return processor - //} - - processor := &WasmProcessor{log: proc.log, mainProcessor: proc, wasmBytes: proc.wasmBytes, wasmVM: proc.wasmVM} - err := processor.InitVM(proc.NewInstance(), processor) +func (proc *WasmProcessor) getSubProcessor(vmInstance wasmhost.WasmVM) *WasmProcessor { + processor := &WasmProcessor{log: proc.log, mainProcessor: proc, wasmVM: proc.wasmVM} + processor.Init() + err := processor.InitVM(vmInstance, processor) if err != nil { panic("Cannot clone processor: " + err.Error()) } - processor.Init() - // TODO decide if we want be able to examine state directly from tests - // proc.SetExport(0x8fff, ViewCopyAllState) + processor.scContext = NewWasmContext("", processor) wasmhost.Connect(processor.scContext) err = processor.Instantiate() if err != nil { panic("Cannot instantiate: " + err.Error()) } + + // TODO reuse on_load data from main processor err = processor.RunFunction("on_load") if err != nil { panic("Cannot run on_load: " + err.Error()) } return processor } - -//func (proc *WasmProcessor) fromPool() *WasmProcessor { -// proc.contextLock.Lock() -// defer proc.contextLock.Unlock() -// processor := proc.procesorPool -// if processor != nil { -// proc.procesorPool = processor.mainProcessor -// processor.mainProcessor = proc -// } -// return processor -//} diff --git a/packages/vm/wasmsolo/solocontext.go b/packages/vm/wasmsolo/solocontext.go index 2cf04136d5..ec08e5c833 100644 --- a/packages/vm/wasmsolo/solocontext.go +++ b/packages/vm/wasmsolo/solocontext.go @@ -24,9 +24,9 @@ import ( ) const ( - SoloDebug = false + SoloDebug = true SoloHostTracing = false - SoloStackTracing = false + SoloStackTracing = true ) var ( From 560f22a1e8b3c6a46a30fd97715c851d69866bd6 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Thu, 18 Nov 2021 17:24:35 -0800 Subject: [PATCH 088/198] Turn off debug flags --- packages/vm/wasmsolo/solocontext.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/vm/wasmsolo/solocontext.go b/packages/vm/wasmsolo/solocontext.go index ec08e5c833..2cf04136d5 100644 --- a/packages/vm/wasmsolo/solocontext.go +++ b/packages/vm/wasmsolo/solocontext.go @@ -24,9 +24,9 @@ import ( ) const ( - SoloDebug = true + SoloDebug = false SoloHostTracing = false - SoloStackTracing = true + SoloStackTracing = false ) var ( From 1143e221bf55d05ef90a5d5505cecf4e793734b1 Mon Sep 17 00:00:00 2001 From: Karolis Petrauskas Date: Fri, 19 Nov 2021 11:07:10 +0200 Subject: [PATCH 089/198] ACS test improved by taking various input sizes. --- Makefile | 5 +++- .../commonsubset/commonsubset_test.go | 25 +++++++++++-------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 6ea18c5ee4..bd424b0375 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,9 @@ test: install test-short: go test -tags $(BUILD_TAGS) --short --count 1 -failfast ./... +test-heavy: + go test -tags $(BUILD_TAGS),runheavy --timeout 30m --count 1 -failfast ./... + install: go install -tags $(BUILD_TAGS) -ldflags $(BUILD_LD_FLAGS) ./... @@ -36,5 +39,5 @@ docker-build: --build-arg BUILD_LD_FLAGS='${BUILD_LD_FLAGS}' \ . -.PHONY: all build build-windows build-lint test test-short install install-windows lint gofumpt-list docker-build +.PHONY: all build build-windows build-lint test test-short test-heavy install install-windows lint gofumpt-list docker-build diff --git a/packages/chain/consensus/commonsubset/commonsubset_test.go b/packages/chain/consensus/commonsubset/commonsubset_test.go index f64a7304bb..32e594e3bb 100644 --- a/packages/chain/consensus/commonsubset/commonsubset_test.go +++ b/packages/chain/consensus/commonsubset/commonsubset_test.go @@ -5,6 +5,7 @@ package commonsubset_test import ( "bytes" + "crypto/rand" "fmt" "sync" "testing" @@ -177,12 +178,13 @@ func TestRandomized(t *testing.T) { } func TestCoordinator(t *testing.T) { - t.Run("N=1/T=1", func(tt *testing.T) { testCoordinator(tt, 1, 1) }) - t.Run("N=4/T=3", func(tt *testing.T) { testCoordinator(tt, 4, 3) }) - t.Run("N=10/T=7", func(tt *testing.T) { testCoordinator(tt, 10, 7) }) + t.Run("N=1/T=1/P=1E2", func(tt *testing.T) { testCoordinator(tt, 1, 1, 100) }) + t.Run("N=4/T=3/P=1E2", func(tt *testing.T) { testCoordinator(tt, 4, 3, 100) }) + t.Run("N=10/T=7/P=1E2", func(tt *testing.T) { testCoordinator(tt, 10, 7, 100) }) + t.Run("N=10/T=7/P=1E5", func(tt *testing.T) { testCoordinator(tt, 10, 7, 100000) }) } -func testCoordinator(t *testing.T, peerCount, threshold uint16) { +func testCoordinator(t *testing.T, peerCount, threshold uint16, inputLen int) { log := testlogger.NewLogger(t) defer log.Sync() peeringID := peering.RandomPeeringID() @@ -223,7 +225,8 @@ func testCoordinator(t *testing.T, peerCount, threshold uint16) { resultsWG.Add(int(peerCount)) for i := range acsCoords { ii := i - input := []byte(peerNetIDs[i]) + input := make([]byte, inputLen) + _, _ = rand.Read(input) acsCoords[i].RunACSConsensus(input, sessionID, 1, func(sid uint64, res [][]byte) { results[ii] = res resultsWG.Done() @@ -244,12 +247,13 @@ func testCoordinator(t *testing.T, peerCount, threshold uint16) { } func TestRandomizedWithCC(t *testing.T) { - t.Run("N=1/T=1", func(tt *testing.T) { testRandomizedWithCC(tt, 1, 1) }) - t.Run("N=4/T=3", func(tt *testing.T) { testRandomizedWithCC(tt, 4, 3) }) - t.Run("N=10/T=7", func(tt *testing.T) { testRandomizedWithCC(tt, 10, 7) }) + t.Run("N=1/T=1/P=1E2", func(tt *testing.T) { testRandomizedWithCC(tt, 1, 1, 100) }) + t.Run("N=4/T=3/P=1E2", func(tt *testing.T) { testRandomizedWithCC(tt, 4, 3, 100) }) + t.Run("N=10/T=7/P=1E2", func(tt *testing.T) { testRandomizedWithCC(tt, 10, 7, 100) }) + t.Run("N=10/T=7/P=1E5", func(tt *testing.T) { testRandomizedWithCC(tt, 10, 7, 100000) }) } -func testRandomizedWithCC(t *testing.T, peerCount, threshold uint16) { +func testRandomizedWithCC(t *testing.T, peerCount, threshold uint16, inputLen int) { log := testlogger.NewLogger(t) defer log.Sync() peeringID := peering.RandomPeeringID() @@ -290,7 +294,8 @@ func testRandomizedWithCC(t *testing.T, peerCount, threshold uint16) { resultsWG.Add(int(peerCount)) for i := range acsCoords { ii := i - input := []byte(peerNetIDs[i]) + input := make([]byte, inputLen) + _, _ = rand.Read(input) acsCoords[i].RunACSConsensus(input, sessionID, 1, func(sid uint64, res [][]byte) { results[ii] = res resultsWG.Done() From ac1593fb51e27bf61e89737159a17457c0224799 Mon Sep 17 00:00:00 2001 From: Karolis Petrauskas Date: Fri, 19 Nov 2021 12:58:08 +0200 Subject: [PATCH 090/198] Redundant makefile target removed. --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index 1da35ba0ba..0c8e77d3e3 100644 --- a/Makefile +++ b/Makefile @@ -21,9 +21,6 @@ test: install test-short: go test -tags $(BUILD_TAGS) --short --count 1 -failfast ./... -test-heavy: - go test -tags $(BUILD_TAGS),runheavy --timeout 30m --count 1 -failfast ./... - install: go install -tags $(BUILD_TAGS) -ldflags $(BUILD_LD_FLAGS) ./... From 4e7dc31174f91f9863a816ec9dc44aa41399e41f Mon Sep 17 00:00:00 2001 From: Karolis Petrauskas Date: Fri, 19 Nov 2021 13:00:59 +0200 Subject: [PATCH 091/198] Redundant makefile target removed. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0c8e77d3e3..021324d442 100644 --- a/Makefile +++ b/Makefile @@ -39,5 +39,5 @@ docker-build: --build-arg BUILD_LD_FLAGS='${BUILD_LD_FLAGS}' \ . -.PHONY: all build build-windows build-lint test test-short test-heavy install install-windows lint gofumpt-list docker-build +.PHONY: all build build-windows build-lint test test-short test-full install install-windows lint gofumpt-list docker-build From 6429b1a136a7426e1a5e5a066457a7c006ff4206 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Fri, 19 Nov 2021 15:45:29 +0200 Subject: [PATCH 092/198] Goshimmers txstream library usage limitted --- packages/chain/chain.go | 12 ++- packages/chain/chainimpl/chainimpl.go | 7 +- packages/chain/consensus/consensus.go | 4 +- packages/chain/nodeconnimpl/nodeconnimpl.go | 89 +++++++++++++++---- .../chain/nodeconnimpl/nodeconnimpl_chain.go | 59 ++++++++++++ packages/chain/statemgr/statemgr.go | 4 +- packages/chains/chains.go | 14 ++- packages/chains/chains_test.go | 3 +- packages/chains/dispatch.go | 89 +++++++------------ plugins/chains/plugin.go | 3 +- 10 files changed, 191 insertions(+), 93 deletions(-) create mode 100644 packages/chain/nodeconnimpl/nodeconnimpl_chain.go diff --git a/packages/chain/chain.go b/packages/chain/chain.go index 1936660d7b..627348cde5 100644 --- a/packages/chain/chain.go +++ b/packages/chain/chain.go @@ -83,7 +83,7 @@ type Committee interface { GetRandomValidators(upToN int) []string } -type NodeConnection interface { +type NodeConnectionSender interface { PullBacklog(addr *ledgerstate.AliasAddress) PullState(addr *ledgerstate.AliasAddress) PullConfirmedTransaction(addr ledgerstate.Address, txid ledgerstate.TransactionID) @@ -92,6 +92,16 @@ type NodeConnection interface { PostTransaction(tx *ledgerstate.Transaction) } +type NodeConnection interface { + NodeConnectionSender + AttachToTransactionReceived(func(*ledgerstate.AliasAddress, *ledgerstate.Transaction)) + AttachToInclusionStateReceived(func(*ledgerstate.AliasAddress, ledgerstate.TransactionID, ledgerstate.InclusionState)) + AttachToOutputReceived(func(*ledgerstate.AliasAddress, ledgerstate.Output)) + AttachToUnspentAliasOutputReceived(func(*ledgerstate.AliasAddress, *ledgerstate.AliasOutput, time.Time)) + Subscribe(addr ledgerstate.Address) + Unsubscribe(addr ledgerstate.Address) +} + type StateManager interface { Ready() *ready.Ready EventGetBlockMsg(msg *messages.GetBlockMsg) diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index d21c4a6922..ebc0e63295 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -9,7 +9,6 @@ import ( "time" "github.com/iotaledger/goshimmer/packages/ledgerstate" - txstream "github.com/iotaledger/goshimmer/packages/txstream/client" "github.com/iotaledger/hive.go/events" "github.com/iotaledger/hive.go/kvstore" "github.com/iotaledger/hive.go/logger" @@ -62,7 +61,7 @@ type chainObj struct { stateMgr chain.StateManager consensus chain.Consensus log *logger.Logger - nodeConn chain.NodeConnection + nodeConn chain.NodeConnectionSender db kvstore.KVStore peerNetworkConfig registry.PeerNetworkConfigProvider netProvider peering.NetworkProvider @@ -88,7 +87,7 @@ type committeeStruct struct { func NewChain( chainID *iscp.ChainID, log *logger.Logger, - txstreamClient *txstream.Client, + nc chain.NodeConnection, peerNetConfig registry.PeerNetworkConfigProvider, db kvstore.KVStore, netProvider peering.NetworkProvider, @@ -127,7 +126,7 @@ func NewChain( msgPipe: pipe.NewLimitPriorityInfinitePipe(messagePriorityFun, maxMsgBuffer), chainID: chainID, log: chainLog, - nodeConn: nodeconnimpl.New(txstreamClient, chainLog), + nodeConn: nodeconnimpl.NewChainNodeConnImplementation(nc, chainLog), db: db, chainStateSync: chainStateSync, stateReader: state.NewOptimisticStateReader(db, chainStateSync), diff --git a/packages/chain/consensus/consensus.go b/packages/chain/consensus/consensus.go index fb122f61a0..606d12638b 100644 --- a/packages/chain/consensus/consensus.go +++ b/packages/chain/consensus/consensus.go @@ -26,7 +26,7 @@ type Consensus struct { chain chain.ChainCore committee chain.Committee mempool chain.Mempool - nodeConn chain.NodeConnection + nodeConn chain.NodeConnectionSender vmRunner vm.VMRunner currentState state.VirtualStateAccess stateOutput *ledgerstate.AliasOutput @@ -81,7 +81,7 @@ type workflowFlags struct { var _ chain.Consensus = &Consensus{} -func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Committee, nodeConn chain.NodeConnection, pullMissingRequestsFromCommittee bool, consensusMetrics metrics.ConsensusMetrics, timersOpt ...ConsensusTimers) *Consensus { +func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Committee, nodeConn chain.NodeConnectionSender, pullMissingRequestsFromCommittee bool, consensusMetrics metrics.ConsensusMetrics, timersOpt ...ConsensusTimers) *Consensus { var timers ConsensusTimers if len(timersOpt) > 0 { timers = timersOpt[0] diff --git a/packages/chain/nodeconnimpl/nodeconnimpl.go b/packages/chain/nodeconnimpl/nodeconnimpl.go index a919268528..3895294e99 100644 --- a/packages/chain/nodeconnimpl/nodeconnimpl.go +++ b/packages/chain/nodeconnimpl/nodeconnimpl.go @@ -1,56 +1,111 @@ package nodeconnimpl import ( - "github.com/iotaledger/hive.go/logger" + "time" "github.com/iotaledger/goshimmer/packages/ledgerstate" - txstream "github.com/iotaledger/goshimmer/packages/txstream/client" + "github.com/iotaledger/goshimmer/packages/txstream" + txstream_client "github.com/iotaledger/goshimmer/packages/txstream/client" + "github.com/iotaledger/hive.go/events" + "github.com/iotaledger/hive.go/logger" + "github.com/iotaledger/wasp/packages/chain" ) type NodeConnImplementation struct { - client *txstream.Client - log *logger.Logger + client *txstream_client.Client + log *logger.Logger // general chains logger } -func New(nodeConnClient *txstream.Client, log *logger.Logger) *NodeConnImplementation { +var _ chain.NodeConnection = &NodeConnImplementation{} + +func NewNodeConnection(nodeConnClient *txstream_client.Client, log *logger.Logger) chain.NodeConnection { return &NodeConnImplementation{ client: nodeConnClient, log: log, } } +// NOTE: NodeConnectionSender methods are logged through each chain logger in ChainNodeConnImplementation + func (n *NodeConnImplementation) PullBacklog(addr *ledgerstate.AliasAddress) { - n.log.Debugf("NodeConnImplementation::PullBacklog(addr=%s)...", addr.Base58()) n.client.RequestBacklog(addr) - n.log.Debugf("NodeConnImplementation::PullBacklog(addr=%s)... Done", addr.Base58()) } func (n *NodeConnImplementation) PullState(addr *ledgerstate.AliasAddress) { - n.log.Debugf("NodeConnImplementation::PullState(addr=%s)...", addr.Base58()) n.client.RequestUnspentAliasOutput(addr) - n.log.Debugf("NodeConnImplementation::PullState(addr=%s)... Done", addr.Base58()) } func (n *NodeConnImplementation) PullConfirmedTransaction(addr ledgerstate.Address, txid ledgerstate.TransactionID) { - n.log.Debugf("NodeConnImplementation::PullConfirmedTransaction(addr=%s)...", addr.Base58()) n.client.RequestConfirmedTransaction(addr, txid) - n.log.Debugf("NodeConnImplementation::PullConfirmedTransaction(addr=%s)... Done", addr.Base58()) } func (n *NodeConnImplementation) PullTransactionInclusionState(addr ledgerstate.Address, txid ledgerstate.TransactionID) { - n.log.Debugf("NodeConnImplementation::PullTransactionInclusionState(addr=%s)...", addr.Base58()) n.client.RequestTxInclusionState(addr, txid) - n.log.Debugf("NodeConnImplementation::PullTransactionInclusionState(addr=%s)... Done", addr.Base58()) } func (n *NodeConnImplementation) PullConfirmedOutput(addr ledgerstate.Address, outputID ledgerstate.OutputID) { - n.log.Debugf("NodeConnImplementation::PullConfirmedOutput(addr=%s)...", addr.Base58()) n.client.RequestConfirmedOutput(addr, outputID) - n.log.Debugf("NodeConnImplementation::PullConfirmedOutput(addr=%s)... Done", addr.Base58()) } func (n *NodeConnImplementation) PostTransaction(tx *ledgerstate.Transaction) { - n.log.Debugf("NodeConnImplementation::PostTransaction(tx, id=%s)...", tx.ID()) n.client.PostTransaction(tx) - n.log.Debugf("NodeConnImplementation::PostTransaction(tx, id=%s)... Done", tx.ID()) +} + +func (n *NodeConnImplementation) AttachToTransactionReceived(fun func(*ledgerstate.AliasAddress, *ledgerstate.Transaction)) { + n.client.Events.TransactionReceived.Attach(events.NewClosure(func(msg *txstream.MsgTransaction) { + n.log.Debugf("NodeConnnection::TransactionReceived...") + defer n.log.Debugf("NodeConnnection::TransactionReceived... Done") + aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) + if !ok { + n.log.Warnf("NodeConnnection::TransactionReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) + return + } + fun(aliasAddr, msg.Tx) + })) +} + +func (n *NodeConnImplementation) AttachToInclusionStateReceived(fun func(*ledgerstate.AliasAddress, ledgerstate.TransactionID, ledgerstate.InclusionState)) { + n.client.Events.InclusionStateReceived.Attach(events.NewClosure(func(msg *txstream.MsgTxInclusionState) { + n.log.Debugf("NodeConnnection::InclusionStateReceived...") + defer n.log.Debugf("NodeConnnection::InclusionStateReceived... Done") + aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) + if !ok { + n.log.Warnf("NodeConnnection::InclusionStateReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) + return + } + fun(aliasAddr, msg.TxID, msg.State) + })) +} + +func (n *NodeConnImplementation) AttachToOutputReceived(fun func(*ledgerstate.AliasAddress, ledgerstate.Output)) { + n.client.Events.OutputReceived.Attach(events.NewClosure(func(msg *txstream.MsgOutput) { + n.log.Debugf("NodeConnnection::OutputReceived...") + defer n.log.Debugf("NodeConnnection::OutputReceived... Done") + aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) + if !ok { + n.log.Warnf("NodeConnnection::OutputReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) + return + } + fun(aliasAddr, msg.Output) + })) +} + +func (n *NodeConnImplementation) AttachToUnspentAliasOutputReceived(fun func(*ledgerstate.AliasAddress, *ledgerstate.AliasOutput, time.Time)) { + n.client.Events.UnspentAliasOutputReceived.Attach(events.NewClosure(func(msg *txstream.MsgUnspentAliasOutput) { + n.log.Debugf("NodeConnnection::UnspentAliasOutputReceived...") + defer n.log.Debugf("NodeConnnection::UnspentAliasOutputReceived... Done") + fun(msg.AliasAddress, msg.AliasOutput, msg.Timestamp) + })) +} + +func (n *NodeConnImplementation) Subscribe(addr ledgerstate.Address) { + n.log.Debugf("NodeConnnection::Subscribing to %v...", addr.String()) + defer n.log.Debugf("NodeConnnection::Subscribing done") + n.client.Subscribe(addr) +} + +func (n *NodeConnImplementation) Unsubscribe(addr ledgerstate.Address) { + n.log.Debugf("NodeConnnection::Unsubscribing from %v...", addr.String()) + defer n.log.Debugf("NodeConnnection::Unsubscribing done") + n.client.Unsubscribe(addr) } diff --git a/packages/chain/nodeconnimpl/nodeconnimpl_chain.go b/packages/chain/nodeconnimpl/nodeconnimpl_chain.go new file mode 100644 index 0000000000..182372b0b2 --- /dev/null +++ b/packages/chain/nodeconnimpl/nodeconnimpl_chain.go @@ -0,0 +1,59 @@ +package nodeconnimpl + +import ( + "github.com/iotaledger/goshimmer/packages/ledgerstate" + "github.com/iotaledger/hive.go/logger" + "github.com/iotaledger/wasp/packages/chain" + "github.com/iotaledger/wasp/packages/iscp" +) + +type ChainNodeConnImplementation struct { + client chain.NodeConnection + log *logger.Logger // each chain has its own logger +} + +var _ chain.NodeConnectionSender = &ChainNodeConnImplementation{} + +func NewChainNodeConnImplementation(nodeConnClient chain.NodeConnection, log *logger.Logger) chain.NodeConnectionSender { + return &ChainNodeConnImplementation{ + client: nodeConnClient, + log: log, + } +} + +func (n *ChainNodeConnImplementation) PullBacklog(addr *ledgerstate.AliasAddress) { + n.log.Debugf("ChainNodeConnImplementation::PullBacklog(addr=%s)...", addr.Base58()) + n.client.PullBacklog(addr) + n.log.Debugf("ChainNodeConnImplementation::PullBacklog(addr=%s)... Done", addr.Base58()) +} + +func (n *ChainNodeConnImplementation) PullState(addr *ledgerstate.AliasAddress) { + n.log.Debugf("ChainNodeConnImplementation::PullState(addr=%s)...", addr.Base58()) + n.client.PullState(addr) + n.log.Debugf("ChainNodeConnImplementation::PullState(addr=%s)... Done", addr.Base58()) +} + +func (n *ChainNodeConnImplementation) PullConfirmedTransaction(addr ledgerstate.Address, txID ledgerstate.TransactionID) { + n.log.Debugf("ChainNodeConnImplementation::PullConfirmedTransaction(addr=%s, txID=%v)...", addr.Base58(), txID.Base58()) + n.client.PullConfirmedTransaction(addr, txID) + n.log.Debugf("ChainNodeConnImplementation::PullConfirmedTransaction(addr=%s, txID=%v)... Done", addr.Base58(), txID.Base58()) +} + +func (n *ChainNodeConnImplementation) PullTransactionInclusionState(addr ledgerstate.Address, txID ledgerstate.TransactionID) { + n.log.Debugf("ChainNodeConnImplementation::PullTransactionInclusionState(addr=%s, txID=%v)...", addr.Base58(), txID.Base58()) + n.client.PullTransactionInclusionState(addr, txID) + n.log.Debugf("ChainNodeConnImplementation::PullTransactionInclusionState(addr=%s, txID=%v)... Done", addr.Base58(), txID.Base58()) +} + +func (n *ChainNodeConnImplementation) PullConfirmedOutput(addr ledgerstate.Address, outputID ledgerstate.OutputID) { + outputIDStr := iscp.OID(outputID) + n.log.Debugf("ChainNodeConnImplementation::PullConfirmedOutput(addr=%s, outputID=%v)...", addr.Base58(), outputIDStr) + n.client.PullConfirmedOutput(addr, outputID) + n.log.Debugf("ChainNodeConnImplementation::PullConfirmedOutput(addr=%s, outputID=%v)... Done", addr.Base58(), outputIDStr) +} + +func (n *ChainNodeConnImplementation) PostTransaction(tx *ledgerstate.Transaction) { + n.log.Debugf("ChainNodeConnImplementation::PostTransaction(txID=%s)...", tx.ID().Base58()) + n.client.PostTransaction(tx) + n.log.Debugf("ChainNodeConnImplementation::PostTransaction(txID=%s)... Done", tx.ID().Base58()) +} diff --git a/packages/chain/statemgr/statemgr.go b/packages/chain/statemgr/statemgr.go index dbd0b63783..9ecd445f54 100644 --- a/packages/chain/statemgr/statemgr.go +++ b/packages/chain/statemgr/statemgr.go @@ -25,7 +25,7 @@ type stateManager struct { store kvstore.KVStore chain chain.ChainCore peers peering.PeerDomainProvider - nodeConn chain.NodeConnection + nodeConn chain.NodeConnectionSender pullStateRetryTime time.Time solidState state.VirtualStateAccess stateOutput *ledgerstate.AliasOutput @@ -51,7 +51,7 @@ const ( maxBlocksToCommitConst = 10000 // 10k ) -func New(store kvstore.KVStore, c chain.ChainCore, peers peering.PeerDomainProvider, nodeconn chain.NodeConnection, timersOpt ...StateManagerTimers) chain.StateManager { +func New(store kvstore.KVStore, c chain.ChainCore, peers peering.PeerDomainProvider, nodeconn chain.NodeConnectionSender, timersOpt ...StateManagerTimers) chain.StateManager { var timers StateManagerTimers if len(timersOpt) > 0 { timers = timersOpt[0] diff --git a/packages/chains/chains.go b/packages/chains/chains.go index d0f2233548..60ad65de10 100644 --- a/packages/chains/chains.go +++ b/packages/chains/chains.go @@ -5,8 +5,6 @@ import ( "time" "github.com/iotaledger/goshimmer/packages/ledgerstate" - txstream "github.com/iotaledger/goshimmer/packages/txstream/client" - "github.com/iotaledger/hive.go/events" "github.com/iotaledger/hive.go/logger" "github.com/iotaledger/wasp/packages/chain" "github.com/iotaledger/wasp/packages/chain/chainimpl" @@ -34,7 +32,7 @@ type Chains struct { mutex sync.RWMutex log *logger.Logger allChains map[[ledgerstate.AddressLength]byte]chain.Chain - nodeConn *txstream.Client + nodeConn chain.NodeConnection processorConfig *processors.Config offledgerBroadcastUpToNPeers int offledgerBroadcastInterval time.Duration @@ -75,15 +73,15 @@ func (c *Chains) Dismiss() { c.allChains = make(map[[ledgerstate.AddressLength]byte]chain.Chain) } -func (c *Chains) Attach(nodeConn *txstream.Client) { +func (c *Chains) Attach(nodeConn chain.NodeConnection) { if c.nodeConn != nil { c.log.Panicf("Chains: already attached") } c.nodeConn = nodeConn - c.nodeConn.Events.TransactionReceived.Attach(events.NewClosure(c.dispatchTransactionMsg)) - c.nodeConn.Events.InclusionStateReceived.Attach(events.NewClosure(c.dispatchInclusionStateMsg)) - c.nodeConn.Events.OutputReceived.Attach(events.NewClosure(c.dispatchOutputMsg)) - c.nodeConn.Events.UnspentAliasOutputReceived.Attach(events.NewClosure(c.dispatchUnspentAliasOutputMsg)) + c.nodeConn.AttachToTransactionReceived(c.dispatchTransactionMsg) + c.nodeConn.AttachToInclusionStateReceived(c.dispatchInclusionStateMsg) + c.nodeConn.AttachToOutputReceived(c.dispatchOutputMsg) + c.nodeConn.AttachToUnspentAliasOutputReceived(c.dispatchUnspentAliasOutputMsg) } func (c *Chains) ActivateAllFromRegistry(registryProvider registry.Provider, allMetrics *metrics.Metrics) error { diff --git a/packages/chains/chains_test.go b/packages/chains/chains_test.go index afc22a205e..257a97971b 100644 --- a/packages/chains/chains_test.go +++ b/packages/chains/chains_test.go @@ -8,6 +8,7 @@ import ( "github.com/iotaledger/goshimmer/packages/database" txstream "github.com/iotaledger/goshimmer/packages/txstream/client" "github.com/iotaledger/hive.go/kvstore" + "github.com/iotaledger/wasp/packages/chain/nodeconnimpl" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/testutil/testlogger" "github.com/iotaledger/wasp/packages/vm/processors" @@ -28,5 +29,5 @@ func TestBasic(t *testing.T) { nconn := txstream.New("dummyID", logger, func() (addr string, conn net.Conn, err error) { return "", nil, xerrors.New("dummy dial error") }) - ch.Attach(nconn) + ch.Attach(nodeconnimpl.NewNodeConnection(nconn, logger)) } diff --git a/packages/chains/dispatch.go b/packages/chains/dispatch.go index 3688bd5a5a..b8b73d7790 100644 --- a/packages/chains/dispatch.go +++ b/packages/chains/dispatch.go @@ -1,87 +1,62 @@ package chains import ( + "time" + "github.com/iotaledger/goshimmer/packages/ledgerstate" - "github.com/iotaledger/goshimmer/packages/txstream" "github.com/iotaledger/wasp/packages/iscp" ) -func (c *Chains) dispatchTransactionMsg(msg *txstream.MsgTransaction) { - c.log.Debugf("NodeConnImplementation::dispatchTransactionMsg...") - defer c.log.Debugf("NodeConnImplementation::dispatchTransactionMsg... Done") - aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) - if !ok { - c.log.Warnf("chains: cannot dispatch transaction message to non-alias address") - return - } - chainID := iscp.NewChainID(aliasAddr) +func (c *Chains) dispatchTransactionMsg(address *ledgerstate.AliasAddress, tx *ledgerstate.Transaction) { + c.log.Debugf("Chains::dispatchTransactionMsg tx ID %v to address %v", tx.ID().Base58(), address.String()) + chainID := iscp.NewChainID(address) chain := c.Get(chainID) if chain == nil { - // not interested in this chainID + c.log.Warnf("Chains::dispatchTransactionMsg: not interested in tx ID %v, ignoring it", tx.ID().Base58()) return } - c.log.Debugw("dispatch transaction", - "txid", msg.Tx.ID().Base58(), - "chainid", chainID.String(), - ) - chain.ReceiveTransaction(msg.Tx) + c.log.Debugf("Chains::dispatchTransactionMsg: dispatching tx ID %v to chain ID %v", tx.ID().Base58(), chainID.String()) + chain.ReceiveTransaction(tx) + c.log.Debugf("Chains::dispatchTransactionMsg: dispatching tx ID %v completed", tx.ID().Base58()) } -func (c *Chains) dispatchInclusionStateMsg(msg *txstream.MsgTxInclusionState) { - c.log.Debugf("NodeConnImplementation::dispatchInclusionStateMsg...") - defer c.log.Debugf("NodeConnImplementation::dispatchInclusionStateMsg... Done") - aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) - if !ok { - c.log.Warnf("chains: cannot dispatch inclusion state message to non-alias address") - return - } - chainID := iscp.NewChainID(aliasAddr) +func (c *Chains) dispatchInclusionStateMsg(address *ledgerstate.AliasAddress, txID ledgerstate.TransactionID, iState ledgerstate.InclusionState) { + c.log.Debugf("Chains::dispatchInclusionStateMsg tx ID %v inclusion state %v to address %v", txID.Base58(), iState.String(), address.String()) + chainID := iscp.NewChainID(address) chain := c.Get(chainID) if chain == nil { - // not interested in this chainID + c.log.Warnf("Chains::dispatchInclusionStateMsg: not interested in tx ID %v inclusion state, ignoring it", txID.Base58()) return } - c.log.Debugw("dispatch transaction", - "txid", msg.TxID.Base58(), - "chainid", chainID.String(), - "inclusion", msg.State.String(), - ) - chain.ReceiveInclusionState(msg.TxID, msg.State) + c.log.Debugf("Chains::dispatchInclusionStateMsg: dispatching tx ID %v inclusion state to chain ID %v", txID.Base58(), chainID.String()) + chain.ReceiveInclusionState(txID, iState) + c.log.Debugf("Chains::dispatchInclusionStateMsg: dispatching tx ID %v inclusion state completed", txID.Base58()) } -func (c *Chains) dispatchOutputMsg(msg *txstream.MsgOutput) { - c.log.Debugf("NodeConnImplementation::dispatchOutputMsg...") - defer c.log.Debugf("NodeConnImplementation::dispatchOutputMsg... Done") - aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) - if !ok { - c.log.Warnf("chains: cannot dispatch output message to non-alias address") - return - } - chainID := iscp.NewChainID(aliasAddr) +func (c *Chains) dispatchOutputMsg(address *ledgerstate.AliasAddress, output ledgerstate.Output) { + outputID := iscp.OID(output.ID()) + c.log.Debugf("Chains::dispatchOutputMsg output ID %v to address %v", outputID, address.String()) + chainID := iscp.NewChainID(address) chain := c.Get(chainID) if chain == nil { - // not interested in this message + c.log.Warnf("Chains::dispatchOutputMsg: not interested in output ID %v, ignoring it", outputID) return } - c.log.Debugw("dispatch output", - "outputID", iscp.OID(msg.Output.ID()), - "chainid", chainID.String(), - ) - chain.ReceiveOutput(msg.Output) + c.log.Debugf("Chains::dispatchOutputMsg: dispatching output ID %v to chain ID %v", outputID, chainID.String()) + chain.ReceiveOutput(output) + c.log.Debugf("Chains::dispatchOutputMsg: dispatching output ID %v completed", outputID) } -func (c *Chains) dispatchUnspentAliasOutputMsg(msg *txstream.MsgUnspentAliasOutput) { - c.log.Debugf("NodeConnImplementation::dispatchUnspentAliasOutputMsg...") - defer c.log.Debugf("NodeConnImplementation::dispatchUnspentAliasOutputMsg... Done") - chainID := iscp.NewChainID(msg.AliasAddress) +func (c *Chains) dispatchUnspentAliasOutputMsg(address *ledgerstate.AliasAddress, output *ledgerstate.AliasOutput, timestamp time.Time) { + outputID := iscp.OID(output.ID()) + c.log.Debugf("Chains::dispatchUnspentAliasOutputMsg output ID %v timestamp %v to address %v", outputID, timestamp, address.String()) + chainID := iscp.NewChainID(address) chain := c.Get(chainID) if chain == nil { - // not interested in this message + c.log.Warnf("Chains::dispatchUnspentAliasOutputMsg: not interested in output ID %v, ignoring it", outputID) return } - c.log.Debugw("dispatch state", - "outputID", iscp.OID(msg.AliasOutput.ID()), - "chainid", chainID.String(), - ) - chain.ReceiveState(msg.AliasOutput, msg.Timestamp) + c.log.Debugf("Chains::dispatchUnspentAliasOutputMsg: dispatching output ID %v to chain ID %v", outputID, chainID.String()) + chain.ReceiveState(output, timestamp) + c.log.Debugf("Chains::dispatchOutputMsg: dispatching output ID %v completed", outputID) } diff --git a/plugins/chains/plugin.go b/plugins/chains/plugin.go index b3ec790996..befaec28ac 100644 --- a/plugins/chains/plugin.go +++ b/plugins/chains/plugin.go @@ -7,6 +7,7 @@ import ( "github.com/iotaledger/hive.go/logger" "github.com/iotaledger/hive.go/node" _ "github.com/iotaledger/wasp/packages/chain/chainimpl" + "github.com/iotaledger/wasp/packages/chain/nodeconnimpl" "github.com/iotaledger/wasp/packages/chains" metricspkg "github.com/iotaledger/wasp/packages/metrics" "github.com/iotaledger/wasp/packages/parameters" @@ -47,7 +48,7 @@ func run(_ *node.Plugin) { database.GetOrCreateKVStore, ) err := daemon.BackgroundWorker(PluginName, func(shutdownSignal <-chan struct{}) { - allChains.Attach(nodeconn.NodeConnection()) + allChains.Attach(nodeconnimpl.NewNodeConnection(nodeconn.NodeConnection(), log)) if parameters.GetBool(parameters.MetricsEnabled) { allMetrics = metrics.AllMetrics() } From 5bcdaaa23ba2aa426dd06be16e3de1e183abe40b Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Fri, 19 Nov 2021 17:28:04 +0200 Subject: [PATCH 093/198] Unneeded nodeconn functions removed --- packages/chain/chain.go | 2 -- packages/chain/nodeconnimpl/nodeconnimpl.go | 8 -------- packages/chain/nodeconnimpl/nodeconnimpl_chain.go | 12 ------------ 3 files changed, 22 deletions(-) diff --git a/packages/chain/chain.go b/packages/chain/chain.go index 627348cde5..fd2be56a75 100644 --- a/packages/chain/chain.go +++ b/packages/chain/chain.go @@ -84,9 +84,7 @@ type Committee interface { } type NodeConnectionSender interface { - PullBacklog(addr *ledgerstate.AliasAddress) PullState(addr *ledgerstate.AliasAddress) - PullConfirmedTransaction(addr ledgerstate.Address, txid ledgerstate.TransactionID) PullTransactionInclusionState(addr ledgerstate.Address, txid ledgerstate.TransactionID) PullConfirmedOutput(addr ledgerstate.Address, outputID ledgerstate.OutputID) PostTransaction(tx *ledgerstate.Transaction) diff --git a/packages/chain/nodeconnimpl/nodeconnimpl.go b/packages/chain/nodeconnimpl/nodeconnimpl.go index 3895294e99..f3150c0304 100644 --- a/packages/chain/nodeconnimpl/nodeconnimpl.go +++ b/packages/chain/nodeconnimpl/nodeconnimpl.go @@ -27,18 +27,10 @@ func NewNodeConnection(nodeConnClient *txstream_client.Client, log *logger.Logge // NOTE: NodeConnectionSender methods are logged through each chain logger in ChainNodeConnImplementation -func (n *NodeConnImplementation) PullBacklog(addr *ledgerstate.AliasAddress) { - n.client.RequestBacklog(addr) -} - func (n *NodeConnImplementation) PullState(addr *ledgerstate.AliasAddress) { n.client.RequestUnspentAliasOutput(addr) } -func (n *NodeConnImplementation) PullConfirmedTransaction(addr ledgerstate.Address, txid ledgerstate.TransactionID) { - n.client.RequestConfirmedTransaction(addr, txid) -} - func (n *NodeConnImplementation) PullTransactionInclusionState(addr ledgerstate.Address, txid ledgerstate.TransactionID) { n.client.RequestTxInclusionState(addr, txid) } diff --git a/packages/chain/nodeconnimpl/nodeconnimpl_chain.go b/packages/chain/nodeconnimpl/nodeconnimpl_chain.go index 182372b0b2..2c3af98c38 100644 --- a/packages/chain/nodeconnimpl/nodeconnimpl_chain.go +++ b/packages/chain/nodeconnimpl/nodeconnimpl_chain.go @@ -21,24 +21,12 @@ func NewChainNodeConnImplementation(nodeConnClient chain.NodeConnection, log *lo } } -func (n *ChainNodeConnImplementation) PullBacklog(addr *ledgerstate.AliasAddress) { - n.log.Debugf("ChainNodeConnImplementation::PullBacklog(addr=%s)...", addr.Base58()) - n.client.PullBacklog(addr) - n.log.Debugf("ChainNodeConnImplementation::PullBacklog(addr=%s)... Done", addr.Base58()) -} - func (n *ChainNodeConnImplementation) PullState(addr *ledgerstate.AliasAddress) { n.log.Debugf("ChainNodeConnImplementation::PullState(addr=%s)...", addr.Base58()) n.client.PullState(addr) n.log.Debugf("ChainNodeConnImplementation::PullState(addr=%s)... Done", addr.Base58()) } -func (n *ChainNodeConnImplementation) PullConfirmedTransaction(addr ledgerstate.Address, txID ledgerstate.TransactionID) { - n.log.Debugf("ChainNodeConnImplementation::PullConfirmedTransaction(addr=%s, txID=%v)...", addr.Base58(), txID.Base58()) - n.client.PullConfirmedTransaction(addr, txID) - n.log.Debugf("ChainNodeConnImplementation::PullConfirmedTransaction(addr=%s, txID=%v)... Done", addr.Base58(), txID.Base58()) -} - func (n *ChainNodeConnImplementation) PullTransactionInclusionState(addr ledgerstate.Address, txID ledgerstate.TransactionID) { n.log.Debugf("ChainNodeConnImplementation::PullTransactionInclusionState(addr=%s, txID=%v)...", addr.Base58(), txID.Base58()) n.client.PullTransactionInclusionState(addr, txID) From 236249658e0c774f5ae58cf75e9a35b612575146 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Fri, 19 Nov 2021 13:27:23 -0800 Subject: [PATCH 094/198] Worked around WasmTime panic bug --- go.mod | 2 +- go.sum | 2 + packages/solo/req.go | 2 +- packages/vm/wasmhost/wasmedgevm.go | 22 ++++---- packages/vm/wasmhost/wasmervm.go | 20 +++---- packages/vm/wasmhost/wasmtimevm.go | 30 +++++----- packages/vm/wasmhost/wasmvm.go | 85 ++++++++++++++++++++++++++--- packages/vm/wasmsolo/solocontext.go | 4 ++ 8 files changed, 121 insertions(+), 46 deletions(-) diff --git a/go.mod b/go.mod index cea33dbb80..669a802d98 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/PuerkitoBio/goquery v1.6.1 github.com/anthdm/hbbft v0.0.0-20190702061856-0826ffdcf567 github.com/bygui86/multi-profile/v2 v2.1.0 - github.com/bytecodealliance/wasmtime-go v0.21.0 + github.com/bytecodealliance/wasmtime-go v0.31.0 github.com/wasmerio/wasmer-go v1.0.4 github.com/second-state/WasmEdge-go v0.9.0-rc3 // indirect github.com/ethereum/go-ethereum v1.10.10 diff --git a/go.sum b/go.sum index 244bf3b696..6ba6d789cd 100644 --- a/go.sum +++ b/go.sum @@ -153,6 +153,8 @@ github.com/bygui86/multi-profile/v2 v2.1.0 h1:x/jPqeL/6hJqLXoDI/H5zLPsSFbDR6IEbr github.com/bygui86/multi-profile/v2 v2.1.0/go.mod h1:f4qCZiQo1nnJdwbPoADUtdDXg3hhnpfgZ9iq3/kW4BA= github.com/bytecodealliance/wasmtime-go v0.21.0 h1:8C6fNmpfzF6QQ9h0PCvGaYORhtgMvANCumafDPDmBSU= github.com/bytecodealliance/wasmtime-go v0.21.0/go.mod h1:q320gUxqyI8yB+ZqRuaJOEnGkAnHh6WtJjMaT2CW4wI= +github.com/bytecodealliance/wasmtime-go v0.31.0 h1:AbMdV1pwjw/0Ito5yARcGzY366cq5NIiDk5vpy1c2Lw= +github.com/bytecodealliance/wasmtime-go v0.31.0/go.mod h1:q320gUxqyI8yB+ZqRuaJOEnGkAnHh6WtJjMaT2CW4wI= github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34= github.com/capossele/asset-registry v0.0.0-20210521112927-c9d6e74574e8/go.mod h1:BXwVCA0+rgYcMKC3vVkfjF+2nXYIYq3h/HndbaCuw08= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= diff --git a/packages/solo/req.go b/packages/solo/req.go index 76e3a11b56..721525a50f 100644 --- a/packages/solo/req.go +++ b/packages/solo/req.go @@ -281,7 +281,7 @@ func (ch *Chain) CallView(scName, funName string, params ...interface{}) (dict.D // WaitForRequestsThrough waits for the moment when counters for incoming requests and removed // requests in the mempool of the chain both become equal to the specified number func (ch *Chain) WaitForRequestsThrough(numReq int, maxWait ...time.Duration) bool { - maxw := 5 * time.Second + maxw := 10 * time.Second var deadline time.Time if len(maxWait) > 0 { maxw = maxWait[0] diff --git a/packages/vm/wasmhost/wasmedgevm.go b/packages/vm/wasmhost/wasmedgevm.go index 4b96c0361f..d66ca04ba8 100644 --- a/packages/vm/wasmhost/wasmedgevm.go +++ b/packages/vm/wasmhost/wasmedgevm.go @@ -65,33 +65,33 @@ func (vm *WasmEdgeVM) importModule(name string) { func (vm *WasmEdgeVM) LinkHost(impl WasmVM, host *WasmHost) error { _ = vm.WasmVMBase.LinkHost(impl, host) - vm.importModule("WasmLib") - vm.importFunc(5, 1, "hostGetBytes", vm.exportHostGetBytes) - vm.importFunc(2, 1, "hostGetKeyID", vm.exportHostGetKeyID) - vm.importFunc(3, 1, "hostGetObjectID", vm.exportHostGetObjectID) - vm.importFunc(5, 0, "hostSetBytes", vm.exportHostSetBytes) + vm.importModule(ModuleWasmLib) + vm.importFunc(5, 1, FuncHostGetBytes, vm.exportHostGetBytes) + vm.importFunc(2, 1,FuncHostGetKeyID, vm.exportHostGetKeyID) + vm.importFunc(3, 1, FuncHostGetObjectID, vm.exportHostGetObjectID) + vm.importFunc(5, 0, FuncHostSetBytes, vm.exportHostSetBytes) err := vm.edge.RegisterImport(vm.module) if err != nil { return err } // AssemblyScript Wasm versions uses this one to write panic message to console - vm.importModule("env") - vm.importFunc(4, 0, "abort", vm.exportAbort) + vm.importModule(ModuleEnv) + vm.importFunc(4, 0, FuncAbort, vm.exportAbort) err = vm.edge.RegisterImport(vm.module) if err != nil { return err } // TinyGo Wasm versions uses these to write panic message to console - vm.importModule("wasi_unstable") - vm.importFunc(4, 1, "fd_write", vm.exportFdWrite) + vm.importModule(ModuleWasi1) + vm.importFunc(4, 1, FuncFdWrite, vm.exportFdWrite) err = vm.edge.RegisterImport(vm.module) if err != nil { return err } - vm.importModule("wasi_snapshot_preview1") - vm.importFunc(4, 1, "fd_write", vm.exportFdWrite) + vm.importModule(ModuleWasi2) + vm.importFunc(4, 1, FuncFdWrite, vm.exportFdWrite) return vm.edge.RegisterImport(vm.module) } diff --git a/packages/vm/wasmhost/wasmervm.go b/packages/vm/wasmhost/wasmervm.go index a826be74f7..8afb66c419 100644 --- a/packages/vm/wasmhost/wasmervm.go +++ b/packages/vm/wasmhost/wasmervm.go @@ -40,24 +40,24 @@ func (vm *WasmerVM) LinkHost(impl WasmVM, host *WasmHost) error { _ = vm.WasmVMBase.LinkHost(impl, host) funcs := map[string]wasmer.IntoExtern{ - "hostGetBytes": vm.importFunc(5, 1, vm.exportHostGetBytes), - "hostGetKeyID": vm.importFunc(2, 1, vm.exportHostGetKeyID), - "hostGetObjectID": vm.importFunc(3, 1, vm.exportHostGetObjectID), - "hostSetBytes": vm.importFunc(5, 0, vm.exportHostSetBytes), + FuncHostGetBytes: vm.importFunc(5, 1, vm.exportHostGetBytes), + FuncHostGetKeyID: vm.importFunc(2, 1, vm.exportHostGetKeyID), + FuncHostGetObjectID: vm.importFunc(3, 1, vm.exportHostGetObjectID), + FuncHostSetBytes: vm.importFunc(5, 0, vm.exportHostSetBytes), } - vm.linker.Register("WasmLib", funcs) + vm.linker.Register(ModuleWasmLib, funcs) funcs = map[string]wasmer.IntoExtern{ - "abort": vm.importFunc(4, 0, vm.exportAbort), + FuncAbort: vm.importFunc(4, 0, vm.exportAbort), } - vm.linker.Register("env", funcs) + vm.linker.Register(ModuleEnv, funcs) // TinyGo Wasm implementation uses this one to write panic message to console funcs = map[string]wasmer.IntoExtern{ - "fd_write": vm.importFunc(4, 1, vm.exportFdWrite), + FuncFdWrite: vm.importFunc(4, 1, vm.exportFdWrite), } - vm.linker.Register("wasi_unstable", funcs) - vm.linker.Register("wasi_snapshot_preview1", funcs) + vm.linker.Register(ModuleWasi1, funcs) + vm.linker.Register(ModuleWasi2, funcs) return nil } diff --git a/packages/vm/wasmhost/wasmtimevm.go b/packages/vm/wasmhost/wasmtimevm.go index 18e9d18655..79ee641033 100644 --- a/packages/vm/wasmhost/wasmtimevm.go +++ b/packages/vm/wasmhost/wasmtimevm.go @@ -43,38 +43,38 @@ func (vm *WasmTimeVM) LinkHost(impl WasmVM, host *WasmHost) (err error) { return err } - vm.linker = wasmtime.NewLinker(vm.store) + vm.linker = wasmtime.NewLinker(vm.engine) _ = vm.WasmVMBase.LinkHost(impl, host) - err = vm.linker.DefineFunc("WasmLib", "hostGetBytes", vm.HostGetBytes) + err = vm.linker.DefineFunc(vm.store, ModuleWasmLib, FuncHostGetBytes, vm.HostGetBytes) if err != nil { return err } - err = vm.linker.DefineFunc("WasmLib", "hostGetKeyID", vm.HostGetKeyID) + err = vm.linker.DefineFunc(vm.store, ModuleWasmLib, FuncHostGetKeyID, vm.HostGetKeyID) if err != nil { return err } - err = vm.linker.DefineFunc("WasmLib", "hostGetObjectID", vm.HostGetObjectID) + err = vm.linker.DefineFunc(vm.store, ModuleWasmLib, FuncHostGetObjectID, vm.HostGetObjectID) if err != nil { return err } - err = vm.linker.DefineFunc("WasmLib", "hostSetBytes", vm.HostSetBytes) + err = vm.linker.DefineFunc(vm.store, ModuleWasmLib, FuncHostSetBytes, vm.HostSetBytes) if err != nil { return err } // AssemblyScript Wasm versions uses this one to write panic message to console - err = vm.linker.DefineFunc("env", "abort", vm.EnvAbort) + err = vm.linker.DefineFunc(vm.store, ModuleEnv, FuncAbort, vm.HostAbort) if err != nil { return err } // TinyGo Wasm versions uses this one to write panic message to console - err = vm.linker.DefineFunc("wasi_unstable", "fd_write", vm.HostFdWrite) + err = vm.linker.DefineFunc(vm.store, ModuleWasi1, FuncFdWrite, vm.HostFdWrite) if err != nil { return err } - return vm.linker.DefineFunc("wasi_snapshot_preview1", "fd_write", vm.HostFdWrite) + return vm.linker.DefineFunc(vm.store, ModuleWasi2, FuncFdWrite, vm.HostFdWrite) } func (vm *WasmTimeVM) LoadWasm(wasmData []byte) (err error) { @@ -86,11 +86,11 @@ func (vm *WasmTimeVM) LoadWasm(wasmData []byte) (err error) { } func (vm *WasmTimeVM) Instantiate() (err error) { - vm.instance, err = vm.linker.Instantiate(vm.module) + vm.instance, err = vm.linker.Instantiate(vm.store, vm.module) if err != nil { return err } - memory := vm.instance.GetExport("memory") + memory := vm.instance.GetExport(vm.store, "memory") if memory == nil { return errors.New("no memory export") } @@ -102,28 +102,28 @@ func (vm *WasmTimeVM) Instantiate() (err error) { } func (vm *WasmTimeVM) RunFunction(functionName string, args ...interface{}) error { - export := vm.instance.GetExport(functionName) + export := vm.instance.GetExport(vm.store, functionName) if export == nil { return errors.New("unknown export function: '" + functionName + "'") } return vm.Run(func() (err error) { - _, err = export.Func().Call(args...) + _, err = export.Func().Call(vm.store, args...) return err }) } func (vm *WasmTimeVM) RunScFunction(index int32) error { - export := vm.instance.GetExport("on_call") + export := vm.instance.GetExport(vm.store, "on_call") if export == nil { return errors.New("unknown export function: 'on_call'") } return vm.Run(func() (err error) { - _, err = export.Func().Call(index) + _, err = export.Func().Call(vm.store, index) return err }) } func (vm *WasmTimeVM) UnsafeMemory() []byte { - return vm.memory.UnsafeData() + return vm.memory.UnsafeData(vm.store) } diff --git a/packages/vm/wasmhost/wasmvm.go b/packages/vm/wasmhost/wasmvm.go index f539949779..7c87d02b99 100644 --- a/packages/vm/wasmhost/wasmvm.go +++ b/packages/vm/wasmhost/wasmvm.go @@ -10,7 +10,19 @@ import ( "time" ) -const defaultTimeout = 5 * time.Second +const ( + defaultTimeout = 5 * time.Second + FuncAbort = "abort" + FuncFdWrite = "fd_write" + FuncHostGetBytes = "hostGetBytes" + FuncHostGetKeyID = "hostGetKeyID" + FuncHostGetObjectID = "hostGetObjectID" + FuncHostSetBytes = "hostSetBytes" + ModuleEnv = "env" + ModuleWasi1 = "wasi_unstable" + ModuleWasi2 = "wasi_snapshot_preview1" + ModuleWasmLib = "WasmLib" +) var ( // DisableWasmTimeout can be used to disable the annoying timeout during debugging @@ -43,14 +55,44 @@ type WasmVM interface { type WasmVMBase struct { impl WasmVM host *WasmHost + panicErr error result []byte resultKeyID int32 timeoutStarted bool } -func (vm *WasmVMBase) EnvAbort(errMsg, fileName, line, col int32) { +// catchPanicMessage is used in every host function to catch any panic. +// It will save the first panic it encounters in the WasmVMBase so that +// the caller of the Wasm function can retrieve the correct error. +// This is a workaround to WasmTime saving the *last* panic instead of +// the first, thereby reporting the wrong panic error sometimes +func (vm *WasmVMBase) catchPanicMessage() { + panicMsg := recover() + if panicMsg == nil { + return + } + if vm.panicErr == nil { + switch msg := panicMsg.(type) { + case error: + vm.panicErr = msg + default: + vm.panicErr = fmt.Errorf("%v", msg) + } + } + // rethrow and let nature run its course... + panic(panicMsg) +} + +//nolint:unparam +func (vm *WasmVMBase) getKvStore(id int32) *KvStoreHost { + return vm.host.getKvStore(id) +} + +func (vm *WasmVMBase) HostAbort(errMsg, fileName, line, col int32) { // crude implementation assumes texts to only use ASCII part of UTF-16 + defer vm.catchPanicMessage() + // null-terminated UTF-16 error message str1 := make([]byte, 0) ptr := vm.impl.VMGetBytes(errMsg, 2) @@ -70,12 +112,9 @@ func (vm *WasmVMBase) EnvAbort(errMsg, fileName, line, col int32) { panic(fmt.Sprintf("AssemblyScript panic: %s (%s %d:%d)", string(str1), string(str2), line, col)) } -//nolint:unparam -func (vm *WasmVMBase) getKvStore(id int32) *KvStoreHost { - return vm.host.getKvStore(id) -} - func (vm *WasmVMBase) HostFdWrite(_fd, iovs, _size, written int32) int32 { + defer vm.catchPanicMessage() + host := vm.getKvStore(0) host.TraceAllf("HostFdWrite(...)") // very basic implementation that expects fd to be stdout and iovs to be only one element @@ -91,6 +130,8 @@ func (vm *WasmVMBase) HostFdWrite(_fd, iovs, _size, written int32) int32 { } func (vm *WasmVMBase) HostGetBytes(objID, keyID, typeID, stringRef, size int32) int32 { + defer vm.catchPanicMessage() + host := vm.getKvStore(0) host.TraceAllf("HostGetBytes(o%d,k%d,t%d,r%d,s%d)", objID, keyID, typeID, stringRef, size) @@ -137,6 +178,8 @@ func (vm *WasmVMBase) HostGetBytes(objID, keyID, typeID, stringRef, size int32) } func (vm *WasmVMBase) HostGetKeyID(keyRef, size int32) int32 { + defer vm.catchPanicMessage() + host := vm.getKvStore(0) host.TraceAllf("HostGetKeyID(r%d,s%d)", keyRef, size) // non-negative size means original key was a string @@ -151,12 +194,16 @@ func (vm *WasmVMBase) HostGetKeyID(keyRef, size int32) int32 { } func (vm *WasmVMBase) HostGetObjectID(objID, keyID, typeID int32) int32 { + defer vm.catchPanicMessage() + host := vm.getKvStore(0) host.TraceAllf("HostGetObjectID(o%d,k%d,t%d)", objID, keyID, typeID) return host.GetObjectID(objID, keyID, typeID) } func (vm *WasmVMBase) HostSetBytes(objID, keyID, typeID, stringRef, size int32) { + defer vm.catchPanicMessage() + host := vm.getKvStore(0) host.TraceAllf("HostSetBytes(o%d,k%d,t%d,r%d,s%d)", objID, keyID, typeID, stringRef, size) bytes := vm.impl.VMGetBytes(stringRef, size) @@ -179,9 +226,27 @@ func (vm *WasmVMBase) LinkHost(impl WasmVM, host *WasmHost) error { } func (vm *WasmVMBase) Run(runner func() error) (err error) { + defer func() { + r := recover() + if r == nil { + return + } + // could be the wrong panic message due to a WasmTime bug, so we always + // rethrow our intercepted first panic instead of WasmTime's last panic + if vm.panicErr != nil { + panic(vm.panicErr) + } + panic(r) + }() + if vm.timeoutStarted { // no need to wrap nested calls in timeout code - return runner() + err = runner() + if vm.panicErr != nil { + err = vm.panicErr + vm.panicErr = nil + } + return err } timeout := defaultTimeout @@ -208,6 +273,10 @@ func (vm *WasmVMBase) Run(runner func() error) (err error) { err = runner() done <- true vm.timeoutStarted = false + if vm.panicErr != nil { + err = vm.panicErr + vm.panicErr = nil + } return err } diff --git a/packages/vm/wasmsolo/solocontext.go b/packages/vm/wasmsolo/solocontext.go index 2cf04136d5..d26e638a23 100644 --- a/packages/vm/wasmsolo/solocontext.go +++ b/packages/vm/wasmsolo/solocontext.go @@ -156,6 +156,10 @@ func soloContext(t *testing.T, chain *solo.Chain, scName string, creator *SoloAg // StartChain starts a new chain named chainName. func StartChain(t *testing.T, chainName string, env ...*solo.Solo) *solo.Chain { + if SoloDebug { + // avoid pesky timeouts during debugging + wasmhost.DisableWasmTimeout = true + } wasmhost.HostTracing = SoloHostTracing // wasmhost.HostTracingAll = SoloHostTracing From cac759d71349dbc435060416ad0037b23d293011 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Sat, 20 Nov 2021 18:13:20 -0800 Subject: [PATCH 095/198] Introduce events to schema --- contracts/wasm/dividend/test/dividend_bg.wasm | Bin 32172 -> 32172 bytes .../test/donatewithfeedback_bg.wasm | Bin 36378 -> 36374 bytes contracts/wasm/erc20/go/erc20/erc20.go | 29 +++--- contracts/wasm/erc20/go/erc20/events.go | 20 ++++ contracts/wasm/erc20/go/erc20/lib.go | 4 + contracts/wasm/erc20/schema.yaml | 5 + contracts/wasm/erc20/src/erc20.rs | 29 +++--- contracts/wasm/erc20/src/events.rs | 24 +++++ contracts/wasm/erc20/src/lib.rs | 10 ++ contracts/wasm/erc20/test/erc20_bg.wasm | Bin 34341 -> 35270 bytes contracts/wasm/erc20/ts/erc20/contract.ts | 4 + contracts/wasm/erc20/ts/erc20/erc20.ts | 25 +++-- contracts/wasm/erc20/ts/erc20/events.ts | 19 ++++ contracts/wasm/erc20/ts/erc20/index.ts | 1 + .../wasm/fairauction/test/fairauction_bg.wasm | Bin 42599 -> 42600 bytes .../fair_roulette_service.ts | 36 +++---- .../fairroulette/go/fairroulette/events.go | 49 ++++++++++ .../go/fairroulette/fairroulette.go | 18 ++-- .../wasm/fairroulette/go/fairroulette/lib.go | 11 ++- contracts/wasm/fairroulette/schema.yaml | 14 +++ contracts/wasm/fairroulette/src/events.rs | 51 ++++++++++ .../wasm/fairroulette/src/fairroulette.rs | 49 +++------- contracts/wasm/fairroulette/src/lib.rs | 12 +++ .../fairroulette/test/fairroulette_bg.wasm | Bin 41127 -> 39986 bytes .../fairroulette/ts/fairroulette/contract.ts | 5 + .../fairroulette/ts/fairroulette/events.ts | 48 ++++++++++ .../ts/fairroulette/fairroulette.ts | 24 ++--- .../fairroulette/ts/fairroulette/index.ts | 1 + .../wasm/inccounter/test/inccounter_bg.wasm | Bin 36919 -> 36919 bytes contracts/wasm/testcore/test/testcore_bg.wasm | Bin 50571 -> 50575 bytes .../wasm/testwasmlib/test/testwasmlib_bg.wasm | Bin 39463 -> 39463 bytes .../tokenregistry/test/tokenregistry_bg.wasm | Bin 31896 -> 31888 bytes .../sbtests/sbtestsc/testcore_bg.wasm | Bin 50571 -> 50575 bytes packages/vm/wasmlib/go/wasmlib/events.go | 74 ++++++++++++++ packages/vm/wasmlib/go/wasmlib/hashtypes.go | 2 +- packages/vm/wasmlib/src/bytes.rs | 24 ++--- packages/vm/wasmlib/src/events.rs | 90 ++++++++++++++++++ packages/vm/wasmlib/src/lib.rs | 2 + packages/vm/wasmlib/ts/wasmlib/bytes.ts | 24 ++--- packages/vm/wasmlib/ts/wasmlib/events.ts | 88 +++++++++++++++++ packages/vm/wasmlib/ts/wasmlib/index.ts | 1 + tools/cluster/tests/wasm/inccounter_bg.wasm | Bin 36919 -> 36919 bytes tools/schema/generator/emitter.go | 17 ++++ tools/schema/generator/generator.go | 5 + .../generator/gotemplates/alltemplates.go | 1 + tools/schema/generator/gotemplates/events.go | 34 +++++++ tools/schema/generator/gotemplates/lib.go | 9 ++ .../generator/rstemplates/alltemplates.go | 9 ++ tools/schema/generator/rstemplates/events.go | 45 +++++++++ tools/schema/generator/rstemplates/lib.go | 20 ++++ tools/schema/generator/schema.go | 82 ++++++++++------ .../generator/tstemplates/alltemplates.go | 1 + .../schema/generator/tstemplates/contract.go | 9 ++ tools/schema/generator/tstemplates/events.go | 34 +++++++ tools/schema/generator/tstemplates/index.go | 5 + tools/schema/main.go | 1 + 56 files changed, 888 insertions(+), 177 deletions(-) create mode 100644 contracts/wasm/erc20/go/erc20/events.go create mode 100644 contracts/wasm/erc20/src/events.rs create mode 100644 contracts/wasm/erc20/ts/erc20/events.ts create mode 100644 contracts/wasm/fairroulette/go/fairroulette/events.go create mode 100644 contracts/wasm/fairroulette/src/events.rs create mode 100644 contracts/wasm/fairroulette/ts/fairroulette/events.ts create mode 100644 packages/vm/wasmlib/go/wasmlib/events.go create mode 100644 packages/vm/wasmlib/src/events.rs create mode 100644 packages/vm/wasmlib/ts/wasmlib/events.ts create mode 100644 tools/schema/generator/gotemplates/events.go create mode 100644 tools/schema/generator/rstemplates/events.go create mode 100644 tools/schema/generator/tstemplates/events.go diff --git a/contracts/wasm/dividend/test/dividend_bg.wasm b/contracts/wasm/dividend/test/dividend_bg.wasm index 96142c1f21b4888fe8ec73343c0f979c98f8dfe5..c375d57115ad0873046a285643af1990426378da 100644 GIT binary patch delta 262 zcmZ4Un{mx=#tj0D%#2J-lZ6>)@I|&UPG{5r5h~LeBR213Jnt@irQ-mDqqYKzBS)5F zLnn}Zq+|1J&we(hGo6!l0{WO1bZy=faE4{FOStmn)uFi{T6k4EP@RwhqoYEW*QMTaxp*vBaq^rY@Vyn i$TN9!cCzd(76ArVpjZwNO8_y9KMly%++3V%DF6U8>rk-( delta 256 zcmZ4Un{mx=#tj0D%uGy-lZ6>)@I|ySwlPj;)R@kwGMzDU^G?R|?!qly2N)c+6<8cO zvK%*n*k3v~&-UzRW9n(2tP{}3^q_t7o`5qfjINVAL;Jy`lJKn#pgJK1Mn{D##|9Al zO~+)vuy2z)LY0Ltw1Le7%l!edKeTVI3b$sP{6BWl^7zvmdQ0aR=nImIS^n3VxG;#xt0O|*Z@%X diff --git a/contracts/wasm/donatewithfeedback/test/donatewithfeedback_bg.wasm b/contracts/wasm/donatewithfeedback/test/donatewithfeedback_bg.wasm index 51a1dfea40e7987a854800c8101665f76705c91a..2c39e87b3a6d9f86fe7621c49cc0c47f40738f73 100644 GIT binary patch delta 412 zcmbO=hiTdzrVUDrER0M{Oq10ZwHTQu2QudKB~4^p#HbGcmFGgQ; z#t)M{EHgzF7##(&9KSRiU=XNOU{qk#WEL=Io_yZ&hXF^H0)yj;bq5$Um>2{afKnhy z4s+%OASQ$388jJ&&A+TXr5ODtyM#U!UeIxX!BJa*#gQY+@eGJPp<}a6m>@gjsmXq^ z^{kF>fc9-Z8!N)dG^2C!OPp4?S!#mm6}0gOP3bMnJVeMYXyf>p_~%UA>$T!CUaKr8{oF#a?kTXXZp HYEK~mHyC~1 delta 440 zcmZ9IPbh<79LJyEvn`|OWe!NZHpxs8HMWySsg0%_xS2Mr?44M-7=_5TgTwsFK}(u) zlIXcO?68ZqG;$KPL~)ao16s@TzH;%@w?5DFd49j=&t8)5C+V3P^psM-Hs}Byj=@5e zF98WiL01Z_De&VB*x-wQgQpLQ=yJ?8vEo*Sv{TYTWndrc8rx|aWRR(yV%G85D+Oi3 za;KV-)>Q*moz$m06u^wC%>R={{_b=)fCu}>Uro313}H4|FSfFx%9%Lto~SN^OB|eB z3@oK{L$uMBfvsHDe(u*Enk zQzivl33|f={3`rN%NvO(c@rPQPnUWO_!8-aGW4uWw*+(&86t#)MCwHT=6iyzB1U{( cR-k~MNR+ztco%V2mWyR|fJg 0, "erc20.transfer.fail: wrong 'amount' parameter") balances := f.State.Balances() - sourceBalance := balances.GetInt64(ctx.Caller()) + sourceAgent := ctx.Caller() + sourceBalance := balances.GetInt64(sourceAgent) ctx.Require(sourceBalance.Value() >= amount, "erc20.transfer.fail: not enough funds") - targetAddr := f.Params.Account().Value() - targetBalance := balances.GetInt64(targetAddr) + targetAgent := f.Params.Account().Value() + targetBalance := balances.GetInt64(targetAgent) result := targetBalance.Value() + amount ctx.Require(result > 0, "erc20.transfer.fail: overflow") sourceBalance.SetValue(sourceBalance.Value() - amount) targetBalance.SetValue(targetBalance.Value() + amount) + + f.Events.Transfer(amount, sourceAgent, targetAgent) } // Moves the amount of tokens from sender to recipient using the allowance mechanism. -// Amount is then deducted from the caller’s allowance. This function emits the Transfer event. +// Amount is then deducted from the caller’s allowance. +// This function emits the Transfer event. // Input: // - PARAM_ACCOUNT: agentID the spender // - PARAM_RECIPIENT: agentID the target // - PARAM_AMOUNT: i64 func funcTransferFrom(ctx wasmlib.ScFuncContext, f *TransferFromContext) { // validate parameters - account := f.Params.Account().Value() - recipient := f.Params.Recipient().Value() amount := f.Params.Amount().Value() ctx.Require(amount > 0, "erc20.transfer_from.fail: wrong 'amount' parameter") // allowances are in the map under the name of the account - allowances := f.State.AllAllowances().GetAllowancesForAgent(account) + sourceAgent := f.Params.Account().Value() + allowances := f.State.AllAllowances().GetAllowancesForAgent(sourceAgent) allowance := allowances.GetInt64(ctx.Caller()) ctx.Require(allowance.Value() >= amount, "erc20.transfer_from.fail: not enough allowance") balances := f.State.Balances() - sourceBalance := balances.GetInt64(account) + sourceBalance := balances.GetInt64(sourceAgent) ctx.Require(sourceBalance.Value() >= amount, "erc20.transfer_from.fail: not enough funds") - recipientBalance := balances.GetInt64(recipient) - result := recipientBalance.Value() + amount + targetAgent := f.Params.Recipient().Value() + targetBalance := balances.GetInt64(targetAgent) + result := targetBalance.Value() + amount ctx.Require(result > 0, "erc20.transfer_from.fail: overflow") sourceBalance.SetValue(sourceBalance.Value() - amount) - recipientBalance.SetValue(recipientBalance.Value() + amount) + targetBalance.SetValue(targetBalance.Value() + amount) allowance.SetValue(allowance.Value() - amount) + + f.Events.Transfer(amount, sourceAgent, targetAgent) } // the view returns max number of tokens the owner PARAM_ACCOUNT of the account diff --git a/contracts/wasm/erc20/go/erc20/events.go b/contracts/wasm/erc20/go/erc20/events.go new file mode 100644 index 0000000000..eea5d9fbdd --- /dev/null +++ b/contracts/wasm/erc20/go/erc20/events.go @@ -0,0 +1,20 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package erc20 + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +type Erc20Events struct{} + +func (e Erc20Events) Transfer(amount int64, from wasmlib.ScAgentID, to wasmlib.ScAgentID) { + wasmlib.NewEventEncoder("erc20.transfer"). + Int64(amount). + AgentID(from). + AgentID(to). + Emit() +} diff --git a/contracts/wasm/erc20/go/erc20/lib.go b/contracts/wasm/erc20/go/erc20/lib.go index d4948bdbf6..5970c162bd 100644 --- a/contracts/wasm/erc20/go/erc20/lib.go +++ b/contracts/wasm/erc20/go/erc20/lib.go @@ -25,6 +25,7 @@ func OnLoad() { } type ApproveContext struct { + Events Erc20Events Params ImmutableApproveParams State MutableErc20State } @@ -46,6 +47,7 @@ func funcApproveThunk(ctx wasmlib.ScFuncContext) { } type InitContext struct { + Events Erc20Events Params ImmutableInitParams State MutableErc20State } @@ -67,6 +69,7 @@ func funcInitThunk(ctx wasmlib.ScFuncContext) { } type TransferContext struct { + Events Erc20Events Params ImmutableTransferParams State MutableErc20State } @@ -88,6 +91,7 @@ func funcTransferThunk(ctx wasmlib.ScFuncContext) { } type TransferFromContext struct { + Events Erc20Events Params ImmutableTransferFromParams State MutableErc20State } diff --git a/contracts/wasm/erc20/schema.yaml b/contracts/wasm/erc20/schema.yaml index 31d9cc2147..7bb44b4a24 100644 --- a/contracts/wasm/erc20/schema.yaml +++ b/contracts/wasm/erc20/schema.yaml @@ -1,5 +1,10 @@ name: Erc20 description: ERC-20 PoC for IOTA Smart Contracts +events: + transfer: + amount: Int64 + from: AgentID + to: AgentID structs: {} typedefs: AllowancesForAgent: map[AgentID]Int64 diff --git a/contracts/wasm/erc20/src/erc20.rs b/contracts/wasm/erc20/src/erc20.rs index 12ada48ffb..9f9aed7d39 100644 --- a/contracts/wasm/erc20/src/erc20.rs +++ b/contracts/wasm/erc20/src/erc20.rs @@ -44,6 +44,7 @@ pub fn func_init(ctx: &ScFuncContext, f: &InitContext) { } // transfer moves tokens from caller's account to target account +// This function emits the Transfer event. // Input: // - PARAM_ACCOUNT: agentID // - PARAM_AMOUNT: i64 @@ -52,47 +53,53 @@ pub fn func_transfer(ctx: &ScFuncContext, f: &TransferContext) { ctx.require(amount > 0, "erc20.transfer.fail: wrong 'amount' parameter"); let balances = f.state.balances(); - let source_balance = balances.get_int64(&ctx.caller()); + let source_agent = ctx.caller(); + let source_balance = balances.get_int64(&source_agent); ctx.require(source_balance.value() >= amount, "erc20.transfer.fail: not enough funds"); - let target_addr = f.params.account().value(); - let target_balance = balances.get_int64(&target_addr); + let target_agent = f.params.account().value(); + let target_balance = balances.get_int64(&target_agent); let result = target_balance.value() + amount; ctx.require(result > 0, "erc20.transfer.fail: overflow"); source_balance.set_value(source_balance.value() - amount); target_balance.set_value(target_balance.value() + amount); + + f.events.transfer(amount, &source_agent, &target_agent); } // Moves the amount of tokens from sender to recipient using the allowance mechanism. -// Amount is then deducted from the caller’s allowance. This function emits the Transfer event. +// Amount is then deducted from the caller’s allowance. +// This function emits the Transfer event. // Input: // - PARAM_ACCOUNT: agentID the spender // - PARAM_RECIPIENT: agentID the target // - PARAM_AMOUNT: i64 pub fn func_transfer_from(ctx: &ScFuncContext, f: &TransferFromContext) { // validate parameters - let account = f.params.account().value(); - let recipient = f.params.recipient().value(); let amount = f.params.amount().value(); ctx.require(amount > 0, "erc20.transfer_from.fail: wrong 'amount' parameter"); // allowances are in the map under the name of the account - let allowances = f.state.all_allowances().get_allowances_for_agent(&account); + let source_agent = f.params.account().value(); + let allowances = f.state.all_allowances().get_allowances_for_agent(&source_agent); let allowance = allowances.get_int64(&ctx.caller()); ctx.require(allowance.value() >= amount, "erc20.transfer_from.fail: not enough allowance"); let balances = f.state.balances(); - let source_balance = balances.get_int64(&account); + let source_balance = balances.get_int64(&source_agent); ctx.require(source_balance.value() >= amount, "erc20.transfer_from.fail: not enough funds"); - let recipient_balance = balances.get_int64(&recipient); - let result = recipient_balance.value() + amount; + let target_agent = f.params.recipient().value(); + let target_balance = balances.get_int64(&target_agent); + let result = target_balance.value() + amount; ctx.require(result > 0, "erc20.transfer_from.fail: overflow"); source_balance.set_value(source_balance.value() - amount); - recipient_balance.set_value(recipient_balance.value() + amount); + target_balance.set_value(target_balance.value() + amount); allowance.set_value(allowance.value() - amount); + + f.events.transfer(amount, &source_agent, &target_agent); } // the view returns max number of tokens the owner PARAM_ACCOUNT of the account diff --git a/contracts/wasm/erc20/src/events.rs b/contracts/wasm/erc20/src/events.rs new file mode 100644 index 0000000000..d943007f53 --- /dev/null +++ b/contracts/wasm/erc20/src/events.rs @@ -0,0 +1,24 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] + +use wasmlib::*; + +pub struct Erc20Events { +} + +impl Erc20Events { + + pub fn transfer(&self, amount: i64, from: &ScAgentID, to: &ScAgentID) { + let mut encoder = EventEncoder::new("erc20.transfer"); + encoder.int64(amount); + encoder.agent_id(&from); + encoder.agent_id(&to); + encoder.emit(); + } +} diff --git a/contracts/wasm/erc20/src/lib.rs b/contracts/wasm/erc20/src/lib.rs index 2dc5059e2a..e3bc083c0b 100644 --- a/contracts/wasm/erc20/src/lib.rs +++ b/contracts/wasm/erc20/src/lib.rs @@ -13,6 +13,7 @@ use wasmlib::*; use wasmlib::host::*; use crate::consts::*; +use crate::events::*; use crate::keys::*; use crate::params::*; use crate::results::*; @@ -20,6 +21,7 @@ use crate::state::*; mod consts; mod contract; +mod events; mod keys; mod params; mod results; @@ -46,6 +48,7 @@ fn on_load() { } pub struct ApproveContext { + events: Erc20Events, params: ImmutableApproveParams, state: MutableErc20State, } @@ -53,6 +56,7 @@ pub struct ApproveContext { fn func_approve_thunk(ctx: &ScFuncContext) { ctx.log("erc20.funcApprove"); let f = ApproveContext { + events: Erc20Events {}, params: ImmutableApproveParams { id: OBJ_ID_PARAMS, }, @@ -67,6 +71,7 @@ fn func_approve_thunk(ctx: &ScFuncContext) { } pub struct InitContext { + events: Erc20Events, params: ImmutableInitParams, state: MutableErc20State, } @@ -74,6 +79,7 @@ pub struct InitContext { fn func_init_thunk(ctx: &ScFuncContext) { ctx.log("erc20.funcInit"); let f = InitContext { + events: Erc20Events {}, params: ImmutableInitParams { id: OBJ_ID_PARAMS, }, @@ -88,6 +94,7 @@ fn func_init_thunk(ctx: &ScFuncContext) { } pub struct TransferContext { + events: Erc20Events, params: ImmutableTransferParams, state: MutableErc20State, } @@ -95,6 +102,7 @@ pub struct TransferContext { fn func_transfer_thunk(ctx: &ScFuncContext) { ctx.log("erc20.funcTransfer"); let f = TransferContext { + events: Erc20Events {}, params: ImmutableTransferParams { id: OBJ_ID_PARAMS, }, @@ -109,6 +117,7 @@ fn func_transfer_thunk(ctx: &ScFuncContext) { } pub struct TransferFromContext { + events: Erc20Events, params: ImmutableTransferFromParams, state: MutableErc20State, } @@ -116,6 +125,7 @@ pub struct TransferFromContext { fn func_transfer_from_thunk(ctx: &ScFuncContext) { ctx.log("erc20.funcTransferFrom"); let f = TransferFromContext { + events: Erc20Events {}, params: ImmutableTransferFromParams { id: OBJ_ID_PARAMS, }, diff --git a/contracts/wasm/erc20/test/erc20_bg.wasm b/contracts/wasm/erc20/test/erc20_bg.wasm index 868e080120ce03abfa9c4ccbac97f5f49f364f69..bc37edaebc60b0833481c66625bb5acb1c188642 100644 GIT binary patch delta 13063 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 Bz~uk{ delta 12471 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 diff --git a/contracts/wasm/erc20/ts/erc20/contract.ts b/contracts/wasm/erc20/ts/erc20/contract.ts index 050766e474..111b9e6733 100644 --- a/contracts/wasm/erc20/ts/erc20/contract.ts +++ b/contracts/wasm/erc20/ts/erc20/contract.ts @@ -14,6 +14,7 @@ export class ApproveCall { } export class ApproveContext { + events: sc.Erc20Events = new sc.Erc20Events(); params: sc.ImmutableApproveParams = new sc.ImmutableApproveParams(); state: sc.MutableErc20State = new sc.MutableErc20State(); } @@ -24,6 +25,7 @@ export class InitCall { } export class InitContext { + events: sc.Erc20Events = new sc.Erc20Events(); params: sc.ImmutableInitParams = new sc.ImmutableInitParams(); state: sc.MutableErc20State = new sc.MutableErc20State(); } @@ -34,6 +36,7 @@ export class TransferCall { } export class TransferContext { + events: sc.Erc20Events = new sc.Erc20Events(); params: sc.ImmutableTransferParams = new sc.ImmutableTransferParams(); state: sc.MutableErc20State = new sc.MutableErc20State(); } @@ -44,6 +47,7 @@ export class TransferFromCall { } export class TransferFromContext { + events: sc.Erc20Events = new sc.Erc20Events(); params: sc.ImmutableTransferFromParams = new sc.ImmutableTransferFromParams(); state: sc.MutableErc20State = new sc.MutableErc20State(); } diff --git a/contracts/wasm/erc20/ts/erc20/erc20.ts b/contracts/wasm/erc20/ts/erc20/erc20.ts index 16f351ad9d..161a48b736 100644 --- a/contracts/wasm/erc20/ts/erc20/erc20.ts +++ b/contracts/wasm/erc20/ts/erc20/erc20.ts @@ -43,6 +43,7 @@ export function funcInit(ctx: wasmlib.ScFuncContext, f: sc.InitContext): void { } // transfer moves tokens from caller's account to target account +// This function emits the Transfer event. // Input: // - PARAM_ACCOUNT: agentID // - PARAM_AMOUNT: i64 @@ -51,47 +52,53 @@ export function funcTransfer(ctx: wasmlib.ScFuncContext, f: sc.TransferContext): ctx.require(amount > 0, "erc20.transfer.fail: wrong 'amount' parameter"); let balances = f.state.balances(); - let sourceBalance = balances.getInt64(ctx.caller()); + let sourceAgent = ctx.caller(); + let sourceBalance = balances.getInt64(sourceAgent); ctx.require(sourceBalance.value() >= amount, "erc20.transfer.fail: not enough funds"); - let targetAddr = f.params.account().value(); - let targetBalance = balances.getInt64(targetAddr); + let targetAgent = f.params.account().value(); + let targetBalance = balances.getInt64(targetAgent); let result = targetBalance.value() + amount; ctx.require(result > 0, "erc20.transfer.fail: overflow"); sourceBalance.setValue(sourceBalance.value() - amount); targetBalance.setValue(targetBalance.value() + amount); + + f.events.transfer(amount, sourceAgent, targetAgent) } // Moves the amount of tokens from sender to recipient using the allowance mechanism. -// Amount is then deducted from the caller’s allowance. This function emits the Transfer event. +// Amount is then deducted from the caller’s allowance. +// This function emits the Transfer event. // Input: // - PARAM_ACCOUNT: agentID the spender // - PARAM_RECIPIENT: agentID the target // - PARAM_AMOUNT: i64 export function funcTransferFrom(ctx: wasmlib.ScFuncContext, f: sc.TransferFromContext): void { // validate parameters - let account = f.params.account().value(); - let recipient = f.params.recipient().value(); let amount = f.params.amount().value(); ctx.require(amount > 0, "erc20.transferFrom.fail: wrong 'amount' parameter"); // allowances are in the map under the name of the account - let allowances = f.state.allAllowances().getAllowancesForAgent(account); + let sourceAgent = f.params.account().value(); + let allowances = f.state.allAllowances().getAllowancesForAgent(sourceAgent); let allowance = allowances.getInt64(ctx.caller()); ctx.require(allowance.value() >= amount, "erc20.transferFrom.fail: not enough allowance"); let balances = f.state.balances(); - let sourceBalance = balances.getInt64(account); + let sourceBalance = balances.getInt64(sourceAgent); ctx.require(sourceBalance.value() >= amount, "erc20.transferFrom.fail: not enough funds"); - let recipientBalance = balances.getInt64(recipient); + let targetAgent = f.params.recipient().value(); + let recipientBalance = balances.getInt64(targetAgent); let result = recipientBalance.value() + amount; ctx.require(result > 0, "erc20.transferFrom.fail: overflow"); sourceBalance.setValue(sourceBalance.value() - amount); recipientBalance.setValue(recipientBalance.value() + amount); allowance.setValue(allowance.value() - amount); + + f.events.transfer(amount, sourceAgent, targetAgent) } // the view returns max number of tokens the owner PARAM_ACCOUNT of the account diff --git a/contracts/wasm/erc20/ts/erc20/events.ts b/contracts/wasm/erc20/ts/erc20/events.ts new file mode 100644 index 0000000000..6b4142fa39 --- /dev/null +++ b/contracts/wasm/erc20/ts/erc20/events.ts @@ -0,0 +1,19 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "wasmlib"; + +export class Erc20Events { + + transfer(amount: i64, from: wasmlib.ScAgentID, to: wasmlib.ScAgentID): void { + new wasmlib.EventEncoder("erc20.transfer"). + int64(amount). + agentID(from). + agentID(to). + emit(); + } +} diff --git a/contracts/wasm/erc20/ts/erc20/index.ts b/contracts/wasm/erc20/ts/erc20/index.ts index 602bcc4fe7..9411e9de15 100644 --- a/contracts/wasm/erc20/ts/erc20/index.ts +++ b/contracts/wasm/erc20/ts/erc20/index.ts @@ -9,6 +9,7 @@ export * from "./erc20"; export * from "./consts"; export * from "./contract"; +export * from "./events"; export * from "./keys"; export * from "./lib"; export * from "./params"; diff --git a/contracts/wasm/fairauction/test/fairauction_bg.wasm b/contracts/wasm/fairauction/test/fairauction_bg.wasm index dd6d5ae480cefb524766bf460e9612efe38c5299..aedd4a53138ef94d16ef4f4a1380f01dbfb3a6e1 100644 GIT binary patch delta 5238 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 delta 5303 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 CNoc76 diff --git a/contracts/wasm/fairroulette/frontend/src/lib/fairroulette_client/fair_roulette_service.ts b/contracts/wasm/fairroulette/frontend/src/lib/fairroulette_client/fair_roulette_service.ts index f4c77a6991..ed5b5434c0 100644 --- a/contracts/wasm/fairroulette/frontend/src/lib/fairroulette_client/fair_roulette_service.ts +++ b/contracts/wasm/fairroulette/frontend/src/lib/fairroulette_client/fair_roulette_service.ts @@ -62,7 +62,7 @@ export class FairRouletteService { private handleVmMessage(message: string[]): void { const messageHandlers: MessageHandlers = { - 'fairroulette.bet.placed': (index) => { + 'fairroulette.bet': (index) => { const bet: Bet = { better: message[index + 1], amount: Number(message[index + 2]), @@ -72,22 +72,6 @@ export class FairRouletteService { this.emitter.emit('betPlaced', bet); }, - 'fairroulette.round.state': (index) => { - if (message[index + 1] == '1') { - this.emitter.emit('roundStarted', message[index + 2]); - } else { - this.emitter.emit('roundStopped'); - } - }, - - 'fairroulette.round.number': (index) => { - this.emitter.emit('roundNumber', message[index + 1] || 0); - }, - - 'fairroulette.round.winning_number': (index) => { - this.emitter.emit('winningNumber', message[index + 1] || 0); - }, - 'fairroulette.payout': (index) => { const bet: Bet = { better: message[index + 1], @@ -97,6 +81,22 @@ export class FairRouletteService { this.emitter.emit('payout', bet); }, + + 'fairroulette.round': (index) => { + this.emitter.emit('roundNumber', message[index + 1] || 0); + }, + + 'fairroulette.start': (index) => { + this.emitter.emit('roundStarted', message[index + 1] || 0); + }, + + 'fairroulette.stop': (index) => { + this.emitter.emit('roundStopped'); + }, + + 'fairroulette.winner': (index) => { + this.emitter.emit('winningNumber', message[index + 1] || 0); + }, }; const topicIndex = 3; @@ -108,7 +108,7 @@ export class FairRouletteService { } private handleIncomingMessage(message: MessageEvent): void { - const msg = message.data.toString().split(' '); + const msg = message.data.toString().split('|'); if (msg.length == 0) { return; diff --git a/contracts/wasm/fairroulette/go/fairroulette/events.go b/contracts/wasm/fairroulette/go/fairroulette/events.go new file mode 100644 index 0000000000..146adce850 --- /dev/null +++ b/contracts/wasm/fairroulette/go/fairroulette/events.go @@ -0,0 +1,49 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package fairroulette + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +type FairRouletteEvents struct{} + +func (e FairRouletteEvents) Bet(address wasmlib.ScAddress, amount int64, number int64) { + wasmlib.NewEventEncoder("fairroulette.bet"). + Address(address). + Int64(amount). + Int64(number). + Emit() +} + +func (e FairRouletteEvents) Payout(address wasmlib.ScAddress, amount int64) { + wasmlib.NewEventEncoder("fairroulette.payout"). + Address(address). + Int64(amount). + Emit() +} + +func (e FairRouletteEvents) Round(number int64) { + wasmlib.NewEventEncoder("fairroulette.round"). + Int64(number). + Emit() +} + +func (e FairRouletteEvents) Start() { + wasmlib.NewEventEncoder("fairroulette.start"). + Emit() +} + +func (e FairRouletteEvents) Stop() { + wasmlib.NewEventEncoder("fairroulette.stop"). + Emit() +} + +func (e FairRouletteEvents) Winner(number int64) { + wasmlib.NewEventEncoder("fairroulette.winner"). + Int64(number). + Emit() +} diff --git a/contracts/wasm/fairroulette/go/fairroulette/fairroulette.go b/contracts/wasm/fairroulette/go/fairroulette/fairroulette.go index 6b9efa05d3..729953c23c 100644 --- a/contracts/wasm/fairroulette/go/fairroulette/fairroulette.go +++ b/contracts/wasm/fairroulette/go/fairroulette/fairroulette.go @@ -81,9 +81,7 @@ func funcPlaceBet(ctx wasmlib.ScFuncContext, f *PlaceBetContext) { // of serializing the bet struct into a bytes representation. bets.GetBet(betNr).SetValue(bet) - ctx.Event("fairroulette.bet.placed " + bet.Better.Address().String() + - " " + ctx.Utility().String(bet.Amount) + - " " + ctx.Utility().String(bet.Number)) + f.Events.Bet(bet.Better.Address(), bet.Amount, bet.Number) // Was this the first bet of this round? if betNr == 0 { @@ -105,13 +103,12 @@ func funcPlaceBet(ctx wasmlib.ScFuncContext, f *PlaceBetContext) { timestamp := int32(ctx.Timestamp() / NanoTimeDivider) f.State.RoundStartedAt().SetValue(timestamp) - ctx.Event("fairroulette.round.state " + f.State.RoundStatus().String() + - " " + ctx.Utility().String(int64(timestamp))) + f.Events.Start() roundNumber := f.State.RoundNumber() roundNumber.SetValue(roundNumber.Value() + 1) - ctx.Event("fairroulette.round.number " + roundNumber.String()) + f.Events.Round(roundNumber.Value()) // And now for our next trick we post a delayed request to ourselves on the Tangle. // We are requesting to call the 'payWinners' function, but delay it for the playPeriod @@ -178,8 +175,7 @@ func funcPayWinners(ctx wasmlib.ScFuncContext, f *PayWinnersContext) { // so that the 'bets' array becomes available for when the next betting round ends. bets.Clear() - ctx.Event("fairroulette.round.winning_number " + ctx.Utility().String(winningNumber)) - + f.Events.Winner(winningNumber) // Did we have any winners at all? if len(winners) == 0 { // No winners, log this fact to the log on the host. @@ -221,7 +217,7 @@ func funcPayWinners(ctx wasmlib.ScFuncContext, f *PayWinnersContext) { } // Announce who got sent what as event. - ctx.Event("fairroulette.payout " + bet.Better.Address().String() + " " + ctx.Utility().String(payout)) + f.Events.Payout(bet.Better.Address(), payout) } // This is where we transfer the remainder after payout to the creator of the smart contract. @@ -237,7 +233,7 @@ func funcPayWinners(ctx wasmlib.ScFuncContext, f *PayWinnersContext) { // Set round status to 0, send out event to notify that the round has ended f.State.RoundStatus().SetValue(0) - ctx.Event("fairroulette.round.state " + f.State.RoundStatus().String()) + f.Events.Stop() } func funcForceReset(ctx wasmlib.ScFuncContext, f *ForceResetContext) { @@ -249,7 +245,7 @@ func funcForceReset(ctx wasmlib.ScFuncContext, f *ForceResetContext) { // Set round status to 0, send out event to notify that the round has ended f.State.RoundStatus().SetValue(0) - ctx.Event("fairroulette.round.state " + f.State.RoundStatus().String()) + f.Events.Stop() } // 'playPeriod' can be used by the contract creator to set the length of a betting round diff --git a/contracts/wasm/fairroulette/go/fairroulette/lib.go b/contracts/wasm/fairroulette/go/fairroulette/lib.go index 6a4da53cda..5ca3bb14f4 100644 --- a/contracts/wasm/fairroulette/go/fairroulette/lib.go +++ b/contracts/wasm/fairroulette/go/fairroulette/lib.go @@ -27,7 +27,8 @@ func OnLoad() { } type ForcePayoutContext struct { - State MutableFairRouletteState + Events FairRouletteEvents + State MutableFairRouletteState } func funcForcePayoutThunk(ctx wasmlib.ScFuncContext) { @@ -46,7 +47,8 @@ func funcForcePayoutThunk(ctx wasmlib.ScFuncContext) { } type ForceResetContext struct { - State MutableFairRouletteState + Events FairRouletteEvents + State MutableFairRouletteState } func funcForceResetThunk(ctx wasmlib.ScFuncContext) { @@ -65,7 +67,8 @@ func funcForceResetThunk(ctx wasmlib.ScFuncContext) { } type PayWinnersContext struct { - State MutableFairRouletteState + Events FairRouletteEvents + State MutableFairRouletteState } func funcPayWinnersThunk(ctx wasmlib.ScFuncContext) { @@ -84,6 +87,7 @@ func funcPayWinnersThunk(ctx wasmlib.ScFuncContext) { } type PlaceBetContext struct { + Events FairRouletteEvents Params ImmutablePlaceBetParams State MutableFairRouletteState } @@ -104,6 +108,7 @@ func funcPlaceBetThunk(ctx wasmlib.ScFuncContext) { } type PlayPeriodContext struct { + Events FairRouletteEvents Params ImmutablePlayPeriodParams State MutableFairRouletteState } diff --git a/contracts/wasm/fairroulette/schema.yaml b/contracts/wasm/fairroulette/schema.yaml index 9e739154a1..d895358ffe 100644 --- a/contracts/wasm/fairroulette/schema.yaml +++ b/contracts/wasm/fairroulette/schema.yaml @@ -1,5 +1,19 @@ name: FairRoulette description: "" +events: + bet: + address: Address // address of better + amount: Int64 // amount of iotas to bet + number: Int64 // number to bet on + payout: + address: Address // address of winner + amount: Int64 // amount of iotas won + round: + number: Int64 // current betting round number + start: + stop: + winner: + number: Int64 // the winning number structs: Bet: amount: Int64 diff --git a/contracts/wasm/fairroulette/src/events.rs b/contracts/wasm/fairroulette/src/events.rs new file mode 100644 index 0000000000..be639f0726 --- /dev/null +++ b/contracts/wasm/fairroulette/src/events.rs @@ -0,0 +1,51 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] + +use wasmlib::*; + +pub struct FairRouletteEvents { +} + +impl FairRouletteEvents { + + pub fn bet(&self, address: &ScAddress, amount: i64, number: i64) { + let mut encoder = EventEncoder::new("fairroulette.bet"); + encoder.address(&address); + encoder.int64(amount); + encoder.int64(number); + encoder.emit(); + } + + pub fn payout(&self, address: &ScAddress, amount: i64) { + let mut encoder = EventEncoder::new("fairroulette.payout"); + encoder.address(&address); + encoder.int64(amount); + encoder.emit(); + } + + pub fn round(&self, number: i64) { + let mut encoder = EventEncoder::new("fairroulette.round"); + encoder.int64(number); + encoder.emit(); + } + + pub fn start(&self) { + EventEncoder::new("fairroulette.start").emit(); + } + + pub fn stop(&self) { + EventEncoder::new("fairroulette.stop").emit(); + } + + pub fn winner(&self, number: i64) { + let mut encoder = EventEncoder::new("fairroulette.winner"); + encoder.int64(number); + encoder.emit(); + } +} diff --git a/contracts/wasm/fairroulette/src/fairroulette.rs b/contracts/wasm/fairroulette/src/fairroulette.rs index ebdaabd71d..7b2bc95955 100644 --- a/contracts/wasm/fairroulette/src/fairroulette.rs +++ b/contracts/wasm/fairroulette/src/fairroulette.rs @@ -25,7 +25,7 @@ const DEFAULT_PLAY_PERIOD: i32 = 60; const ENABLE_SELF_POST: bool = true; // The number to divide nano seconds to seconds. -const NANO_TIME_DIVIDER: i64 = 1000000000; +const NANO_TIME_DIVIDER: i64 = 1_000_000_000; // 'placeBet' is used by betters to place a bet on a number from 1 to MAX_NUMBER. The first // incoming bet triggers a betting round of configurable duration. After the playing period @@ -81,12 +81,7 @@ pub fn func_place_bet(ctx: &ScFuncContext, f: &PlaceBetContext) { // of serializing the bet struct into a bytes representation. bets.get_bet(bet_nr).set_value(&bet); - ctx.event(&format!( - "fairroulette.bet.placed {0} {1} {2}", - &bet.better.address().to_string(), - bet.amount, - bet.number - )); + f.events.bet(&bet.better.address(), bet.amount, bet.number); // Was this the first bet of this round? if bet_nr == 0 { @@ -109,19 +104,12 @@ pub fn func_place_bet(ctx: &ScFuncContext, f: &PlaceBetContext) { let timestamp = (ctx.timestamp() / NANO_TIME_DIVIDER) as i32; f.state.round_started_at().set_value(timestamp); - ctx.event(&format!( - "fairroulette.round.state {0} {1}", - f.state.round_status().value(), - timestamp - )); + f.events.start(); let round_number = f.state.round_number(); round_number.set_value(round_number.value() + 1); - ctx.event(&format!( - "fairroulette.round.number {0}", - round_number.value() - )); + f.events.round(round_number.value()); // And now for our next trick we post a delayed request to ourselves on the Tangle. // We are requesting to call the 'payWinners' function, but delay it for the play_period @@ -190,10 +178,7 @@ pub fn func_pay_winners(ctx: &ScFuncContext, f: &PayWinnersContext) { // so that the 'bets' array becomes available for when the next betting round ends. bets.clear(); - ctx.event(&format!( - "fairroulette.round.winning_number {}", - winning_number - )); + f.events.winner(winning_number); // Did we have any winners at all? if winners.is_empty() { @@ -236,11 +221,7 @@ pub fn func_pay_winners(ctx: &ScFuncContext, f: &PayWinnersContext) { } // Announce who got sent what as event. - ctx.event(&format!( - "fairroulette.payout {} {}", - &bet.better.address().to_string(), - payout - )); + f.events.payout(&bet.better.address(), payout); } // This is where we transfer the remainder after payout to the creator of the smart contract. @@ -256,26 +237,20 @@ pub fn func_pay_winners(ctx: &ScFuncContext, f: &PayWinnersContext) { // Set round status to 0, send out event to notify that the round has ended f.state.round_status().set_value(0); - ctx.event(&format!( - "fairroulette.round.state {0}", - f.state.round_status().value() - )); + f.events.stop(); } -pub fn func_force_reset(ctx: &ScFuncContext, f: &ForceResetContext) { - +pub fn func_force_reset(_ctx: &ScFuncContext, f: &ForceResetContext) { + // Get the 'bets' array in state storage. let bets: ArrayOfMutableBet = f.state.bets(); - + // Clear all bets. bets.clear(); - + // Set round status to 0, send out event to notify that the round has ended f.state.round_status().set_value(0); - ctx.event(&format!( - "fairroulette.round.state {0}", - f.state.round_status().value() - )); + f.events.stop(); } // 'playPeriod' can be used by the contract creator to set the length of a betting round diff --git a/contracts/wasm/fairroulette/src/lib.rs b/contracts/wasm/fairroulette/src/lib.rs index 89b5f0a67a..753003c506 100644 --- a/contracts/wasm/fairroulette/src/lib.rs +++ b/contracts/wasm/fairroulette/src/lib.rs @@ -13,6 +13,7 @@ use wasmlib::*; use wasmlib::host::*; use crate::consts::*; +use crate::events::*; use crate::keys::*; use crate::params::*; use crate::results::*; @@ -20,6 +21,7 @@ use crate::state::*; mod consts; mod contract; +mod events; mod keys; mod params; mod results; @@ -48,6 +50,7 @@ fn on_load() { } pub struct ForcePayoutContext { + events: FairRouletteEvents, state: MutableFairRouletteState, } @@ -58,6 +61,7 @@ fn func_force_payout_thunk(ctx: &ScFuncContext) { ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); let f = ForcePayoutContext { + events: FairRouletteEvents {}, state: MutableFairRouletteState { id: OBJ_ID_STATE, }, @@ -67,6 +71,7 @@ fn func_force_payout_thunk(ctx: &ScFuncContext) { } pub struct ForceResetContext { + events: FairRouletteEvents, state: MutableFairRouletteState, } @@ -77,6 +82,7 @@ fn func_force_reset_thunk(ctx: &ScFuncContext) { ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); let f = ForceResetContext { + events: FairRouletteEvents {}, state: MutableFairRouletteState { id: OBJ_ID_STATE, }, @@ -86,6 +92,7 @@ fn func_force_reset_thunk(ctx: &ScFuncContext) { } pub struct PayWinnersContext { + events: FairRouletteEvents, state: MutableFairRouletteState, } @@ -96,6 +103,7 @@ fn func_pay_winners_thunk(ctx: &ScFuncContext) { ctx.require(ctx.caller() == ctx.account_id(), "no permission"); let f = PayWinnersContext { + events: FairRouletteEvents {}, state: MutableFairRouletteState { id: OBJ_ID_STATE, }, @@ -105,6 +113,7 @@ fn func_pay_winners_thunk(ctx: &ScFuncContext) { } pub struct PlaceBetContext { + events: FairRouletteEvents, params: ImmutablePlaceBetParams, state: MutableFairRouletteState, } @@ -112,6 +121,7 @@ pub struct PlaceBetContext { fn func_place_bet_thunk(ctx: &ScFuncContext) { ctx.log("fairroulette.funcPlaceBet"); let f = PlaceBetContext { + events: FairRouletteEvents {}, params: ImmutablePlaceBetParams { id: OBJ_ID_PARAMS, }, @@ -125,6 +135,7 @@ fn func_place_bet_thunk(ctx: &ScFuncContext) { } pub struct PlayPeriodContext { + events: FairRouletteEvents, params: ImmutablePlayPeriodParams, state: MutableFairRouletteState, } @@ -136,6 +147,7 @@ fn func_play_period_thunk(ctx: &ScFuncContext) { ctx.require(ctx.caller() == ctx.contract_creator(), "no permission"); let f = PlayPeriodContext { + events: FairRouletteEvents {}, params: ImmutablePlayPeriodParams { id: OBJ_ID_PARAMS, }, diff --git a/contracts/wasm/fairroulette/test/fairroulette_bg.wasm b/contracts/wasm/fairroulette/test/fairroulette_bg.wasm index 30fe7c995a834f7302cc900d66f0203502b7434d..fecbdba2f30d8a70fdbca1fa330343997d098a57 100644 GIT binary patch delta 15663 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 delta 17027 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 kNkmY;0q>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "wasmlib"; + +export class FairRouletteEvents { + + bet(address: wasmlib.ScAddress, amount: i64, number: i64): void { + new wasmlib.EventEncoder("fairroulette.bet"). + address(address). + int64(amount). + int64(number). + emit(); + } + + payout(address: wasmlib.ScAddress, amount: i64): void { + new wasmlib.EventEncoder("fairroulette.payout"). + address(address). + int64(amount). + emit(); + } + + round(number: i64): void { + new wasmlib.EventEncoder("fairroulette.round"). + int64(number). + emit(); + } + + start(): void { + new wasmlib.EventEncoder("fairroulette.start"). + emit(); + } + + stop(): void { + new wasmlib.EventEncoder("fairroulette.stop"). + emit(); + } + + winner(number: i64): void { + new wasmlib.EventEncoder("fairroulette.winner"). + int64(number). + emit(); + } +} diff --git a/contracts/wasm/fairroulette/ts/fairroulette/fairroulette.ts b/contracts/wasm/fairroulette/ts/fairroulette/fairroulette.ts index 020388b334..6319c393de 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/fairroulette.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/fairroulette.ts @@ -77,11 +77,7 @@ export function funcPlaceBet(ctx: wasmlib.ScFuncContext, f: sc.PlaceBetContext): // of serializing the bet struct into a bytes representation. bets.getBet(betNr).setValue(bet); - ctx.event("fairroulette.bet.placed " + - bet.better.address().toString() + " " + - bet.amount.toString() + " " + - bet.number.toString() - ); + f.events.bet(bet.better.address(), bet.amount, bet.number); // Was this the first bet of this round? if (betNr == 0) { @@ -104,15 +100,12 @@ export function funcPlaceBet(ctx: wasmlib.ScFuncContext, f: sc.PlaceBetContext): let timestamp = (ctx.timestamp() / NANO_TIME_DIVIDER) as i32; f.state.roundStartedAt().setValue(timestamp); - ctx.event("fairroulette.round.state " + - f.state.roundStatus().toString() + " " + - timestamp.toString() - ); + f.events.start(); let roundNumber = f.state.roundNumber(); roundNumber.setValue(roundNumber.value() + 1); - ctx.event("fairroulette.round.number " + roundNumber.toString()); + f.events.round(roundNumber.value()); // And now for our next trick we post a delayed request to ourselves on the Tangle. // We are requesting to call the 'payWinners' function, but delay it for the playPeriod @@ -181,7 +174,7 @@ export function funcPayWinners(ctx: wasmlib.ScFuncContext, f: sc.PayWinnersConte // so that the 'bets' array becomes available for when the next betting round ends. bets.clear(); - ctx.event("fairroulette.round.winningNumber " + winningNumber.toString()); + f.events.winner(winningNumber); // Did we have any winners at all? if (winners.length == 0) { @@ -224,10 +217,7 @@ export function funcPayWinners(ctx: wasmlib.ScFuncContext, f: sc.PayWinnersConte } // Announce who got sent what as event. - ctx.event("fairroulette.payout " + - bet.better.address().toString() + " " + - payout.toString() - ); + f.events.payout(bet.better.address(), payout); } // This is where we transfer the remainder after payout to the creator of the smart contract. @@ -243,7 +233,7 @@ export function funcPayWinners(ctx: wasmlib.ScFuncContext, f: sc.PayWinnersConte // Set round status to 0, send out event to notify that the round has ended f.state.roundStatus().setValue(0); - ctx.event("fairroulette.round.state " + f.state.roundStatus().toString()); + f.events.stop(); } export function funcForceReset(ctx: wasmlib.ScFuncContext, f: sc.ForceResetContext): void { @@ -256,7 +246,7 @@ export function funcForceReset(ctx: wasmlib.ScFuncContext, f: sc.ForceResetConte // Set round status to 0, send out event to notify that the round has ended f.state.roundStatus().setValue(0); - ctx.event("fairroulette.round.state +" + f.state.roundStatus().toString()); + f.events.stop(); } // 'playPeriod' can be used by the contract creator to set the length of a betting round diff --git a/contracts/wasm/fairroulette/ts/fairroulette/index.ts b/contracts/wasm/fairroulette/ts/fairroulette/index.ts index d6151e8562..a14f6af431 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/index.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/index.ts @@ -9,6 +9,7 @@ export * from "./fairroulette"; export * from "./consts"; export * from "./contract"; +export * from "./events"; export * from "./keys"; export * from "./lib"; export * from "./params"; diff --git a/contracts/wasm/inccounter/test/inccounter_bg.wasm b/contracts/wasm/inccounter/test/inccounter_bg.wasm index 4677231d6333136822704b7bd95911f1630cc2b2..9fd8cbc5e418c8c4f188cd07d16b14cde857e69d 100644 GIT binary patch delta 318 zcmdnKfNA>zrVYl7ER4*|%#+O-ckz|3VBEo|10vLRFqUlo&seU^7`nM!)m~HhMc)Ai zM{NZbM~*DVDg8k9jlRt%{ZiN&LnrHn?EsR`!vdHd^iQ@7pTx9f!sfH#YnUd-#VSvp z6P3*vGC4k0NqAN-P?wMbqoYEWje<|$b`*PVmY`b&&}}OJSUxzar29eOYD=M7dTGdRiMHVq`>4Tkfp+~S-p^vhlxRC z@~zrzrU16d?sZBaD!Zgm1&vjP3q6`qg2&BX&|Etqy6rUVcn=Jc|U4X$AD3$}n S5&PXn?wH(S;J6#xJ&cWAu; delta 319 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 delta 5424 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 diff --git a/contracts/wasm/testwasmlib/test/testwasmlib_bg.wasm b/contracts/wasm/testwasmlib/test/testwasmlib_bg.wasm index 90d483c1f05bbd9368d8969d034bd3859bff29ed..5bdfc6e5188256a52ca159b33f91741d8fb674cd 100644 GIT binary patch delta 747 zcmZ8eUr3Wt6#ve3>TJ2beV^5otl^eaD~gEd4`i1JMWdi%E*CSHEBp+hq%vG35^YX% zb7%PwMm-4nAR*p8IFQ&NXwV*di1c9(dx{=Rg2W(v=zOe|?85K<&iS2l&pG$r=>(fj zusJ7`moZv+1Qxd5Ps5=(NW;D~+!Je%Y=IoUZJlDd36xvy;z8R`C1k|!%L!2P(UioU zHUl?md~}@bPf?M+`U@b7N!PC3*%(QR%uF1(mz!kZhGxTAa(uj+XYr@2gAy;cH<}kP zCCL{glTES#pAkdtsWRxqbDmzdJdVN>W3w^Qe4R7p^9!oDgBn^jzD$Ss3cmD?Dzm!0 z)5iYE@9{+EXfgZ0yh5@|9K7+`fY6zoIoHtA?N*+ajz5V5-EQ@p ze!<#Jx5~yb(A|W4HLLPwq9nG6mo&Gsp;xM*&c*kMiljDQf$#3NiJm)G0IT|DATQ?o z%;osKzX?#q`maV=I#1ed zf|XG8C&=E9=HX6@w@Q{;$a4^?30{0Wj10D*8gA6-bb)*Y8Yz$nH|VjY@By95MvjV; HBdg{=-SYM% delta 743 zcmZ8eUr19?7{A|fwu!m!?zOc4%b8R&iin6_^bn!AD6p7g3k`J1t|5q2hDIULrY^Vk z*@!6WLC}YY;Th#XXoDUG`QSs4kVHfe2GJjqiZJRsj+N}d@BF^+_x(NhP9)hxk|mr_ z%;*&1ewbc+ApsfKn}J;!xG0t&)d=(WxM`ft$5Cx^h)b?PGdvf+nvfWtVv8O>T#vi zuGoQ(i@}z35wzk_UpJc_Md6FFhY`_mhBIyMHg()U11k;wl8X2u-fazQlTxm*vww0L z54VN$+5hE5lHH>A>;n^i@H_Omh}@4x+6|tT_M<3*--9nY9QsVOAT}4ph~Eo7ob9O6 z-xfxfqPYFs_m#@%C{;RhU1y}7hzM6_614d-a#nBo1#JP3cCB#vJJ=ua=kiTFMkHMd{b=gzY4H`_Xjqyk8zP2I7oj}e7f?=VzVlWVj-9a>j)~= zg!X|AW1;pPUbCtkBkeq)l92b~WbY>E_~u3zyu+rTgYNE?I~EMG>lWM`I#O0nDe?ee zJ!(U3HgAclG?G_MC?j}ra0uD&608`mkyMwX&KyN@^mMpN#$FHakz^h@0Nvuy$XDxM D=ghAs1{++!cC>SphaUubnbfz_TZkM@0|OcpZgwd!QvK_4}lAa zNR7}2NM~SbUv>^kkg%eq1pV|95?FoXZNRf*xlI?{oO3rO^g515p+zXrpl|5i64IDb zz;4RKQRv&c)j}N%bXY*9HT3A^dljL>a*WZqiJ}&1bQNyrq>$21O5S2B`K*~^_qUW(LM7BF&PhEUHnn@mv^s=)u`9 z4f%O~sH4i&bw)2+`}>@?(0eX~)p`1K`98iadXs%sgokvqKUSmjyi01z4${~D{ft$2 zU@Mdyh|!Piq}2@{XPN5&SK|lxU0{1-)+=3k4A4#Qv(bhZL0Lb%VeQXFZ**YOrSn6* zbaC*HR~jliG&6FVdPZV(T?(}{Ey630e8W(qQ2hINPewnuP)k3@F3|LNGcF)4j?ZBg rDLip%Z=DD}U{z03CJDP}$y`4Ya;4~IY=Tdi&$eG;JK+saoRoh7(2>ot delta 819 zcmah`O-NKx6u#%Yr;h#cNP_7Hx$~pUkfODCL(#&EC}~9sGdY_vv4p%M2HCb|Am`~K zNINhXv~Uy5!o|>AG%bQzg_Mh-O)c6M)}mUp7(t?QpA59?!nx-=-#!0#Z4Wl~pn3vq zL;*bX8Z^m4GbziIZx*`mlzNWN@kmXpv*Iw*xR$Hs4--ROqjcCHYH z5h{&+>8h^sznzt~3TgG(;LTP4!T6PStd;29#8Z6i`O}k4gf*H<$Ec8AWb`9IIa+VU80toZ9Uo&mkj#JcvEgF?Y$rNsET=g(xn*+jWNG?p9p z*Qcu%6=!3iQHjdYaX~|~L;lw6SL{3^q)`BMuQoWH3A&kg_p diff --git a/packages/vm/core/testcore/sbtests/sbtestsc/testcore_bg.wasm b/packages/vm/core/testcore/sbtests/sbtestsc/testcore_bg.wasm index cec6d2afc3b010db29b7df9cdde0314342fb72ae..9fed24e2156e4ef211ac7c81e95e72b908f68a98 100644 GIT binary patch delta 5446 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 delta 5424 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 diff --git a/packages/vm/wasmlib/go/wasmlib/events.go b/packages/vm/wasmlib/go/wasmlib/events.go new file mode 100644 index 0000000000..b2046d83a2 --- /dev/null +++ b/packages/vm/wasmlib/go/wasmlib/events.go @@ -0,0 +1,74 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +package wasmlib + +import ( + "strconv" +) + +// encodes separate entities into a byte buffer +type EventEncoder struct { + event string +} + +func NewEventEncoder(eventName string) *EventEncoder { + e := &EventEncoder{event: eventName} + timestamp := Root.GetInt64(KeyTimestamp).Value() + // convert nanoseconds to seconds + return e.Int64(timestamp / 1_000_000_000) +} + +func (e *EventEncoder) Address(value ScAddress) *EventEncoder { + return e.String(value.String()) +} + +func (e *EventEncoder) AgentID(value ScAgentID) *EventEncoder { + return e.String(value.String()) +} + +func (e *EventEncoder) Bytes(value []byte) *EventEncoder { + return e.String(base58Encode(value)) +} + +func (e *EventEncoder) ChainID(value ScChainID) *EventEncoder { + return e.String(value.String()) +} + +func (e *EventEncoder) Color(value ScColor) *EventEncoder { + return e.String(value.String()) +} + +func (e *EventEncoder) Emit() { + Root.GetString(KeyEvent).SetValue(e.event) +} + +func (e *EventEncoder) Hash(value ScHash) *EventEncoder { + return e.String(value.String()) +} + +func (e *EventEncoder) Hname(value ScHname) *EventEncoder { + return e.String(value.String()) +} + +func (e *EventEncoder) Int16(value int16) *EventEncoder { + return e.Int64(int64(value)) +} + +func (e *EventEncoder) Int32(value int32) *EventEncoder { + return e.Int64(int64(value)) +} + +func (e *EventEncoder) Int64(value int64) *EventEncoder { + return e.String(strconv.FormatInt(value, 10)) +} + +func (e *EventEncoder) RequestID(value ScRequestID) *EventEncoder { + return e.String(value.String()) +} + +func (e *EventEncoder) String(value string) *EventEncoder { + // TODO encode potential vertical bars that are present in the value string + e.event += "|" + value + return e +} diff --git a/packages/vm/wasmlib/go/wasmlib/hashtypes.go b/packages/vm/wasmlib/go/wasmlib/hashtypes.go index 05c8500f16..97aa7da84e 100644 --- a/packages/vm/wasmlib/go/wasmlib/hashtypes.go +++ b/packages/vm/wasmlib/go/wasmlib/hashtypes.go @@ -217,7 +217,7 @@ func (hn ScHname) KeyID() Key32 { } func (hn ScHname) String() string { - return strconv.FormatInt(int64(hn), 10) + return strconv.FormatInt(int64(hn), 16) } // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ diff --git a/packages/vm/wasmlib/src/bytes.rs b/packages/vm/wasmlib/src/bytes.rs index 2ec2e5a14f..69768bb791 100644 --- a/packages/vm/wasmlib/src/bytes.rs +++ b/packages/vm/wasmlib/src/bytes.rs @@ -142,14 +142,12 @@ impl BytesEncoder { // encodes an ScAddress into the byte buffer pub fn address(&mut self, value: &ScAddress) -> &BytesEncoder { - self.bytes(value.to_bytes()); - self + self.bytes(value.to_bytes()) } // encodes an ScAgentID into the byte buffer pub fn agent_id(&mut self, value: &ScAgentID) -> &BytesEncoder { - self.bytes(value.to_bytes()); - self + self.bytes(value.to_bytes()) } // encodes a substring of bytes into the byte buffer @@ -161,14 +159,12 @@ impl BytesEncoder { // encodes an ScChainID into the byte buffer pub fn chain_id(&mut self, value: &ScChainID) -> &BytesEncoder { - self.bytes(value.to_bytes()); - self + self.bytes(value.to_bytes()) } // encodes an ScColor into the byte buffer pub fn color(&mut self, value: &ScColor) -> &BytesEncoder { - self.bytes(value.to_bytes()); - self + self.bytes(value.to_bytes()) } // retrieve the encoded byte buffer @@ -178,14 +174,12 @@ impl BytesEncoder { // encodes an ScHash into the byte buffer pub fn hash(&mut self, value: &ScHash) -> &BytesEncoder { - self.bytes(value.to_bytes()); - self + self.bytes(value.to_bytes()) } // encodes an ScHname into the byte buffer pub fn hname(&mut self, value: &ScHname) -> &BytesEncoder { - self.bytes(&value.to_bytes()); - self + self.bytes(&value.to_bytes()) } // encodes an int16 into the byte buffer @@ -222,13 +216,11 @@ impl BytesEncoder { // encodes an ScRequestID into the byte buffer pub fn request_id(&mut self, value: &ScRequestID) -> &BytesEncoder { - self.bytes(value.to_bytes()); - self + self.bytes(value.to_bytes()) } // encodes an UTF-8 text string into the byte buffer pub fn string(&mut self, value: &str) -> &BytesEncoder { - self.bytes(value.as_bytes()); - self + self.bytes(value.as_bytes()) } } diff --git a/packages/vm/wasmlib/src/events.rs b/packages/vm/wasmlib/src/events.rs new file mode 100644 index 0000000000..5f889c7fd4 --- /dev/null +++ b/packages/vm/wasmlib/src/events.rs @@ -0,0 +1,90 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +use crate::context::*; +use crate::hashtypes::*; +use crate::keys::*; + +// encodes separate entities into a byte buffer +pub struct EventEncoder { + event: String, +} + +impl EventEncoder { + // constructs an encoder + pub fn new(event_name: &str) -> EventEncoder { + let mut e = EventEncoder { event: event_name.to_string() }; + let timestamp = ROOT.get_int64(&KEY_TIMESTAMP).value(); + e.int64(timestamp / 1_000_000_000); + e + } + + // encodes an ScAddress into the byte buffer + pub fn address(&mut self, value: &ScAddress) -> &EventEncoder { + self.string(&value.to_string()) + } + + // encodes an ScAgentID into the byte buffer + pub fn agent_id(&mut self, value: &ScAgentID) -> &EventEncoder { + self.string(&value.to_string()) + } + + // encodes a substring of bytes into the byte buffer + pub fn bytes(&mut self, value: &[u8]) -> &EventEncoder { + self.string(&base58_encode(value)) + } + + // encodes an ScChainID into the byte buffer + pub fn chain_id(&mut self, value: &ScChainID) -> &EventEncoder { + self.string(&value.to_string()) + } + + // encodes an ScColor into the byte buffer + pub fn color(&mut self, value: &ScColor) -> &EventEncoder { + self.string(&value.to_string()) + } + + // retrieve the encoded byte buffer + pub fn emit(&self) { + ROOT.get_string(&KEY_EVENT).set_value(&self.event); + } + + // encodes an ScHash into the byte buffer + pub fn hash(&mut self, value: &ScHash) -> &EventEncoder { + self.string(&value.to_string()) + } + + // encodes an ScHname into the byte buffer + pub fn hname(&mut self, value: &ScHname) -> &EventEncoder { + self.string(&value.to_string()) + } + + // encodes an int16 into the byte buffer + // note that these are encoded using leb128 encoding to conserve space + pub fn int16(&mut self, value: i16) -> &EventEncoder { + self.string(&value.to_string()) + } + + // encodes an int32 into the byte buffer + // note that these are encoded using leb128 encoding to conserve space + pub fn int32(&mut self, value: i32) -> &EventEncoder { + self.string(&value.to_string()) + } + + // encodes an int64 into the byte buffer + // note that these are encoded using leb128 encoding to conserve space + pub fn int64(&mut self, value: i64) -> &EventEncoder { + self.string(&value.to_string()) + } + + // encodes an ScRequestID into the byte buffer + pub fn request_id(&mut self, value: &ScRequestID) -> &EventEncoder { + self.string(&value.to_string()) + } + + // encodes an UTF-8 text string into the byte buffer + pub fn string(&mut self, value: &str) -> &EventEncoder { + self.event += &("|".to_owned() + value); + self + } +} diff --git a/packages/vm/wasmlib/src/lib.rs b/packages/vm/wasmlib/src/lib.rs index 83b33eb132..6b28fa2f1b 100644 --- a/packages/vm/wasmlib/src/lib.rs +++ b/packages/vm/wasmlib/src/lib.rs @@ -6,6 +6,7 @@ pub use bytes::*; pub use context::*; pub use contract::*; +pub use events::*; pub use exports::ScExports; pub use hashtypes::*; pub use immutable::*; @@ -20,6 +21,7 @@ pub mod coreblob; pub mod coreblocklog; pub mod coregovernance; pub mod coreroot; +mod events; mod exports; mod hashtypes; pub mod host; diff --git a/packages/vm/wasmlib/ts/wasmlib/bytes.ts b/packages/vm/wasmlib/ts/wasmlib/bytes.ts index 0e45ed0ced..557b16b3c5 100644 --- a/packages/vm/wasmlib/ts/wasmlib/bytes.ts +++ b/packages/vm/wasmlib/ts/wasmlib/bytes.ts @@ -138,14 +138,12 @@ export class BytesEncoder { // encodes an ScAddress into the byte buffer address(value: ScAddress): BytesEncoder { - this.bytes(value.toBytes()); - return this; + return this.bytes(value.toBytes()); } // encodes an ScAgentID into the byte buffer agentID(value: ScAgentID): BytesEncoder { - this.bytes(value.toBytes()); - return this; + return this.bytes(value.toBytes()); } // encodes a substring of bytes into the byte buffer @@ -159,14 +157,12 @@ export class BytesEncoder { // encodes an ScChainID into the byte buffer chainID(value: ScChainID): BytesEncoder { - this.bytes(value.toBytes()); - return this; + return this.bytes(value.toBytes()); } // encodes an ScColor into the byte buffer color(value: ScColor): BytesEncoder { - this.bytes(value.toBytes()); - return this; + return this.bytes(value.toBytes()); } // retrieve the encoded byte buffer @@ -176,14 +172,12 @@ export class BytesEncoder { // encodes an ScHash into the byte buffer hash(value: ScHash): BytesEncoder { - this.bytes(value.toBytes()); - return this; + return this.bytes(value.toBytes()); } // encodes an ScHname into the byte buffer hname(value: ScHname): BytesEncoder { - this.bytes(value.toBytes()); - return this; + return this.bytes(value.toBytes()); } // encodes an int16 into the byte buffer @@ -221,13 +215,11 @@ export class BytesEncoder { // encodes an ScRequestID into the byte buffer requestID(value: ScRequestID): BytesEncoder { - this.bytes(value.toBytes()); - return this; + return this.bytes(value.toBytes()); } // encodes an UTF-8 text string into the byte buffer string(value: string): BytesEncoder { - this.bytes(Convert.fromString(value)); - return this; + return this.bytes(Convert.fromString(value)); } } diff --git a/packages/vm/wasmlib/ts/wasmlib/events.ts b/packages/vm/wasmlib/ts/wasmlib/events.ts new file mode 100644 index 0000000000..def1d6bb5d --- /dev/null +++ b/packages/vm/wasmlib/ts/wasmlib/events.ts @@ -0,0 +1,88 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +import {ScAddress, ScAgentID, ScChainID, ScColor, ScHash, ScHname, ScRequestID} from "./hashtypes"; +import * as keys from "./keys"; +import {base58Encode, ROOT} from "./context"; + +// encodes separate entities into a byte buffer +export class EventEncoder { + event: string; + + // constructs an encoder + constructor(eventName: string) { + this.event = eventName; + let timestamp = ROOT.getInt64(keys.KEY_TIMESTAMP).value(); + this.int64(timestamp / 1_000_000_000); + } + + // encodes an ScAddress into the byte buffer + address(value: ScAddress): EventEncoder { + return this.string(value.toString()); + } + + // encodes an ScAgentID into the byte buffer + agentID(value: ScAgentID): EventEncoder { + return this.string(value.toString()); + } + + // encodes a substring of bytes into the byte buffer + bytes(value: u8[]): EventEncoder { + return this.string(base58Encode(value)); + } + + // encodes an ScChainID into the byte buffer + chainID(value: ScChainID): EventEncoder { + return this.string(value.toString()); + } + + // encodes an ScColor into the byte buffer + color(value: ScColor): EventEncoder { + return this.string(value.toString()); + } + + // retrieve the encoded byte buffer + emit(): void { + ROOT.getString(keys.KEY_EVENT).setValue(this.event); + } + + // encodes an ScHash into the byte buffer + hash(value: ScHash): EventEncoder { + return this.string(value.toString()); + } + + // encodes an ScHname into the byte buffer + hname(value: ScHname): EventEncoder { + return this.string(value.toString()); + } + + // encodes an int16 into the byte buffer + // note that these are encoded using leb128 encoding to conserve space + int16(value: i16): EventEncoder { + return this.string(value.toString()); + } + + // encodes an int32 into the byte buffer + // note that these are encoded using leb128 encoding to conserve space + int32(value: i32): EventEncoder { + return this.string(value.toString()); + } + + // encodes an int64 into the byte buffer + // note that these are encoded using leb128 encoding to conserve space + int64(value: i64): EventEncoder { + return this.string(value.toString()); + } + + // encodes an ScRequestID into the byte buffer + requestID(value: ScRequestID): EventEncoder { + return this.string(value.toString()); + } + + // encodes an UTF-8 text string into the byte buffer + string(value: string): EventEncoder { + //TODO encode potential vertical bars that are present in the value string + this.event += "|" + value; + return this; + } +} diff --git a/packages/vm/wasmlib/ts/wasmlib/index.ts b/packages/vm/wasmlib/ts/wasmlib/index.ts index 15311b1cb6..bb10d93cda 100644 --- a/packages/vm/wasmlib/ts/wasmlib/index.ts +++ b/packages/vm/wasmlib/ts/wasmlib/index.ts @@ -2,6 +2,7 @@ export * from "./bytes" export * from "./context" export * from "./contract" export * from "./convert" +export * from "./events" export * from "./exports" export * from "./hashtypes" export * from "./host" diff --git a/tools/cluster/tests/wasm/inccounter_bg.wasm b/tools/cluster/tests/wasm/inccounter_bg.wasm index 4677231d6333136822704b7bd95911f1630cc2b2..9fd8cbc5e418c8c4f188cd07d16b14cde857e69d 100644 GIT binary patch delta 318 zcmdnKfNA>zrVYl7ER4*|%#+O-ckz|3VBEo|10vLRFqUlo&seU^7`nM!)m~HhMc)Ai zM{NZbM~*DVDg8k9jlRt%{ZiN&LnrHn?EsR`!vdHd^iQ@7pTx9f!sfH#YnUd-#VSvp z6P3*vGC4k0NqAN-P?wMbqoYEWje<|$b`*PVmY`b&&}}OJSUxzar29eOYD=M7dTGdRiMHVq`>4Tkfp+~S-p^vhlxRC z@~zrzrU16d?sZBaD!Zgm1&vjP3q6`qg2&BX&|Etqy6rUVcn=Jc|U4X$AD3$}n S5&PXn?wH(S;J6#xJ&cWAu; delta 319 zcmdnKfNA>zrVYl7EX>TzjFZh7ckz|1U|hktgHdM(quLI}(#`)F%as{JHkYf~YYNYp zaDc&4TY<%qBg^p!h}|(^^GUxHcE*s&dSN?&Hhc{eW6I3Q$Qebpc$a4J93uNEvn`|2$1yLpZ23@wHfAiVsiHu;a`+LBa zgSEZ^u^;qqo)XK!wfT8EBje;b>E4@PWL#pO{JTJfBUFLOQ6Ni&Ve-xbr^OnDJd*?K zbeI@KChw|CR_tOEU~pw%V8{Vt2_S~?rvcfTKrA|0t2Ud7fqnAyS|t#*yS9yK0{dj= UIxAi=pfm_D0 Date: Sat, 20 Nov 2021 21:25:57 -0800 Subject: [PATCH 096/198] Small cleanup --- contracts/wasm/dividend/test/dividend_bg.wasm | Bin 32172 -> 32298 bytes .../test/donatewithfeedback_bg.wasm | Bin 36374 -> 36517 bytes contracts/wasm/erc20/test/erc20_bg.wasm | Bin 35270 -> 35397 bytes .../wasm/fairauction/test/fairauction_bg.wasm | Bin 42600 -> 42734 bytes .../fairroulette/test/fairroulette_bg.wasm | Bin 39986 -> 40130 bytes .../wasm/helloworld/test/helloworld_bg.wasm | Bin 15265 -> 15362 bytes .../wasm/inccounter/test/inccounter_bg.wasm | Bin 36919 -> 37054 bytes contracts/wasm/testcore/test/testcore_bg.wasm | Bin 50575 -> 53216 bytes .../wasm/testwasmlib/test/testwasmlib_bg.wasm | Bin 39463 -> 39591 bytes .../tokenregistry/test/tokenregistry_bg.wasm | Bin 31888 -> 32022 bytes .../sbtests/sbtestsc/testcore_bg.wasm | Bin 50575 -> 53216 bytes packages/vm/wasmlib/go/wasmlib/hashtypes.go | 22 +++++++++++------ packages/vm/wasmlib/src/hashtypes.rs | 23 ++++++++++++------ packages/vm/wasmlib/ts/wasmlib/hashtypes.ts | 23 +++++++++++------- tools/cluster/tests/wasm/inccounter_bg.wasm | Bin 36919 -> 37054 bytes 15 files changed, 43 insertions(+), 25 deletions(-) diff --git a/contracts/wasm/dividend/test/dividend_bg.wasm b/contracts/wasm/dividend/test/dividend_bg.wasm index c375d57115ad0873046a285643af1990426378da..a7caea24529037c9b6d93d4accfc904899bb3234 100644 GIT binary patch delta 5564 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 delta 5450 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 XlDD@<^YHfY2nYU!ahA?Jw*UVDjuBJX diff --git a/contracts/wasm/donatewithfeedback/test/donatewithfeedback_bg.wasm b/contracts/wasm/donatewithfeedback/test/donatewithfeedback_bg.wasm index 2c39e87b3a6d9f86fe7621c49cc0c47f40738f73..ffaff0c7d4a1b685fa6a344a6cfd9d18403d77d6 100644 GIT binary patch delta 6166 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 Kx%&9qn*J9+WufH& diff --git a/contracts/wasm/erc20/test/erc20_bg.wasm b/contracts/wasm/erc20/test/erc20_bg.wasm index bc37edaebc60b0833481c66625bb5acb1c188642..90f3dac50d50e16729acae7e70c9391c4d4edab7 100644 GIT binary patch delta 5560 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 SbuR(Y%MA4T!)o#21OE%{+*CsV delta 5424 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 diff --git a/contracts/wasm/fairauction/test/fairauction_bg.wasm b/contracts/wasm/fairauction/test/fairauction_bg.wasm index aedd4a53138ef94d16ef4f4a1380f01dbfb3a6e1..b8430b6a5ad4fbf866735d4db35affb0aba8e6ee 100644 GIT binary patch delta 7133 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 diff --git a/contracts/wasm/fairroulette/test/fairroulette_bg.wasm b/contracts/wasm/fairroulette/test/fairroulette_bg.wasm index fecbdba2f30d8a70fdbca1fa330343997d098a57..34691270e0264c2683990179f8bcbd9419f944cf 100644 GIT binary patch delta 6811 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 delta 6510 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 diff --git a/contracts/wasm/helloworld/test/helloworld_bg.wasm b/contracts/wasm/helloworld/test/helloworld_bg.wasm index 8af77e238cc12947633a7e08fc9be88f59a0e9a6..953bebf390089421397c48da09b17759299e0346 100644 GIT binary patch delta 3241 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 Hfs3C5t?_c@ diff --git a/contracts/wasm/inccounter/test/inccounter_bg.wasm b/contracts/wasm/inccounter/test/inccounter_bg.wasm index 9fd8cbc5e418c8c4f188cd07d16b14cde857e69d..743e62f03da1de233b905cfb13e44ac2d2adda21 100644 GIT binary patch delta 5934 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 RnZTvXD*%Fint6EF{{cu2n<@YR diff --git a/contracts/wasm/testcore/test/testcore_bg.wasm b/contracts/wasm/testcore/test/testcore_bg.wasm index 9fed24e2156e4ef211ac7c81e95e72b908f68a98..58ca27e22cffa55c31b1d3decdad7878830f7355 100644 GIT binary patch literal 53216 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 diff --git a/contracts/wasm/testwasmlib/test/testwasmlib_bg.wasm b/contracts/wasm/testwasmlib/test/testwasmlib_bg.wasm index 5bdfc6e5188256a52ca159b33f91741d8fb674cd..d5900dd1aa71eeb0ed1f1128d01f47ec16e72131 100644 GIT binary patch delta 6049 zcmai22~?CJx+L<$Y{`cO! z@4ol$yZ5{I-QsMMe)fu9`)^UsNVl#DJw(?}; zxFCKZ#v13vDRD!z2)BRMMd6!yRfN?%px*ih(Lg8l>7t3g)nCJSzbzi)U)aW@{evw- zBvP!s_h3)B?vgfTtMUtFt5l6wTC`H1L*J(AG0M_4zpjK7m3~oSFOZHb-5D-is-8C5 z%g1+02x;f_no6ti>s5Y-vQ-p9*shwI%`GOodq{^{sD|K=Y3yx>T3u=3dERYz`4=cyW$)~uU!S)$vaY!mt)M=JJ??~$9v%1FmxT{EvKb&RCV zxF&qIa0gqcq(`pHl+jEXI@u$~=sHQ-C)x{CGkwxyX2DI~$d#qr{b7p7xKOEI@STN1@rip7*<4la>^OSX-CE$a0^p>-yi%*v3rq}4-oxZ8< z);yf1NvG7NCc$HhnbL{R}q6^(k}1dGryF!gzGMQ&Kgv9UJML&~n+%!&Wpb z!M(a2BG4gZIgN^Onb#tNHj(%ZmS)z#JPSp>2&9kux$KVVE1)r!zK|L=N+LWQc|75LaiEcg2QoM#SGoaARXJBBp@5X)#-=A;F-}Vg{JKj9skPHPMT)1>C(C`w~^HG-!6*0JA?DSE!$CqR-+c zaF-QdBu>-D_=#xW#<-rG2?b~;CM*_>bPnT2`Z{5RxI|f=Y_u~yLq!wq^Nd3KfoFuc zNiOeVv}?Q*#Vxwx%@(%;?cPM;Xm|z2zIiC=8__`>N#&v;urT?y5O^0-Ct&S{)Sn_{ ze3+Vm@mHxi@cSnNyZk;jEoVm1Ls9@6$i(bL1`6_x=}@gVjb6zMi9SQ;nL0!hf%`mAiVUWkl zdYt-r)wWVUDEdX3_|R72 zv#Iuax}MWlKYW&cn>{e`@L3knTvotT|J7EZoK-%D!t{Ui9+mQiIj!@oP3jZf4w(0% zD8{3%t1qY`XGokS@z@Eq=lBE>ppKkD{Q`~F0i07r1)CO6=M*@{re4?8?K3T!F&U3g z6N5Mhex24QF6wW%fvP^ILiFkrfw%$H0ysXBH(TFvg8q=VOs_jZ(+4VVmxqPa@xG!i zQ8va-6TLC;3CxEM%E=D8PwI?${SiL?7W1?SU@`sB4d9j=rFawwN^BUc+hOG{MQ}E| z+yXsa9mH_GGpH-_+=El*b;-h+>}gKzu#iyI`cy7Z5MLgX1{i_J$G~Xe9T>%hEB!i` zY@)Md3%oS=uR_Sci$nV9$RwAC`A1wjZ`DuARVnr2BtHs0#c|ACrTVd1zFcsYjN!4^ zCw=%+u>IWO*~wk<4xT(IJ*yPCLwwt;|acKn

Didv^%0TJ=kIJ9YYT?sw<4Uhvd54XVSffW@ z=t3!@#z=&TyMwh8wm_onVR)qG)5GCJhZ6X?AZ<_#<(e3?Jgy1l4l52X=>^t*)j*ra z41yk)$9yQ_se0@zahHBSb}8EY!i>mP_?vBxyH*R;N^1)*15&Bu208c_0~XI8_pV-h zlv2iD#PjyS`1L`E1Zd2}4E@-7x>)3KTxQVd^g&UE34}$l-Cdj*^fCF1O2s+aS0wQg zUMTX4H|bVUPH@44BP~IExwWnZD~e0>+9vvk;-~N?{ZKqzv>T~%d3tyDP?16pW*5UE6Xy8E6N|u7KRAFeo=p>BINdilK6wYg8=S$* zAS(PUVD0pPX3q6R-iD3L;ANOzJ3`y%elg-SJBb^t1R4P0px5tNh*MlcC?-a~h*H(a zw`q*64n|Z5otc+8rr{_T;ju7=H8ND4wH*@Nwn=!OnS`FmKKwJwB-P2Fh|RuD9lJuV z`F-@dD}kZ&nK$^NvChA!UIDgKCGO+yyX zp*~BzKo)eMeJdkObiKMVCtPuok???BeMy2d@QNhcf!R3)=@#_NDOY$&;f;T^dG|c8Q($&ct$|*?| zZ&6W6rl>WSxAK0;M%VHdI#-ewd!M-};0BkbseO9_Z6(nn`sRMjL}No)s+xFw`q1(% z(U%T9!M#cQmv4=3eUg2TQddld;%is*L#&)!k&cr3-4#{Q*Q`J@cfH5sHY!@#r^|*0 zg80>y+Yy=mRYk%}>sF;kbMZV__eg!T$k)T+nnpUc%8SXXt0qJvP9OKzE{a+`FXq^j zZoE`STUO7FdBC3bc5`n#fj^4UOFc17ho6}H=rBzyof}ij{8$T!CQ|AV@1@`C&BsZs zOQet2Ocx&=T9-$2)(+KoyhaDt_645bSzAE}HH`!uTaDOFz4i&j0gr}bP1XKIhp^yf-a zzU2Ip_*m9*TFwYjKhVd|rRv9b(;uIUhtHjxQvF};fw(6F%aAns({h#j*pD%d+27)blb85_9gzaD*e^63x ztMWa)k0x(!6<5i><$1RDt6RMK$^G=!mPXM^D_$rRk{Vx7{3GRsMKH;|ctq`JX@p!#Eh4U9L zu>Mipp1P9lB1Zp1JNRs%@> z_cE8UT(D-vk=DZ}%2eLz#fMl0c(clA_qK+0F$d7s-JQsMa z!MO(d<$)Zp-7vHWaHG-N(Z{3bjT-3d1H*ltYbJopek?=pL|=v8VM>jw?H5%KDjif9 vJ~mE$;N{wFA-=qLL(2kLjF0uWbKc-Gv5o delta 5971 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 delta 5147 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 diff --git a/packages/vm/core/testcore/sbtests/sbtestsc/testcore_bg.wasm b/packages/vm/core/testcore/sbtests/sbtestsc/testcore_bg.wasm index 9fed24e2156e4ef211ac7c81e95e72b908f68a98..58ca27e22cffa55c31b1d3decdad7878830f7355 100644 GIT binary patch literal 53216 zcmdtL3w&KwnfJdh=a!tLJuL-FTguL%NVv33Z%JA&bQfAEAmt`_0cqL>Xwo)qk`{O! zX$nUYWx6uMAe_is#e&>Fd|DTskl`d~)ybX}wph zJjwIZ?1@SCsx^JRYlkTb(h_TMPVextD~5ZAyi#2@a9nn4cunxyAXoB&=6ueZ5CrAW z(@^=&d48!7dKJGZ41F*3^Zfa~mF7ckyorSZ-(gtrnoIdY&MQ#QFL}kHmkUGBEBRc) z05JJ{NDCVC2NeNtUjfB*Q1HT_IV|V%z-kI7wQvcnj@6?Tz4I3WtqHvN^Yio(hWVWP z3%#7zlykK_kDi*tfPO)SDpU(|IYG$f!kl0B{d~~m`M#P0nephpD1f=VzuCX|VgPuP z3QbIDJTkJ!D;H;mg^j%%2L`VQyyC#7i#81Otn()7Zf(zo4PJNCM}ZRi<=(&duL*v} z=U@Ec`Cs$j=D*#)(LZ?W%JVP#y8nRx7XKFi9sWE0FZq{$!@pv|;Jf^xtNaK3NgwcU z^1tc7+yAxyq<=GwzshI(Kasd5xF&d^E}c*MTdoOqbN3puzU{YPdM($7{mFf=3qI~2 zz34jsC;rF$*IMbr{{Qy-cl&Gp;P3Z;>c4#Izx&^#-Rpu09h=&I<m;#c=ogBSpo9S6hxvCjvwa04@yydNa>_xf$wov^A z+m(n*+o}|J)8ZpYJoC&m#nVV|TZp_%s$PG5#FlNbzXfpqaDV)wzH&8BU-2XVyvOSU zWYxZJt;-2y-sD`Z`HN%#$4CE;W zDToSG^rB*X__jE=r7y0y4o;q~g6VAqN_={VyjHIq73jCn=CuUn$ZrkG>NfVHypX6o z;-@3tqOpaMSNT`}(t5PXE{D)O@+k#VKgzA*9y|+CxN=LC4t@F!)w2NH=U1&?f4O>l zNT6ILkJLcI zINVnC<8V0M%Y^l{6_}#?-PAGFz#gvpTQu(Wpw!}*tqh!l!Op;o3S~n$-x-w1VI9~+|J(JQ;R2b2sRyyE!M184 z4!0}^tz1f$7q=Fp0=$;6o#ud98#4z!bT@8{d?RmesV2l_id*1@aHS?fyle~e1}AIY zhnbY9z?>ixMS22*K#VNbAKoI;!2$IhhDnEvv$jK$uES)~t;2L^bQ>hy!U>|0E;|C4 zUf@kkYe^>Q_S{@&Tv*MrSqSN0BXKZDl{EgrrRg zU9*xWl-QS)=$ch~Qi;ct5?!-uPbslKDbY2nw)20I_+3(>YgX+#m5lHu40O$^-JrxZ zNr|pmwVRaKm6Yh3RlBja`zK`&8qFh^N4?!l<1mOyG|t|dsiBIiivjpwnTI*I)I_aWS2Tl5Fma3jI;gANlCH{;Kq+ zX(4HD)Hh~JYCX|~m_M`~(4D)AH|A7fo7Dua)CIbt(BIdmMk7)JBO@cyDdq)Me(&Qx zd6ob4qn49(mukGqCotSngy^^&NU3$AmFXo>i&csbJQiPL`P&Wwr%*_NrZjF!sti4+ zNULH^5yDZfL3IK`s&iC-YJ%j8sZog`FkGklgQX~cNP_;BkC7;UA0JYV9fTA$93i=r zmX`}9?aO79jBfhVnKMI+v9Nhmhc;Q&yfXoqZEnnA0RR3z2%hhk_m&Hmj?NX>r2bUo zt+4rg%t!sJj=bzb;_~7en?D-2WImJgo_vi5K9N(vVy4Dts&Qd(IJYHUOfD+)wdEL9 z!92k-9s#M!-EvW#cTGm+NERq&((tr)zb2(aGvAeL1mI%bT%QH#N|2s5!H_-fE&`s z@>*j-2xDd}2jBTsExB1ei@vQZkU=g{6I#{iy(17;qVsIcrx`fXiNIgZj!ljoxwO!g z$qw+z)O3d_>w!n^#Vou3LN!&6STOd@!Y?o1Q}PSjiDB$VwdTpeBsgbYYn|9Bee+Kn zL^Y8PPiyr-Cs-~PT49;oyx5FRU}!BprInRK*alLpE<1yW8n{-lp`qPQi~GF3SjLyz zN4fpB8IgSa(CGcLuq#+d@hzW`^V7lILtIY>4vSh3i@DTpr*ijFyQ^?_rrou3cZ!hD z$B&Hy9Mh5D2?61fv)g4k*XO?H?sIk4r|Z2X>%C;XYsAo{+*Sfn7Inx@>?c7gBrPiT zRSPf&E8y*?V_=*$Lp}LzngdqreX<&b*`6Ptumw|Bh=V?o3yl^n0OIZPii|= zllbs*Ff~p1=Y2%9Wua2Prq10pzsAq}8l)MaA=8CD5IHz3^?jXNIju$hPNmu}rbv2A zsX&C>EkU+32e5}?kyXSD1`C!V;Lb`DSCozR6E{`S!#X!L;g18jsiXV>=>oZKH9YGk zUbaNtgN(Tas&}LdkSI#RbYUlwRYR*^sZO)HcnrW!qr`rV1B*S0h!Tbh!66eF*NXkk zf%VHM6A+Qdz?wk(&7`>tHl|cA-&FLQ5zY3XGOB?^)o;rg@!E1B&7xcty^iZFEvhv`Q5v0i>Z#cKf)r_6Q?On2#K2O*p;{MbJEh)C zLzq5SMl(0X`=l4GcEQyK8`VyfZ5wxVlh#H-(+6f@MUE{Gg5rikTDeXwH%o`(;7Bq{FHDvaV+!7L$DTGm^D7 z*=(=*t`dTv8|t)73cOZ-8lyKND6`E~YV$JK$Ve>NM}10G9bBARb~BZ$ZVh5QLu+IQ zwERvPPB&1LMw7OW&{~!0)j)fD7z|twr+t}NQ}55Zfk>NVwPqR|M2LD%k3xK3c7<>@ z(uj7nL-sT)5eTtmYhB<* zaDnXN_H_~cf>4a|R-*WNiZq+5E?lPFD?CRdsoi`8(y_cvE)|9M6H_Kq0qw=(w}298 zSGRsv1GlSUK?(WqDDceb01jakXdFn8X_p}*vO@Tez$T(uqRn9gqiC3NMM97Outer?D$2*r8)F$qnLCwjwKzCUpa>sYLikZWOWI1}-%s(5wP+dMz zh>z&nmZNL-eTj7CsyPJ}5o+l;cq+a;{yXE@>9|%jf!QlJ_%M1wCf8NVvZpDZY>INQ zIosugIm(|Z1jy!an;Vtw}`6|D)_F5+e3^5_G5HO6B&B%6f~cduv{d?QCeV@dR$I6DUtQc zp>Z;%mm<4?-4sRI)^v7j*VOelcK# zSdeHDRQDM=)Z@k9_@_NY8w_vUzF5>LDQID%E7LDx#!in|#292qXjv=c6GWkwN`m$m zQRy9Dtf!I`$epb06c|(4f1OHF>Isz`&^jvJf8U=(rJsLAR3bXbOg{&eBy7H;l3IyM z#`s&zYJ`MNmsn_l5C4g505zP_5|9x+|FJVMD!NZq0}1nP_1n?`SM7`@%et$ZIUQ13b*C}uiL@}3bz*fv|o zPYC>O3dw&|_cyxx2Xw#7-QTWz%_nt0qBD5H-7~wL!H9DA!3vat+Duoc@fb3E5M8MEZr=IYHNyTlclwqi$FJV`p_0< zM2Thm<-V{S588ZmY|&IJES0QuNjr^AD1$Jy$$!XZ1}lm-_FsJId8`K=Y12a13}Y#g ze+}E+ayh)j7iPULN2#G$jSWCkTvAX+01W)Bo)&i8WDD{LN@&+bdGw+>W;Y4m^i_*c z7gtHXRJz0u&1We)+G=I!*6W%A#;;yR=h7RuOSZCVx(r;Gp4iB`91Q`$UTMFwAR^A_ z5b7cTAItkq+H~u{PGbc^HcsSL=`LL2wMU`z&~ja265)#|LEB7qmx?>f87x(YrD~2* zbK{A>85is2AmK;$j3ch;v3p$X~Ewx%;CwrcJ*)|a-fU%VYraU z^&Jy<%c5(APY!LZ&a|Fv<`X2$opW(R1!@8>Fh=4qVpCsLXXMZ^3i0a@owb!v$yL{= zr^sQ^)?W^trP5J|cCug;VxZ%VKm_{~BDV&SO&`ClSr7p=gG;lh#kzxXT3H*B7ok>b z;y<`^E)uB2#W^gL0#otd$#HWKNtHwzm?=^th@|^jj&!!ohsV-Lcy|uEhVTh(0WQ)v z(4XTOj{fhZKKF;*eOT26ymY(#`G zj4&FkMvQlxH6kQzQB1;Epwl6J{OerCvbk9vbG}_6L=a-nttngzF9Ji+P6%TJjBmSp z51Z)*IwM)^E9#t!nVt41x9s&=Aa#Y2gqCT8n+W4MMz@?P6u==B<`x|-{;q~?CCB}c zi^z#$tgMpy;-hWh+ng|C7#D5DD!%7HM}M2?BxCJ@Dn`vKn12mUYv|N37Io1Ec(9ej zH5bUeHmtdufgPY9HqoZCmQqd&%7@D=5aTkn4eCNcOp+iHBhg;9Ff3|gks4Dtj0rV$ z$2vIAVha6{U&ZWN;EGY8I}|r-O7_U3Vr8ceO<9{66y#R|zqE3YCN?DNzrrrNxygp@ z5=JJiE}K-0bMX`GoXcUgxrq^Hm{FStnr;Zk1&SM@;c{`e+c)P%T%y%vRS|wR^iS1B zjSnM=J#S}XD|w*W>Q`JXT>`4iF7YDlvf8Hkt>HA=C$M7y&`x060L3m80Z$ZV45XYf z84A-1=;z*~j~~emKvVLFg*VHK{dhw>yW+DrJ3nrX@4EvIt5i_Q;*yp~W;lNBYse(} zU)kZij5jOekhqv-+^P(0ah7qHGA70Z43j3GS4MN(oMn7f8M(NeWqd;!t#M11@jYd< z;4`H#e&%XS$TI#z8N?s5jNdDRAXt|1v@#~eld_CAz1A`&XBoSdaZr3vmhlN?Opm8z z84oIBN_=pZ@e^fCjt|K)o>a!c@u6A9wXY-N(0FQ=v0E7vnCT}n@n zt7-ZpN>7Q8Ow*rNdSW~)O+V<;M_JmV-Vgj>squT&H}0#ADK{9_0b^6B)n^SA3ilLZGJL5h?;JLy~zYlAgwHojqc8wO9`){ zNn!GQd}O@;I)rGgSAIC>bHaee3dEY_iw?ARo=6TNIA-r$cE5h_+}sJk;+@;xxf&~o zZn4`CC)=Vj^+)(*SX?OgPv1Ka(!F!nBT6Y4-8&EDGzaO10iM8t_Ri6rDdNw%cV1I3 zIf3VmLU*SJEG%W2cBi$xb|;u%CJAOpX%ILXq%IS7C!v8uIz2ytead!X$2~t_b9g`8 zHHt_QG1rKs+ESu3*GF2KJz%*s?#U038hug-yTmgi)!^CofZHspdUS7ZXh}pwEs1-$mY=geKdP38)VI8=p(RlfwQNsYe%@N% zr6L_9o5i|MZVgpvo9E$d(=SFA$izG_LTU> zcawE^7MZ};{9XunSU18$V0mP2N-kKM{?l?q4_U%^tceJ0*tseM#`K$#9IbNNol{%X z9bDo~madOmw#ECDs#vP9Ei0acB=~lwk6LM)gRIu%ZG>yaYmraYv0CDbNsp_Hn z%{thwm^`iINlAH}k>_IJJPoLGUwkkztWMBMCH9#@^pj@;oSMX^Ova~x5N@IdEnm_N zpR3FfW3Q~>V*0xcKTj^6GgB^Rfp@AErjU}p;0~7&bAUfC-whaEcc|OS@xnF2_TlQiHRsgQE}bN1a{bDG zpdZB~nYM_3y918MRZb-nJ)r5YdU2!BBJS7t)PT46R*dxYECnch3Eb!S4+7O(*{hmp z297s0aA+d?;?T2~9eY;%nyY9~b`4MnUfd`|iO5@nGvi&V-s-BO1-!UXa**=|G`}lc zGP(bb)IMZjDG?V~h)hHClZdbk?*=yKHKs-G7MGS0mE-rT%NEzAu=t|jp$)J$4P!&z z$Ll+j|L<5=Q*YoY?rUaBHsI6+@l}4~O~(@L^Q{UP9*A)74>4LhiTv2XI_e z|FeFaI4lN#DLcRM0lbw2eBz}fYKrQO+O9@Tea?>)*TkxK2>C`atx-~+_v6GLvFh!r z-YB1mGa_WDo;V>^JyP{Xotbzbs=kM9Qs;SCbvY$?g($B^wVC)HNt?vyur{cpV2s*K z91d0gf}gq>Rvo6p!9TECqI%+FSatar2gQ%d?WprHzFOyFq^?DPc#ZE|{P%km*uj!K zhf%M>IYzSJp`uP$czG4v%d1e}Jcn07Pz$3kuOi3jv=PFVa^_Xw6UeI&q%mHFmO^!2 zg}DQt!OER=(Ao^Q zr)zLC$Kb{W+!A4|qe7)GzQ2|VNZ@l*;SF-HCOfrg*5Iawo)UkduBQiTyTLVh?rz?# zZVq^6_#Y2Hu6R=RVRrp8A@jpT@>ZTw(Ap2XpXvw~64hW*9o_>!0PO*kU&havC4 z8T+S~?u0o)=D(85PC)Y)nd|;2{uqG`cRTrCO@Dj%`d2pwV7KS<}(cC{WY)4@8UQo{R3d^EvZneWt zl;y*~_X<3_|7)5@g=M@4=9xFGzS{8U*vWCO_zz#LapUjrKqa%eMcW0i1X>_d3_K`RbjV!^=%;=%}(&6#HXcM<}S+W1yj1ZD1g5 z!faDdvqdbV9@{V`|E)3(Y zukNv(@whxpjWXdB)S=2abu~_vw3LHt&r+($(^&9o3%AwvNxfhN8YNhXYSepvX0jy_ ze=INk8P9YPFgE_dPykrV?45!rb3GDP7?S3-`C2JH&M&ZYcy}WQIjUVPNtEhNbzzWsZ~m; zwjH$qs%1@N0iIvUxJ+B@jvhLt7jBBryLPVy+t9s`Ze0Shi8C4a+whsE(sO9`Gd!k4S z=h)jk!%w01D6kh9Ax9P?!JUXD2wPMO2f~^og7%Igg-`=r3Z7dsU&-gD8fZ(vOHRJy z!RTN#GLc>^^kSYDU=iqBf-vsF6`So+g3n?-O(5AzfFz5 zrA^p><|`^qj|nz&VTZ8hX#@ypMp3mvP#eD^aoZ|v7Z){IZx4I z% z&iUxUpJ<8K&0TX>*v_R%+sM`uk76o!Jkm}}Jx7bUh)X6wDkWk!4ojl|6*@_9SB3VV zBmSmv=D22iu+Z&owsA%pqA&6C%ye;yhi{EGAaLMD-u<2`ui3>wj4mS*O!r_@e{^7E|EjrMT6(6DkxjcVlx#@9ZxiO-Q zRt<0@)vA!ct%ph(P(q-SXcoSrl%rwv>+Exl)X(Ts8`Er?y%du9?njAp|%LI z-359weAwtysU83=1)*JcJq{Jbe&zc<=g8nXZWUBbLZymVBdGQq2N#YBz#NLka&ZCu zicZ>eg|f&NrYmJ>RwgP@h!~aj*qwV+r_@(z)p$Zon6?(<-+^Dez)IrBb${Q-K=@@| z`L%e5PKE4q(GwV`yU#>-%*jg@Nn&PMyvo_tU|H~Tx=<><_l;M5tyuY%&oM}F;RK*F zihFIPq~n&KrpPu@I3G9$E( z3q8sz0{zMc=m`0^&`~p^(52g;I=X4>aYdFx8SYUi=;FO+J>KYOhUVF2HTQW6b?ym* zygLKT;V-H3qg}Lr*{%n@b0M>5$MKNoe9UVS@EdcOI(WrXg^_AWmn&a=DRQ8ft_(=mh62d*%xd&pj_HwRyHfUD5*J ze|ci;5E%HN!lExyK2WnBc@XRXkdZVhHtT_xItb{3Ivhnj_jq2?g-(F5iJ;vK_8dPB z=OQ1D1g!4D{tB-`qzV-LOn^IrDI8(B&ru{};Wkeau7g3QDR6-+&I`aCnhPB1nTp_! zWzYCm$8cLEvSXW8iuiiaTdIS@^a?Pr_Tki%o@05Kbf{&J_BZq#Z<|MXj(uAxY2hHp zeuo~%25k-zGYeP_gGCu*@W7nGK3gYUe~muSR>H>47X;kJ*MW)@Dfrf;J`ng5w%bcn z(1g`c+N^q5LWncaYj zJ4gUxT28qqy~llUUNCuskN`jt9g#xg^ZruzB0DmkIl{h@_cWF7lwC(Wc&`jE)^s~G zddsRF3e#IwF}~?rR{fY`X_w$N@}i1udaq;vtGlwTOM$Gtz%Y=>>(B_P`Jnm8mSd;Mw^ zFU%9(m~If0dBWjzKy^wLqgkq&AFG!&>7hLc58`@f0^2V-U5I^}sx`W88_H@EG@MFt zQkhFj`CcB!a^_{PTxi5HkcD7#R>Se*qCH|9NWE&i5D|-Syd9b#ff6m&I-lWywpTfFOSr*YM&%;Ndb3cVQxJ)0)ieZ~`i8+V!3)d*V5yiC z0LBN@_Wu=rY(Q)niujY%1pecY5p| zC!j1^oJ28G=%*I#kLh5T-iA8`t)uA;r`s&s!_~HLt(qnLIyKPbqjtpcwrB0rP&~>W zyd=rQMSf#dVu=_@%}@aW1$MbWgEGWwUfBQ z-LWFwsJQ%zz#Xn&B`Gmw7&)^8lEGwLTBZaVQ4|Hsd`Sc%hkvS<0U5O)zkYB6{6QUlBthY4`V?Es4I?U;j6u>|qV3rF_|CH!R^ zYXLNJ33XfNy(e&|7C43q(ZCntLt%$k=^^KZoG&VHL2A zUR@Dp?SzFW{L0C(nN&DgFj#ZxSTlcH709q2h(P~y61(0TYyoO|&h!2TuR;oD+V)Ez`SY#2L z?<<0nR|E$Xr_*U&G-VnX+ngdbW2cIlR?P1r=8D)R^spFub@*))?|D2xBd={XDEfOAEq)h>SanumnR58?tAi7VeW! z3s353g)EvFLuzGgB8Z1kN5qtbM8F`SLSSP^NT+#T7gI|})KeYp0wcf2+``S{Q}2hO zo>-!R=KoJpPee!qRe1%f66(D^5l|OS36@gJB1MFJ(lfuj+67VPjT6#iHaHn2s_Olm z3WMmG1^JLt;bdyhBVcox4?7D174tOIEW1Z4aYNn1J%W{NE}L8u=0s+xX`9PpkxU$s zb#s8z&1I7!p(@>RoVcY0XT6~l%#xf;P#6X zWsaXul`1R*<)kN}f&}l^Y-Gf;CpGgf=A>A_0zFTm7t@)!z?(33m2Q@PjQ7Dcm1Cm- z8E?Zt%gX9RpNsyHVeIR}yU>lMc)Y6HB(q251fAR#Tmh5qsqv$Z4LLn2a*0*#{WQk5 zR2RlS7^h0PifrrM02VIvPBsTZm483Z@KTLle#)=4caDZO(iT}eP{y#Cy-N+9#@yy9 zo9F#mYshG%)+jSicJ^|N^%}KzOFRkT=Cw$dvwjt zRwuD4)+g@qTOD0gh$>mRxKqr`k~ncj{FM5dQCUto<}9luCzA3h9Kb_t9(99{^+fZf9QuQ&T3KRW;K42YH5bNX7$`tp*qnQVMYote}`c7ln9M{C2 zr?1=tJ+%&AYE}5MJw#r>=>nyi^7dfqm_R8`@hMckpXgJN1xhvbs(eoaFAXxf3J+^x#R2RsJty%E8q)@LU+8A@_GtI zacBZ-BWXOL#7NqqQYz@}*^P<{ybgeO%IfXEW|?e_ zpl}x+XXX9ALSOdKsh*{@JXV5%dz>*jn#N?vW4CoA)>k@Q3tZbzdFWO~aU5xs>&R`~ z-$#Z*HnyYls9(R9)(RSrfuUHSfMK+0b%I%l5ajVz(sF`oSJLu^(liT=z~~%|zmf*@ zpR|(3WlL7l8jkr{j8y@H`?5u^xmkhpxc}X+^^;`MHwI27S-4^|V%{4W->2B9zL*7Dba{@&;$7cP z^2CKoWCljObORao<(k<$A6d`pu$#8}iT};es@C>4;#)qdFd&iIfwMVN#sta&vC!6046p3$ zrR}K5L`j)~S;;GZA>m~F3@8&UrGV{XjDpthvO&ZGa`IdK%KM0t;&I5TxfMJ?uZWMG zT1*}~ixuKfkc^89kcBeD3XpLb4Ul0~f8fWS3yhf|0g%|7!HovS6nIDiW8{trjJfCi z%X{ne4+CgaxIaM1V=Z25j7@{WeOy)CD^FrGF#pXOHGRd`sDkn1byALU0;D4%>9=@@ zbL3>rB4d^^D!fUF$EbAB`N-7Ih1ZyBcrvY&EiaP=0;$g< zoh}y2l7fo8_KVCK<@nxF(J{dinc3u!hsHjNWJZ<})wd10@H=zcf-9FfZO2xL#V!|O zR4Yp&|Mtof_O@S5eQ2nb*Z~aSWwAMD1dD{aY#b#Z03lng;64Tt~E4)~Qh>UFsO%*$s0;&K=XCV~n!w(2~%f#*v?J+;#o`k3=qeA=K zIM!Uuj?^@|1FT1v8uRgm6~`M$LN=+vhG7tjG-y+6`$t!1{PaMB5F}D2R@ZvJGOjUy zVjIsC3Sy zurH*93~j)=07iCNQz<7$n_)+eVR91G$&r(t4Gbz$sIv z8$JUu=^~4i`H+=WEj7*8HItF-bPFLk!}{W46-KdTMA9|9^4OwXuon>vy#o-1;w)4( zS2-8i^*PWb_SZ;R_lp3>Gb9FVCI|ClsraG_Oh}11lX@~oXR}qLnkqx$If$ds0eeMp zvsECb%JGN@YU4-h;D^k;lwcH=@ABOWbiWJ3#UFj^p7eoFsd;;niU3dD14Rhir9iMi z+v5n7p53z0D#sVyqg(e2ihFb`eG`T(2q=zy2?pZHuqE&f4~^3OK>Te%s(Y;PT?xjC zZZvg>B7n?6FKA(`-ZR~V{%m=_y}MQLAVGA?Lk?^kCCAugIG&k;UD99U7i;a z0~5uk_GM|5j!b=)wizLW;Od(SFtN3bkDEr3b7oJqfp2z_$ni38lpzy#$W4OXEyC_l z3R3Lu9mUS1>(9l`x-y&hU%;+#0PGUljbc|ryT2xO*Gtdfi|f>(ZQ;)LytW|r+B_Hp zUadJhh>{#+GIi#Lqma*ib`W;7bPIA!=Z!v+yo_m}CRGCZ`rv*nXeEbEiee6Ym$V+PCQU8gF zr>ac67OU7B2WA{!LZ!x4-)=DalAdZnOdg{WEPLgPysgs5tnxGJ2yHNey}gxlF2l!H-{a162=kRiWC6@w;5ck9?a-)`#1&pcptA`w`v|lRH%K_)xFL zgg{L+kI*!|8vpU@d*5++r>DyJb5=vMBdbp&CG!YO?U4V)tlN=<7VarD6t}HI^3rg6 zSPPNR?>NFI71ZzXeX((WK7K)8{9RK)`DHt)O2*lqHZmFHX^&lyA4) zrH^po_P8IN+v2P+lL4y+OJOX(a+H>uE<%LkYAdjSq_|gnr-upDS0H}X0fUDugRmF( zI6JL0w<9J%A}3imx*J}AdO4(4q+Kz3E~7De2yQX@K&xz1Fr#5AZSN^Y4`TQU$pd*_ z8lw-A7`+!KF?waBG5TybqR&aC8>*o?IyG@H)*U)ZuH-`>hIMM4wI|3hc7_!22QIMA z#@N7_S2xP?vv!pm+f|#odaALj8|wYSxb08w%0EC?`{WcK2DYgSdSAn+#_eidMnE}i zc7{*W6t9mMIIg%mo+h@Jj*o5c;z`E90bM)AWUlx%wFij-t#hQ@y|u^}R?nIEO#$MZ%|E1gJ*vb|hX*vJj$}leC!^bJe|f{N$~V zU;VRpZ+Bh{>u>XC4hT52oW4w~O6_cKIwuY>FV(#~Q3Q4VVDhGoqBVqi` zSMq#_d>>f8@()DNAdxK=kq;NHw#}}muz;0cB0{Y5s2pmiH?-AWQ2CG;Q5&x10Y^dzVC1#XCrPo$yYdX5#wqsODod51gTmt&k#a>w65 z8}6^#i|^FPy^qd4I+^gt%N+1jCmI_X36Uh@^mOkWb|PJ~m!3X7DO$x(-myoPLCW9A z2rLmSQ;MceJBgl0?3Efm@?&kNFHiaL)_gSa$F9pa&5?7tG?$#MEx#Q#c=ACre# zPm;e9g{u z!FC&W^2IXlmF_;MT@sFU&YT_4+?)+B?s&1FipNCn_}!@{2LtxI>a54GWXE8$lD&=-V&IFW5VL2{;=CFPrPS$z6ka|BEIfj zfIQ5Bw3U8+kKa+T^V4NCn5u>zpUneTNH}rAvmO`6|0ZngFp4p9An+` zfbo^%j|<%Nn(@{5_WQR`oD6^5@ii_+YAM>-+r0QKTGq^{>Fum+g<;%b`n2*|8EP3% zl1Y$Ir<+k6gy*ZCHp6hh(SJX77F`}pV15$8+)L}I^)W4JCR>MT5H?#!HJ+A*yT$aZ zqj>k-7u7IXM}fuM_y@{3xCZt5j{f;Zif4`AQR9x}Xh(be__u19yz-BZPKbBCgN&mO z*wL?4>_|9fM2#<@8SQAyam7kc{69NwZiaUy87Jx|W$Vf2Av!3ujho{b?FC(m(2@v#xrRl>=yrq}NTayRW2s&A0NdYEv z1=$N=K4l)EBkd+~BE+ie8Mee{aghm|5$ipEtifo&ZOE3&z{{OW$qY)O7R+5jz>@7p zQ*RfGLg`^GQRqpCB7)k_JL|-jQ7EY)3ZE|047pidkUspJ|m5}C*mQ&wT^KPTmVSNJ#8y55sA>GS2O5$dLHnI{$%oSlG8CA z_Cp(}aJ`oKcNkAt|0y_M(u>v|AG}4^uCw~~Fd*)0}s!HtL8gE&qJZ**U zL}VN>kR!ri^_Bh{8VSQ?`FJ318|6-fWpZ(Sv7)B z11W*z$yDf&g_wDz^qsXDp!@Jjw6c!nP}_{&Z6~wfs#TLV3|VQS`6 ze!S~#l-u!rs!5$J1fk0Hu-p{tnA)_UsyNPsMI4YCO4!0oW_f|gu9NBPKA<~bS=5G3 zJ0{v9l+u7<6%`?#sH2kQxf#)oY`r>jUg5uBAIWyLz)&EEloX2RS^f+%LDUhbe zrIC6+cxNXTmz$kI@@hT$`LNV#xwFP~_=E(tT~p2`%{zbj z_kmth<*|Dke_tiXxe{ZB+Gd}8_ko)IKqa-!W@j^kfFTqbFkjeH4S~**;FDju10^#` zp69B4j#plkfwswZUI_Zx+2@-qw#im}r$N(giw3AH{X-S^+$M_0m*OcOO{T!)^e!8JFb)P2?=yLrmVD)ukIoc3Y811x z10}Qj%FIJs4QM0waoNy}4hfZ=)y>Et|D;tI7&SEV4>Iy&vWf=O zI^XL$w~47JhHc%CS94!&O@&IVW&}*JoG54cq|Wl*-cbQB+xGMVtV-yN|_Fm zO5G(aG{bP68vl`pkYXL%uHhSX|6Vx(ie|+hm#13M-6xf&ppq*5N^un}q-qvdyW}m& z_^HCjlxV2%&Dsi|N+Tli-|wXAaax}Jv+`u;1mRm+t0{C-gTv31r!bl-d_x9R7Bl`A zK{!GX{#AJfVG1Lc?`Qms0@hNyJe|w~@Nl_er0T=VLh0~M*m8?yAdg|CR6fiSOr7KW zN3qD3@X7~K!Yy6UiC%qz7(23KUlSQls!p!2dOS5JlBL%sn5OF=WDYe=22Wa`wX&?N zk+=@HaFj%E@hF$9US)cD0?p%%5`N@}-`!EZGoVge9OT6bvIa$Nf@^be*2X~aKvx1{ zf`Lv)W8-UFW}v*Z>m3JM;I*<+LY7w!`X>tm-yy8bN|B8C{@qN=BYagp3hrb)u8iNM z83LdtywIOl&@?+*MBbKiIq4_dvOJj%r&*FNUB7)<%C8&(NfCqn9|QcPc&8%I*V3bg z1PP~wOL@hcXZ05;I0eZf`qRK+kmE)Hk(wYx6341sqz(Zu_Thso4HQc{)OfJ$gx6KW zzl*}xaJ!u!4bQ+CodsEhxqORtqFX<`ZK=E6W<#}Eu5=~L7T@i{G4RF-kvE-3fedpN zW1nJl0hASaT$`heAy`Wq)#U%UF+H{AT5uYT#O?d8z(?Nk2bs)EN_aF191!4YeFHf)I2^==-% zG{&ZJnzQ^&yI(u7b<=R~Aorf>2FYcwWzjt-TlbtlzLC>bazM)9}iZTtfZ!4kq`P_N?EO6)3UlvQ52%Sx$n^ ziG#g8!vlls2G(!7B-%7Ed@0vCbLI^94h=^Gn>Jh#4Q<`Ld0=pOh*WR15e$0QMQaB( z3|Kd6G_Wb!ymfH%z)Bo!#LQL&JkKbKkW&Y56IlmVLQW zyG;u{FMuBU^Z79Co-kcIFxY$1(B>WnxGuSXV?ytBy+dmU*KZzPKd|YA*&oG&y>5V6 zUhm~S8#iz0J*ju|hJh>2J=;i714X&fhJj07v3wgOzc88|olDoEfMr0mSDf4nh1ah= zsb{$7!sx_gUeDONaZT^wk|^uvh0*4oP3zZ2D_(N?>Cy5t&OQ5O(V44Oo^kGIjhqI^ zpT?NyvssfK9lcG{ezayOx)|W=#y~u8wOz39HSq63s$wX3gX%yQc5U)(>C0Zm{RFa|gyHmc!=a^=k$; z^{idH9%3cb;f^u$eU7oTNoC*Gpr8xU8sVaA}^Q=c=mpIX#=!tr@sn zKzba(6T#Oc_YSTVgq0`RB@y$Ka}xnilT>nisi|Fo3NeLZk}J8ZQ&pB&er6(oCeQXY zyMxQ9B1#iy(0=paz$F4!E9A2~w)G6E&}okor99lNW4EEvv7vs305=5BUzn?SMXu|T zYd_Zl=`Bh6a<0;iJGoBe`c|&ZT;H9P-@;Y8^kZBlPoLx}S^9L6{}rx+|6p?cc2fSm zB>iKqYX1wa>gPYXmbeCahewI4(iN_Plj4*1pSC}g@-pRBu7WcsNiXIqywYphF2(DG zNqJ*?af6iC1w(^tFW9ht&78p@?}9?bI|x`O@*(h$>BKn~Z$*?x)xgH}Ly-59Xd@Jt z*1sZx*v7Ug)W#OkK!1JFxQb*f+=M&F7C3$#C*N`K0SXeH9;dY4jQtmIZ5+`_sS>Pf zo8>lEKe=92)-`G%5YMzhB@SU=oQbv;(Oen!r$RnKDylxT~w1)~aKY}utq z@Hn|r5C_P9c`sIFJnrgTc!2EjTR6Qjwu#GEn>vEj4Ze{wXV=)Ox>mIXjg8K!HENp% zqRqYNDx^lX(+Qr5NL{tDFk~0T4np*6fTD_Hn#++H+d5UP^$=9I5x}`%I>rD?XBg^Z zN}sE_nd<{KpFdu6>6{t^TZgjxZzz9O5To`oHT-qBWT5KnjSI5I&W;bOp~84T#(Euf z=+qZK8-O||Wn36pjb{T>k|!I|;{hn=+Kg7XIk z`!Bd;;DSrw_^oT^tR2{R!TN#Wo(;Y0F6kY-;If{f%@=I$S=)~{G<3nXjmp@F%Vw^d z>@TY^+_$won=X=DbdkI@yf?2>@lN4VVENa?H7no7Jk*r$O3JUHzW#cmlhzMy-q3?r zr*-T`R;fK&^+toe!&?Vg8b>{wqTa#5fx&3&rrygp_pW6vzu}4#mt63Yq29rv3x@hx z=C!jgTfb@Dz-2?THx6wxA9SwT zFtEA!q;@aIbg*aein$DHV6A043odWip1}2JKJtv^4Y%_-hL8TV`aPD< zUqQ&qwvv@%bZd_4of3x}Pw)p6+wNy_W8CZ8U!^y072(Y?R*zE~nDp!%VX1`8Q=k zX$a#%$Bj(wz*Y$!{hoeM#oNlY3?7TQYQhne)o1q(ZQU@uWXaY|mksu8Za-$V!d!^Y z>g9ujt0N1kSnnd`ImA0r2|7Yx|dI>c+2T$ z1D~mU()8Q7my9joqd(!lkk2AMQ}~F_JNcyYk}M%2M8}EEUx*%yi($o+Gy}f}NAba- zd?f2xpO>J$MtjWat!Suc8fu(+(v!9DEMhrMz4uX1Iw$Q{E1#NbS-)SUj`UPkPriIY zj&ux9P~OF-W8VA)3m0{EbuaE&vvytY#pj>9;)Ez^cmm~V{inItJPfSqLlvu6yn~HB z!)q`7%Lt5WSHRX7{N;x@{Wgn!6wOG}>bHr{*(mNMr!9ZkMK5=M!e8^RPd6XQ1ZvvS z?0b99PwrLz0zNO~^CCV=`K0Y)?w9d7kA`ASX5 z(C|7F-pvXY_7lF)z%Dwp;>`fw&jEY{*EIbE>6xU(_tMV7Nj!5hpQU`#v7EyFNlUqB(=orRdqHnE*ZK1= z?(JRBxnS+0i#r!w+|@gO?Zu1M%uNTEsiuoJ4$s{lnZ8wMm}57A!pa2V|sT~o~VCBqkYqb3Ii*Ia>?l?4NzS z=P#PyIlpUu_x!~RIu^`ZFn_^<1q&A}f_1wVbT3%Euw&u8h4U9KSh#TEqJ^CcyB2mY zT)e1b(Y!_T7cE${aM7Ygor}5_buU`n+0i+#bAIQ7&V`+eIy*bNI=ed;cXf2l>zd!S zple~*qOQ)auCDH`#oZm<^SbAEFX&#_y{NmhyQ{mqd+}mWTuk?i0lk=Ji^)O`7*9%v z)!g^+S;MFOm@xzy+OU3Y?_8o(YcCxXdwW++cXKEh;?KdJO_%gWIJAQZjqyav6s`ox ziVTSO#96!OZeVDRzRb0n!5~hQK=>W`;=Z)pwRh01r=h54*l`$*Ea6R^QSlC;%^a@M z%l?1!pBKOJ(=2Kh@N-np^4IvI-#Pv9$}cs2|G{HtV|Z}xX7p6=;3iGR>4#TLSKoyq zdmdwc1zTnpN=KwKfz;JWsODg`=k1`KBIws~70o2;fbiDzvd0*`;DwQ4mJ+@-N2G;e?-OL7Px+tOk1++VgYcn6|(lkAdd--9! zXCt346vASmRBD>kJfnPA%am4rhIJxuhnYP2pr%9oL-SLE!@_CB8NuQH5r;(KapCd7 z?D8DHBb*n^_iqh86nr@MkZmzy;Cn0X7kmOTH3D^I;} z=Nl=!`_rHK^4A{x=3_tQhjb@c>5}I!U$OGkSFY>b`Q~@M`>PLrvvtxj%U7PiuJ`&k ze~8Lo`s$A!`|1AHNy}HR>mAwo@q0h_`ENhG|Cd+4<_))e@N=L4(pMh*=J&pT%8j4> z#+M)b=E^fxo&T~|UUcmn-}JG6_|)gW@a3;OJn4`_Uva^2e*5$@Bdr^^{P0H;CLXbA zV8-DWz52?J-uan(|MQSTXCATQ{L(|;esupYe?2(#rs1t`n|smo z=FGkI&QE>*E8l$hNAFzv_8U9ibi|%7JowBRt6u(!VrgRK=()f6_e}#`FFaw{@?CF! z`k8Ys*?Rw1_kQb<@BYiv&v?;A)vJD#yXvIU^ju-mj@u`Ud}L93d1POBSjo@L%`MCo zL%&!kPHH}L;^g8>ieYX>b5mFfi(!C_wB+((x!_MYIKL#ER4n8x#q*0n@!-}ob0>zg zLq9jEFtKGx?(m~7iZX}JXOLHg94x>uj#F6WA zSH1nP^1;{Kke{1>eleIZwQ1xNvxi$ozB8>QKk`g|A9gkExM0f2J*APa zAKM)^7rIL;N-c%q^33q%xtBGKTs?J0^C3;A=SE&%_{c3Shvw$poZIoe=M`J>`H>Gy z+Oe^6dHb;iO0Un2d@h_GPHZJ&;WNAdHVvBj;h_n+3U5)KoIhyN6#wAh(BQDv8TrFY zv;4lWKe#veR`5{Ex0}8bJRE$_-OK$tnBj0W6+V$q!ip|e|(Z%cE^p=5(e(~=wU-Qm)9o_ztckjOW{kPnD+Z~_2 z_r5~8<>14YoUr_?58nE~H+B~fn^ryQMJIge%em;tqn_8kpnJ(Fr=EW1IWIX+Jhpmm z@5TK?m%n=Z>u>q+op zlW+dVs}>iJ%>}EU*Sw;+J%7+ucfF$bwA|w2q@|kbxBsrR^E<~jz3;a>j+hrt%9VCp zcWtge-x@X*D{oyr@|)(N(xyXKjJ$J7%lS=*jl6Eh$>D33O+5HDXC625?b+e9T(D#F zlDz*KZ{*=)PR}*xf~zN;bovWN{^=X?t9x-^?vKetGw^Eo$2lS@mU=|?m6d)pWJ-z-p7A@Zsg5* z$$tOyFCl1G^f=7z2mJe|lsgWt_`SuT5CneiNPp(^SCp4DHThF>eiK?Ce_VLkL_gvQ z2|rgteHELrO&sgz#|%nTXbz_FKGel1iyXgC75X!Ske51=&Qrmk5*&gmp*E09elctg zX8Jsdz{@9_{C0pZ4)f@lVo)}iLWd3mrDp_-!7c6MaQ_rP=L6a=`8=3gY$>hrgQjxf z)L=T$e7|dgPk;HcKdZ^VIOi8YDL5?1g_RsXix3q2i9YlW4-XFyW(G?GzgY5va+5zh zyez2t+rnJXD3SLkuGzWgiq!V%-r1O4zQwuKyr9#+EA!vk4N0qO#?;qk%D2DkjmNbMzMM-8ywfx}c z;8Wl_J$Ok;IlK|aN_#`5G4D0`!LONXc);I9UpYT&ZZFvE6oPOLMD~i1!9V+upeShn zqd*7H8SYY7KKNt4JpY8;S-NMOxqPV<6ldmc;GxFc{E|PxKP2x@1j;0XkcUHaUU6g5 zTRpPhJKX|(CS|x>+c*ux@yBoCtNJ*tdMZ^nuWDjrb=}srtl@&v29^g~iPrl$1xCCU ziq>+tsdwG%HCKdrMY-1=K5x#VjyWAsd$!h(w1k@7F@N^Fj$;a!^>9XNsL(NIUiX}i i76trguVE=bIBRmpocVLQXt<_x!J`;gZLLoaOVnR6C7RX>zG|_KaSy@0F3X3UX!UXj<(Ix3- zO}={k#7ibkvQEf;5;RK@8-I`ZUVMn(N8+lUuZVlad~u&>clBwbr@Sh*h`D01SRj;m zQA~YJOgpY_p_p{@>mu(_ald#&JRm+5pNNOib~AoAynxL2_}BLnaRABje18bPZ}EFu zboucS(eHb)L*!rjop@H1^}0j+Ry+gguzH91llaNU;sbGR;a|iq6nrOgdtC89qT6K$ zMXLqt?88F6YnK*(EfT^LGU~o1>SQ}Vb(yNxPC?==A?@jP0I@xBdWmO^$hAF7hH5on zJR}$GP(z$iT~@r)Xw_EOR>BI^cp)$BzAR+v)amgoX~l(8W7l|=`cLQ_Grtn?FyK1_ zog+1kVkG*rypa1x;e|cNZ4{`fw^_<;Jjafqz_~6Vq%&PELC3Z6h@F%TJCq0)+enTH z_v!aD5d&Iq!pXIBL`=G7h^7a5bFF6$FYyO#V=VZW=EI;o(I9i_Z@*1TY~NoIs`9 znS2)C2CN+~1)=;nz zqV8kofDF5j9VKHLz(Amy;W^h&?SqN$MabRh?$3l50srDoPF4(j0oBvpohU;(mEuj< zfJ#_$1qDDgab#4d7@Coa=@8kgO^+h2N8K%2pS0AVc9k2g9IAo979YsL8#qIud7)Y` z0)Hs%8^2tNj|LDX=ZftoLh}63mQ$8*`0*71I>lZf3UnHB3`rdzsnk*Dy_i?Pq3> zU&Ay7c7U0EehpKM-_L!VUUiTemT-8Vr)Lf`!xGjUO3%#Ni5ix$ranD0j~SM*W=?u$ z;m#zgSj4LNtO_!Vm|+QP8qzb%m|+QPmZWD^GQ$$qtYv0}pJAG+*~H9hQ@YK*`!!5cV6)&tyquwY3v8Xc5)O~eVckNYf~`pst(MS0RmM!}0k%xNAoc&xL?evR zoH5qba06rVEwt~|6BIFM7g9_E;b~T~8*M9a&>}Y3N(zC|30p-$G)CCCOSyT8DA)r; z?%!3vyt1k^hHH-o>#n8AMw-Wourb+L;67pqbx&T0<9*5y2n4>tvxaD%?-j7kb`8*f zMoF4@3vrp+lh-4wfu;t|GUj%=fMH6^%R)qGxz8cM@j+4G#t|fHe-VzMyt$LMwQJTQ z1Er89Vuz`WN8qna7@}@-dqR!C5_m2W>Sd9mWN;vCxMRaj1Ytfm{T?0T>`W6zNr8J# zZ$cmC!-MNSFXGw08?|ekn%2}X%gY|YFvH!i`sbG<_lrc9uhI#(PF@KI-E59{0z`ox z6Iy!NwWpUPa><9*Uasfruuf{d3>yJC!Tg8>^UkKoiPMM>vkP5-&v_hoF=r1{*Qra* zy+qikn))JNPdr3koX4EenG-q>1IEOoZ$@0#!o<@w{?UXIT``^Vz1ECUwt|JoR)ZO> zy?i7;9r0nf{yy zyF(*#jaGR7<=hkMp0>|seg5-COU~P%YTCVX>@Gb|!*aJ(EB*IDPPN_J3(K_|Xs4_2 z_KvDB5 zatQ{q$bYVl3N5Ll^M9ZrfVw!fafXeKdx-vku^wP(l?80Dbf!vYXs+E9RhI!4>q$sE zPe;y(d28dAS*tY}lkpvTBz4S`@av#8Iolp}3|P6M(qvOu3w#6j6Ri3pW=5bLxk4iu4{=7M|3jUb4Ph@b5}HrR>TwOhj!7s`M6S9*(A(T7 zlF!s9rKQo%Iq-l$tlD@3(fw$z%c!q}ggXmC&{=YNExMzIh4i8?Sov{A*VP*1zMDG8 z2e_EP9t8enndP6qFjQ}NU6OAJZV_;yPV)83GLQ+I?%S^vJo(BO`Amja^RYTsJl!JO>{c#Ga+w~w`h5m zz&L;yD1v*pfD%Nsy<&9RR9wt*C^o7>P=R7RzZU8bU6j3cqgq@(u+!{Kjj)B>SVB7+ ztiW`7!XD238aaED`lh_cg7R2<10`bgcSnvmQ{#?Y@sje&EA0;&)yVSR#UC^hjTJL4 zvHp8l)#!EbTpYv6puV}TLMB$qysy!W{q``G8; z9j?umb289Z9gV)CCAf-A^yd)0hqVDLj@+4n)vI>SM|B5aY9&()P(8a9o%kbiL9P~9 zjjZI`PEpIJRqLLuYmo0_Z)43qU4yv7JzL$=@L14%Th-LCgzUnU~dk zQRj5;n%oY63ftwQo%&l0@pR7|ByMr<67EY_&#|Z;_9NH*Cj>GNEoiC( zSwY%&X^fCmg?$ceuI&!YY&6}pnF3VmaQA5T`hYJgw?|Ry5gG%`er=f*dr$T5u}sWR zzwL1ho?rJkNz7Q&yRxl-u^!g*qJkM*vsBm}XqNcWvBJ*Dchtt7qXE$RxH)(}cwC)$ zS21DI&tkww2;AbDp_43IxECT zsRh^e>cY$Xh)9D7aKLVgh-|&18#p2uhaZZFutW)ZIyxc({}2!j?_1n273G=0P6t66 zrGBGDF(HJ&0KtJEgs>4pJl40zgbb_Q6xnfvEr$@K3V1~-gb;3A=Mg4w1Grh3pt_%= z_xFdM)Ia+7MIgJ_eNW9hsVIBT+l`RF<-V&{ozx+@h7qj%bUpxz+&x;=C&Y1RV9UJ$ z9H#^<*r;mf3iQ2I&!Uepi`MF<`|m!w>HdtSFn(+bOD7~-{zA9B|DHyxD6`kkgQjX+ zzrv*HV)lLLqGNOF4hL{PbufhN0@luS@k`ys6Kq+~yk&hbJN=fhg=`7?XIie)E!VSU zvaos6c^OS%9@!N3FumyxHZ5u1a(+fjm`b*UsWdIu>rVg5mT7(FQVt7)rmFtr!lVJ5 zx!~w7mIZMBxLngkH0WXjC#4;hi`ce9KprBMjCN7ej&j062zDv%z}2ZeE@Kn`8H5Szy6*( zk#7%a`}w8J7eX+8{srdqFg^VIn!xMH5W50E<{B|bB(aPP5X~dWd_%bGlZ)!L}MhxoqBYDSdXb>|E zV1KNp84DD&oW6z84MxfN1kW|#ePDGgnK^U)sEei&G%#X(hs31J%y!jrV2|=!2gl@6 z;>t0&h<+pCU{tW?42V`!1{NiCdpEEI+X02}Xs~>q&0A+Qhrz%WRL~rt9738=7%N|7 zv#|T17$RTcs~J05W!gu}HziddZR}wAHi7+-&likJmS&1fF2uZbfAgQq4NlA#oVHW{ zj^sw8jW0XX=KmHReI?~L5W_HS{!0N4l*e|v6|q!Gga+GxEJM)a3o!%1e;`F}aQkx9 zNLm(TJNhfqHx}T&B=@LO29-pA&ESF2#rQ$(ld0&!SDf>kyvZ67#2I>SA^4Zh4@DX5 zXswWbaG~M1YWN=rEeQV$A@5J#16qoVM%UBA}J(7zptDk%h+Jm*k|ZgAblI z*MBLbA5LiSDuQQDld5DB`gKC;AfnJvQ$hI53E~G3q#odY;Gofa1kbcQe$+tl^+Nj5 zf(B4wXWvyWNi-ee7w5 z0pM$kOst^c87Z`pJ6VEAVa;8q^`;enX|S>4<*?x8Ln>n_3m*GajUQ4{nHhHa5=h04 z=Rpm@`#H1|+f@HEi+Zp`S7W6oyU>LH$t>tJ6?%g1dpn4EKONE`$p%~%K8-PCwER0; z`UVyD){>d}1`#x*nl->QbHz(!D^jH-BTh2DPa{Jc<&QNP4rA{x&MeF&9d50hXNL0J z(3XZWm)@w2Q6W9252S{2@rc4!L^0pApE07S_-IxvX8ZQ;RyAzcz0nTbt;YSdH6IOo zP}qlGS2vsyXY$Ay9hq!6qhsOW*WsDrDP?TBXAdvI_M<&rqVB*MRd)Rws?+eU$D}}x z964f5jdPKO^{VXyUOIfBedrDKl`&rHbx zi!WM(oTjTex750!gw11S8%HJTlC#S4zezhA=W*v}>VdO56`3tzv*C#a zfz7>ECau-mXT_6$;BkuHQ?>(2om%YZLlh484$O;bf&;mPW12f|Yb-^u%ZLXy9I*tp z+)zA(t-RP$#||a!8HfUF5I`a<)H~IlRcVE|wNhz?d4rCTpi^ljv4oh)DdAwtMSj7( zkuUM^!X*;RX(ZrKM@|N_^?}ivmV{o5X(+S)1;Fw(0Kjfx1_pye?t2{uDQR2z!ruW7 zr|399Iw+i@yN){ycSS#|5J~S^xf-C{6G1m!ZPf8|tdysu0G=Mp|>7Lu(%5vXSJI^jI_&H$pZbF4U zs%bBC!8wIPxgW^3|6mI5qW1+;TYe~HCona%F5GO?yS*TkfN7}IxN{1V&2SkXevZt< z1;IAq;(jIkHWU%(AsN0HuGT=y>c$8T85A2fEB2Rb+g^O7L1uFR;f$J#POUx z<^nwTjVZ@7dTxdIT=hD)ZKXLWh4h}ZMeC$K_SQ2AqA({}=5iVZf=d{y&g(Pm3qgky z*L(kA9B$y0FLi9ss{x-0-jHQ6*Zyybc&p&35SLI*Ne(9YUe)9L;|2vAZWNc>ncJH! z9YccuS-4!mPT_fQN`nipo`a<%NK}i@zqDY*JMeJWfyczNp$PoPTfBuAbn5Uj_k$f! zh2v8wp937Y`+&+37o3KBxeG2BrM$8IM5!7(_S}M%zkr_E)N9;R#Pvm(mpV75j+}ee z$t_p$r~!afSkK0rTm%g61W=ilQ==|gY2zmF_ZRif;yq#Ze$vI8V~18j^KIyxo1?%%6T zz=7xQs(lkmlW*eAdAhyyESxa{zS4^3TE$vza8?!=Oy6Dtpvhu>i#hLwXfa{skFuD> z9*{Ad&<0N%3+iNuDg!J@n$oY0)yOb-x^wG4ws^SpOpAvbv1t}BVk};`I@91Kjl}~g z0?f^@X~jQa)MEXtC^)L8Adf9lM(vdhW(KT;>%nN~doo#>gerTX5Lw>DQBdB@_S=RP z7+FkigBpOHa2x4tBp1IY7lEc(Q=G;T{0F(1B)3{}9RC>`Gr8DAB}d+}Yly|68Lb1~ z02cu^s#_*LiX}qHrKk2VMxVDcaC!{eiDTQlIU018(7eY@W$>Qfz*Eot}X`|5X>9b361!%iZ`qn+%_2#*$;n?N+aoL$>h&&xYh&?@Tf5|#jE z>O|>5S_oQH$sLe))zz0*v>QmWcz6#ZLvxEZ8`U$HA0|mxlpS>vh~6s<6upnQKzkpo z4wpWGGdp)RdK(0PObX~+Xq<(_9T``9B;zA$nmiJ~>2DyzVSw9;sMQ{nr0GYFBS4T* zbJX!49EA_<@`w-wKTml035@i#qx=ficmenb4&SJLruPBSDH6~>IkD5KEmLn^nV;Nz zH^k9dZx;``9k&?4gDTxI7P*-VKDf@lsOx*w27q1?r&eh!7P?AnVn$u zmP{SPf=@m;cMI+TxW8F|b(kZ~`V6+wM-DzUAzwx4PQgkH(5aP}4-GaoL2n~;+(1_) zYuy6*DNBwuTjn|jdcZdOl~sDXQa=7L>YMY(lW;-cg&s>LpD>gP)CFqV!fA|W4s!Ot zou!Qi)OB24L9*%aC3W`V17;2%140j4PS}hwrw2Y4%t?_KJBkU=0#XH)G6ea2FiRA# z)-B4GTR2cKLLIKVHNFTptgw#Yl~#Ri6&B2eZ?o~$3%YjT+a8|em8@QlCf(t;F!A>C zeF+}!7#$bBJ85z=?>O?R9}QfMIFW`Ko=L~Ym_-O%{wjpv2C<9pOt3!;&eCx1e;xSp zL32~QtvaDX6ZWE~)uzcM zOx~Yd^5aEMqpvou9b?pC*Lc`yt+%-Zkz3x@GD-;ZiIL5bZZc(nvZu52d`lnd?rZ|Z zO$mX|h6pD}d!PubrWA5h801Ig9>4T& z#JH=usBQ3!<1k<`vv7#h#65b+~8jk9a5n*l0Dp~T{! z&HuAY6Rsu$V=($h=4iQ5T{(4(*r#6B&-T+!8nBQ-5g%X(f;))U@KWyE<(F|klbJy? zVQDahHPiN^Ku$un`Gj9Cu>4VI9=ud{N#58}XE z&ol2@AN@h)!xiDelHMtIQGubuqvxPFK#uD!_=p1pt6tZP6pyHx*K|jK_S`jzZtwCg z5JOFakRNX8m`!6dF&pp9FlPJuno_Yv6;1cLJ`F99G_q-WSuzWwg}^Yn93(al!rT&d z_4HvSUr|LN$$ZTXAp57$Srn*urk|ZVQgSn&dqthGSJdm;su4qgTB`!4@*G?=HsU1L z6ZmW(P$b{L$vpy)u+GJ zt`E9NeaV3rAADWh+o=13M*1FED^tkbO>h)$RI{%;Avzho;xnYlYV&mk1t)r9rF$Zl z8P|C>(c2gh9Q>!(6^V^1>v|8*it8(rC*q!;fUSNX_Qtc^0EInckVRUf2(%f-h~D@L z$34-rdgEq^PFy6!i7_|p0XHP%B@%a?I08I!a2Trl-Y9rNV`Fx~8m-3%pGh&Jv)X-q zfmoqFxxS02Qu#L|@a%oV850k$FmrglFkWIOuH*Am3lxP~n6hLh1e2QK!oxqkoyA#N zWg-c4j-*2!&Pw(B8`=&^o6?XXZMPO(Lm)aIkv~N%hzL=Jn?6PR+<4ltlcBrNw#n2} zj8F_I0qX}@V7~?CU}hNJFS)U(^+xjNVw@TYaC@VAzG-0hU+cv%q`{3Vz51ZP zfmpG_VCr}u4Wo5`r8eEv;Qk8NKk1mXAF|zFt4nV_gBOONBJvt+GmAvX9jRWrIU$Cq z-``v!MyT&@J~{ck?_xeT(vnZ8MtwE{yj0SsnIhCMTeiqhMqv9DDAs`Xchg$>t=~6F|+pwd}-*+cF-%|0X=9|0X;UgGaqEV^ZhT5}FE-T6SZnGHpeE zda~}{f_pDH0CTUPeh8iy*H7sE4zGkF?WPUvUe$wB#C4{x#S~R$sy0fBOQtIk$5J8 z{xg-kZL?Jdf(P$TXrhq7LKN3Wvo^eb8Pm%d*_M_@jT-^+KLTKpSe<_8vb zwcQbRapf9z)d6q2RL9xfiXO*0dn(Qi5F3M)kcVBvu*OZO@v}P(;CCN{)|4WykOy@^ zl(%^~qjRwRORviYC^1{I{)-gqu{%2rwvV3cU1)0#uf&MbZN|bho55+>U2`f1^v8swp8AnZa}-okV~A5I zC}pD1Z8oaDcb#4^&tTxRPdl_!I3sL#KH#+9hEF&J?>O2jQ#Z}6EH+=@IMj+9P+E_W zkece?!=0;tS}q<}H_q*u3DkfKq5;t6xde)&fNX=wmfL(F8<@_T+a;o}Q@4oj(7H@? z|1-Br9IJ}wb&B}={sZQXj_m{UAQLK^dSqU8muk&LiCtR5M+`c_uieRi&k9ZqzCufX z-&D6;b@#}aK0)v?F@NZnO_;~ub7r%ikWZ%7g8)6hFEIfb4w&>UBiV2VG~_p!%rrJG z7i#XQ{w|RbM{^&oU36a!iU*v;1?Js$ap&GFRIf4XRD^u0`@MO6S8s2mSW`4@-z2ygNPU5!DFN_|XhfD{9tIxlp zw3+pWoLkAKXwFM~JfAK=1|*ZFqxRyOXv**cz*8w_)6{oN8|^3~d1E7?4qV^5xKs&I z=p5%Sj6^gpJZ&v<5*8OASYALW5zFFs22Cxs%kYOn_vgQhq1k&nIk{+AeeZ$ypDf zpqzYOP?-EPGlp3~keYJ7nFsMrv>&w#=UyalqmGuQ(LOx2ZR3z>SQo4kTYof z(d5b3m~?P!)bAgR$E)-?S}=Z5Y$4ISCgEzF>4klNhPu1gDS#Lfkcf_Bj6 zYZJAup;P%G!?Tnn*Q3-x>!Hl@PuzfMs3d|l zsgRr0B@f+)HRzWQjj34jJg{_^A0si}EJ4;$EN0PxUv)@VsVNVa3|)dzoMM^4&%%9) z{r97>XQToLbLWR&Ew_0np+$jDo@PCOdc8{xFe-m5rh{Hd*{PIYQ(!*tkl46^Y)(q8eB?pY88c{R@$t<_d70Hdr6k3z7xF`v zB@FJehp4`W)*EK5*&Tb|>mNuZy63T484`9#~z5)$r~B!!SdY|T_3DedY6ad)n?gWe zqrO>uYO+{weWfD!#aXKKF|Yk5y?WuPt67=A)w(}b=RD@M zt>=+Ex=q^?Rd+r%NsLtoAM294WhrV6zuZ3R*d^uSF?H6GvaIu=W*|(BTvDL!U6L!# zQ;U}@Z+isMa3-#qkGE^LnpoOm3*WH5oqKYui@IuAv3m7!DPB_HCwAF8SE=`(IHhAf z{Uy{z$PZ{^im_EGpI})R$g$Vbwy;=(msThL@j8m|Ema!P-0P5vlL66?kUytcaQXH$ z%NTzV;Lr5&uzt9vM*P|$&f@f?vJv1(W-P6 zqlIN0kw(OCS%%0=18feIR{n(;N{QhEmQh*9ESpfW9-0f+36m9TtC>#?f@;>f4Ql7I zZlbIDc3ByAI=m;35yfi2lVxJPn)qbDRt-YK)5vVV_d+)!AHhr1jW%Y_$V!S0}d zOHi%$*v*@$+^71tYcH)>8~jfUSgYbYj(ten+tejbb?R9fBQU)=CrECr6~rvh=XPW) z3l#{@VmSeT`>}fVsm{3YvE!+}Rruc<&_>SMp$C+(rEXqVv}V9Fo9yKEA=k>XENh0J-hniN{9Hf3 z0BH{Lk0Q-O`W(_$NZ0xGFCooE{#QstNOvF&Bi-$n{~jsvf9$89`Sk})K52c67b1v; zO-JpJMv?D`l!V|@Z=LUkl!yX?0s?~ey-*)R{V7OE@Gw7rHc}E6q(M7FSfOQ|=L0lD zu;#>7L$h1qKN8#v)roynsUBT-zP&e39a`6^&E7oM8U~E>g=J+Uz0_4pHmnj$)qCsb ziqq7@4JV8D)ngl;7bR-s3vS9q3I?}~SJH2T_WruQ2@_=52ln!k$n?6~ss_O3Mr)r-Kk)<}Ef$3Ku~orqr_ zX7I;+H+A!-%k6l9+P~>oCOI$aq_;^fGRdqL6K=e~wa!3;1Nc?rr>4EMBL7!~uGJBl zPk^cv>917xmnW-dUOrP?p}u;#&dw@Qmo^S4swy&I_%8yqE==gz)0&DhTkUwMXQH2n zmQ#@B-*OfsJx}KhjpwVOo2%VzsPRyG0BIYfD({u{C;j-^D<@t0lWEuVoOTUcP|lR? z1^8Wv-&p)S{JF)Z?eWOR@pFsS-pvWs`jw7irt1F6@7l958}fG%ei!36PL;e`E*7X$ zUp+N@ONr_9H|pM33$vpgU5n)YMm_&(ceet$0^|lDrIggFEuMW*N40ZHpZxn!MkQS2 z!%R_yuXQilh8zX+TcqsqL!`tvMU8#!s~vq%_QWy zAji2!5llK}&7s$3gwOpp;c^?s8jc^+AkPt!${;@)?*s5lANhFX&zW}PkZF^zI(yQU g6Mr&z+O)~j^ka>??Nlem;5jB>J8+~sZpUr^3+MQBD*ylh diff --git a/packages/vm/wasmlib/go/wasmlib/hashtypes.go b/packages/vm/wasmlib/go/wasmlib/hashtypes.go index 97aa7da84e..70b0904930 100644 --- a/packages/vm/wasmlib/go/wasmlib/hashtypes.go +++ b/packages/vm/wasmlib/go/wasmlib/hashtypes.go @@ -5,7 +5,6 @@ package wasmlib import ( "encoding/binary" - "strconv" ) // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ @@ -35,7 +34,7 @@ func (o ScAddress) Bytes() []byte { } func (o ScAddress) KeyID() Key32 { - return GetKeyIDFromBytes(o.Bytes()) + return GetKeyIDFromBytes(o.id[:]) } func (o ScAddress) String() string { @@ -79,7 +78,7 @@ func (o ScAgentID) Hname() ScHname { } func (o ScAgentID) KeyID() Key32 { - return GetKeyIDFromBytes(o.Bytes()) + return GetKeyIDFromBytes(o.id[:]) } func (o ScAgentID) IsAddress() bool { @@ -116,7 +115,7 @@ func (o ScChainID) Bytes() []byte { } func (o ScChainID) KeyID() Key32 { - return GetKeyIDFromBytes(o.Bytes()) + return GetKeyIDFromBytes(o.id[:]) } func (o ScChainID) String() string { @@ -160,7 +159,7 @@ func (o ScColor) Bytes() []byte { } func (o ScColor) KeyID() Key32 { - return GetKeyIDFromBytes(o.Bytes()) + return GetKeyIDFromBytes(o.id[:]) } func (o ScColor) String() string { @@ -187,7 +186,7 @@ func (o ScHash) Bytes() []byte { } func (o ScHash) KeyID() Key32 { - return GetKeyIDFromBytes(o.Bytes()) + return GetKeyIDFromBytes(o.id[:]) } func (o ScHash) String() string { @@ -217,7 +216,14 @@ func (hn ScHname) KeyID() Key32 { } func (hn ScHname) String() string { - return strconv.FormatInt(int64(hn), 16) + const hex = "0123456789abcdef" + res := make([]byte, 8) + val := hn + for i := 0; i < 8; i++ { + res[7-i] = hex[val&0x0f] + val >>= 4 + } + return string(res) } // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ @@ -240,7 +246,7 @@ func (o ScRequestID) Bytes() []byte { } func (o ScRequestID) KeyID() Key32 { - return GetKeyIDFromBytes(o.Bytes()) + return GetKeyIDFromBytes(o.id[:]) } func (o ScRequestID) String() string { diff --git a/packages/vm/wasmlib/src/hashtypes.rs b/packages/vm/wasmlib/src/hashtypes.rs index d71fcadec4..21cbb6e71e 100644 --- a/packages/vm/wasmlib/src/hashtypes.rs +++ b/packages/vm/wasmlib/src/hashtypes.rs @@ -44,7 +44,7 @@ impl ScAddress { // can be used as key in maps impl MapKey for ScAddress { fn get_key_id(&self) -> Key32 { - get_key_id_from_bytes(self.to_bytes()) + get_key_id_from_bytes(&self.id) } } @@ -101,7 +101,7 @@ impl ScAgentID { // can be used as key in maps impl MapKey for ScAgentID { fn get_key_id(&self) -> Key32 { - get_key_id_from_bytes(self.to_bytes()) + get_key_id_from_bytes(&self.id) } } @@ -140,7 +140,7 @@ impl ScChainID { // can be used as key in maps impl MapKey for ScChainID { fn get_key_id(&self) -> Key32 { - get_key_id_from_bytes(self.to_bytes()) + get_key_id_from_bytes(&self.id) } } @@ -183,7 +183,7 @@ impl ScColor { // can be used as key in maps impl MapKey for ScColor { fn get_key_id(&self) -> Key32 { - get_key_id_from_bytes(self.to_bytes()) + get_key_id_from_bytes(&self.id) } } @@ -215,7 +215,7 @@ impl ScHash { // can be used as key in maps impl MapKey for ScHash { fn get_key_id(&self) -> Key32 { - get_key_id_from_bytes(self.to_bytes()) + get_key_id_from_bytes(&self.id) } } @@ -242,9 +242,16 @@ impl ScHname { self.0.to_le_bytes().to_vec() } - // human-readable string representation + // human-readable string representation: 8 hex digits pub fn to_string(&self) -> String { - self.0.to_string() + let hex = "0123456789abcdef".as_bytes(); + let mut res = [0u8; 8]; + let mut val = self.0; + for n in 0..8 { + res[7 - n] = hex[val as usize & 0x0f]; + val >>= 4; + } + String::from_utf8(res.to_vec()).expect("WTF? invalid?") } } @@ -283,6 +290,6 @@ impl ScRequestID { // can be used as key in maps impl MapKey for ScRequestID { fn get_key_id(&self) -> Key32 { - get_key_id_from_bytes(self.to_bytes()) + get_key_id_from_bytes(&self.id) } } diff --git a/packages/vm/wasmlib/ts/wasmlib/hashtypes.ts b/packages/vm/wasmlib/ts/wasmlib/hashtypes.ts index 98d65a0324..72e35f1ac5 100644 --- a/packages/vm/wasmlib/ts/wasmlib/hashtypes.ts +++ b/packages/vm/wasmlib/ts/wasmlib/hashtypes.ts @@ -41,7 +41,7 @@ export class ScAddress implements MapKey { // can be used as key in maps getKeyID(): Key32 { - return getKeyIDFromBytes(this.toBytes()); + return getKeyIDFromBytes(this.id); } // convert to byte array representation @@ -91,7 +91,7 @@ export class ScAgentID implements MapKey { // can be used as key in maps getKeyID(): Key32 { - return getKeyIDFromBytes(this.toBytes()); + return getKeyIDFromBytes(this.id); } // get contract name hash for this agent @@ -146,7 +146,7 @@ export class ScChainID implements MapKey { // can be used as key in maps getKeyID(): Key32 { - return getKeyIDFromBytes(this.toBytes()); + return getKeyIDFromBytes(this.id); } // convert to byte array representation @@ -197,7 +197,7 @@ export class ScColor implements MapKey { // can be used as key in maps getKeyID(): Key32 { - return getKeyIDFromBytes(this.toBytes()); + return getKeyIDFromBytes(this.id); } // convert to byte array representation @@ -233,7 +233,7 @@ export class ScHash implements MapKey { // can be used as key in maps getKeyID(): Key32 { - return getKeyIDFromBytes(this.toBytes()); + return getKeyIDFromBytes(this.id); } // convert to byte array representation @@ -288,10 +288,15 @@ export class ScHname implements MapKey { return this.id; } - // human-readable string representation + // human-readable string representation: 8 hex digits toString(): string { - let id = Convert.toI32(this.id); - return id.toString(); + const hex = "0123456789abcdef"; + let res = "" + for (let i = 3; i >= 0; i--) { + let b = this.id[i]; + res += hex.charAt((b >> 4) & 0x0f) + hex.charAt(b & 0x0f); + } + return res; } } @@ -317,7 +322,7 @@ export class ScRequestID implements MapKey { // can be used as key in maps getKeyID(): Key32 { - return getKeyIDFromBytes(this.toBytes()); + return getKeyIDFromBytes(this.id); } // convert to byte array representation diff --git a/tools/cluster/tests/wasm/inccounter_bg.wasm b/tools/cluster/tests/wasm/inccounter_bg.wasm index 9fd8cbc5e418c8c4f188cd07d16b14cde857e69d..743e62f03da1de233b905cfb13e44ac2d2adda21 100644 GIT binary patch delta 5934 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 RnZTvXD*%Fint6EF{{cu2n<@YR From e1076f43f1c1c711ee9b75ed51dc49cb6f87a6d4 Mon Sep 17 00:00:00 2001 From: "Marcelo R. Bianchi" Date: Sun, 21 Nov 2021 09:12:46 -0300 Subject: [PATCH 097/198] Change webapi callview endpoint from GET to POST --- packages/webapi/state/callview.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/webapi/state/callview.go b/packages/webapi/state/callview.go index a5c67d9669..4a6c2ded75 100644 --- a/packages/webapi/state/callview.go +++ b/packages/webapi/state/callview.go @@ -31,6 +31,15 @@ func AddEndpoints(server echoswagger.ApiRouter, allChains chains.Provider) { s := &callViewService{allChains} + server.POST(routes.CallView(":chainID", ":contractHname", ":fname"), s.handleCallView). + SetSummary("Call a view function on a contract"). + AddParamPath("", "chainID", "ChainID (base58-encoded)"). + AddParamPath("", "contractHname", "Contract Hname"). + AddParamPath("getInfo", "fname", "Function name"). + AddParamBody(dictExample, "params", "Parameters", false). + AddResponse(http.StatusOK, "Result", dictExample, nil) + + // Deprecated server.GET(routes.CallView(":chainID", ":contractHname", ":fname"), s.handleCallView). SetSummary("Call a view function on a contract"). AddParamPath("", "chainID", "ChainID (base58-encoded)"). From 268f9801a01d6ea5197b25d9c5b5268a541661a2 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Sun, 21 Nov 2021 04:38:20 -0800 Subject: [PATCH 098/198] Fix lint warning --- contracts/wasm/erc20/go/erc20/events.go | 1 + contracts/wasm/fairroulette/go/fairroulette/events.go | 1 + tools/schema/generator/gotemplates/events.go | 1 + 3 files changed, 3 insertions(+) diff --git a/contracts/wasm/erc20/go/erc20/events.go b/contracts/wasm/erc20/go/erc20/events.go index eea5d9fbdd..eb32d7a60a 100644 --- a/contracts/wasm/erc20/go/erc20/events.go +++ b/contracts/wasm/erc20/go/erc20/events.go @@ -5,6 +5,7 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead +//nolint:gocritic package erc20 import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" diff --git a/contracts/wasm/fairroulette/go/fairroulette/events.go b/contracts/wasm/fairroulette/go/fairroulette/events.go index 146adce850..353c75c871 100644 --- a/contracts/wasm/fairroulette/go/fairroulette/events.go +++ b/contracts/wasm/fairroulette/go/fairroulette/events.go @@ -5,6 +5,7 @@ // >>>> DO NOT CHANGE THIS FILE! <<<< // Change the json schema instead +//nolint:gocritic package fairroulette import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" diff --git a/tools/schema/generator/gotemplates/events.go b/tools/schema/generator/gotemplates/events.go index 8f1f7b0961..a52a60fb7b 100644 --- a/tools/schema/generator/gotemplates/events.go +++ b/tools/schema/generator/gotemplates/events.go @@ -3,6 +3,7 @@ package gotemplates var eventsGo = map[string]string{ // ******************************* "events.go": ` +//nolint:gocritic $#emit goHeader $#set TypeName $Package$+Events From 7fd94a33f759b540c5732476a22b4c5542159446 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Sun, 21 Nov 2021 13:34:34 -0800 Subject: [PATCH 099/198] Fixed missing use in params.rs --- contracts/wasm/Cargo.lock | 10 ++ contracts/wasm/Cargo.toml | 1 + contracts/wasm/myworld/Cargo.toml | 26 ++++ contracts/wasm/myworld/go/main.go | 24 +++ contracts/wasm/myworld/go/myworld/consts.go | 47 ++++++ contracts/wasm/myworld/go/myworld/contract.go | 69 ++++++++ contracts/wasm/myworld/go/myworld/keys.go | 34 ++++ contracts/wasm/myworld/go/myworld/lib.go | 126 +++++++++++++++ contracts/wasm/myworld/go/myworld/myworld.go | 28 ++++ contracts/wasm/myworld/go/myworld/params.go | 58 +++++++ contracts/wasm/myworld/go/myworld/results.go | 72 +++++++++ contracts/wasm/myworld/go/myworld/state.go | 36 +++++ contracts/wasm/myworld/go/myworld/structs.go | 64 ++++++++ contracts/wasm/myworld/schema.yaml | 30 ++++ contracts/wasm/myworld/src/consts.rs | 35 +++++ contracts/wasm/myworld/src/contract.rs | 91 +++++++++++ contracts/wasm/myworld/src/keys.rs | 40 +++++ contracts/wasm/myworld/src/lib.rs | 147 ++++++++++++++++++ contracts/wasm/myworld/src/myworld.rs | 29 ++++ contracts/wasm/myworld/src/params.rs | 82 ++++++++++ contracts/wasm/myworld/src/results.rs | 94 +++++++++++ contracts/wasm/myworld/src/state.rs | 48 ++++++ contracts/wasm/myworld/src/structs.rs | 70 +++++++++ contracts/wasm/myworld/test/myworld_test.go | 48 ++++++ tools/schema/generator/rstemplates/params.go | 1 + 25 files changed, 1310 insertions(+) create mode 100644 contracts/wasm/myworld/Cargo.toml create mode 100644 contracts/wasm/myworld/go/main.go create mode 100644 contracts/wasm/myworld/go/myworld/consts.go create mode 100644 contracts/wasm/myworld/go/myworld/contract.go create mode 100644 contracts/wasm/myworld/go/myworld/keys.go create mode 100644 contracts/wasm/myworld/go/myworld/lib.go create mode 100644 contracts/wasm/myworld/go/myworld/myworld.go create mode 100644 contracts/wasm/myworld/go/myworld/params.go create mode 100644 contracts/wasm/myworld/go/myworld/results.go create mode 100644 contracts/wasm/myworld/go/myworld/state.go create mode 100644 contracts/wasm/myworld/go/myworld/structs.go create mode 100644 contracts/wasm/myworld/schema.yaml create mode 100644 contracts/wasm/myworld/src/consts.rs create mode 100644 contracts/wasm/myworld/src/contract.rs create mode 100644 contracts/wasm/myworld/src/keys.rs create mode 100644 contracts/wasm/myworld/src/lib.rs create mode 100644 contracts/wasm/myworld/src/myworld.rs create mode 100644 contracts/wasm/myworld/src/params.rs create mode 100644 contracts/wasm/myworld/src/results.rs create mode 100644 contracts/wasm/myworld/src/state.rs create mode 100644 contracts/wasm/myworld/src/structs.rs create mode 100644 contracts/wasm/myworld/test/myworld_test.go diff --git a/contracts/wasm/Cargo.lock b/contracts/wasm/Cargo.lock index 107782c9da..46db5d5dff 100644 --- a/contracts/wasm/Cargo.lock +++ b/contracts/wasm/Cargo.lock @@ -134,6 +134,16 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" +[[package]] +name = "myworld" +version = "0.1.0" +dependencies = [ + "console_error_panic_hook", + "wasm-bindgen-test", + "wasmlib 0.1.0", + "wee_alloc", +] + [[package]] name = "proc-macro2" version = "1.0.24" diff --git a/contracts/wasm/Cargo.toml b/contracts/wasm/Cargo.toml index 6bab15ed67..50c6b2680a 100644 --- a/contracts/wasm/Cargo.toml +++ b/contracts/wasm/Cargo.toml @@ -3,6 +3,7 @@ [workspace] members = [ + "myworld", "dividend", "donatewithfeedback", "erc20", diff --git a/contracts/wasm/myworld/Cargo.toml b/contracts/wasm/myworld/Cargo.toml new file mode 100644 index 0000000000..d2abf5034f --- /dev/null +++ b/contracts/wasm/myworld/Cargo.toml @@ -0,0 +1,26 @@ +# Copyright 2020 IOTA Stiftung +# SPDX-License-Identifier: Apache-2.0 + +[package] +name = "myworld" +description = "MyWorld description" +license = "Apache-2.0" +version = "0.1.0" +authors = ["John Doe "] +edition = "2018" +repository = "https://github.com/iotaledger/wasp" + +[lib] +crate-type = ["cdylib", "rlib"] + +[features] +default = ["console_error_panic_hook"] + +[dependencies] +wasmlib = { path = "../../../packages/vm/wasmlib" } +#wasmlib = { git = "https://github.com/iotaledger/wasp", branch = "develop" } +console_error_panic_hook = { version = "0.1.6", optional = true } +wee_alloc = { version = "0.4.5", optional = true } + +[dev-dependencies] +wasm-bindgen-test = "0.3.13" diff --git a/contracts/wasm/myworld/go/main.go b/contracts/wasm/myworld/go/main.go new file mode 100644 index 0000000000..be1e394e48 --- /dev/null +++ b/contracts/wasm/myworld/go/main.go @@ -0,0 +1,24 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +// +build wasm + +package main + +import "github.com/iotaledger/wasp/packages/vm/wasmclient" + +import "github.com/iotaledger/wasp/contracts/wasm/myworld/go/myworld" + +func main() { +} + +//export on_load +func onLoad() { + h := &wasmclient.WasmVMHost{} + h.ConnectWasmHost() + myworld.OnLoad() +} diff --git a/contracts/wasm/myworld/go/myworld/consts.go b/contracts/wasm/myworld/go/myworld/consts.go new file mode 100644 index 0000000000..a1788c7f68 --- /dev/null +++ b/contracts/wasm/myworld/go/myworld/consts.go @@ -0,0 +1,47 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package myworld + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +const ( + ScName = "myworld" + ScDescription = "MyWorld description" + HScName = wasmlib.ScHname(0x5efde160) +) + +const ( + ParamOwner = "owner" + ParamTreasure = "treasure" +) + +const ( + ResultOwner = "owner" + ResultTreasures = "treasures" +) + +const ( + StateOwner = "owner" + StateTreasures = "treasures" +) + +const ( + FuncDepositTreasure = "depositTreasure" + FuncInit = "init" + FuncSetOwner = "setOwner" + ViewGetAllTreasures = "getAllTreasures" + ViewGetOwner = "getOwner" +) + +const ( + HFuncDepositTreasure = wasmlib.ScHname(0x186cdf0f) + HFuncInit = wasmlib.ScHname(0x1f44d644) + HFuncSetOwner = wasmlib.ScHname(0x2a15fe7b) + HViewGetAllTreasures = wasmlib.ScHname(0x193d3714) + HViewGetOwner = wasmlib.ScHname(0x137107a6) +) diff --git a/contracts/wasm/myworld/go/myworld/contract.go b/contracts/wasm/myworld/go/myworld/contract.go new file mode 100644 index 0000000000..110efc7f26 --- /dev/null +++ b/contracts/wasm/myworld/go/myworld/contract.go @@ -0,0 +1,69 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package myworld + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +type DepositTreasureCall struct { + Func *wasmlib.ScFunc + Params MutableDepositTreasureParams +} + +type InitCall struct { + Func *wasmlib.ScInitFunc + Params MutableInitParams +} + +type SetOwnerCall struct { + Func *wasmlib.ScFunc + Params MutableSetOwnerParams +} + +type GetAllTreasuresCall struct { + Func *wasmlib.ScView + Results ImmutableGetAllTreasuresResults +} + +type GetOwnerCall struct { + Func *wasmlib.ScView + Results ImmutableGetOwnerResults +} + +type Funcs struct{} + +var ScFuncs Funcs + +func (sc Funcs) DepositTreasure(ctx wasmlib.ScFuncCallContext) *DepositTreasureCall { + f := &DepositTreasureCall{Func: wasmlib.NewScFunc(ctx, HScName, HFuncDepositTreasure)} + f.Func.SetPtrs(&f.Params.id, nil) + return f +} + +func (sc Funcs) Init(ctx wasmlib.ScFuncCallContext) *InitCall { + f := &InitCall{Func: wasmlib.NewScInitFunc(ctx, HScName, HFuncInit, keyMap[:], idxMap[:])} + f.Func.SetPtrs(&f.Params.id, nil) + return f +} + +func (sc Funcs) SetOwner(ctx wasmlib.ScFuncCallContext) *SetOwnerCall { + f := &SetOwnerCall{Func: wasmlib.NewScFunc(ctx, HScName, HFuncSetOwner)} + f.Func.SetPtrs(&f.Params.id, nil) + return f +} + +func (sc Funcs) GetAllTreasures(ctx wasmlib.ScViewCallContext) *GetAllTreasuresCall { + f := &GetAllTreasuresCall{Func: wasmlib.NewScView(ctx, HScName, HViewGetAllTreasures)} + f.Func.SetPtrs(nil, &f.Results.id) + return f +} + +func (sc Funcs) GetOwner(ctx wasmlib.ScViewCallContext) *GetOwnerCall { + f := &GetOwnerCall{Func: wasmlib.NewScView(ctx, HScName, HViewGetOwner)} + f.Func.SetPtrs(nil, &f.Results.id) + return f +} diff --git a/contracts/wasm/myworld/go/myworld/keys.go b/contracts/wasm/myworld/go/myworld/keys.go new file mode 100644 index 0000000000..15be57b9b6 --- /dev/null +++ b/contracts/wasm/myworld/go/myworld/keys.go @@ -0,0 +1,34 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package myworld + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +const ( + IdxParamOwner = 0 + IdxParamTreasure = 1 + + IdxResultOwner = 2 + IdxResultTreasures = 3 + + IdxStateOwner = 4 + IdxStateTreasures = 5 +) + +const keyMapLen = 6 + +var keyMap = [keyMapLen]wasmlib.Key{ + ParamOwner, + ParamTreasure, + ResultOwner, + ResultTreasures, + StateOwner, + StateTreasures, +} + +var idxMap [keyMapLen]wasmlib.Key32 diff --git a/contracts/wasm/myworld/go/myworld/lib.go b/contracts/wasm/myworld/go/myworld/lib.go new file mode 100644 index 0000000000..36e7090f2d --- /dev/null +++ b/contracts/wasm/myworld/go/myworld/lib.go @@ -0,0 +1,126 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package myworld + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +func OnLoad() { + exports := wasmlib.NewScExports() + exports.AddFunc(FuncDepositTreasure, funcDepositTreasureThunk) + exports.AddFunc(FuncInit, funcInitThunk) + exports.AddFunc(FuncSetOwner, funcSetOwnerThunk) + exports.AddView(ViewGetAllTreasures, viewGetAllTreasuresThunk) + exports.AddView(ViewGetOwner, viewGetOwnerThunk) + + for i, key := range keyMap { + idxMap[i] = key.KeyID() + } +} + +type DepositTreasureContext struct { + Params ImmutableDepositTreasureParams + State MutableMyWorldState +} + +func funcDepositTreasureThunk(ctx wasmlib.ScFuncContext) { + ctx.Log("myworld.funcDepositTreasure") + f := &DepositTreasureContext{ + Params: ImmutableDepositTreasureParams{ + id: wasmlib.OBJ_ID_PARAMS, + }, + State: MutableMyWorldState{ + id: wasmlib.OBJ_ID_STATE, + }, + } + ctx.Require(f.Params.Treasure().Exists(), "missing mandatory treasure") + funcDepositTreasure(ctx, f) + ctx.Log("myworld.funcDepositTreasure ok") +} + +type InitContext struct { + Params ImmutableInitParams + State MutableMyWorldState +} + +func funcInitThunk(ctx wasmlib.ScFuncContext) { + ctx.Log("myworld.funcInit") + f := &InitContext{ + Params: ImmutableInitParams{ + id: wasmlib.OBJ_ID_PARAMS, + }, + State: MutableMyWorldState{ + id: wasmlib.OBJ_ID_STATE, + }, + } + funcInit(ctx, f) + ctx.Log("myworld.funcInit ok") +} + +type SetOwnerContext struct { + Params ImmutableSetOwnerParams + State MutableMyWorldState +} + +func funcSetOwnerThunk(ctx wasmlib.ScFuncContext) { + ctx.Log("myworld.funcSetOwner") + + // current owner of this smart contract + access := ctx.State().GetAgentID(wasmlib.Key("owner")) + ctx.Require(access.Exists(), "access not set: owner") + ctx.Require(ctx.Caller() == access.Value(), "no permission") + + f := &SetOwnerContext{ + Params: ImmutableSetOwnerParams{ + id: wasmlib.OBJ_ID_PARAMS, + }, + State: MutableMyWorldState{ + id: wasmlib.OBJ_ID_STATE, + }, + } + ctx.Require(f.Params.Owner().Exists(), "missing mandatory owner") + funcSetOwner(ctx, f) + ctx.Log("myworld.funcSetOwner ok") +} + +type GetAllTreasuresContext struct { + Results MutableGetAllTreasuresResults + State ImmutableMyWorldState +} + +func viewGetAllTreasuresThunk(ctx wasmlib.ScViewContext) { + ctx.Log("myworld.viewGetAllTreasures") + f := &GetAllTreasuresContext{ + Results: MutableGetAllTreasuresResults{ + id: wasmlib.OBJ_ID_RESULTS, + }, + State: ImmutableMyWorldState{ + id: wasmlib.OBJ_ID_STATE, + }, + } + viewGetAllTreasures(ctx, f) + ctx.Log("myworld.viewGetAllTreasures ok") +} + +type GetOwnerContext struct { + Results MutableGetOwnerResults + State ImmutableMyWorldState +} + +func viewGetOwnerThunk(ctx wasmlib.ScViewContext) { + ctx.Log("myworld.viewGetOwner") + f := &GetOwnerContext{ + Results: MutableGetOwnerResults{ + id: wasmlib.OBJ_ID_RESULTS, + }, + State: ImmutableMyWorldState{ + id: wasmlib.OBJ_ID_STATE, + }, + } + viewGetOwner(ctx, f) + ctx.Log("myworld.viewGetOwner ok") +} diff --git a/contracts/wasm/myworld/go/myworld/myworld.go b/contracts/wasm/myworld/go/myworld/myworld.go new file mode 100644 index 0000000000..281dfd2bf5 --- /dev/null +++ b/contracts/wasm/myworld/go/myworld/myworld.go @@ -0,0 +1,28 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +package myworld + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +func funcDepositTreasure(ctx wasmlib.ScFuncContext, f *DepositTreasureContext) { +} + +func funcInit(ctx wasmlib.ScFuncContext, f *InitContext) { + if f.Params.Owner().Exists() { + f.State.Owner().SetValue(f.Params.Owner().Value()) + return + } + f.State.Owner().SetValue(ctx.ContractCreator()) +} + +func funcSetOwner(ctx wasmlib.ScFuncContext, f *SetOwnerContext) { + f.State.Owner().SetValue(f.Params.Owner().Value()) +} + +func viewGetAllTreasures(ctx wasmlib.ScViewContext, f *GetAllTreasuresContext) { +} + +func viewGetOwner(ctx wasmlib.ScViewContext, f *GetOwnerContext) { + f.Results.Owner().SetValue(f.State.Owner().Value()) +} diff --git a/contracts/wasm/myworld/go/myworld/params.go b/contracts/wasm/myworld/go/myworld/params.go new file mode 100644 index 0000000000..a604233092 --- /dev/null +++ b/contracts/wasm/myworld/go/myworld/params.go @@ -0,0 +1,58 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package myworld + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +type ImmutableDepositTreasureParams struct { + id int32 +} + +func (s ImmutableDepositTreasureParams) Treasure() ImmutableTreasure { + return ImmutableTreasure{objID: s.id, keyID: idxMap[IdxParamTreasure]} +} + +type MutableDepositTreasureParams struct { + id int32 +} + +func (s MutableDepositTreasureParams) Treasure() MutableTreasure { + return MutableTreasure{objID: s.id, keyID: idxMap[IdxParamTreasure]} +} + +type ImmutableInitParams struct { + id int32 +} + +func (s ImmutableInitParams) Owner() wasmlib.ScImmutableAgentID { + return wasmlib.NewScImmutableAgentID(s.id, idxMap[IdxParamOwner]) +} + +type MutableInitParams struct { + id int32 +} + +func (s MutableInitParams) Owner() wasmlib.ScMutableAgentID { + return wasmlib.NewScMutableAgentID(s.id, idxMap[IdxParamOwner]) +} + +type ImmutableSetOwnerParams struct { + id int32 +} + +func (s ImmutableSetOwnerParams) Owner() wasmlib.ScImmutableAgentID { + return wasmlib.NewScImmutableAgentID(s.id, idxMap[IdxParamOwner]) +} + +type MutableSetOwnerParams struct { + id int32 +} + +func (s MutableSetOwnerParams) Owner() wasmlib.ScMutableAgentID { + return wasmlib.NewScMutableAgentID(s.id, idxMap[IdxParamOwner]) +} diff --git a/contracts/wasm/myworld/go/myworld/results.go b/contracts/wasm/myworld/go/myworld/results.go new file mode 100644 index 0000000000..6215231616 --- /dev/null +++ b/contracts/wasm/myworld/go/myworld/results.go @@ -0,0 +1,72 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package myworld + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +type ArrayOfImmutableTreasure struct { + objID int32 +} + +func (a ArrayOfImmutableTreasure) Length() int32 { + return wasmlib.GetLength(a.objID) +} + +func (a ArrayOfImmutableTreasure) GetTreasure(index int32) ImmutableTreasure { + return ImmutableTreasure{objID: a.objID, keyID: wasmlib.Key32(index)} +} + +type ImmutableGetAllTreasuresResults struct { + id int32 +} + +func (s ImmutableGetAllTreasuresResults) Treasures() ArrayOfImmutableTreasure { + arrID := wasmlib.GetObjectID(s.id, idxMap[IdxResultTreasures], wasmlib.TYPE_ARRAY|wasmlib.TYPE_BYTES) + return ArrayOfImmutableTreasure{objID: arrID} +} + +type ArrayOfMutableTreasure struct { + objID int32 +} + +func (a ArrayOfMutableTreasure) Clear() { + wasmlib.Clear(a.objID) +} + +func (a ArrayOfMutableTreasure) Length() int32 { + return wasmlib.GetLength(a.objID) +} + +func (a ArrayOfMutableTreasure) GetTreasure(index int32) MutableTreasure { + return MutableTreasure{objID: a.objID, keyID: wasmlib.Key32(index)} +} + +type MutableGetAllTreasuresResults struct { + id int32 +} + +func (s MutableGetAllTreasuresResults) Treasures() ArrayOfMutableTreasure { + arrID := wasmlib.GetObjectID(s.id, idxMap[IdxResultTreasures], wasmlib.TYPE_ARRAY|wasmlib.TYPE_BYTES) + return ArrayOfMutableTreasure{objID: arrID} +} + +type ImmutableGetOwnerResults struct { + id int32 +} + +func (s ImmutableGetOwnerResults) Owner() wasmlib.ScImmutableAgentID { + return wasmlib.NewScImmutableAgentID(s.id, idxMap[IdxResultOwner]) +} + +type MutableGetOwnerResults struct { + id int32 +} + +func (s MutableGetOwnerResults) Owner() wasmlib.ScMutableAgentID { + return wasmlib.NewScMutableAgentID(s.id, idxMap[IdxResultOwner]) +} diff --git a/contracts/wasm/myworld/go/myworld/state.go b/contracts/wasm/myworld/go/myworld/state.go new file mode 100644 index 0000000000..a7427311b4 --- /dev/null +++ b/contracts/wasm/myworld/go/myworld/state.go @@ -0,0 +1,36 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package myworld + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +type ImmutableMyWorldState struct { + id int32 +} + +func (s ImmutableMyWorldState) Owner() wasmlib.ScImmutableAgentID { + return wasmlib.NewScImmutableAgentID(s.id, idxMap[IdxStateOwner]) +} + +func (s ImmutableMyWorldState) Treasures() ArrayOfImmutableTreasure { + arrID := wasmlib.GetObjectID(s.id, idxMap[IdxStateTreasures], wasmlib.TYPE_ARRAY|wasmlib.TYPE_BYTES) + return ArrayOfImmutableTreasure{objID: arrID} +} + +type MutableMyWorldState struct { + id int32 +} + +func (s MutableMyWorldState) Owner() wasmlib.ScMutableAgentID { + return wasmlib.NewScMutableAgentID(s.id, idxMap[IdxStateOwner]) +} + +func (s MutableMyWorldState) Treasures() ArrayOfMutableTreasure { + arrID := wasmlib.GetObjectID(s.id, idxMap[IdxStateTreasures], wasmlib.TYPE_ARRAY|wasmlib.TYPE_BYTES) + return ArrayOfMutableTreasure{objID: arrID} +} diff --git a/contracts/wasm/myworld/go/myworld/structs.go b/contracts/wasm/myworld/go/myworld/structs.go new file mode 100644 index 0000000000..7b807c0054 --- /dev/null +++ b/contracts/wasm/myworld/go/myworld/structs.go @@ -0,0 +1,64 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package myworld + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +type Treasure struct { + Amount int64 // how much to deposit + Name string // human readible name + Owner wasmlib.ScAgentID // who deposits the treasure +} + +func NewTreasureFromBytes(bytes []byte) *Treasure { + decode := wasmlib.NewBytesDecoder(bytes) + data := &Treasure{} + data.Amount = decode.Int64() + data.Name = decode.String() + data.Owner = decode.AgentID() + decode.Close() + return data +} + +func (o *Treasure) Bytes() []byte { + return wasmlib.NewBytesEncoder(). + Int64(o.Amount). + String(o.Name). + AgentID(o.Owner). + Data() +} + +type ImmutableTreasure struct { + objID int32 + keyID wasmlib.Key32 +} + +func (o ImmutableTreasure) Exists() bool { + return wasmlib.Exists(o.objID, o.keyID, wasmlib.TYPE_BYTES) +} + +func (o ImmutableTreasure) Value() *Treasure { + return NewTreasureFromBytes(wasmlib.GetBytes(o.objID, o.keyID, wasmlib.TYPE_BYTES)) +} + +type MutableTreasure struct { + objID int32 + keyID wasmlib.Key32 +} + +func (o MutableTreasure) Exists() bool { + return wasmlib.Exists(o.objID, o.keyID, wasmlib.TYPE_BYTES) +} + +func (o MutableTreasure) SetValue(value *Treasure) { + wasmlib.SetBytes(o.objID, o.keyID, wasmlib.TYPE_BYTES, value.Bytes()) +} + +func (o MutableTreasure) Value() *Treasure { + return NewTreasureFromBytes(wasmlib.GetBytes(o.objID, o.keyID, wasmlib.TYPE_BYTES)) +} diff --git a/contracts/wasm/myworld/schema.yaml b/contracts/wasm/myworld/schema.yaml new file mode 100644 index 0000000000..4cbaab5d28 --- /dev/null +++ b/contracts/wasm/myworld/schema.yaml @@ -0,0 +1,30 @@ +name: MyWorld +description: MyWorld description +structs: + Treasure: + amount: Int64 // how much to deposit + name: String // human readible name + owner: AgentID // who deposits the treasure +typedefs: {} +state: + owner: AgentID // current owner of this smart contract + treasures: Treasure[] // all deposits ever made +funcs: + init: + params: + owner: AgentID? // optional owner of this smart contract + setOwner: + access: owner // current owner of this smart contract + params: + owner: AgentID // new owner of this smart contract + depositTreasure: + params: + treasure: Treasure +views: + getOwner: + results: + owner: AgentID // current owner of this smart contract + getAllTreasures: + results: + treasures: Treasure[] + diff --git a/contracts/wasm/myworld/src/consts.rs b/contracts/wasm/myworld/src/consts.rs new file mode 100644 index 0000000000..4d21bba250 --- /dev/null +++ b/contracts/wasm/myworld/src/consts.rs @@ -0,0 +1,35 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] + +use wasmlib::*; + +pub const SC_NAME : &str = "myworld"; +pub const SC_DESCRIPTION : &str = "MyWorld description"; +pub const HSC_NAME : ScHname = ScHname(0x5efde160); + +pub const PARAM_OWNER : &str = "owner"; +pub const PARAM_TREASURE : &str = "treasure"; + +pub const RESULT_OWNER : &str = "owner"; +pub const RESULT_TREASURES : &str = "treasures"; + +pub const STATE_OWNER : &str = "owner"; +pub const STATE_TREASURES : &str = "treasures"; + +pub const FUNC_DEPOSIT_TREASURE : &str = "depositTreasure"; +pub const FUNC_INIT : &str = "init"; +pub const FUNC_SET_OWNER : &str = "setOwner"; +pub const VIEW_GET_ALL_TREASURES : &str = "getAllTreasures"; +pub const VIEW_GET_OWNER : &str = "getOwner"; + +pub const HFUNC_DEPOSIT_TREASURE : ScHname = ScHname(0x186cdf0f); +pub const HFUNC_INIT : ScHname = ScHname(0x1f44d644); +pub const HFUNC_SET_OWNER : ScHname = ScHname(0x2a15fe7b); +pub const HVIEW_GET_ALL_TREASURES : ScHname = ScHname(0x193d3714); +pub const HVIEW_GET_OWNER : ScHname = ScHname(0x137107a6); diff --git a/contracts/wasm/myworld/src/contract.rs b/contracts/wasm/myworld/src/contract.rs new file mode 100644 index 0000000000..0f369d2af1 --- /dev/null +++ b/contracts/wasm/myworld/src/contract.rs @@ -0,0 +1,91 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] + +use std::ptr; + +use wasmlib::*; + +use crate::consts::*; +use crate::params::*; +use crate::results::*; + +pub struct DepositTreasureCall { + pub func: ScFunc, + pub params: MutableDepositTreasureParams, +} + +pub struct InitCall { + pub func: ScInitFunc, + pub params: MutableInitParams, +} + +pub struct SetOwnerCall { + pub func: ScFunc, + pub params: MutableSetOwnerParams, +} + +pub struct GetAllTreasuresCall { + pub func: ScView, + pub results: ImmutableGetAllTreasuresResults, +} + +pub struct GetOwnerCall { + pub func: ScView, + pub results: ImmutableGetOwnerResults, +} + +pub struct ScFuncs { +} + +impl ScFuncs { + pub fn deposit_treasure(_ctx: & dyn ScFuncCallContext) -> DepositTreasureCall { + let mut f = DepositTreasureCall { + func: ScFunc::new(HSC_NAME, HFUNC_DEPOSIT_TREASURE), + params: MutableDepositTreasureParams { id: 0 }, + }; + f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); + f + } + + pub fn init(_ctx: & dyn ScFuncCallContext) -> InitCall { + let mut f = InitCall { + func: ScInitFunc::new(HSC_NAME, HFUNC_INIT), + params: MutableInitParams { id: 0 }, + }; + f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); + f + } + + pub fn set_owner(_ctx: & dyn ScFuncCallContext) -> SetOwnerCall { + let mut f = SetOwnerCall { + func: ScFunc::new(HSC_NAME, HFUNC_SET_OWNER), + params: MutableSetOwnerParams { id: 0 }, + }; + f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); + f + } + + pub fn get_all_treasures(_ctx: & dyn ScViewCallContext) -> GetAllTreasuresCall { + let mut f = GetAllTreasuresCall { + func: ScView::new(HSC_NAME, HVIEW_GET_ALL_TREASURES), + results: ImmutableGetAllTreasuresResults { id: 0 }, + }; + f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); + f + } + + pub fn get_owner(_ctx: & dyn ScViewCallContext) -> GetOwnerCall { + let mut f = GetOwnerCall { + func: ScView::new(HSC_NAME, HVIEW_GET_OWNER), + results: ImmutableGetOwnerResults { id: 0 }, + }; + f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); + f + } +} diff --git a/contracts/wasm/myworld/src/keys.rs b/contracts/wasm/myworld/src/keys.rs new file mode 100644 index 0000000000..0e178a6294 --- /dev/null +++ b/contracts/wasm/myworld/src/keys.rs @@ -0,0 +1,40 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] + +use wasmlib::*; + +use crate::*; + +pub(crate) const IDX_PARAM_OWNER : usize = 0; +pub(crate) const IDX_PARAM_TREASURE : usize = 1; + +pub(crate) const IDX_RESULT_OWNER : usize = 2; +pub(crate) const IDX_RESULT_TREASURES : usize = 3; + +pub(crate) const IDX_STATE_OWNER : usize = 4; +pub(crate) const IDX_STATE_TREASURES : usize = 5; + +pub const KEY_MAP_LEN: usize = 6; + +pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ + PARAM_OWNER, + PARAM_TREASURE, + RESULT_OWNER, + RESULT_TREASURES, + STATE_OWNER, + STATE_TREASURES, +]; + +pub static mut IDX_MAP: [Key32; KEY_MAP_LEN] = [Key32(0); KEY_MAP_LEN]; + +pub fn idx_map(idx: usize) -> Key32 { + unsafe { + IDX_MAP[idx] + } +} diff --git a/contracts/wasm/myworld/src/lib.rs b/contracts/wasm/myworld/src/lib.rs new file mode 100644 index 0000000000..f11042edd3 --- /dev/null +++ b/contracts/wasm/myworld/src/lib.rs @@ -0,0 +1,147 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] +#![allow(unused_imports)] + +use myworld::*; +use wasmlib::*; +use wasmlib::host::*; + +use crate::consts::*; +use crate::keys::*; +use crate::params::*; +use crate::results::*; +use crate::state::*; + +mod consts; +mod contract; +mod keys; +mod params; +mod results; +mod state; +mod structs; +mod myworld; + +#[no_mangle] +fn on_load() { + let exports = ScExports::new(); + exports.add_func(FUNC_DEPOSIT_TREASURE, func_deposit_treasure_thunk); + exports.add_func(FUNC_INIT, func_init_thunk); + exports.add_func(FUNC_SET_OWNER, func_set_owner_thunk); + exports.add_view(VIEW_GET_ALL_TREASURES, view_get_all_treasures_thunk); + exports.add_view(VIEW_GET_OWNER, view_get_owner_thunk); + + unsafe { + for i in 0..KEY_MAP_LEN { + IDX_MAP[i] = get_key_id_from_string(KEY_MAP[i]); + } + } +} + +pub struct DepositTreasureContext { + params: ImmutableDepositTreasureParams, + state: MutableMyWorldState, +} + +fn func_deposit_treasure_thunk(ctx: &ScFuncContext) { + ctx.log("myworld.funcDepositTreasure"); + let f = DepositTreasureContext { + params: ImmutableDepositTreasureParams { + id: OBJ_ID_PARAMS, + }, + state: MutableMyWorldState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.treasure().exists(), "missing mandatory treasure"); + func_deposit_treasure(ctx, &f); + ctx.log("myworld.funcDepositTreasure ok"); +} + +pub struct InitContext { + params: ImmutableInitParams, + state: MutableMyWorldState, +} + +fn func_init_thunk(ctx: &ScFuncContext) { + ctx.log("myworld.funcInit"); + let f = InitContext { + params: ImmutableInitParams { + id: OBJ_ID_PARAMS, + }, + state: MutableMyWorldState { + id: OBJ_ID_STATE, + }, + }; + func_init(ctx, &f); + ctx.log("myworld.funcInit ok"); +} + +pub struct SetOwnerContext { + params: ImmutableSetOwnerParams, + state: MutableMyWorldState, +} + +fn func_set_owner_thunk(ctx: &ScFuncContext) { + ctx.log("myworld.funcSetOwner"); + + // current owner of this smart contract + let access = ctx.state().get_agent_id("owner"); + ctx.require(access.exists(), "access not set: owner"); + ctx.require(ctx.caller() == access.value(), "no permission"); + + let f = SetOwnerContext { + params: ImmutableSetOwnerParams { + id: OBJ_ID_PARAMS, + }, + state: MutableMyWorldState { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.owner().exists(), "missing mandatory owner"); + func_set_owner(ctx, &f); + ctx.log("myworld.funcSetOwner ok"); +} + +pub struct GetAllTreasuresContext { + results: MutableGetAllTreasuresResults, + state: ImmutableMyWorldState, +} + +fn view_get_all_treasures_thunk(ctx: &ScViewContext) { + ctx.log("myworld.viewGetAllTreasures"); + let f = GetAllTreasuresContext { + results: MutableGetAllTreasuresResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableMyWorldState { + id: OBJ_ID_STATE, + }, + }; + view_get_all_treasures(ctx, &f); + ctx.log("myworld.viewGetAllTreasures ok"); +} + +pub struct GetOwnerContext { + results: MutableGetOwnerResults, + state: ImmutableMyWorldState, +} + +fn view_get_owner_thunk(ctx: &ScViewContext) { + ctx.log("myworld.viewGetOwner"); + let f = GetOwnerContext { + results: MutableGetOwnerResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableMyWorldState { + id: OBJ_ID_STATE, + }, + }; + view_get_owner(ctx, &f); + ctx.log("myworld.viewGetOwner ok"); +} diff --git a/contracts/wasm/myworld/src/myworld.rs b/contracts/wasm/myworld/src/myworld.rs new file mode 100644 index 0000000000..73c1427e8d --- /dev/null +++ b/contracts/wasm/myworld/src/myworld.rs @@ -0,0 +1,29 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +use wasmlib::*; + +use crate::*; +use crate::structs::*; + +pub fn func_deposit_treasure(ctx: &ScFuncContext, f: &DepositTreasureContext) { +} + +pub fn func_init(ctx: &ScFuncContext, f: &InitContext) { + if f.params.owner().exists() { + f.state.owner().set_value(&f.params.owner().value()); + return; + } + f.state.owner().set_value(&ctx.contract_creator()); +} + +pub fn func_set_owner(ctx: &ScFuncContext, f: &SetOwnerContext) { + f.state.owner().set_value(&f.params.owner().value()); +} + +pub fn view_get_all_treasures(ctx: &ScViewContext, f: &GetAllTreasuresContext) { +} + +pub fn view_get_owner(ctx: &ScViewContext, f: &GetOwnerContext) { + f.results.owner().set_value(&f.state.owner().value()); +} diff --git a/contracts/wasm/myworld/src/params.rs b/contracts/wasm/myworld/src/params.rs new file mode 100644 index 0000000000..4ea65c75ef --- /dev/null +++ b/contracts/wasm/myworld/src/params.rs @@ -0,0 +1,82 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] +#![allow(unused_imports)] + +use wasmlib::*; +use wasmlib::host::*; +use wasmlib::structs::*; + +use crate::*; +use crate::keys::*; + +#[derive(Clone, Copy)] +pub struct ImmutableDepositTreasureParams { + pub(crate) id: i32, +} + +impl ImmutableDepositTreasureParams { + pub fn treasure(&self) -> ImmutableTreasure { + ImmutableTreasure { obj_id: self.id, key_id: idx_map(IDX_PARAM_TREASURE) } + } +} + +#[derive(Clone, Copy)] +pub struct MutableDepositTreasureParams { + pub(crate) id: i32, +} + +impl MutableDepositTreasureParams { + pub fn treasure(&self) -> MutableTreasure { + MutableTreasure { obj_id: self.id, key_id: idx_map(IDX_PARAM_TREASURE) } + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableInitParams { + pub(crate) id: i32, +} + +impl ImmutableInitParams { + pub fn owner(&self) -> ScImmutableAgentID { + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableInitParams { + pub(crate) id: i32, +} + +impl MutableInitParams { + pub fn owner(&self) -> ScMutableAgentID { + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableSetOwnerParams { + pub(crate) id: i32, +} + +impl ImmutableSetOwnerParams { + pub fn owner(&self) -> ScImmutableAgentID { + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableSetOwnerParams { + pub(crate) id: i32, +} + +impl MutableSetOwnerParams { + pub fn owner(&self) -> ScMutableAgentID { + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) + } +} diff --git a/contracts/wasm/myworld/src/results.rs b/contracts/wasm/myworld/src/results.rs new file mode 100644 index 0000000000..8ac0a64433 --- /dev/null +++ b/contracts/wasm/myworld/src/results.rs @@ -0,0 +1,94 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] +#![allow(unused_imports)] + +use wasmlib::*; +use wasmlib::host::*; + +use crate::*; +use crate::keys::*; +use crate::structs::*; + +pub struct ArrayOfImmutableTreasure { + pub(crate) obj_id: i32, +} + +impl ArrayOfImmutableTreasure { + pub fn length(&self) -> i32 { + get_length(self.obj_id) + } + + pub fn get_treasure(&self, index: i32) -> ImmutableTreasure { + ImmutableTreasure { obj_id: self.obj_id, key_id: Key32(index) } + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableGetAllTreasuresResults { + pub(crate) id: i32, +} + +impl ImmutableGetAllTreasuresResults { + pub fn treasures(&self) -> ArrayOfImmutableTreasure { + let arr_id = get_object_id(self.id, idx_map(IDX_RESULT_TREASURES), TYPE_ARRAY | TYPE_BYTES); + ArrayOfImmutableTreasure { obj_id: arr_id } + } +} + +pub struct ArrayOfMutableTreasure { + pub(crate) obj_id: i32, +} + +impl ArrayOfMutableTreasure { + pub fn clear(&self) { + clear(self.obj_id); + } + + pub fn length(&self) -> i32 { + get_length(self.obj_id) + } + + pub fn get_treasure(&self, index: i32) -> MutableTreasure { + MutableTreasure { obj_id: self.obj_id, key_id: Key32(index) } + } +} + +#[derive(Clone, Copy)] +pub struct MutableGetAllTreasuresResults { + pub(crate) id: i32, +} + +impl MutableGetAllTreasuresResults { + pub fn treasures(&self) -> ArrayOfMutableTreasure { + let arr_id = get_object_id(self.id, idx_map(IDX_RESULT_TREASURES), TYPE_ARRAY | TYPE_BYTES); + ArrayOfMutableTreasure { obj_id: arr_id } + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableGetOwnerResults { + pub(crate) id: i32, +} + +impl ImmutableGetOwnerResults { + pub fn owner(&self) -> ScImmutableAgentID { + ScImmutableAgentID::new(self.id, idx_map(IDX_RESULT_OWNER)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableGetOwnerResults { + pub(crate) id: i32, +} + +impl MutableGetOwnerResults { + pub fn owner(&self) -> ScMutableAgentID { + ScMutableAgentID::new(self.id, idx_map(IDX_RESULT_OWNER)) + } +} diff --git a/contracts/wasm/myworld/src/state.rs b/contracts/wasm/myworld/src/state.rs new file mode 100644 index 0000000000..aa641e3abd --- /dev/null +++ b/contracts/wasm/myworld/src/state.rs @@ -0,0 +1,48 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] +#![allow(unused_imports)] + +use wasmlib::*; +use wasmlib::host::*; + +use crate::*; +use crate::keys::*; +use crate::structs::*; + +#[derive(Clone, Copy)] +pub struct ImmutableMyWorldState { + pub(crate) id: i32, +} + +impl ImmutableMyWorldState { + pub fn owner(&self) -> ScImmutableAgentID { + ScImmutableAgentID::new(self.id, idx_map(IDX_STATE_OWNER)) + } + + pub fn treasures(&self) -> ArrayOfImmutableTreasure { + let arr_id = get_object_id(self.id, idx_map(IDX_STATE_TREASURES), TYPE_ARRAY | TYPE_BYTES); + ArrayOfImmutableTreasure { obj_id: arr_id } + } +} + +#[derive(Clone, Copy)] +pub struct MutableMyWorldState { + pub(crate) id: i32, +} + +impl MutableMyWorldState { + pub fn owner(&self) -> ScMutableAgentID { + ScMutableAgentID::new(self.id, idx_map(IDX_STATE_OWNER)) + } + + pub fn treasures(&self) -> ArrayOfMutableTreasure { + let arr_id = get_object_id(self.id, idx_map(IDX_STATE_TREASURES), TYPE_ARRAY | TYPE_BYTES); + ArrayOfMutableTreasure { obj_id: arr_id } + } +} diff --git a/contracts/wasm/myworld/src/structs.rs b/contracts/wasm/myworld/src/structs.rs new file mode 100644 index 0000000000..12b9d3b8d5 --- /dev/null +++ b/contracts/wasm/myworld/src/structs.rs @@ -0,0 +1,70 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] + +use wasmlib::*; +use wasmlib::host::*; + +pub struct Treasure { + pub amount : i64, // how much to deposit + pub name : String, // human readible name + pub owner : ScAgentID, // who deposits the treasure +} + +impl Treasure { + pub fn from_bytes(bytes: &[u8]) -> Treasure { + let mut decode = BytesDecoder::new(bytes); + Treasure { + amount : decode.int64(), + name : decode.string(), + owner : decode.agent_id(), + } + } + + pub fn to_bytes(&self) -> Vec { + let mut encode = BytesEncoder::new(); + encode.int64(self.amount); + encode.string(&self.name); + encode.agent_id(&self.owner); + return encode.data(); + } +} + +pub struct ImmutableTreasure { + pub(crate) obj_id: i32, + pub(crate) key_id: Key32, +} + +impl ImmutableTreasure { + pub fn exists(&self) -> bool { + exists(self.obj_id, self.key_id, TYPE_BYTES) + } + + pub fn value(&self) -> Treasure { + Treasure::from_bytes(&get_bytes(self.obj_id, self.key_id, TYPE_BYTES)) + } +} + +pub struct MutableTreasure { + pub(crate) obj_id: i32, + pub(crate) key_id: Key32, +} + +impl MutableTreasure { + pub fn exists(&self) -> bool { + exists(self.obj_id, self.key_id, TYPE_BYTES) + } + + pub fn set_value(&self, value: &Treasure) { + set_bytes(self.obj_id, self.key_id, TYPE_BYTES, &value.to_bytes()); + } + + pub fn value(&self) -> Treasure { + Treasure::from_bytes(&get_bytes(self.obj_id, self.key_id, TYPE_BYTES)) + } +} diff --git a/contracts/wasm/myworld/test/myworld_test.go b/contracts/wasm/myworld/test/myworld_test.go new file mode 100644 index 0000000000..1f2d94486f --- /dev/null +++ b/contracts/wasm/myworld/test/myworld_test.go @@ -0,0 +1,48 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +package test + +import ( + "testing" + + "github.com/iotaledger/wasp/contracts/wasm/myworld/go/myworld" + "github.com/iotaledger/wasp/packages/solo" + "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + "github.com/iotaledger/wasp/packages/vm/wasmsolo" + "github.com/stretchr/testify/require" +) + +var ( + peer *wasmsolo.SoloAgent + tokenColor wasmlib.ScColor +) + +func TestDeploy(t *testing.T) { + ctx := wasmsolo.NewSoloContext(t, myworld.ScName, myworld.OnLoad) + require.NoError(t, ctx.ContractExists(myworld.ScName)) + + // set up account and mint some tokens + peer = ctx.NewSoloAgent() + tokenColor, ctx.Err = peer.Mint(10) + require.NoError(t, ctx.Err) + require.EqualValues(t, solo.Saldo-10, peer.Balance()) + require.EqualValues(t, 10, peer.Balance(tokenColor)) + + var newTreasure myworld.Treasure + newTreasure.Amount = 500 + newTreasure.Name = "Test" + newTreasure.Owner = peer.ScAgentID() + + depositTreasure := myworld.ScFuncs.DepositTreasure(ctx.Sign(peer)) + depositTreasure.Params.Treasure().SetValue(&newTreasure) + depositTreasure.Func.TransferIotas(500).Post() + require.NoError(t, ctx.Err) + + getAllTreasures := myworld.ScFuncs.GetAllTreasures(ctx) + getAllTreasures.Func.Call() + require.NoError(t, ctx.Err) + + firstStoredTreasure := getAllTreasures.Results.Treasures().GetTreasure(0) + t.Logf("Success on Treasure from %s", firstStoredTreasure.Value().Name) +} diff --git a/tools/schema/generator/rstemplates/params.go b/tools/schema/generator/rstemplates/params.go index 769201645f..fe33636bfe 100644 --- a/tools/schema/generator/rstemplates/params.go +++ b/tools/schema/generator/rstemplates/params.go @@ -17,6 +17,7 @@ use wasmlib::host::*; use crate::*; use crate::keys::*; +$#if structs useStructs `, // ******************************* "paramsFunc": ` From e9d05e4ca8de41d0e6ba0977134a0a9659bcbfa0 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Sun, 21 Nov 2021 13:37:22 -0800 Subject: [PATCH 100/198] Remove test contract --- contracts/wasm/Cargo.toml | 1 - contracts/wasm/myworld/Cargo.toml | 26 ---- contracts/wasm/myworld/go/main.go | 24 --- contracts/wasm/myworld/go/myworld/consts.go | 47 ------ contracts/wasm/myworld/go/myworld/contract.go | 69 -------- contracts/wasm/myworld/go/myworld/keys.go | 34 ---- contracts/wasm/myworld/go/myworld/lib.go | 126 --------------- contracts/wasm/myworld/go/myworld/myworld.go | 28 ---- contracts/wasm/myworld/go/myworld/params.go | 58 ------- contracts/wasm/myworld/go/myworld/results.go | 72 --------- contracts/wasm/myworld/go/myworld/state.go | 36 ----- contracts/wasm/myworld/go/myworld/structs.go | 64 -------- contracts/wasm/myworld/schema.yaml | 30 ---- contracts/wasm/myworld/src/consts.rs | 35 ----- contracts/wasm/myworld/src/contract.rs | 91 ----------- contracts/wasm/myworld/src/keys.rs | 40 ----- contracts/wasm/myworld/src/lib.rs | 147 ------------------ contracts/wasm/myworld/src/myworld.rs | 29 ---- contracts/wasm/myworld/src/params.rs | 82 ---------- contracts/wasm/myworld/src/results.rs | 94 ----------- contracts/wasm/myworld/src/state.rs | 48 ------ contracts/wasm/myworld/src/structs.rs | 70 --------- contracts/wasm/myworld/test/myworld_test.go | 48 ------ 23 files changed, 1299 deletions(-) delete mode 100644 contracts/wasm/myworld/Cargo.toml delete mode 100644 contracts/wasm/myworld/go/main.go delete mode 100644 contracts/wasm/myworld/go/myworld/consts.go delete mode 100644 contracts/wasm/myworld/go/myworld/contract.go delete mode 100644 contracts/wasm/myworld/go/myworld/keys.go delete mode 100644 contracts/wasm/myworld/go/myworld/lib.go delete mode 100644 contracts/wasm/myworld/go/myworld/myworld.go delete mode 100644 contracts/wasm/myworld/go/myworld/params.go delete mode 100644 contracts/wasm/myworld/go/myworld/results.go delete mode 100644 contracts/wasm/myworld/go/myworld/state.go delete mode 100644 contracts/wasm/myworld/go/myworld/structs.go delete mode 100644 contracts/wasm/myworld/schema.yaml delete mode 100644 contracts/wasm/myworld/src/consts.rs delete mode 100644 contracts/wasm/myworld/src/contract.rs delete mode 100644 contracts/wasm/myworld/src/keys.rs delete mode 100644 contracts/wasm/myworld/src/lib.rs delete mode 100644 contracts/wasm/myworld/src/myworld.rs delete mode 100644 contracts/wasm/myworld/src/params.rs delete mode 100644 contracts/wasm/myworld/src/results.rs delete mode 100644 contracts/wasm/myworld/src/state.rs delete mode 100644 contracts/wasm/myworld/src/structs.rs delete mode 100644 contracts/wasm/myworld/test/myworld_test.go diff --git a/contracts/wasm/Cargo.toml b/contracts/wasm/Cargo.toml index 50c6b2680a..6bab15ed67 100644 --- a/contracts/wasm/Cargo.toml +++ b/contracts/wasm/Cargo.toml @@ -3,7 +3,6 @@ [workspace] members = [ - "myworld", "dividend", "donatewithfeedback", "erc20", diff --git a/contracts/wasm/myworld/Cargo.toml b/contracts/wasm/myworld/Cargo.toml deleted file mode 100644 index d2abf5034f..0000000000 --- a/contracts/wasm/myworld/Cargo.toml +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2020 IOTA Stiftung -# SPDX-License-Identifier: Apache-2.0 - -[package] -name = "myworld" -description = "MyWorld description" -license = "Apache-2.0" -version = "0.1.0" -authors = ["John Doe "] -edition = "2018" -repository = "https://github.com/iotaledger/wasp" - -[lib] -crate-type = ["cdylib", "rlib"] - -[features] -default = ["console_error_panic_hook"] - -[dependencies] -wasmlib = { path = "../../../packages/vm/wasmlib" } -#wasmlib = { git = "https://github.com/iotaledger/wasp", branch = "develop" } -console_error_panic_hook = { version = "0.1.6", optional = true } -wee_alloc = { version = "0.4.5", optional = true } - -[dev-dependencies] -wasm-bindgen-test = "0.3.13" diff --git a/contracts/wasm/myworld/go/main.go b/contracts/wasm/myworld/go/main.go deleted file mode 100644 index be1e394e48..0000000000 --- a/contracts/wasm/myworld/go/main.go +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -// +build wasm - -package main - -import "github.com/iotaledger/wasp/packages/vm/wasmclient" - -import "github.com/iotaledger/wasp/contracts/wasm/myworld/go/myworld" - -func main() { -} - -//export on_load -func onLoad() { - h := &wasmclient.WasmVMHost{} - h.ConnectWasmHost() - myworld.OnLoad() -} diff --git a/contracts/wasm/myworld/go/myworld/consts.go b/contracts/wasm/myworld/go/myworld/consts.go deleted file mode 100644 index a1788c7f68..0000000000 --- a/contracts/wasm/myworld/go/myworld/consts.go +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -package myworld - -import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" - -const ( - ScName = "myworld" - ScDescription = "MyWorld description" - HScName = wasmlib.ScHname(0x5efde160) -) - -const ( - ParamOwner = "owner" - ParamTreasure = "treasure" -) - -const ( - ResultOwner = "owner" - ResultTreasures = "treasures" -) - -const ( - StateOwner = "owner" - StateTreasures = "treasures" -) - -const ( - FuncDepositTreasure = "depositTreasure" - FuncInit = "init" - FuncSetOwner = "setOwner" - ViewGetAllTreasures = "getAllTreasures" - ViewGetOwner = "getOwner" -) - -const ( - HFuncDepositTreasure = wasmlib.ScHname(0x186cdf0f) - HFuncInit = wasmlib.ScHname(0x1f44d644) - HFuncSetOwner = wasmlib.ScHname(0x2a15fe7b) - HViewGetAllTreasures = wasmlib.ScHname(0x193d3714) - HViewGetOwner = wasmlib.ScHname(0x137107a6) -) diff --git a/contracts/wasm/myworld/go/myworld/contract.go b/contracts/wasm/myworld/go/myworld/contract.go deleted file mode 100644 index 110efc7f26..0000000000 --- a/contracts/wasm/myworld/go/myworld/contract.go +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -package myworld - -import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" - -type DepositTreasureCall struct { - Func *wasmlib.ScFunc - Params MutableDepositTreasureParams -} - -type InitCall struct { - Func *wasmlib.ScInitFunc - Params MutableInitParams -} - -type SetOwnerCall struct { - Func *wasmlib.ScFunc - Params MutableSetOwnerParams -} - -type GetAllTreasuresCall struct { - Func *wasmlib.ScView - Results ImmutableGetAllTreasuresResults -} - -type GetOwnerCall struct { - Func *wasmlib.ScView - Results ImmutableGetOwnerResults -} - -type Funcs struct{} - -var ScFuncs Funcs - -func (sc Funcs) DepositTreasure(ctx wasmlib.ScFuncCallContext) *DepositTreasureCall { - f := &DepositTreasureCall{Func: wasmlib.NewScFunc(ctx, HScName, HFuncDepositTreasure)} - f.Func.SetPtrs(&f.Params.id, nil) - return f -} - -func (sc Funcs) Init(ctx wasmlib.ScFuncCallContext) *InitCall { - f := &InitCall{Func: wasmlib.NewScInitFunc(ctx, HScName, HFuncInit, keyMap[:], idxMap[:])} - f.Func.SetPtrs(&f.Params.id, nil) - return f -} - -func (sc Funcs) SetOwner(ctx wasmlib.ScFuncCallContext) *SetOwnerCall { - f := &SetOwnerCall{Func: wasmlib.NewScFunc(ctx, HScName, HFuncSetOwner)} - f.Func.SetPtrs(&f.Params.id, nil) - return f -} - -func (sc Funcs) GetAllTreasures(ctx wasmlib.ScViewCallContext) *GetAllTreasuresCall { - f := &GetAllTreasuresCall{Func: wasmlib.NewScView(ctx, HScName, HViewGetAllTreasures)} - f.Func.SetPtrs(nil, &f.Results.id) - return f -} - -func (sc Funcs) GetOwner(ctx wasmlib.ScViewCallContext) *GetOwnerCall { - f := &GetOwnerCall{Func: wasmlib.NewScView(ctx, HScName, HViewGetOwner)} - f.Func.SetPtrs(nil, &f.Results.id) - return f -} diff --git a/contracts/wasm/myworld/go/myworld/keys.go b/contracts/wasm/myworld/go/myworld/keys.go deleted file mode 100644 index 15be57b9b6..0000000000 --- a/contracts/wasm/myworld/go/myworld/keys.go +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -package myworld - -import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" - -const ( - IdxParamOwner = 0 - IdxParamTreasure = 1 - - IdxResultOwner = 2 - IdxResultTreasures = 3 - - IdxStateOwner = 4 - IdxStateTreasures = 5 -) - -const keyMapLen = 6 - -var keyMap = [keyMapLen]wasmlib.Key{ - ParamOwner, - ParamTreasure, - ResultOwner, - ResultTreasures, - StateOwner, - StateTreasures, -} - -var idxMap [keyMapLen]wasmlib.Key32 diff --git a/contracts/wasm/myworld/go/myworld/lib.go b/contracts/wasm/myworld/go/myworld/lib.go deleted file mode 100644 index 36e7090f2d..0000000000 --- a/contracts/wasm/myworld/go/myworld/lib.go +++ /dev/null @@ -1,126 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -package myworld - -import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" - -func OnLoad() { - exports := wasmlib.NewScExports() - exports.AddFunc(FuncDepositTreasure, funcDepositTreasureThunk) - exports.AddFunc(FuncInit, funcInitThunk) - exports.AddFunc(FuncSetOwner, funcSetOwnerThunk) - exports.AddView(ViewGetAllTreasures, viewGetAllTreasuresThunk) - exports.AddView(ViewGetOwner, viewGetOwnerThunk) - - for i, key := range keyMap { - idxMap[i] = key.KeyID() - } -} - -type DepositTreasureContext struct { - Params ImmutableDepositTreasureParams - State MutableMyWorldState -} - -func funcDepositTreasureThunk(ctx wasmlib.ScFuncContext) { - ctx.Log("myworld.funcDepositTreasure") - f := &DepositTreasureContext{ - Params: ImmutableDepositTreasureParams{ - id: wasmlib.OBJ_ID_PARAMS, - }, - State: MutableMyWorldState{ - id: wasmlib.OBJ_ID_STATE, - }, - } - ctx.Require(f.Params.Treasure().Exists(), "missing mandatory treasure") - funcDepositTreasure(ctx, f) - ctx.Log("myworld.funcDepositTreasure ok") -} - -type InitContext struct { - Params ImmutableInitParams - State MutableMyWorldState -} - -func funcInitThunk(ctx wasmlib.ScFuncContext) { - ctx.Log("myworld.funcInit") - f := &InitContext{ - Params: ImmutableInitParams{ - id: wasmlib.OBJ_ID_PARAMS, - }, - State: MutableMyWorldState{ - id: wasmlib.OBJ_ID_STATE, - }, - } - funcInit(ctx, f) - ctx.Log("myworld.funcInit ok") -} - -type SetOwnerContext struct { - Params ImmutableSetOwnerParams - State MutableMyWorldState -} - -func funcSetOwnerThunk(ctx wasmlib.ScFuncContext) { - ctx.Log("myworld.funcSetOwner") - - // current owner of this smart contract - access := ctx.State().GetAgentID(wasmlib.Key("owner")) - ctx.Require(access.Exists(), "access not set: owner") - ctx.Require(ctx.Caller() == access.Value(), "no permission") - - f := &SetOwnerContext{ - Params: ImmutableSetOwnerParams{ - id: wasmlib.OBJ_ID_PARAMS, - }, - State: MutableMyWorldState{ - id: wasmlib.OBJ_ID_STATE, - }, - } - ctx.Require(f.Params.Owner().Exists(), "missing mandatory owner") - funcSetOwner(ctx, f) - ctx.Log("myworld.funcSetOwner ok") -} - -type GetAllTreasuresContext struct { - Results MutableGetAllTreasuresResults - State ImmutableMyWorldState -} - -func viewGetAllTreasuresThunk(ctx wasmlib.ScViewContext) { - ctx.Log("myworld.viewGetAllTreasures") - f := &GetAllTreasuresContext{ - Results: MutableGetAllTreasuresResults{ - id: wasmlib.OBJ_ID_RESULTS, - }, - State: ImmutableMyWorldState{ - id: wasmlib.OBJ_ID_STATE, - }, - } - viewGetAllTreasures(ctx, f) - ctx.Log("myworld.viewGetAllTreasures ok") -} - -type GetOwnerContext struct { - Results MutableGetOwnerResults - State ImmutableMyWorldState -} - -func viewGetOwnerThunk(ctx wasmlib.ScViewContext) { - ctx.Log("myworld.viewGetOwner") - f := &GetOwnerContext{ - Results: MutableGetOwnerResults{ - id: wasmlib.OBJ_ID_RESULTS, - }, - State: ImmutableMyWorldState{ - id: wasmlib.OBJ_ID_STATE, - }, - } - viewGetOwner(ctx, f) - ctx.Log("myworld.viewGetOwner ok") -} diff --git a/contracts/wasm/myworld/go/myworld/myworld.go b/contracts/wasm/myworld/go/myworld/myworld.go deleted file mode 100644 index 281dfd2bf5..0000000000 --- a/contracts/wasm/myworld/go/myworld/myworld.go +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -package myworld - -import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" - -func funcDepositTreasure(ctx wasmlib.ScFuncContext, f *DepositTreasureContext) { -} - -func funcInit(ctx wasmlib.ScFuncContext, f *InitContext) { - if f.Params.Owner().Exists() { - f.State.Owner().SetValue(f.Params.Owner().Value()) - return - } - f.State.Owner().SetValue(ctx.ContractCreator()) -} - -func funcSetOwner(ctx wasmlib.ScFuncContext, f *SetOwnerContext) { - f.State.Owner().SetValue(f.Params.Owner().Value()) -} - -func viewGetAllTreasures(ctx wasmlib.ScViewContext, f *GetAllTreasuresContext) { -} - -func viewGetOwner(ctx wasmlib.ScViewContext, f *GetOwnerContext) { - f.Results.Owner().SetValue(f.State.Owner().Value()) -} diff --git a/contracts/wasm/myworld/go/myworld/params.go b/contracts/wasm/myworld/go/myworld/params.go deleted file mode 100644 index a604233092..0000000000 --- a/contracts/wasm/myworld/go/myworld/params.go +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -package myworld - -import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" - -type ImmutableDepositTreasureParams struct { - id int32 -} - -func (s ImmutableDepositTreasureParams) Treasure() ImmutableTreasure { - return ImmutableTreasure{objID: s.id, keyID: idxMap[IdxParamTreasure]} -} - -type MutableDepositTreasureParams struct { - id int32 -} - -func (s MutableDepositTreasureParams) Treasure() MutableTreasure { - return MutableTreasure{objID: s.id, keyID: idxMap[IdxParamTreasure]} -} - -type ImmutableInitParams struct { - id int32 -} - -func (s ImmutableInitParams) Owner() wasmlib.ScImmutableAgentID { - return wasmlib.NewScImmutableAgentID(s.id, idxMap[IdxParamOwner]) -} - -type MutableInitParams struct { - id int32 -} - -func (s MutableInitParams) Owner() wasmlib.ScMutableAgentID { - return wasmlib.NewScMutableAgentID(s.id, idxMap[IdxParamOwner]) -} - -type ImmutableSetOwnerParams struct { - id int32 -} - -func (s ImmutableSetOwnerParams) Owner() wasmlib.ScImmutableAgentID { - return wasmlib.NewScImmutableAgentID(s.id, idxMap[IdxParamOwner]) -} - -type MutableSetOwnerParams struct { - id int32 -} - -func (s MutableSetOwnerParams) Owner() wasmlib.ScMutableAgentID { - return wasmlib.NewScMutableAgentID(s.id, idxMap[IdxParamOwner]) -} diff --git a/contracts/wasm/myworld/go/myworld/results.go b/contracts/wasm/myworld/go/myworld/results.go deleted file mode 100644 index 6215231616..0000000000 --- a/contracts/wasm/myworld/go/myworld/results.go +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -package myworld - -import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" - -type ArrayOfImmutableTreasure struct { - objID int32 -} - -func (a ArrayOfImmutableTreasure) Length() int32 { - return wasmlib.GetLength(a.objID) -} - -func (a ArrayOfImmutableTreasure) GetTreasure(index int32) ImmutableTreasure { - return ImmutableTreasure{objID: a.objID, keyID: wasmlib.Key32(index)} -} - -type ImmutableGetAllTreasuresResults struct { - id int32 -} - -func (s ImmutableGetAllTreasuresResults) Treasures() ArrayOfImmutableTreasure { - arrID := wasmlib.GetObjectID(s.id, idxMap[IdxResultTreasures], wasmlib.TYPE_ARRAY|wasmlib.TYPE_BYTES) - return ArrayOfImmutableTreasure{objID: arrID} -} - -type ArrayOfMutableTreasure struct { - objID int32 -} - -func (a ArrayOfMutableTreasure) Clear() { - wasmlib.Clear(a.objID) -} - -func (a ArrayOfMutableTreasure) Length() int32 { - return wasmlib.GetLength(a.objID) -} - -func (a ArrayOfMutableTreasure) GetTreasure(index int32) MutableTreasure { - return MutableTreasure{objID: a.objID, keyID: wasmlib.Key32(index)} -} - -type MutableGetAllTreasuresResults struct { - id int32 -} - -func (s MutableGetAllTreasuresResults) Treasures() ArrayOfMutableTreasure { - arrID := wasmlib.GetObjectID(s.id, idxMap[IdxResultTreasures], wasmlib.TYPE_ARRAY|wasmlib.TYPE_BYTES) - return ArrayOfMutableTreasure{objID: arrID} -} - -type ImmutableGetOwnerResults struct { - id int32 -} - -func (s ImmutableGetOwnerResults) Owner() wasmlib.ScImmutableAgentID { - return wasmlib.NewScImmutableAgentID(s.id, idxMap[IdxResultOwner]) -} - -type MutableGetOwnerResults struct { - id int32 -} - -func (s MutableGetOwnerResults) Owner() wasmlib.ScMutableAgentID { - return wasmlib.NewScMutableAgentID(s.id, idxMap[IdxResultOwner]) -} diff --git a/contracts/wasm/myworld/go/myworld/state.go b/contracts/wasm/myworld/go/myworld/state.go deleted file mode 100644 index a7427311b4..0000000000 --- a/contracts/wasm/myworld/go/myworld/state.go +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -package myworld - -import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" - -type ImmutableMyWorldState struct { - id int32 -} - -func (s ImmutableMyWorldState) Owner() wasmlib.ScImmutableAgentID { - return wasmlib.NewScImmutableAgentID(s.id, idxMap[IdxStateOwner]) -} - -func (s ImmutableMyWorldState) Treasures() ArrayOfImmutableTreasure { - arrID := wasmlib.GetObjectID(s.id, idxMap[IdxStateTreasures], wasmlib.TYPE_ARRAY|wasmlib.TYPE_BYTES) - return ArrayOfImmutableTreasure{objID: arrID} -} - -type MutableMyWorldState struct { - id int32 -} - -func (s MutableMyWorldState) Owner() wasmlib.ScMutableAgentID { - return wasmlib.NewScMutableAgentID(s.id, idxMap[IdxStateOwner]) -} - -func (s MutableMyWorldState) Treasures() ArrayOfMutableTreasure { - arrID := wasmlib.GetObjectID(s.id, idxMap[IdxStateTreasures], wasmlib.TYPE_ARRAY|wasmlib.TYPE_BYTES) - return ArrayOfMutableTreasure{objID: arrID} -} diff --git a/contracts/wasm/myworld/go/myworld/structs.go b/contracts/wasm/myworld/go/myworld/structs.go deleted file mode 100644 index 7b807c0054..0000000000 --- a/contracts/wasm/myworld/go/myworld/structs.go +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -package myworld - -import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" - -type Treasure struct { - Amount int64 // how much to deposit - Name string // human readible name - Owner wasmlib.ScAgentID // who deposits the treasure -} - -func NewTreasureFromBytes(bytes []byte) *Treasure { - decode := wasmlib.NewBytesDecoder(bytes) - data := &Treasure{} - data.Amount = decode.Int64() - data.Name = decode.String() - data.Owner = decode.AgentID() - decode.Close() - return data -} - -func (o *Treasure) Bytes() []byte { - return wasmlib.NewBytesEncoder(). - Int64(o.Amount). - String(o.Name). - AgentID(o.Owner). - Data() -} - -type ImmutableTreasure struct { - objID int32 - keyID wasmlib.Key32 -} - -func (o ImmutableTreasure) Exists() bool { - return wasmlib.Exists(o.objID, o.keyID, wasmlib.TYPE_BYTES) -} - -func (o ImmutableTreasure) Value() *Treasure { - return NewTreasureFromBytes(wasmlib.GetBytes(o.objID, o.keyID, wasmlib.TYPE_BYTES)) -} - -type MutableTreasure struct { - objID int32 - keyID wasmlib.Key32 -} - -func (o MutableTreasure) Exists() bool { - return wasmlib.Exists(o.objID, o.keyID, wasmlib.TYPE_BYTES) -} - -func (o MutableTreasure) SetValue(value *Treasure) { - wasmlib.SetBytes(o.objID, o.keyID, wasmlib.TYPE_BYTES, value.Bytes()) -} - -func (o MutableTreasure) Value() *Treasure { - return NewTreasureFromBytes(wasmlib.GetBytes(o.objID, o.keyID, wasmlib.TYPE_BYTES)) -} diff --git a/contracts/wasm/myworld/schema.yaml b/contracts/wasm/myworld/schema.yaml deleted file mode 100644 index 4cbaab5d28..0000000000 --- a/contracts/wasm/myworld/schema.yaml +++ /dev/null @@ -1,30 +0,0 @@ -name: MyWorld -description: MyWorld description -structs: - Treasure: - amount: Int64 // how much to deposit - name: String // human readible name - owner: AgentID // who deposits the treasure -typedefs: {} -state: - owner: AgentID // current owner of this smart contract - treasures: Treasure[] // all deposits ever made -funcs: - init: - params: - owner: AgentID? // optional owner of this smart contract - setOwner: - access: owner // current owner of this smart contract - params: - owner: AgentID // new owner of this smart contract - depositTreasure: - params: - treasure: Treasure -views: - getOwner: - results: - owner: AgentID // current owner of this smart contract - getAllTreasures: - results: - treasures: Treasure[] - diff --git a/contracts/wasm/myworld/src/consts.rs b/contracts/wasm/myworld/src/consts.rs deleted file mode 100644 index 4d21bba250..0000000000 --- a/contracts/wasm/myworld/src/consts.rs +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -#![allow(dead_code)] - -use wasmlib::*; - -pub const SC_NAME : &str = "myworld"; -pub const SC_DESCRIPTION : &str = "MyWorld description"; -pub const HSC_NAME : ScHname = ScHname(0x5efde160); - -pub const PARAM_OWNER : &str = "owner"; -pub const PARAM_TREASURE : &str = "treasure"; - -pub const RESULT_OWNER : &str = "owner"; -pub const RESULT_TREASURES : &str = "treasures"; - -pub const STATE_OWNER : &str = "owner"; -pub const STATE_TREASURES : &str = "treasures"; - -pub const FUNC_DEPOSIT_TREASURE : &str = "depositTreasure"; -pub const FUNC_INIT : &str = "init"; -pub const FUNC_SET_OWNER : &str = "setOwner"; -pub const VIEW_GET_ALL_TREASURES : &str = "getAllTreasures"; -pub const VIEW_GET_OWNER : &str = "getOwner"; - -pub const HFUNC_DEPOSIT_TREASURE : ScHname = ScHname(0x186cdf0f); -pub const HFUNC_INIT : ScHname = ScHname(0x1f44d644); -pub const HFUNC_SET_OWNER : ScHname = ScHname(0x2a15fe7b); -pub const HVIEW_GET_ALL_TREASURES : ScHname = ScHname(0x193d3714); -pub const HVIEW_GET_OWNER : ScHname = ScHname(0x137107a6); diff --git a/contracts/wasm/myworld/src/contract.rs b/contracts/wasm/myworld/src/contract.rs deleted file mode 100644 index 0f369d2af1..0000000000 --- a/contracts/wasm/myworld/src/contract.rs +++ /dev/null @@ -1,91 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -#![allow(dead_code)] - -use std::ptr; - -use wasmlib::*; - -use crate::consts::*; -use crate::params::*; -use crate::results::*; - -pub struct DepositTreasureCall { - pub func: ScFunc, - pub params: MutableDepositTreasureParams, -} - -pub struct InitCall { - pub func: ScInitFunc, - pub params: MutableInitParams, -} - -pub struct SetOwnerCall { - pub func: ScFunc, - pub params: MutableSetOwnerParams, -} - -pub struct GetAllTreasuresCall { - pub func: ScView, - pub results: ImmutableGetAllTreasuresResults, -} - -pub struct GetOwnerCall { - pub func: ScView, - pub results: ImmutableGetOwnerResults, -} - -pub struct ScFuncs { -} - -impl ScFuncs { - pub fn deposit_treasure(_ctx: & dyn ScFuncCallContext) -> DepositTreasureCall { - let mut f = DepositTreasureCall { - func: ScFunc::new(HSC_NAME, HFUNC_DEPOSIT_TREASURE), - params: MutableDepositTreasureParams { id: 0 }, - }; - f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); - f - } - - pub fn init(_ctx: & dyn ScFuncCallContext) -> InitCall { - let mut f = InitCall { - func: ScInitFunc::new(HSC_NAME, HFUNC_INIT), - params: MutableInitParams { id: 0 }, - }; - f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); - f - } - - pub fn set_owner(_ctx: & dyn ScFuncCallContext) -> SetOwnerCall { - let mut f = SetOwnerCall { - func: ScFunc::new(HSC_NAME, HFUNC_SET_OWNER), - params: MutableSetOwnerParams { id: 0 }, - }; - f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); - f - } - - pub fn get_all_treasures(_ctx: & dyn ScViewCallContext) -> GetAllTreasuresCall { - let mut f = GetAllTreasuresCall { - func: ScView::new(HSC_NAME, HVIEW_GET_ALL_TREASURES), - results: ImmutableGetAllTreasuresResults { id: 0 }, - }; - f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); - f - } - - pub fn get_owner(_ctx: & dyn ScViewCallContext) -> GetOwnerCall { - let mut f = GetOwnerCall { - func: ScView::new(HSC_NAME, HVIEW_GET_OWNER), - results: ImmutableGetOwnerResults { id: 0 }, - }; - f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); - f - } -} diff --git a/contracts/wasm/myworld/src/keys.rs b/contracts/wasm/myworld/src/keys.rs deleted file mode 100644 index 0e178a6294..0000000000 --- a/contracts/wasm/myworld/src/keys.rs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -#![allow(dead_code)] - -use wasmlib::*; - -use crate::*; - -pub(crate) const IDX_PARAM_OWNER : usize = 0; -pub(crate) const IDX_PARAM_TREASURE : usize = 1; - -pub(crate) const IDX_RESULT_OWNER : usize = 2; -pub(crate) const IDX_RESULT_TREASURES : usize = 3; - -pub(crate) const IDX_STATE_OWNER : usize = 4; -pub(crate) const IDX_STATE_TREASURES : usize = 5; - -pub const KEY_MAP_LEN: usize = 6; - -pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ - PARAM_OWNER, - PARAM_TREASURE, - RESULT_OWNER, - RESULT_TREASURES, - STATE_OWNER, - STATE_TREASURES, -]; - -pub static mut IDX_MAP: [Key32; KEY_MAP_LEN] = [Key32(0); KEY_MAP_LEN]; - -pub fn idx_map(idx: usize) -> Key32 { - unsafe { - IDX_MAP[idx] - } -} diff --git a/contracts/wasm/myworld/src/lib.rs b/contracts/wasm/myworld/src/lib.rs deleted file mode 100644 index f11042edd3..0000000000 --- a/contracts/wasm/myworld/src/lib.rs +++ /dev/null @@ -1,147 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -#![allow(dead_code)] -#![allow(unused_imports)] - -use myworld::*; -use wasmlib::*; -use wasmlib::host::*; - -use crate::consts::*; -use crate::keys::*; -use crate::params::*; -use crate::results::*; -use crate::state::*; - -mod consts; -mod contract; -mod keys; -mod params; -mod results; -mod state; -mod structs; -mod myworld; - -#[no_mangle] -fn on_load() { - let exports = ScExports::new(); - exports.add_func(FUNC_DEPOSIT_TREASURE, func_deposit_treasure_thunk); - exports.add_func(FUNC_INIT, func_init_thunk); - exports.add_func(FUNC_SET_OWNER, func_set_owner_thunk); - exports.add_view(VIEW_GET_ALL_TREASURES, view_get_all_treasures_thunk); - exports.add_view(VIEW_GET_OWNER, view_get_owner_thunk); - - unsafe { - for i in 0..KEY_MAP_LEN { - IDX_MAP[i] = get_key_id_from_string(KEY_MAP[i]); - } - } -} - -pub struct DepositTreasureContext { - params: ImmutableDepositTreasureParams, - state: MutableMyWorldState, -} - -fn func_deposit_treasure_thunk(ctx: &ScFuncContext) { - ctx.log("myworld.funcDepositTreasure"); - let f = DepositTreasureContext { - params: ImmutableDepositTreasureParams { - id: OBJ_ID_PARAMS, - }, - state: MutableMyWorldState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.treasure().exists(), "missing mandatory treasure"); - func_deposit_treasure(ctx, &f); - ctx.log("myworld.funcDepositTreasure ok"); -} - -pub struct InitContext { - params: ImmutableInitParams, - state: MutableMyWorldState, -} - -fn func_init_thunk(ctx: &ScFuncContext) { - ctx.log("myworld.funcInit"); - let f = InitContext { - params: ImmutableInitParams { - id: OBJ_ID_PARAMS, - }, - state: MutableMyWorldState { - id: OBJ_ID_STATE, - }, - }; - func_init(ctx, &f); - ctx.log("myworld.funcInit ok"); -} - -pub struct SetOwnerContext { - params: ImmutableSetOwnerParams, - state: MutableMyWorldState, -} - -fn func_set_owner_thunk(ctx: &ScFuncContext) { - ctx.log("myworld.funcSetOwner"); - - // current owner of this smart contract - let access = ctx.state().get_agent_id("owner"); - ctx.require(access.exists(), "access not set: owner"); - ctx.require(ctx.caller() == access.value(), "no permission"); - - let f = SetOwnerContext { - params: ImmutableSetOwnerParams { - id: OBJ_ID_PARAMS, - }, - state: MutableMyWorldState { - id: OBJ_ID_STATE, - }, - }; - ctx.require(f.params.owner().exists(), "missing mandatory owner"); - func_set_owner(ctx, &f); - ctx.log("myworld.funcSetOwner ok"); -} - -pub struct GetAllTreasuresContext { - results: MutableGetAllTreasuresResults, - state: ImmutableMyWorldState, -} - -fn view_get_all_treasures_thunk(ctx: &ScViewContext) { - ctx.log("myworld.viewGetAllTreasures"); - let f = GetAllTreasuresContext { - results: MutableGetAllTreasuresResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableMyWorldState { - id: OBJ_ID_STATE, - }, - }; - view_get_all_treasures(ctx, &f); - ctx.log("myworld.viewGetAllTreasures ok"); -} - -pub struct GetOwnerContext { - results: MutableGetOwnerResults, - state: ImmutableMyWorldState, -} - -fn view_get_owner_thunk(ctx: &ScViewContext) { - ctx.log("myworld.viewGetOwner"); - let f = GetOwnerContext { - results: MutableGetOwnerResults { - id: OBJ_ID_RESULTS, - }, - state: ImmutableMyWorldState { - id: OBJ_ID_STATE, - }, - }; - view_get_owner(ctx, &f); - ctx.log("myworld.viewGetOwner ok"); -} diff --git a/contracts/wasm/myworld/src/myworld.rs b/contracts/wasm/myworld/src/myworld.rs deleted file mode 100644 index 73c1427e8d..0000000000 --- a/contracts/wasm/myworld/src/myworld.rs +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -use wasmlib::*; - -use crate::*; -use crate::structs::*; - -pub fn func_deposit_treasure(ctx: &ScFuncContext, f: &DepositTreasureContext) { -} - -pub fn func_init(ctx: &ScFuncContext, f: &InitContext) { - if f.params.owner().exists() { - f.state.owner().set_value(&f.params.owner().value()); - return; - } - f.state.owner().set_value(&ctx.contract_creator()); -} - -pub fn func_set_owner(ctx: &ScFuncContext, f: &SetOwnerContext) { - f.state.owner().set_value(&f.params.owner().value()); -} - -pub fn view_get_all_treasures(ctx: &ScViewContext, f: &GetAllTreasuresContext) { -} - -pub fn view_get_owner(ctx: &ScViewContext, f: &GetOwnerContext) { - f.results.owner().set_value(&f.state.owner().value()); -} diff --git a/contracts/wasm/myworld/src/params.rs b/contracts/wasm/myworld/src/params.rs deleted file mode 100644 index 4ea65c75ef..0000000000 --- a/contracts/wasm/myworld/src/params.rs +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -#![allow(dead_code)] -#![allow(unused_imports)] - -use wasmlib::*; -use wasmlib::host::*; -use wasmlib::structs::*; - -use crate::*; -use crate::keys::*; - -#[derive(Clone, Copy)] -pub struct ImmutableDepositTreasureParams { - pub(crate) id: i32, -} - -impl ImmutableDepositTreasureParams { - pub fn treasure(&self) -> ImmutableTreasure { - ImmutableTreasure { obj_id: self.id, key_id: idx_map(IDX_PARAM_TREASURE) } - } -} - -#[derive(Clone, Copy)] -pub struct MutableDepositTreasureParams { - pub(crate) id: i32, -} - -impl MutableDepositTreasureParams { - pub fn treasure(&self) -> MutableTreasure { - MutableTreasure { obj_id: self.id, key_id: idx_map(IDX_PARAM_TREASURE) } - } -} - -#[derive(Clone, Copy)] -pub struct ImmutableInitParams { - pub(crate) id: i32, -} - -impl ImmutableInitParams { - pub fn owner(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) - } -} - -#[derive(Clone, Copy)] -pub struct MutableInitParams { - pub(crate) id: i32, -} - -impl MutableInitParams { - pub fn owner(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) - } -} - -#[derive(Clone, Copy)] -pub struct ImmutableSetOwnerParams { - pub(crate) id: i32, -} - -impl ImmutableSetOwnerParams { - pub fn owner(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) - } -} - -#[derive(Clone, Copy)] -pub struct MutableSetOwnerParams { - pub(crate) id: i32, -} - -impl MutableSetOwnerParams { - pub fn owner(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) - } -} diff --git a/contracts/wasm/myworld/src/results.rs b/contracts/wasm/myworld/src/results.rs deleted file mode 100644 index 8ac0a64433..0000000000 --- a/contracts/wasm/myworld/src/results.rs +++ /dev/null @@ -1,94 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -#![allow(dead_code)] -#![allow(unused_imports)] - -use wasmlib::*; -use wasmlib::host::*; - -use crate::*; -use crate::keys::*; -use crate::structs::*; - -pub struct ArrayOfImmutableTreasure { - pub(crate) obj_id: i32, -} - -impl ArrayOfImmutableTreasure { - pub fn length(&self) -> i32 { - get_length(self.obj_id) - } - - pub fn get_treasure(&self, index: i32) -> ImmutableTreasure { - ImmutableTreasure { obj_id: self.obj_id, key_id: Key32(index) } - } -} - -#[derive(Clone, Copy)] -pub struct ImmutableGetAllTreasuresResults { - pub(crate) id: i32, -} - -impl ImmutableGetAllTreasuresResults { - pub fn treasures(&self) -> ArrayOfImmutableTreasure { - let arr_id = get_object_id(self.id, idx_map(IDX_RESULT_TREASURES), TYPE_ARRAY | TYPE_BYTES); - ArrayOfImmutableTreasure { obj_id: arr_id } - } -} - -pub struct ArrayOfMutableTreasure { - pub(crate) obj_id: i32, -} - -impl ArrayOfMutableTreasure { - pub fn clear(&self) { - clear(self.obj_id); - } - - pub fn length(&self) -> i32 { - get_length(self.obj_id) - } - - pub fn get_treasure(&self, index: i32) -> MutableTreasure { - MutableTreasure { obj_id: self.obj_id, key_id: Key32(index) } - } -} - -#[derive(Clone, Copy)] -pub struct MutableGetAllTreasuresResults { - pub(crate) id: i32, -} - -impl MutableGetAllTreasuresResults { - pub fn treasures(&self) -> ArrayOfMutableTreasure { - let arr_id = get_object_id(self.id, idx_map(IDX_RESULT_TREASURES), TYPE_ARRAY | TYPE_BYTES); - ArrayOfMutableTreasure { obj_id: arr_id } - } -} - -#[derive(Clone, Copy)] -pub struct ImmutableGetOwnerResults { - pub(crate) id: i32, -} - -impl ImmutableGetOwnerResults { - pub fn owner(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_RESULT_OWNER)) - } -} - -#[derive(Clone, Copy)] -pub struct MutableGetOwnerResults { - pub(crate) id: i32, -} - -impl MutableGetOwnerResults { - pub fn owner(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_RESULT_OWNER)) - } -} diff --git a/contracts/wasm/myworld/src/state.rs b/contracts/wasm/myworld/src/state.rs deleted file mode 100644 index aa641e3abd..0000000000 --- a/contracts/wasm/myworld/src/state.rs +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -#![allow(dead_code)] -#![allow(unused_imports)] - -use wasmlib::*; -use wasmlib::host::*; - -use crate::*; -use crate::keys::*; -use crate::structs::*; - -#[derive(Clone, Copy)] -pub struct ImmutableMyWorldState { - pub(crate) id: i32, -} - -impl ImmutableMyWorldState { - pub fn owner(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_STATE_OWNER)) - } - - pub fn treasures(&self) -> ArrayOfImmutableTreasure { - let arr_id = get_object_id(self.id, idx_map(IDX_STATE_TREASURES), TYPE_ARRAY | TYPE_BYTES); - ArrayOfImmutableTreasure { obj_id: arr_id } - } -} - -#[derive(Clone, Copy)] -pub struct MutableMyWorldState { - pub(crate) id: i32, -} - -impl MutableMyWorldState { - pub fn owner(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_STATE_OWNER)) - } - - pub fn treasures(&self) -> ArrayOfMutableTreasure { - let arr_id = get_object_id(self.id, idx_map(IDX_STATE_TREASURES), TYPE_ARRAY | TYPE_BYTES); - ArrayOfMutableTreasure { obj_id: arr_id } - } -} diff --git a/contracts/wasm/myworld/src/structs.rs b/contracts/wasm/myworld/src/structs.rs deleted file mode 100644 index 12b9d3b8d5..0000000000 --- a/contracts/wasm/myworld/src/structs.rs +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -#![allow(dead_code)] - -use wasmlib::*; -use wasmlib::host::*; - -pub struct Treasure { - pub amount : i64, // how much to deposit - pub name : String, // human readible name - pub owner : ScAgentID, // who deposits the treasure -} - -impl Treasure { - pub fn from_bytes(bytes: &[u8]) -> Treasure { - let mut decode = BytesDecoder::new(bytes); - Treasure { - amount : decode.int64(), - name : decode.string(), - owner : decode.agent_id(), - } - } - - pub fn to_bytes(&self) -> Vec { - let mut encode = BytesEncoder::new(); - encode.int64(self.amount); - encode.string(&self.name); - encode.agent_id(&self.owner); - return encode.data(); - } -} - -pub struct ImmutableTreasure { - pub(crate) obj_id: i32, - pub(crate) key_id: Key32, -} - -impl ImmutableTreasure { - pub fn exists(&self) -> bool { - exists(self.obj_id, self.key_id, TYPE_BYTES) - } - - pub fn value(&self) -> Treasure { - Treasure::from_bytes(&get_bytes(self.obj_id, self.key_id, TYPE_BYTES)) - } -} - -pub struct MutableTreasure { - pub(crate) obj_id: i32, - pub(crate) key_id: Key32, -} - -impl MutableTreasure { - pub fn exists(&self) -> bool { - exists(self.obj_id, self.key_id, TYPE_BYTES) - } - - pub fn set_value(&self, value: &Treasure) { - set_bytes(self.obj_id, self.key_id, TYPE_BYTES, &value.to_bytes()); - } - - pub fn value(&self) -> Treasure { - Treasure::from_bytes(&get_bytes(self.obj_id, self.key_id, TYPE_BYTES)) - } -} diff --git a/contracts/wasm/myworld/test/myworld_test.go b/contracts/wasm/myworld/test/myworld_test.go deleted file mode 100644 index 1f2d94486f..0000000000 --- a/contracts/wasm/myworld/test/myworld_test.go +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -package test - -import ( - "testing" - - "github.com/iotaledger/wasp/contracts/wasm/myworld/go/myworld" - "github.com/iotaledger/wasp/packages/solo" - "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" - "github.com/iotaledger/wasp/packages/vm/wasmsolo" - "github.com/stretchr/testify/require" -) - -var ( - peer *wasmsolo.SoloAgent - tokenColor wasmlib.ScColor -) - -func TestDeploy(t *testing.T) { - ctx := wasmsolo.NewSoloContext(t, myworld.ScName, myworld.OnLoad) - require.NoError(t, ctx.ContractExists(myworld.ScName)) - - // set up account and mint some tokens - peer = ctx.NewSoloAgent() - tokenColor, ctx.Err = peer.Mint(10) - require.NoError(t, ctx.Err) - require.EqualValues(t, solo.Saldo-10, peer.Balance()) - require.EqualValues(t, 10, peer.Balance(tokenColor)) - - var newTreasure myworld.Treasure - newTreasure.Amount = 500 - newTreasure.Name = "Test" - newTreasure.Owner = peer.ScAgentID() - - depositTreasure := myworld.ScFuncs.DepositTreasure(ctx.Sign(peer)) - depositTreasure.Params.Treasure().SetValue(&newTreasure) - depositTreasure.Func.TransferIotas(500).Post() - require.NoError(t, ctx.Err) - - getAllTreasures := myworld.ScFuncs.GetAllTreasures(ctx) - getAllTreasures.Func.Call() - require.NoError(t, ctx.Err) - - firstStoredTreasure := getAllTreasures.Results.Treasures().GetTreasure(0) - t.Logf("Success on Treasure from %s", firstStoredTreasure.Value().Name) -} From bda951aea53cd8c3727fab28e617b42d85d7e595 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Mon, 22 Nov 2021 11:22:27 +0200 Subject: [PATCH 101/198] Preparation for txstream data collection --- packages/chain/chain.go | 37 ++++-- packages/chain/chainimpl/chainimpl.go | 26 ++-- .../chain/chainimpl/chainimpl_nodeconn.go | 51 ++++++++ packages/chain/chainimpl/interface.go | 11 -- packages/chain/consensus/action.go | 2 +- packages/chain/consensus/consensus.go | 10 +- packages/chain/consensus/setup_test.go | 2 +- packages/chain/nodeconnimpl/nodeconnimpl.go | 123 +++++++++++------- .../chain/nodeconnimpl/nodeconnimpl_chain.go | 47 ------- .../chain/nodeconnimpl/nodeconnimpl_test.go | 26 ++++ packages/chain/statemgr/action.go | 7 +- packages/chain/statemgr/setup_test.go | 20 +-- packages/chain/statemgr/statemgr.go | 5 +- packages/chain/statemgr/statemgr_test.go | 3 +- packages/chains/chains.go | 8 +- packages/chains/chains_test.go | 11 +- packages/chains/dispatch.go | 62 --------- packages/testutil/testchain/mock_nodeconn.go | 52 ++++---- plugins/chains/plugin.go | 2 +- 19 files changed, 245 insertions(+), 260 deletions(-) create mode 100644 packages/chain/chainimpl/chainimpl_nodeconn.go delete mode 100644 packages/chain/nodeconnimpl/nodeconnimpl_chain.go create mode 100644 packages/chain/nodeconnimpl/nodeconnimpl_test.go delete mode 100644 packages/chains/dispatch.go diff --git a/packages/chain/chain.go b/packages/chain/chain.go index fd2be56a75..d4a5cd6c57 100644 --- a/packages/chain/chain.go +++ b/packages/chain/chain.go @@ -37,9 +37,7 @@ type ChainCore interface { // ChainEntry interface to access chain from the chain registry side type ChainEntry interface { ReceiveTransaction(*ledgerstate.Transaction) - ReceiveInclusionState(ledgerstate.TransactionID, ledgerstate.InclusionState) ReceiveState(stateOutput *ledgerstate.AliasOutput, timestamp time.Time) - ReceiveOutput(output ledgerstate.Output) ReceiveOffLedgerRequest(req *request.OffLedger, senderNetID string) Dismiss(reason string) @@ -83,21 +81,38 @@ type Committee interface { GetRandomValidators(upToN int) []string } -type NodeConnectionSender interface { +type ( + NodeConnectionHandleTransactionFun func(*ledgerstate.Transaction) + NodeConnectionHandleInclusionStateFun func(ledgerstate.TransactionID, ledgerstate.InclusionState) + NodeConnectionHandleOutputFun func(ledgerstate.Output) + NodeConnectionHandleUnspentAliasOutputFun func(*ledgerstate.AliasOutput, time.Time) +) + +type NodeConnection interface { + Subscribe(addr ledgerstate.Address) + Unsubscribe(addr ledgerstate.Address) + + AttachToTransactionReceived(*ledgerstate.AliasAddress, NodeConnectionHandleTransactionFun) + AttachToInclusionStateReceived(*ledgerstate.AliasAddress, NodeConnectionHandleInclusionStateFun) + AttachToOutputReceived(*ledgerstate.AliasAddress, NodeConnectionHandleOutputFun) + AttachToUnspentAliasOutputReceived(*ledgerstate.AliasAddress, NodeConnectionHandleUnspentAliasOutputFun) + PullState(addr *ledgerstate.AliasAddress) PullTransactionInclusionState(addr ledgerstate.Address, txid ledgerstate.TransactionID) PullConfirmedOutput(addr ledgerstate.Address, outputID ledgerstate.OutputID) PostTransaction(tx *ledgerstate.Transaction) } -type NodeConnection interface { - NodeConnectionSender - AttachToTransactionReceived(func(*ledgerstate.AliasAddress, *ledgerstate.Transaction)) - AttachToInclusionStateReceived(func(*ledgerstate.AliasAddress, ledgerstate.TransactionID, ledgerstate.InclusionState)) - AttachToOutputReceived(func(*ledgerstate.AliasAddress, ledgerstate.Output)) - AttachToUnspentAliasOutputReceived(func(*ledgerstate.AliasAddress, *ledgerstate.AliasOutput, time.Time)) - Subscribe(addr ledgerstate.Address) - Unsubscribe(addr ledgerstate.Address) +type ChainNodeConnection interface { + AttachToTransactionReceived(NodeConnectionHandleTransactionFun) + AttachToInclusionStateReceived(NodeConnectionHandleInclusionStateFun) + AttachToOutputReceived(NodeConnectionHandleOutputFun) + AttachToUnspentAliasOutputReceived(NodeConnectionHandleUnspentAliasOutputFun) + + PullState() + PullTransactionInclusionState(txid ledgerstate.TransactionID) + PullConfirmedOutput(outputID ledgerstate.OutputID) + PostTransaction(tx *ledgerstate.Transaction) } type StateManager interface { diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index ebc0e63295..3988f98162 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -17,7 +17,6 @@ import ( "github.com/iotaledger/wasp/packages/chain/consensus" "github.com/iotaledger/wasp/packages/chain/mempool" "github.com/iotaledger/wasp/packages/chain/messages" - "github.com/iotaledger/wasp/packages/chain/nodeconnimpl" "github.com/iotaledger/wasp/packages/chain/statemgr" "github.com/iotaledger/wasp/packages/hashing" "github.com/iotaledger/wasp/packages/iscp" @@ -40,11 +39,12 @@ import ( const maxMsgBuffer = 10000 var ( - _ chain.Chain = &chainObj{} - _ chain.ChainCore = &chainObj{} - _ chain.ChainEntry = &chainObj{} - _ chain.ChainRequests = &chainObj{} - _ chain.ChainEvents = &chainObj{} + _ chain.Chain = &chainObj{} + _ chain.ChainCore = &chainObj{} + _ chain.ChainEntry = &chainObj{} + _ chain.ChainRequests = &chainObj{} + _ chain.ChainEvents = &chainObj{} + _ chain.ChainNodeConnection = &chainObj{} ) type chainObj struct { @@ -61,7 +61,7 @@ type chainObj struct { stateMgr chain.StateManager consensus chain.Consensus log *logger.Logger - nodeConn chain.NodeConnectionSender + nodeConn chain.NodeConnection db kvstore.KVStore peerNetworkConfig registry.PeerNetworkConfigProvider netProvider peering.NetworkProvider @@ -126,7 +126,7 @@ func NewChain( msgPipe: pipe.NewLimitPriorityInfinitePipe(messagePriorityFun, maxMsgBuffer), chainID: chainID, log: chainLog, - nodeConn: nodeconnimpl.NewChainNodeConnImplementation(nc, chainLog), + nodeConn: nc, db: db, chainStateSync: chainStateSync, stateReader: state.NewOptimisticStateReader(db, chainStateSync), @@ -149,13 +149,15 @@ func NewChain( } ret.committee.Store(&committeeStruct{}) ret.eventChainTransition.Attach(events.NewClosure(ret.processChainTransition)) + ret.AttachToTransactionReceived(ret.ReceiveTransaction) + ret.AttachToUnspentAliasOutputReceived(ret.ReceiveState) peers, err := netProvider.PeerDomain(peerNetConfig.Neighbors()) if err != nil { log.Errorf("NewChain: %v", err) return nil } - ret.stateMgr = statemgr.New(db, ret, peers, ret.nodeConn) + ret.stateMgr = statemgr.New(db, ret, peers, ret) ret.peers = &peers var peeringID peering.PeeringID = ret.chainID.Array() peers.Attach(&peeringID, func(recv *peering.RecvEvent) { @@ -182,10 +184,6 @@ func (c *chainObj) dispatchMessage(msg interface{}) { } case *messages.StateCandidateMsg: c.stateMgr.EventStateCandidateMsg(msgt) - case *messages.InclusionStateMsg: - if c.consensus != nil { - c.consensus.EventInclusionsStateMsg(msgt) - } case *messages.StateMsg: c.processStateMessage(msgt) case *messages.VMResultMsg: @@ -476,7 +474,7 @@ func (c *chainObj) createNewCommitteeAndConsensus(cmtRec *registry.CommitteeReco } cmt.Attach(c) c.log.Debugf("creating new consensus object...") - c.consensus = consensus.New(c, c.mempool, cmt, c.nodeConn, c.pullMissingRequestsFromCommittee, c.chainMetrics) + c.consensus = consensus.New(c, c.mempool, cmt, c, c.pullMissingRequestsFromCommittee, c.chainMetrics) c.setCommittee(cmt) c.log.Infof("NEW COMMITTEE OF VALIDATORS has been initialized for the state address %s", cmtRec.Address.Base58()) diff --git a/packages/chain/chainimpl/chainimpl_nodeconn.go b/packages/chain/chainimpl/chainimpl_nodeconn.go new file mode 100644 index 0000000000..b077a6e0f7 --- /dev/null +++ b/packages/chain/chainimpl/chainimpl_nodeconn.go @@ -0,0 +1,51 @@ +// Provides implementations for chain.ChainNodeConnection methods +package chainimpl + +import ( + "github.com/iotaledger/goshimmer/packages/ledgerstate" + "github.com/iotaledger/wasp/packages/chain" + "github.com/iotaledger/wasp/packages/iscp" +) + +func (c *chainObj) AttachToTransactionReceived(fun chain.NodeConnectionHandleTransactionFun) { + c.nodeConn.AttachToTransactionReceived(c.ID().AsAliasAddress(), fun) +} + +func (c *chainObj) AttachToInclusionStateReceived(fun chain.NodeConnectionHandleInclusionStateFun) { + c.nodeConn.AttachToInclusionStateReceived(c.ID().AsAliasAddress(), fun) +} + +func (c *chainObj) AttachToOutputReceived(fun chain.NodeConnectionHandleOutputFun) { + c.nodeConn.AttachToOutputReceived(c.ID().AsAliasAddress(), fun) +} + +func (c *chainObj) AttachToUnspentAliasOutputReceived(fun chain.NodeConnectionHandleUnspentAliasOutputFun) { + c.nodeConn.AttachToUnspentAliasOutputReceived(c.ID().AsAliasAddress(), fun) +} + +func (c *chainObj) PullState() { + c.log.Debugf("ChainNodeConnection::PullState...") + c.nodeConn.PullState(c.ID().AsAliasAddress()) + c.log.Debugf("ChainNodeConnection::PullState... Done") +} + +func (c *chainObj) PullTransactionInclusionState(txID ledgerstate.TransactionID) { + txIDStr := txID.Base58() + c.log.Debugf("ChainNodeConnImplementation::PullTransactionInclusionState(txID=%v)...", txIDStr) + c.nodeConn.PullTransactionInclusionState(c.ID().AsAddress(), txID) + c.log.Debugf("ChainNodeConnImplementation::PullTransactionInclusionState(txID=%v)... Done", txIDStr) +} + +func (c *chainObj) PullConfirmedOutput(outputID ledgerstate.OutputID) { + outputIDStr := iscp.OID(outputID) + c.log.Debugf("ChainNodeConnImplementation::PullConfirmedOutput(outputID=%v)...", outputIDStr) + c.nodeConn.PullConfirmedOutput(c.ID().AsAddress(), outputID) + c.log.Debugf("ChainNodeConnImplementation::PullConfirmedOutput(outputID=%v)... Done", outputIDStr) +} + +func (c *chainObj) PostTransaction(tx *ledgerstate.Transaction) { + txIDStr := tx.ID().Base58() + c.log.Debugf("ChainNodeConnImplementation::PostTransaction(txID=%s)...", txIDStr) + c.nodeConn.PostTransaction(tx) + c.log.Debugf("ChainNodeConnImplementation::PostTransaction(txID=%s)... Done", txIDStr) +} diff --git a/packages/chain/chainimpl/interface.go b/packages/chain/chainimpl/interface.go index 4fb64c0933..b438cc5adb 100644 --- a/packages/chain/chainimpl/interface.go +++ b/packages/chain/chainimpl/interface.go @@ -226,17 +226,6 @@ func (c *chainObj) ReceiveState(stateOutput *ledgerstate.AliasOutput, timestamp }) } -func (c *chainObj) ReceiveInclusionState(txID ledgerstate.TransactionID, inclusionState ledgerstate.InclusionState) { - c.ReceiveMessage(&messages.InclusionStateMsg{ - TxID: txID, - State: inclusionState, - }) // TODO special entry point -} - -func (c *chainObj) ReceiveOutput(output ledgerstate.Output) { - c.stateMgr.EventOutputMsg(output) -} - func (c *chainObj) BlobCache() registry.BlobCache { return c.blobProvider } diff --git a/packages/chain/consensus/action.go b/packages/chain/consensus/action.go index f9adaad88e..b48463aaec 100644 --- a/packages/chain/consensus/action.go +++ b/packages/chain/consensus/action.go @@ -405,7 +405,7 @@ func (c *Consensus) pullInclusionStateIfNeeded() { c.log.Debugf("pullInclusionState not needed: delayed till %v", c.pullInclusionStateDeadline) return } - c.nodeConn.PullTransactionInclusionState(c.chain.ID().AsAddress(), c.finalTx.ID()) + c.nodeConn.PullTransactionInclusionState(c.finalTx.ID()) c.pullInclusionStateDeadline = time.Now().Add(c.timers.PullInclusionStateRetry) c.log.Debugf("pullInclusionState: request for inclusion state sent") } diff --git a/packages/chain/consensus/consensus.go b/packages/chain/consensus/consensus.go index 606d12638b..84101708b4 100644 --- a/packages/chain/consensus/consensus.go +++ b/packages/chain/consensus/consensus.go @@ -26,7 +26,7 @@ type Consensus struct { chain chain.ChainCore committee chain.Committee mempool chain.Mempool - nodeConn chain.NodeConnectionSender + nodeConn chain.ChainNodeConnection vmRunner vm.VMRunner currentState state.VirtualStateAccess stateOutput *ledgerstate.AliasOutput @@ -81,7 +81,7 @@ type workflowFlags struct { var _ chain.Consensus = &Consensus{} -func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Committee, nodeConn chain.NodeConnectionSender, pullMissingRequestsFromCommittee bool, consensusMetrics metrics.ConsensusMetrics, timersOpt ...ConsensusTimers) *Consensus { +func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Committee, nodeConn chain.ChainNodeConnection, pullMissingRequestsFromCommittee bool, consensusMetrics metrics.ConsensusMetrics, timersOpt ...ConsensusTimers) *Consensus { var timers ConsensusTimers if len(timersOpt) > 0 { timers = timersOpt[0] @@ -111,6 +111,12 @@ func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Commi pullMissingRequestsFromCommittee: pullMissingRequestsFromCommittee, consensusMetrics: consensusMetrics, } + ret.nodeConn.AttachToInclusionStateReceived(func(txID ledgerstate.TransactionID, inclusionState ledgerstate.InclusionState) { + ret.EventInclusionsStateMsg(&messages.InclusionStateMsg{ + TxID: txID, + State: inclusionState, + }) + }) ret.refreshConsensusInfo() go ret.recvLoop() return ret diff --git a/packages/chain/consensus/setup_test.go b/packages/chain/consensus/setup_test.go index bebac75dab..11388bb874 100644 --- a/packages/chain/consensus/setup_test.go +++ b/packages/chain/consensus/setup_test.go @@ -196,7 +196,7 @@ func (env *MockedEnv) NewNode(nodeIndex uint16, timers ConsensusTimers) *mockedN ret.Log.Infof("transaction already in the ledger: %s", tx.ID().Base58()) } }) - ret.NodeConn.OnPullTransactionInclusionState(func(addr ledgerstate.Address, txid ledgerstate.TransactionID) { + ret.NodeConn.OnPullTransactionInclusionState(func(txid ledgerstate.TransactionID) { if _, already := env.Ledger.GetTransaction(txid); already { go ret.ChainCore.ReceiveMessage(&messages.InclusionStateMsg{ TxID: txid, diff --git a/packages/chain/nodeconnimpl/nodeconnimpl.go b/packages/chain/nodeconnimpl/nodeconnimpl.go index f3150c0304..364403bc19 100644 --- a/packages/chain/nodeconnimpl/nodeconnimpl.go +++ b/packages/chain/nodeconnimpl/nodeconnimpl.go @@ -1,8 +1,6 @@ package nodeconnimpl import ( - "time" - "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/goshimmer/packages/txstream" txstream_client "github.com/iotaledger/goshimmer/packages/txstream/client" @@ -12,17 +10,81 @@ import ( ) type NodeConnImplementation struct { - client *txstream_client.Client - log *logger.Logger // general chains logger + client *txstream_client.Client + transactionHandlers map[ledgerstate.AliasAddress]chain.NodeConnectionHandleTransactionFun + iStateHandlers map[ledgerstate.AliasAddress]chain.NodeConnectionHandleInclusionStateFun + outputHandlers map[ledgerstate.AliasAddress]chain.NodeConnectionHandleOutputFun + unspentAOutputHandlers map[ledgerstate.AliasAddress]chain.NodeConnectionHandleUnspentAliasOutputFun + log *logger.Logger // general chains logger } var _ chain.NodeConnection = &NodeConnImplementation{} func NewNodeConnection(nodeConnClient *txstream_client.Client, log *logger.Logger) chain.NodeConnection { - return &NodeConnImplementation{ - client: nodeConnClient, - log: log, + ret := &NodeConnImplementation{ + client: nodeConnClient, + transactionHandlers: make(map[ledgerstate.AliasAddress]chain.NodeConnectionHandleTransactionFun), + iStateHandlers: make(map[ledgerstate.AliasAddress]chain.NodeConnectionHandleInclusionStateFun), + outputHandlers: make(map[ledgerstate.AliasAddress]chain.NodeConnectionHandleOutputFun), + unspentAOutputHandlers: make(map[ledgerstate.AliasAddress]chain.NodeConnectionHandleUnspentAliasOutputFun), + log: log, } + ret.client.Events.TransactionReceived.Attach(events.NewClosure(func(msg *txstream.MsgTransaction) { + ret.log.Debugf("NodeConnnection::TransactionReceived...") + defer ret.log.Debugf("NodeConnnection::TransactionReceived... Done") + aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) + if !ok { + ret.log.Warnf("NodeConnnection::TransactionReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) + return + } + handler, ok := ret.transactionHandlers[*aliasAddr] + if !ok { + ret.log.Warnf("NodeConnnection::TransactionReceived: no handler for address %v", aliasAddr.String()) + return + } + handler(msg.Tx) + })) + ret.client.Events.InclusionStateReceived.Attach(events.NewClosure(func(msg *txstream.MsgTxInclusionState) { + ret.log.Debugf("NodeConnnection::InclusionStateReceived...") + defer ret.log.Debugf("NodeConnnection::InclusionStateReceived... Done") + aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) + if !ok { + ret.log.Warnf("NodeConnnection::InclusionStateReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) + return + } + handler, ok := ret.iStateHandlers[*aliasAddr] + if !ok { + ret.log.Warnf("NodeConnnection::InclusionStateReceived: no handler for address %v", aliasAddr.String()) + return + } + handler(msg.TxID, msg.State) + })) + ret.client.Events.OutputReceived.Attach(events.NewClosure(func(msg *txstream.MsgOutput) { + ret.log.Debugf("NodeConnnection::OutputReceived...") + defer ret.log.Debugf("NodeConnnection::OutputReceived... Done") + aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) + if !ok { + ret.log.Warnf("NodeConnnection::OutputReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) + return + } + handler, ok := ret.outputHandlers[*aliasAddr] + if !ok { + ret.log.Warnf("NodeConnnection::OutputReceived: no handler for address %v", aliasAddr.String()) + return + } + handler(msg.Output) + })) + ret.client.Events.UnspentAliasOutputReceived.Attach(events.NewClosure(func(msg *txstream.MsgUnspentAliasOutput) { + ret.log.Debugf("NodeConnnection::UnspentAliasOutputReceived...") + defer ret.log.Debugf("NodeConnnection::UnspentAliasOutputReceived... Done") + handler, ok := ret.unspentAOutputHandlers[*msg.AliasAddress] + if !ok { + ret.log.Warnf("NodeConnnection::UnspentAliasOutputReceived: no handler for address %v", msg.AliasAddress.String()) + return + } + handler(msg.AliasOutput, msg.Timestamp) + })) + return ret } // NOTE: NodeConnectionSender methods are logged through each chain logger in ChainNodeConnImplementation @@ -43,51 +105,20 @@ func (n *NodeConnImplementation) PostTransaction(tx *ledgerstate.Transaction) { n.client.PostTransaction(tx) } -func (n *NodeConnImplementation) AttachToTransactionReceived(fun func(*ledgerstate.AliasAddress, *ledgerstate.Transaction)) { - n.client.Events.TransactionReceived.Attach(events.NewClosure(func(msg *txstream.MsgTransaction) { - n.log.Debugf("NodeConnnection::TransactionReceived...") - defer n.log.Debugf("NodeConnnection::TransactionReceived... Done") - aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) - if !ok { - n.log.Warnf("NodeConnnection::TransactionReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) - return - } - fun(aliasAddr, msg.Tx) - })) +func (n *NodeConnImplementation) AttachToTransactionReceived(addr *ledgerstate.AliasAddress, handler chain.NodeConnectionHandleTransactionFun) { + n.transactionHandlers[*addr] = handler } -func (n *NodeConnImplementation) AttachToInclusionStateReceived(fun func(*ledgerstate.AliasAddress, ledgerstate.TransactionID, ledgerstate.InclusionState)) { - n.client.Events.InclusionStateReceived.Attach(events.NewClosure(func(msg *txstream.MsgTxInclusionState) { - n.log.Debugf("NodeConnnection::InclusionStateReceived...") - defer n.log.Debugf("NodeConnnection::InclusionStateReceived... Done") - aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) - if !ok { - n.log.Warnf("NodeConnnection::InclusionStateReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) - return - } - fun(aliasAddr, msg.TxID, msg.State) - })) +func (n *NodeConnImplementation) AttachToInclusionStateReceived(addr *ledgerstate.AliasAddress, handler chain.NodeConnectionHandleInclusionStateFun) { + n.iStateHandlers[*addr] = handler } -func (n *NodeConnImplementation) AttachToOutputReceived(fun func(*ledgerstate.AliasAddress, ledgerstate.Output)) { - n.client.Events.OutputReceived.Attach(events.NewClosure(func(msg *txstream.MsgOutput) { - n.log.Debugf("NodeConnnection::OutputReceived...") - defer n.log.Debugf("NodeConnnection::OutputReceived... Done") - aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) - if !ok { - n.log.Warnf("NodeConnnection::OutputReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) - return - } - fun(aliasAddr, msg.Output) - })) +func (n *NodeConnImplementation) AttachToOutputReceived(addr *ledgerstate.AliasAddress, handler chain.NodeConnectionHandleOutputFun) { + n.outputHandlers[*addr] = handler } -func (n *NodeConnImplementation) AttachToUnspentAliasOutputReceived(fun func(*ledgerstate.AliasAddress, *ledgerstate.AliasOutput, time.Time)) { - n.client.Events.UnspentAliasOutputReceived.Attach(events.NewClosure(func(msg *txstream.MsgUnspentAliasOutput) { - n.log.Debugf("NodeConnnection::UnspentAliasOutputReceived...") - defer n.log.Debugf("NodeConnnection::UnspentAliasOutputReceived... Done") - fun(msg.AliasAddress, msg.AliasOutput, msg.Timestamp) - })) +func (n *NodeConnImplementation) AttachToUnspentAliasOutputReceived(addr *ledgerstate.AliasAddress, handler chain.NodeConnectionHandleUnspentAliasOutputFun) { + n.unspentAOutputHandlers[*addr] = handler } func (n *NodeConnImplementation) Subscribe(addr ledgerstate.Address) { diff --git a/packages/chain/nodeconnimpl/nodeconnimpl_chain.go b/packages/chain/nodeconnimpl/nodeconnimpl_chain.go deleted file mode 100644 index 2c3af98c38..0000000000 --- a/packages/chain/nodeconnimpl/nodeconnimpl_chain.go +++ /dev/null @@ -1,47 +0,0 @@ -package nodeconnimpl - -import ( - "github.com/iotaledger/goshimmer/packages/ledgerstate" - "github.com/iotaledger/hive.go/logger" - "github.com/iotaledger/wasp/packages/chain" - "github.com/iotaledger/wasp/packages/iscp" -) - -type ChainNodeConnImplementation struct { - client chain.NodeConnection - log *logger.Logger // each chain has its own logger -} - -var _ chain.NodeConnectionSender = &ChainNodeConnImplementation{} - -func NewChainNodeConnImplementation(nodeConnClient chain.NodeConnection, log *logger.Logger) chain.NodeConnectionSender { - return &ChainNodeConnImplementation{ - client: nodeConnClient, - log: log, - } -} - -func (n *ChainNodeConnImplementation) PullState(addr *ledgerstate.AliasAddress) { - n.log.Debugf("ChainNodeConnImplementation::PullState(addr=%s)...", addr.Base58()) - n.client.PullState(addr) - n.log.Debugf("ChainNodeConnImplementation::PullState(addr=%s)... Done", addr.Base58()) -} - -func (n *ChainNodeConnImplementation) PullTransactionInclusionState(addr ledgerstate.Address, txID ledgerstate.TransactionID) { - n.log.Debugf("ChainNodeConnImplementation::PullTransactionInclusionState(addr=%s, txID=%v)...", addr.Base58(), txID.Base58()) - n.client.PullTransactionInclusionState(addr, txID) - n.log.Debugf("ChainNodeConnImplementation::PullTransactionInclusionState(addr=%s, txID=%v)... Done", addr.Base58(), txID.Base58()) -} - -func (n *ChainNodeConnImplementation) PullConfirmedOutput(addr ledgerstate.Address, outputID ledgerstate.OutputID) { - outputIDStr := iscp.OID(outputID) - n.log.Debugf("ChainNodeConnImplementation::PullConfirmedOutput(addr=%s, outputID=%v)...", addr.Base58(), outputIDStr) - n.client.PullConfirmedOutput(addr, outputID) - n.log.Debugf("ChainNodeConnImplementation::PullConfirmedOutput(addr=%s, outputID=%v)... Done", addr.Base58(), outputIDStr) -} - -func (n *ChainNodeConnImplementation) PostTransaction(tx *ledgerstate.Transaction) { - n.log.Debugf("ChainNodeConnImplementation::PostTransaction(txID=%s)...", tx.ID().Base58()) - n.client.PostTransaction(tx) - n.log.Debugf("ChainNodeConnImplementation::PostTransaction(txID=%s)... Done", tx.ID().Base58()) -} diff --git a/packages/chain/nodeconnimpl/nodeconnimpl_test.go b/packages/chain/nodeconnimpl/nodeconnimpl_test.go new file mode 100644 index 0000000000..ceca17c522 --- /dev/null +++ b/packages/chain/nodeconnimpl/nodeconnimpl_test.go @@ -0,0 +1,26 @@ +package nodeconnimpl + +import ( + "net" + "testing" + "time" + + "github.com/iotaledger/goshimmer/packages/ledgerstate" + txstream "github.com/iotaledger/goshimmer/packages/txstream/client" + "github.com/iotaledger/wasp/packages/testutil/testlogger" + "golang.org/x/xerrors" +) + +func TestBasic(t *testing.T) { + logger := testlogger.NewLogger(t) + + var addr ledgerstate.AliasAddress + nconn := txstream.New("dummyID", logger, func() (addr string, conn net.Conn, err error) { + return "", nil, xerrors.New("dummy dial error") + }) + nconnimpl := NewNodeConnection(nconn, logger) + nconnimpl.AttachToTransactionReceived(&addr, func(*ledgerstate.Transaction) {}) + nconnimpl.AttachToInclusionStateReceived(&addr, func(ledgerstate.TransactionID, ledgerstate.InclusionState) {}) + nconnimpl.AttachToOutputReceived(&addr, func(ledgerstate.Output) {}) + nconnimpl.AttachToUnspentAliasOutputReceived(&addr, func(*ledgerstate.AliasOutput, time.Time) {}) +} diff --git a/packages/chain/statemgr/action.go b/packages/chain/statemgr/action.go index 9975b844f1..04caa9dd5b 100644 --- a/packages/chain/statemgr/action.go +++ b/packages/chain/statemgr/action.go @@ -66,7 +66,7 @@ func (sm *stateManager) pullStateIfNeeded() { nowis := time.Now() if nowis.After(sm.pullStateRetryTime) { chainAliasAddress := sm.chain.ID().AsAliasAddress() - sm.nodeConn.PullState(chainAliasAddress) + sm.nodeConn.PullState() sm.pullStateRetryTime = nowis.Add(sm.timers.PullStateRetry) sm.log.Debugf("pullState: pulling state for address %v. Next pull in: %v", chainAliasAddress.Base58(), sm.pullStateRetryTime.Sub(nowis)) @@ -127,9 +127,8 @@ func (sm *stateManager) addBlockFromPeer(block state.Block) bool { } if sm.addBlockAndCheckStateOutput(block, nil) { // ask for approving output - chainAddress := sm.chain.ID().AsAddress() - sm.log.Debugf("addBlockFromPeer: requesting approving output ID %v for chain %v", iscp.OID(block.ApprovingOutputID()), chainAddress.Base58()) - sm.nodeConn.PullConfirmedOutput(chainAddress, block.ApprovingOutputID()) + sm.log.Debugf("addBlockFromPeer: requesting approving output ID %v", iscp.OID(block.ApprovingOutputID())) + sm.nodeConn.PullConfirmedOutput(block.ApprovingOutputID()) } return true } diff --git a/packages/chain/statemgr/setup_test.go b/packages/chain/statemgr/setup_test.go index 3b054405fb..cfa73508ca 100644 --- a/packages/chain/statemgr/setup_test.go +++ b/packages/chain/statemgr/setup_test.go @@ -151,9 +151,9 @@ func (env *MockedEnv) PostTransactionToLedger(tx *ledgerstate.Transaction) { env.Log.Infof("MockedEnv.PostTransactionToLedger: posted transaction to ledger: %s", tx.ID().Base58()) } -func (env *MockedEnv) PullStateFromLedger(addr *ledgerstate.AliasAddress) *messages.StateMsg { - env.Log.Debugf("MockedEnv.PullStateFromLedger request received for address %v", addr.Base58) - outputs := env.Ledger.GetAddressOutputs(addr) +func (env *MockedEnv) PullStateFromLedger() *messages.StateMsg { + env.Log.Debugf("MockedEnv.PullStateFromLedger request received") + outputs := env.Ledger.GetAddressOutputs(env.ChainID.AsAliasAddress()) require.EqualValues(env.T, 1, len(outputs)) outTx, ok := env.Ledger.GetTransaction(outputs[0].ID().TransactionID()) require.True(env.T, ok) @@ -167,8 +167,8 @@ func (env *MockedEnv) PullStateFromLedger(addr *ledgerstate.AliasAddress) *messa } } -func (env *MockedEnv) PullConfirmedOutputFromLedger(addr ledgerstate.Address, outputID ledgerstate.OutputID) ledgerstate.Output { - env.Log.Debugf("MockedEnv.PullConfirmedOutputFromLedger for address %v output %v", addr.Base58, iscp.OID(outputID)) +func (env *MockedEnv) PullConfirmedOutputFromLedger(outputID ledgerstate.OutputID) ledgerstate.Output { + env.Log.Debugf("MockedEnv.PullConfirmedOutputFromLedger for output %v", iscp.OID(outputID)) tx, foundTx := env.Ledger.GetTransaction(outputID.TransactionID()) require.True(env.T, foundTx) outputIndex := outputID.OutputIndex() @@ -212,15 +212,15 @@ func (env *MockedEnv) NewMockedNode(nodeIndex int, timers StateManagerTimers) *M log.Debugf("MockedNode.OnPostTransaction: transaction %v posted", tx.ID().Base58()) env.PostTransactionToLedger(tx) }) - ret.NodeConn.OnPullState(func(addr *ledgerstate.AliasAddress) { - log.Debugf("MockedNode.OnPullState request received for address %v", addr.Base58) - response := env.PullStateFromLedger(addr) + ret.NodeConn.OnPullState(func() { + log.Debugf("MockedNode.OnPullState request received") + response := env.PullStateFromLedger() log.Debugf("MockedNode.OnPullState call EventStateMsg: chain output %s", iscp.OID(response.ChainOutput.ID())) go ret.StateManager.EventStateMsg(response) }) - ret.NodeConn.OnPullConfirmedOutput(func(addr ledgerstate.Address, outputID ledgerstate.OutputID) { + ret.NodeConn.OnPullConfirmedOutput(func(outputID ledgerstate.OutputID) { log.Debugf("MockedNode.OnPullConfirmedOutput %v", iscp.OID(outputID)) - response := env.PullConfirmedOutputFromLedger(addr, outputID) + response := env.PullConfirmedOutputFromLedger(outputID) log.Debugf("MockedNode.OnPullConfirmedOutput call EventOutputMsg") go ret.StateManager.EventOutputMsg(response) }) diff --git a/packages/chain/statemgr/statemgr.go b/packages/chain/statemgr/statemgr.go index 9ecd445f54..92db49072b 100644 --- a/packages/chain/statemgr/statemgr.go +++ b/packages/chain/statemgr/statemgr.go @@ -25,7 +25,7 @@ type stateManager struct { store kvstore.KVStore chain chain.ChainCore peers peering.PeerDomainProvider - nodeConn chain.NodeConnectionSender + nodeConn chain.ChainNodeConnection pullStateRetryTime time.Time solidState state.VirtualStateAccess stateOutput *ledgerstate.AliasOutput @@ -51,7 +51,7 @@ const ( maxBlocksToCommitConst = 10000 // 10k ) -func New(store kvstore.KVStore, c chain.ChainCore, peers peering.PeerDomainProvider, nodeconn chain.NodeConnectionSender, timersOpt ...StateManagerTimers) chain.StateManager { +func New(store kvstore.KVStore, c chain.ChainCore, peers peering.PeerDomainProvider, nodeconn chain.ChainNodeConnection, timersOpt ...StateManagerTimers) chain.StateManager { var timers StateManagerTimers if len(timersOpt) > 0 { timers = timersOpt[0] @@ -76,6 +76,7 @@ func New(store kvstore.KVStore, c chain.ChainCore, peers peering.PeerDomainProvi eventTimerMsgCh: make(chan messages.TimerTick), closeCh: make(chan bool), } + ret.nodeConn.AttachToOutputReceived(ret.EventOutputMsg) go ret.initLoadState() return ret diff --git a/packages/chain/statemgr/statemgr_test.go b/packages/chain/statemgr/statemgr_test.go index fc19db3900..9447c27ec4 100644 --- a/packages/chain/statemgr/statemgr_test.go +++ b/packages/chain/statemgr/statemgr_test.go @@ -220,8 +220,7 @@ func TestCatchUpNoConfirmedOutput(t *testing.T) { const targetBlockIndex = 10 node.OnStateTransitionMakeNewStateTransition(targetBlockIndex) - node.NodeConn.OnPullConfirmedOutput(func(addr ledgerstate.Address, outputID ledgerstate.OutputID) { - }) + node.NodeConn.OnPullConfirmedOutput(func(outputID ledgerstate.OutputID) {}) waitSyncBlockIndexAndCheck(10*time.Second, t, node, targetBlockIndex) node1 := env.NewMockedNode(1, NewStateManagerTimers()) diff --git a/packages/chains/chains.go b/packages/chains/chains.go index 60ad65de10..6a37a96c4e 100644 --- a/packages/chains/chains.go +++ b/packages/chains/chains.go @@ -73,15 +73,11 @@ func (c *Chains) Dismiss() { c.allChains = make(map[[ledgerstate.AddressLength]byte]chain.Chain) } -func (c *Chains) Attach(nodeConn chain.NodeConnection) { +func (c *Chains) SetNodeConn(nodeConn chain.NodeConnection) { if c.nodeConn != nil { - c.log.Panicf("Chains: already attached") + c.log.Panicf("Chains: node conn already set") } c.nodeConn = nodeConn - c.nodeConn.AttachToTransactionReceived(c.dispatchTransactionMsg) - c.nodeConn.AttachToInclusionStateReceived(c.dispatchInclusionStateMsg) - c.nodeConn.AttachToOutputReceived(c.dispatchOutputMsg) - c.nodeConn.AttachToUnspentAliasOutputReceived(c.dispatchUnspentAliasOutputMsg) } func (c *Chains) ActivateAllFromRegistry(registryProvider registry.Provider, allMetrics *metrics.Metrics) error { diff --git a/packages/chains/chains_test.go b/packages/chains/chains_test.go index 257a97971b..c89076a039 100644 --- a/packages/chains/chains_test.go +++ b/packages/chains/chains_test.go @@ -1,19 +1,15 @@ package chains import ( - "net" "testing" "time" "github.com/iotaledger/goshimmer/packages/database" - txstream "github.com/iotaledger/goshimmer/packages/txstream/client" "github.com/iotaledger/hive.go/kvstore" - "github.com/iotaledger/wasp/packages/chain/nodeconnimpl" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/testutil/testlogger" "github.com/iotaledger/wasp/packages/vm/processors" "github.com/stretchr/testify/require" - "golang.org/x/xerrors" ) func TestBasic(t *testing.T) { @@ -24,10 +20,5 @@ func TestBasic(t *testing.T) { return db.NewStore() } - ch := New(logger, processors.NewConfig(), 10, time.Second, false, nil, getOrCreateKVStore) - - nconn := txstream.New("dummyID", logger, func() (addr string, conn net.Conn, err error) { - return "", nil, xerrors.New("dummy dial error") - }) - ch.Attach(nodeconnimpl.NewNodeConnection(nconn, logger)) + _ = New(logger, processors.NewConfig(), 10, time.Second, false, nil, getOrCreateKVStore) } diff --git a/packages/chains/dispatch.go b/packages/chains/dispatch.go deleted file mode 100644 index b8b73d7790..0000000000 --- a/packages/chains/dispatch.go +++ /dev/null @@ -1,62 +0,0 @@ -package chains - -import ( - "time" - - "github.com/iotaledger/goshimmer/packages/ledgerstate" - "github.com/iotaledger/wasp/packages/iscp" -) - -func (c *Chains) dispatchTransactionMsg(address *ledgerstate.AliasAddress, tx *ledgerstate.Transaction) { - c.log.Debugf("Chains::dispatchTransactionMsg tx ID %v to address %v", tx.ID().Base58(), address.String()) - chainID := iscp.NewChainID(address) - chain := c.Get(chainID) - if chain == nil { - c.log.Warnf("Chains::dispatchTransactionMsg: not interested in tx ID %v, ignoring it", tx.ID().Base58()) - return - } - c.log.Debugf("Chains::dispatchTransactionMsg: dispatching tx ID %v to chain ID %v", tx.ID().Base58(), chainID.String()) - chain.ReceiveTransaction(tx) - c.log.Debugf("Chains::dispatchTransactionMsg: dispatching tx ID %v completed", tx.ID().Base58()) -} - -func (c *Chains) dispatchInclusionStateMsg(address *ledgerstate.AliasAddress, txID ledgerstate.TransactionID, iState ledgerstate.InclusionState) { - c.log.Debugf("Chains::dispatchInclusionStateMsg tx ID %v inclusion state %v to address %v", txID.Base58(), iState.String(), address.String()) - chainID := iscp.NewChainID(address) - chain := c.Get(chainID) - if chain == nil { - c.log.Warnf("Chains::dispatchInclusionStateMsg: not interested in tx ID %v inclusion state, ignoring it", txID.Base58()) - return - } - c.log.Debugf("Chains::dispatchInclusionStateMsg: dispatching tx ID %v inclusion state to chain ID %v", txID.Base58(), chainID.String()) - chain.ReceiveInclusionState(txID, iState) - c.log.Debugf("Chains::dispatchInclusionStateMsg: dispatching tx ID %v inclusion state completed", txID.Base58()) -} - -func (c *Chains) dispatchOutputMsg(address *ledgerstate.AliasAddress, output ledgerstate.Output) { - outputID := iscp.OID(output.ID()) - c.log.Debugf("Chains::dispatchOutputMsg output ID %v to address %v", outputID, address.String()) - chainID := iscp.NewChainID(address) - chain := c.Get(chainID) - if chain == nil { - c.log.Warnf("Chains::dispatchOutputMsg: not interested in output ID %v, ignoring it", outputID) - return - } - c.log.Debugf("Chains::dispatchOutputMsg: dispatching output ID %v to chain ID %v", outputID, chainID.String()) - chain.ReceiveOutput(output) - c.log.Debugf("Chains::dispatchOutputMsg: dispatching output ID %v completed", outputID) -} - -func (c *Chains) dispatchUnspentAliasOutputMsg(address *ledgerstate.AliasAddress, output *ledgerstate.AliasOutput, timestamp time.Time) { - outputID := iscp.OID(output.ID()) - c.log.Debugf("Chains::dispatchUnspentAliasOutputMsg output ID %v timestamp %v to address %v", outputID, timestamp, address.String()) - chainID := iscp.NewChainID(address) - chain := c.Get(chainID) - if chain == nil { - c.log.Warnf("Chains::dispatchUnspentAliasOutputMsg: not interested in output ID %v, ignoring it", outputID) - return - } - c.log.Debugf("Chains::dispatchUnspentAliasOutputMsg: dispatching output ID %v to chain ID %v", outputID, chainID.String()) - chain.ReceiveState(output, timestamp) - c.log.Debugf("Chains::dispatchOutputMsg: dispatching output ID %v completed", outputID) -} diff --git a/packages/testutil/testchain/mock_nodeconn.go b/packages/testutil/testchain/mock_nodeconn.go index f725dd23c3..41250427be 100644 --- a/packages/testutil/testchain/mock_nodeconn.go +++ b/packages/testutil/testchain/mock_nodeconn.go @@ -2,18 +2,19 @@ package testchain import ( "github.com/iotaledger/goshimmer/packages/ledgerstate" + "github.com/iotaledger/wasp/packages/chain" ) type MockedNodeConn struct { id string - onPullBacklog func(addr *ledgerstate.AliasAddress) - onPullState func(addr *ledgerstate.AliasAddress) - onPullConfirmedTransaction func(addr ledgerstate.Address, txid ledgerstate.TransactionID) - onPullTransactionInclusionState func(addr ledgerstate.Address, txid ledgerstate.TransactionID) - onPullConfirmedOutput func(addr ledgerstate.Address, outputID ledgerstate.OutputID) + onPullState func() + onPullTransactionInclusionState func(txid ledgerstate.TransactionID) + onPullConfirmedOutput func(outputID ledgerstate.OutputID) onPostTransaction func(tx *ledgerstate.Transaction) } +var _ chain.ChainNodeConnection = &MockedNodeConn{} + func NewMockedNodeConnection(id string) *MockedNodeConn { return &MockedNodeConn{id: id} } @@ -22,50 +23,41 @@ func (m *MockedNodeConn) ID() string { return m.id } -func (m *MockedNodeConn) PullBacklog(addr *ledgerstate.AliasAddress) { - m.onPullBacklog(addr) -} - -func (m *MockedNodeConn) PullState(addr *ledgerstate.AliasAddress) { - m.onPullState(addr) +func (m *MockedNodeConn) PullState() { + m.onPullState() } -func (m *MockedNodeConn) PullConfirmedTransaction(addr ledgerstate.Address, txid ledgerstate.TransactionID) { - m.onPullConfirmedTransaction(addr, txid) +func (m *MockedNodeConn) PullTransactionInclusionState(txid ledgerstate.TransactionID) { + m.onPullTransactionInclusionState(txid) } -func (m *MockedNodeConn) PullTransactionInclusionState(addr ledgerstate.Address, txid ledgerstate.TransactionID) { - m.onPullTransactionInclusionState(addr, txid) -} - -func (m *MockedNodeConn) PullConfirmedOutput(addr ledgerstate.Address, outputID ledgerstate.OutputID) { - m.onPullConfirmedOutput(addr, outputID) +func (m *MockedNodeConn) PullConfirmedOutput(outputID ledgerstate.OutputID) { + m.onPullConfirmedOutput(outputID) } func (m *MockedNodeConn) PostTransaction(tx *ledgerstate.Transaction) { m.onPostTransaction(tx) } -func (m *MockedNodeConn) OnPullBacklog(f func(addr *ledgerstate.AliasAddress)) { - m.onPullBacklog = f -} - -func (m *MockedNodeConn) OnPullState(f func(addr *ledgerstate.AliasAddress)) { +func (m *MockedNodeConn) OnPullState(f func()) { m.onPullState = f } -func (m *MockedNodeConn) OnPullConfirmedTransaction(f func(addr ledgerstate.Address, txid ledgerstate.TransactionID)) { - m.onPullConfirmedTransaction = f -} - -func (m *MockedNodeConn) OnPullTransactionInclusionState(f func(addr ledgerstate.Address, txid ledgerstate.TransactionID)) { +func (m *MockedNodeConn) OnPullTransactionInclusionState(f func(txid ledgerstate.TransactionID)) { m.onPullTransactionInclusionState = f } -func (m *MockedNodeConn) OnPullConfirmedOutput(f func(addr ledgerstate.Address, outputID ledgerstate.OutputID)) { +func (m *MockedNodeConn) OnPullConfirmedOutput(f func(outputID ledgerstate.OutputID)) { m.onPullConfirmedOutput = f } func (m *MockedNodeConn) OnPostTransaction(f func(tx *ledgerstate.Transaction)) { m.onPostTransaction = f } + +func (m *MockedNodeConn) AttachToTransactionReceived(chain.NodeConnectionHandleTransactionFun) {} +func (m *MockedNodeConn) AttachToInclusionStateReceived(chain.NodeConnectionHandleInclusionStateFun) { +} +func (m *MockedNodeConn) AttachToOutputReceived(chain.NodeConnectionHandleOutputFun) {} +func (m *MockedNodeConn) AttachToUnspentAliasOutputReceived(chain.NodeConnectionHandleUnspentAliasOutputFun) { +} diff --git a/plugins/chains/plugin.go b/plugins/chains/plugin.go index befaec28ac..1a4d606c66 100644 --- a/plugins/chains/plugin.go +++ b/plugins/chains/plugin.go @@ -48,7 +48,7 @@ func run(_ *node.Plugin) { database.GetOrCreateKVStore, ) err := daemon.BackgroundWorker(PluginName, func(shutdownSignal <-chan struct{}) { - allChains.Attach(nodeconnimpl.NewNodeConnection(nodeconn.NodeConnection(), log)) + allChains.SetNodeConn(nodeconnimpl.NewNodeConnection(nodeconn.NodeConnection(), log)) if parameters.GetBool(parameters.MetricsEnabled) { allMetrics = metrics.AllMetrics() } From e011b7d5ffe8c6224c99a55197124406c22be261 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Mon, 22 Nov 2021 14:46:49 +0200 Subject: [PATCH 102/198] Node connection statistics is being collected --- packages/chain/chain.go | 24 ++++++++++++ packages/chain/chainimpl/chainimpl.go | 1 + .../chain/chainimpl/chainimpl_nodeconn.go | 38 +++++++++++++++++-- packages/chain/nodeconnimpl/nodeconnimpl.go | 30 +++++++++++++++ packages/chain/util.go | 7 ++++ 5 files changed, 96 insertions(+), 4 deletions(-) diff --git a/packages/chain/chain.go b/packages/chain/chain.go index d4a5cd6c57..e74c9e927f 100644 --- a/packages/chain/chain.go +++ b/packages/chain/chain.go @@ -21,6 +21,7 @@ import ( "github.com/iotaledger/wasp/packages/tcrypto" "github.com/iotaledger/wasp/packages/util/ready" "github.com/iotaledger/wasp/packages/vm/processors" + "go.uber.org/atomic" ) type ChainCore interface { @@ -115,6 +116,29 @@ type ChainNodeConnection interface { PostTransaction(tx *ledgerstate.Transaction) } +type NodeConnectionMessageStats struct { + Total atomic.Int32 + LastEvent time.Time + LastMessage interface{} +} + +type NodeConnectionMessagesStats struct { + OutPullState NodeConnectionMessageStats + OutPullTransactionInclusionState NodeConnectionMessageStats + OutPullConfirmedOutput NodeConnectionMessageStats + OutPostTransaction NodeConnectionMessageStats + + InTransaction NodeConnectionMessageStats + InInclusionState NodeConnectionMessageStats + InOutput NodeConnectionMessageStats + InUnspentAliasOutput NodeConnectionMessageStats +} + +type NodeConnectionStats struct { + NodeConnectionMessagesStats + Subscribed []ledgerstate.Address +} + type StateManager interface { Ready() *ready.Ready EventGetBlockMsg(msg *messages.GetBlockMsg) diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index 3988f98162..0b08c3b101 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -77,6 +77,7 @@ type chainObj struct { offledgerBroadcastInterval time.Duration pullMissingRequestsFromCommittee bool chainMetrics metrics.ChainMetrics + stats *chain.NodeConnectionMessagesStats } type committeeStruct struct { diff --git a/packages/chain/chainimpl/chainimpl_nodeconn.go b/packages/chain/chainimpl/chainimpl_nodeconn.go index b077a6e0f7..afadb90df3 100644 --- a/packages/chain/chainimpl/chainimpl_nodeconn.go +++ b/packages/chain/chainimpl/chainimpl_nodeconn.go @@ -2,29 +2,56 @@ package chainimpl import ( + "time" + "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/wasp/packages/chain" "github.com/iotaledger/wasp/packages/iscp" ) func (c *chainObj) AttachToTransactionReceived(fun chain.NodeConnectionHandleTransactionFun) { - c.nodeConn.AttachToTransactionReceived(c.ID().AsAliasAddress(), fun) + c.nodeConn.AttachToTransactionReceived(c.ID().AsAliasAddress(), func(tx *ledgerstate.Transaction) { + chain.CountMessageStats(&c.stats.InTransaction, tx) + fun(tx) + }) } func (c *chainObj) AttachToInclusionStateReceived(fun chain.NodeConnectionHandleInclusionStateFun) { - c.nodeConn.AttachToInclusionStateReceived(c.ID().AsAliasAddress(), fun) + c.nodeConn.AttachToInclusionStateReceived(c.ID().AsAliasAddress(), func(txID ledgerstate.TransactionID, iState ledgerstate.InclusionState) { + chain.CountMessageStats(&c.stats.InInclusionState, struct { + TransactionID ledgerstate.TransactionID + InclusionState ledgerstate.InclusionState + }{ + TransactionID: txID, + InclusionState: iState, + }) + fun(txID, iState) + }) } func (c *chainObj) AttachToOutputReceived(fun chain.NodeConnectionHandleOutputFun) { - c.nodeConn.AttachToOutputReceived(c.ID().AsAliasAddress(), fun) + c.nodeConn.AttachToOutputReceived(c.ID().AsAliasAddress(), func(output ledgerstate.Output) { + chain.CountMessageStats(&c.stats.InOutput, output) + fun(output) + }) } func (c *chainObj) AttachToUnspentAliasOutputReceived(fun chain.NodeConnectionHandleUnspentAliasOutputFun) { - c.nodeConn.AttachToUnspentAliasOutputReceived(c.ID().AsAliasAddress(), fun) + c.nodeConn.AttachToUnspentAliasOutputReceived(c.ID().AsAliasAddress(), func(output *ledgerstate.AliasOutput, timestamp time.Time) { + chain.CountMessageStats(&c.stats.InUnspentAliasOutput, struct { + AliasOutput *ledgerstate.AliasOutput + Timestamp time.Time + }{ + AliasOutput: output, + Timestamp: timestamp, + }) + fun(output, timestamp) + }) } func (c *chainObj) PullState() { c.log.Debugf("ChainNodeConnection::PullState...") + chain.CountMessageStats(&c.stats.OutPullState, nil) c.nodeConn.PullState(c.ID().AsAliasAddress()) c.log.Debugf("ChainNodeConnection::PullState... Done") } @@ -32,6 +59,7 @@ func (c *chainObj) PullState() { func (c *chainObj) PullTransactionInclusionState(txID ledgerstate.TransactionID) { txIDStr := txID.Base58() c.log.Debugf("ChainNodeConnImplementation::PullTransactionInclusionState(txID=%v)...", txIDStr) + chain.CountMessageStats(&c.stats.OutPullTransactionInclusionState, txID) c.nodeConn.PullTransactionInclusionState(c.ID().AsAddress(), txID) c.log.Debugf("ChainNodeConnImplementation::PullTransactionInclusionState(txID=%v)... Done", txIDStr) } @@ -39,6 +67,7 @@ func (c *chainObj) PullTransactionInclusionState(txID ledgerstate.TransactionID) func (c *chainObj) PullConfirmedOutput(outputID ledgerstate.OutputID) { outputIDStr := iscp.OID(outputID) c.log.Debugf("ChainNodeConnImplementation::PullConfirmedOutput(outputID=%v)...", outputIDStr) + chain.CountMessageStats(&c.stats.OutPullConfirmedOutput, outputID) c.nodeConn.PullConfirmedOutput(c.ID().AsAddress(), outputID) c.log.Debugf("ChainNodeConnImplementation::PullConfirmedOutput(outputID=%v)... Done", outputIDStr) } @@ -46,6 +75,7 @@ func (c *chainObj) PullConfirmedOutput(outputID ledgerstate.OutputID) { func (c *chainObj) PostTransaction(tx *ledgerstate.Transaction) { txIDStr := tx.ID().Base58() c.log.Debugf("ChainNodeConnImplementation::PostTransaction(txID=%s)...", txIDStr) + chain.CountMessageStats(&c.stats.OutPostTransaction, tx) c.nodeConn.PostTransaction(tx) c.log.Debugf("ChainNodeConnImplementation::PostTransaction(txID=%s)... Done", txIDStr) } diff --git a/packages/chain/nodeconnimpl/nodeconnimpl.go b/packages/chain/nodeconnimpl/nodeconnimpl.go index 364403bc19..e8965dd040 100644 --- a/packages/chain/nodeconnimpl/nodeconnimpl.go +++ b/packages/chain/nodeconnimpl/nodeconnimpl.go @@ -15,6 +15,7 @@ type NodeConnImplementation struct { iStateHandlers map[ledgerstate.AliasAddress]chain.NodeConnectionHandleInclusionStateFun outputHandlers map[ledgerstate.AliasAddress]chain.NodeConnectionHandleOutputFun unspentAOutputHandlers map[ledgerstate.AliasAddress]chain.NodeConnectionHandleUnspentAliasOutputFun + stats *chain.NodeConnectionStats log *logger.Logger // general chains logger } @@ -27,11 +28,13 @@ func NewNodeConnection(nodeConnClient *txstream_client.Client, log *logger.Logge iStateHandlers: make(map[ledgerstate.AliasAddress]chain.NodeConnectionHandleInclusionStateFun), outputHandlers: make(map[ledgerstate.AliasAddress]chain.NodeConnectionHandleOutputFun), unspentAOutputHandlers: make(map[ledgerstate.AliasAddress]chain.NodeConnectionHandleUnspentAliasOutputFun), + stats: &chain.NodeConnectionStats{}, log: log, } ret.client.Events.TransactionReceived.Attach(events.NewClosure(func(msg *txstream.MsgTransaction) { ret.log.Debugf("NodeConnnection::TransactionReceived...") defer ret.log.Debugf("NodeConnnection::TransactionReceived... Done") + chain.CountMessageStats(&ret.stats.InTransaction, msg) aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) if !ok { ret.log.Warnf("NodeConnnection::TransactionReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) @@ -47,6 +50,7 @@ func NewNodeConnection(nodeConnClient *txstream_client.Client, log *logger.Logge ret.client.Events.InclusionStateReceived.Attach(events.NewClosure(func(msg *txstream.MsgTxInclusionState) { ret.log.Debugf("NodeConnnection::InclusionStateReceived...") defer ret.log.Debugf("NodeConnnection::InclusionStateReceived... Done") + chain.CountMessageStats(&ret.stats.InInclusionState, msg) aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) if !ok { ret.log.Warnf("NodeConnnection::InclusionStateReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) @@ -62,6 +66,7 @@ func NewNodeConnection(nodeConnClient *txstream_client.Client, log *logger.Logge ret.client.Events.OutputReceived.Attach(events.NewClosure(func(msg *txstream.MsgOutput) { ret.log.Debugf("NodeConnnection::OutputReceived...") defer ret.log.Debugf("NodeConnnection::OutputReceived... Done") + chain.CountMessageStats(&ret.stats.InOutput, msg) aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) if !ok { ret.log.Warnf("NodeConnnection::OutputReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) @@ -77,6 +82,7 @@ func NewNodeConnection(nodeConnClient *txstream_client.Client, log *logger.Logge ret.client.Events.UnspentAliasOutputReceived.Attach(events.NewClosure(func(msg *txstream.MsgUnspentAliasOutput) { ret.log.Debugf("NodeConnnection::UnspentAliasOutputReceived...") defer ret.log.Debugf("NodeConnnection::UnspentAliasOutputReceived... Done") + chain.CountMessageStats(&ret.stats.InUnspentAliasOutput, msg) handler, ok := ret.unspentAOutputHandlers[*msg.AliasAddress] if !ok { ret.log.Warnf("NodeConnnection::UnspentAliasOutputReceived: no handler for address %v", msg.AliasAddress.String()) @@ -90,18 +96,34 @@ func NewNodeConnection(nodeConnClient *txstream_client.Client, log *logger.Logge // NOTE: NodeConnectionSender methods are logged through each chain logger in ChainNodeConnImplementation func (n *NodeConnImplementation) PullState(addr *ledgerstate.AliasAddress) { + chain.CountMessageStats(&n.stats.OutPullState, addr) n.client.RequestUnspentAliasOutput(addr) } func (n *NodeConnImplementation) PullTransactionInclusionState(addr ledgerstate.Address, txid ledgerstate.TransactionID) { + chain.CountMessageStats(&n.stats.OutPullTransactionInclusionState, struct { + Address ledgerstate.Address + TransactionID ledgerstate.TransactionID + }{ + Address: addr, + TransactionID: txid, + }) n.client.RequestTxInclusionState(addr, txid) } func (n *NodeConnImplementation) PullConfirmedOutput(addr ledgerstate.Address, outputID ledgerstate.OutputID) { + chain.CountMessageStats(&n.stats.OutPullConfirmedOutput, struct { + Address ledgerstate.Address + OutputID ledgerstate.OutputID + }{ + Address: addr, + OutputID: outputID, + }) n.client.RequestConfirmedOutput(addr, outputID) } func (n *NodeConnImplementation) PostTransaction(tx *ledgerstate.Transaction) { + chain.CountMessageStats(&n.stats.OutPostTransaction, tx) n.client.PostTransaction(tx) } @@ -125,10 +147,18 @@ func (n *NodeConnImplementation) Subscribe(addr ledgerstate.Address) { n.log.Debugf("NodeConnnection::Subscribing to %v...", addr.String()) defer n.log.Debugf("NodeConnnection::Subscribing done") n.client.Subscribe(addr) + n.stats.Subscribed = append(n.stats.Subscribed, addr) } func (n *NodeConnImplementation) Unsubscribe(addr ledgerstate.Address) { n.log.Debugf("NodeConnnection::Unsubscribing from %v...", addr.String()) defer n.log.Debugf("NodeConnnection::Unsubscribing done") n.client.Unsubscribe(addr) + var i int + for i = 0; i < len(n.stats.Subscribed); i++ { + if n.stats.Subscribed[i] == addr { + n.stats.Subscribed = append(n.stats.Subscribed[:i], n.stats.Subscribed[i+1:]...) + break + } + } } diff --git a/packages/chain/util.go b/packages/chain/util.go index f3fc917ad6..1213c5e8b3 100644 --- a/packages/chain/util.go +++ b/packages/chain/util.go @@ -2,6 +2,7 @@ package chain import ( "strconv" + "time" "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/hive.go/logger" @@ -65,3 +66,9 @@ func PublishGovernanceTransition(stateOutput *ledgerstate.AliasOutput) { stateHash.String(), ) } + +func CountMessageStats(stats *NodeConnectionMessageStats, msg interface{}) { + stats.Total.Inc() + stats.LastEvent = time.Now() + stats.LastMessage = msg +} From 3cdbf1660d4f9f3491d2960f515dfa8ea3159212 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Mon, 22 Nov 2021 14:58:29 +0200 Subject: [PATCH 103/198] Not necessary checks removed --- packages/chain/chainimpl/chainimpl.go | 9 --------- .../consensus/commonsubset/commonsubsetcoordinator.go | 5 ----- packages/chain/consensus/consensus.go | 5 ----- packages/chain/statemgr/statemgr.go | 4 ---- 4 files changed, 23 deletions(-) diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index b3460b87ab..1687c65273 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -4,7 +4,6 @@ package chainimpl import ( - "fmt" "sync" "time" @@ -164,10 +163,6 @@ func NewChain( } func (c *chainObj) receiveCommitteePeerMessages(peerMsg *peering.PeerMessageGroupIn) { - if peerMsg.MsgReceiver != chain.PeerMessageReceiverChain { - panic(fmt.Errorf("Chain does not accept peer messages of other receiver type %v, message type=%v", - peerMsg.MsgReceiver, peerMsg.MsgType)) - } if peerMsg.MsgType != chain.PeerMsgTypeMissingRequestIDs { c.log.Warnf("Wrong type of chain message (with committee peering ID): %v, ignoring it", peerMsg.MsgType) return @@ -184,10 +179,6 @@ func (c *chainObj) receiveCommitteePeerMessages(peerMsg *peering.PeerMessageGrou } func (c *chainObj) receiveChainPeerMessages(peerMsg *peering.PeerMessageIn) { - if peerMsg.MsgReceiver != chain.PeerMessageReceiverChain { - panic(fmt.Errorf("Chain does not accept peer messages of other receiver type %v, message type=%v", - peerMsg.MsgReceiver, peerMsg.MsgType)) - } switch peerMsg.MsgType { case chain.PeerMsgTypeOffLedgerRequest: msg, err := messages.NewOffLedgerRequestMsg(peerMsg.MsgData) diff --git a/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go b/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go index 9ce72d9052..59726d6624 100644 --- a/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go +++ b/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go @@ -4,7 +4,6 @@ package commonsubset import ( - "fmt" "sort" "sync" @@ -113,10 +112,6 @@ func (csc *CommonSubsetCoordinator) RunACSConsensus( // TryHandleMessage implements the AsynchronousCommonSubsetRunner interface. // It handles the network messages, if they are of correct type. func (csc *CommonSubsetCoordinator) receiveCommitteePeerMessages(peerMsg *peering.PeerMessageGroupIn) { - if peerMsg.MsgReceiver != peerMessageReceiverCommonSubset { - panic(fmt.Errorf("Committee does not accept peer messages of other receiver type %v, message type=%v", - peerMsg.MsgReceiver, peerMsg.MsgType)) - } if peerMsg.MsgType != peerMsgTypeBatch { csc.log.Warnf("Wrong type of committee message: %v, ignoring it", peerMsg.MsgType) return diff --git a/packages/chain/consensus/consensus.go b/packages/chain/consensus/consensus.go index 19c9160a04..1c632ae0fa 100644 --- a/packages/chain/consensus/consensus.go +++ b/packages/chain/consensus/consensus.go @@ -4,7 +4,6 @@ package consensus import ( - "fmt" "sync" "time" @@ -128,10 +127,6 @@ func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Commi } func (c *consensus) receiveCommitteePeerMessages(peerMsg *peering.PeerMessageGroupIn) { - if peerMsg.MsgReceiver != peerMessageReceiverConsensus { - panic(fmt.Errorf("Consensus does not accept peer messages of other receiver type %v, message type=%v", - peerMsg.MsgReceiver, peerMsg.MsgType)) - } switch peerMsg.MsgType { case peerMsgTypeSignedResult: msg, err := messages.NewSignedResultMsg(peerMsg.MsgData) diff --git a/packages/chain/statemgr/statemgr.go b/packages/chain/statemgr/statemgr.go index 71a9b17f1e..720da0c58a 100644 --- a/packages/chain/statemgr/statemgr.go +++ b/packages/chain/statemgr/statemgr.go @@ -90,10 +90,6 @@ func New(store kvstore.KVStore, c chain.ChainCore, peers peering.PeerDomainProvi } func (sm *stateManager) receiveChainPeerMessages(peerMsg *peering.PeerMessageIn) { - if peerMsg.MsgReceiver != peerMessageReceiverStateManager { - panic(fmt.Errorf("State manager does not accept peer messages of other receiver type %v, message type=%v", - peerMsg.MsgReceiver, peerMsg.MsgType)) - } switch peerMsg.MsgType { case peerMsgTypeGetBlock: msg, err := messages.NewGetBlockMsg(peerMsg.MsgData) From 8789681257eb7bdb999b19c604e035c5dba80ad2 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Mon, 22 Nov 2021 19:59:54 -0800 Subject: [PATCH 104/198] Fixed several bugs and added logging to schema tool --- contracts/wasm/Cargo.lock | 10 --- .../wasm/donatewithfeedback/src/params.rs | 1 + .../wasm/donatewithfeedback/src/structs.rs | 1 + contracts/wasm/erc20/src/params.rs | 1 + contracts/wasm/erc20/src/results.rs | 1 + contracts/wasm/fairauction/src/params.rs | 2 + contracts/wasm/fairauction/src/results.rs | 1 + contracts/wasm/fairauction/src/structs.rs | 2 + contracts/wasm/fairroulette/src/params.rs | 1 + contracts/wasm/fairroulette/src/structs.rs | 1 + contracts/wasm/testwasmlib/src/params.rs | 1 + contracts/wasm/testwasmlib/src/results.rs | 1 + contracts/wasm/tokenregistry/src/params.rs | 1 + contracts/wasm/tokenregistry/src/structs.rs | 1 + tools/schema/generator/emitter.go | 61 +++++++++++++++++++ tools/schema/generator/generator.go | 1 + .../generator/gotemplates/alltemplates.go | 9 +++ tools/schema/generator/gotemplates/proxy.go | 17 +++++- .../schema/generator/gotemplates/typedefs.go | 14 +---- .../generator/rstemplates/alltemplates.go | 9 +++ tools/schema/generator/rstemplates/params.go | 1 + tools/schema/generator/rstemplates/proxy.go | 16 ++++- tools/schema/generator/rstemplates/results.go | 1 + tools/schema/generator/rstemplates/structs.go | 2 + .../schema/generator/rstemplates/typedefs.go | 20 ++---- .../generator/tstemplates/alltemplates.go | 9 +++ tools/schema/generator/tstemplates/proxy.go | 16 ++++- .../schema/generator/tstemplates/typedefs.go | 19 ++---- 28 files changed, 161 insertions(+), 59 deletions(-) diff --git a/contracts/wasm/Cargo.lock b/contracts/wasm/Cargo.lock index 46db5d5dff..107782c9da 100644 --- a/contracts/wasm/Cargo.lock +++ b/contracts/wasm/Cargo.lock @@ -134,16 +134,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" -[[package]] -name = "myworld" -version = "0.1.0" -dependencies = [ - "console_error_panic_hook", - "wasm-bindgen-test", - "wasmlib 0.1.0", - "wee_alloc", -] - [[package]] name = "proc-macro2" version = "1.0.24" diff --git a/contracts/wasm/donatewithfeedback/src/params.rs b/contracts/wasm/donatewithfeedback/src/params.rs index df63e977cf..44fa12eb5b 100644 --- a/contracts/wasm/donatewithfeedback/src/params.rs +++ b/contracts/wasm/donatewithfeedback/src/params.rs @@ -13,6 +13,7 @@ use wasmlib::host::*; use crate::*; use crate::keys::*; +use crate::structs::*; #[derive(Clone, Copy)] pub struct ImmutableDonateParams { diff --git a/contracts/wasm/donatewithfeedback/src/structs.rs b/contracts/wasm/donatewithfeedback/src/structs.rs index 6a90fa7752..5b4f9f43a3 100644 --- a/contracts/wasm/donatewithfeedback/src/structs.rs +++ b/contracts/wasm/donatewithfeedback/src/structs.rs @@ -6,6 +6,7 @@ // Change the json schema instead #![allow(dead_code)] +#![allow(unused_imports)] use wasmlib::*; use wasmlib::host::*; diff --git a/contracts/wasm/erc20/src/params.rs b/contracts/wasm/erc20/src/params.rs index 17cb7f1c61..e57011db0e 100644 --- a/contracts/wasm/erc20/src/params.rs +++ b/contracts/wasm/erc20/src/params.rs @@ -13,6 +13,7 @@ use wasmlib::host::*; use crate::*; use crate::keys::*; +use crate::typedefs::*; #[derive(Clone, Copy)] pub struct ImmutableApproveParams { diff --git a/contracts/wasm/erc20/src/results.rs b/contracts/wasm/erc20/src/results.rs index 30ffd7c1f1..8d01ae636d 100644 --- a/contracts/wasm/erc20/src/results.rs +++ b/contracts/wasm/erc20/src/results.rs @@ -13,6 +13,7 @@ use wasmlib::host::*; use crate::*; use crate::keys::*; +use crate::typedefs::*; #[derive(Clone, Copy)] pub struct ImmutableAllowanceResults { diff --git a/contracts/wasm/fairauction/src/params.rs b/contracts/wasm/fairauction/src/params.rs index a9e5bef5d0..8dcbe76892 100644 --- a/contracts/wasm/fairauction/src/params.rs +++ b/contracts/wasm/fairauction/src/params.rs @@ -13,6 +13,8 @@ use wasmlib::host::*; use crate::*; use crate::keys::*; +use crate::structs::*; +use crate::typedefs::*; #[derive(Clone, Copy)] pub struct ImmutableFinalizeAuctionParams { diff --git a/contracts/wasm/fairauction/src/results.rs b/contracts/wasm/fairauction/src/results.rs index c883bf6c12..9c97fda447 100644 --- a/contracts/wasm/fairauction/src/results.rs +++ b/contracts/wasm/fairauction/src/results.rs @@ -14,6 +14,7 @@ use wasmlib::host::*; use crate::*; use crate::keys::*; use crate::structs::*; +use crate::typedefs::*; #[derive(Clone, Copy)] pub struct ImmutableGetInfoResults { diff --git a/contracts/wasm/fairauction/src/structs.rs b/contracts/wasm/fairauction/src/structs.rs index 2ca3e578f6..56084a4539 100644 --- a/contracts/wasm/fairauction/src/structs.rs +++ b/contracts/wasm/fairauction/src/structs.rs @@ -6,9 +6,11 @@ // Change the json schema instead #![allow(dead_code)] +#![allow(unused_imports)] use wasmlib::*; use wasmlib::host::*; +use crate::typedefs::*; pub struct Auction { pub color : ScColor, // color of tokens for sale diff --git a/contracts/wasm/fairroulette/src/params.rs b/contracts/wasm/fairroulette/src/params.rs index 5139e7f947..34de8c2ed4 100644 --- a/contracts/wasm/fairroulette/src/params.rs +++ b/contracts/wasm/fairroulette/src/params.rs @@ -13,6 +13,7 @@ use wasmlib::host::*; use crate::*; use crate::keys::*; +use crate::structs::*; #[derive(Clone, Copy)] pub struct ImmutablePlaceBetParams { diff --git a/contracts/wasm/fairroulette/src/structs.rs b/contracts/wasm/fairroulette/src/structs.rs index 6452db1ea1..52976d2864 100644 --- a/contracts/wasm/fairroulette/src/structs.rs +++ b/contracts/wasm/fairroulette/src/structs.rs @@ -6,6 +6,7 @@ // Change the json schema instead #![allow(dead_code)] +#![allow(unused_imports)] use wasmlib::*; use wasmlib::host::*; diff --git a/contracts/wasm/testwasmlib/src/params.rs b/contracts/wasm/testwasmlib/src/params.rs index 5405642ba6..553bc61a15 100644 --- a/contracts/wasm/testwasmlib/src/params.rs +++ b/contracts/wasm/testwasmlib/src/params.rs @@ -13,6 +13,7 @@ use wasmlib::host::*; use crate::*; use crate::keys::*; +use crate::typedefs::*; #[derive(Clone, Copy)] pub struct ImmutableArrayClearParams { diff --git a/contracts/wasm/testwasmlib/src/results.rs b/contracts/wasm/testwasmlib/src/results.rs index d5b42d0c3a..528943d5aa 100644 --- a/contracts/wasm/testwasmlib/src/results.rs +++ b/contracts/wasm/testwasmlib/src/results.rs @@ -13,6 +13,7 @@ use wasmlib::host::*; use crate::*; use crate::keys::*; +use crate::typedefs::*; #[derive(Clone, Copy)] pub struct ImmutableArrayLengthResults { diff --git a/contracts/wasm/tokenregistry/src/params.rs b/contracts/wasm/tokenregistry/src/params.rs index 66088d60ef..6cf7b6ae67 100644 --- a/contracts/wasm/tokenregistry/src/params.rs +++ b/contracts/wasm/tokenregistry/src/params.rs @@ -13,6 +13,7 @@ use wasmlib::host::*; use crate::*; use crate::keys::*; +use crate::structs::*; #[derive(Clone, Copy)] pub struct ImmutableMintSupplyParams { diff --git a/contracts/wasm/tokenregistry/src/structs.rs b/contracts/wasm/tokenregistry/src/structs.rs index bac94392cd..ce49529d2f 100644 --- a/contracts/wasm/tokenregistry/src/structs.rs +++ b/contracts/wasm/tokenregistry/src/structs.rs @@ -6,6 +6,7 @@ // Change the json schema instead #![allow(dead_code)] +#![allow(unused_imports)] use wasmlib::*; use wasmlib::host::*; diff --git a/tools/schema/generator/emitter.go b/tools/schema/generator/emitter.go index d7aa76f05a..5f96245fe7 100644 --- a/tools/schema/generator/emitter.go +++ b/tools/schema/generator/emitter.go @@ -1,6 +1,7 @@ package generator import ( + "fmt" "regexp" "strconv" "strings" @@ -8,6 +9,8 @@ import ( "github.com/iotaledger/wasp/packages/iscp" ) +const enableLog = false + const ( KeyArray = "array" KeyBaseType = "basetype" @@ -37,12 +40,35 @@ const ( var emitKeyRegExp = regexp.MustCompile(`\$[a-zA-Z_]+`) +func (g *GenBase) indent() { + g.tab++ +} + +func (g *GenBase) undent() { + g.tab-- +} + +func (g *GenBase) log(text string) { + if !enableLog { + return + } + + for i := 0; i < g.tab; i++ { + fmt.Print(" ") + } + fmt.Println(text) +} + // emit processes "$#emit template" // It processes all lines in the named template // If the template is non-existent nothing will happen // Any line starting with a special "$#" directive will recursively be processed // An unknown directive will result in an error func (g *GenBase) emit(template string) { + g.log("$#emit " + template) + g.indent() + defer g.undent() + lines := strings.Split(g.templates[template], "\n") for i := 1; i < len(lines)-1; i++ { // replace any placeholder keys @@ -87,6 +113,10 @@ func (g *GenBase) emit(template string) { // It processes the template for each item in the array // Produces an error if the array key is unknown func (g *GenBase) emitEach(line string) { + g.log(line) + g.indent() + defer g.undent() + parts := strings.Split(line, " ") if len(parts) != 3 { g.error(line) @@ -126,6 +156,7 @@ func (g *GenBase) emitEach(line string) { func (g *GenBase) emitEachEvent(events []*Struct, template string) { for _, g.currentEvent = range events { + g.log("currentEvent: " + g.currentEvent.Name) g.setMultiKeyValues("evtName", g.currentEvent.Name) g.emit(template) } @@ -146,6 +177,7 @@ func (g *GenBase) emitEachField(fields []*Field, template string) { } for _, g.currentField = range fields { + g.log("currentField: " + g.currentField.Name) g.gen.setFieldKeys(true) g.emit(template) } @@ -166,6 +198,7 @@ func (g *GenBase) emitEachFunc(funcs []*Func, template string) { } for _, g.currentFunc = range funcs { + g.log("currentFunc: " + g.currentFunc.Name) g.gen.setFuncKeys() g.emit(template) } @@ -183,6 +216,7 @@ func (g *GenBase) emitEachMandatoryField(template string) { func (g *GenBase) emitEachStruct(structs []*Struct, template string) { for _, g.currentStruct = range structs { + g.log("currentStruct: " + g.currentStruct.Name) g.setMultiKeyValues("strName", g.currentStruct.Name) g.emit(template) } @@ -192,6 +226,10 @@ func (g *GenBase) emitEachStruct(structs []*Struct, template string) { // It can call back into go code to emit more complex stuff // Produces an error if emitter is unknown func (g *GenBase) emitFunc(line string) { + g.log(line) + g.indent() + defer g.undent() + parts := strings.Split(line, " ") if len(parts) != 2 { g.error(line) @@ -212,6 +250,10 @@ func (g *GenBase) emitFunc(line string) { // Produces an error if named condition is unknown //nolint:funlen func (g *GenBase) emitIf(line string) { + g.log(line) + g.indent() + defer g.undent() + parts := strings.Split(line, " ") if len(parts) < 3 || len(parts) > 4 { g.error(line) @@ -288,6 +330,8 @@ func (g *GenBase) emitIf(line string) { // The special key "exist" is used to add a newly generated type // It can be used to prevent duplicate types from being generated func (g *GenBase) emitSet(line string) { + g.log(line) + parts := strings.Split(line, " ") if len(parts) < 3 { g.error(line) @@ -334,6 +378,23 @@ func (g *GenBase) setCommonKeys() { } func (g *GenBase) setFieldKeys(pad bool) { + tmp := make(map[string]string) + for k, v := range g.keys { + if len(k) < 3 { + continue + } + switch k[:3] { + case "fld": + tmp["old"+k[3:]] = v + case "Fld": + tmp["Old"+k[3:]] = v + case "FLD": + tmp["OLD"+k[3:]] = v + } + } + for k, v := range tmp { + g.keys[k] = v + } g.setMultiKeyValues("fldName", g.currentField.Name) g.setMultiKeyValues("fldType", g.currentField.Type) diff --git a/tools/schema/generator/generator.go b/tools/schema/generator/generator.go index ba98635867..47e4e556d5 100644 --- a/tools/schema/generator/generator.go +++ b/tools/schema/generator/generator.go @@ -42,6 +42,7 @@ type GenBase struct { newTypes map[string]bool rootFolder string s *Schema + tab int templates map[string]string } diff --git a/tools/schema/generator/gotemplates/alltemplates.go b/tools/schema/generator/gotemplates/alltemplates.go index 83b5007a31..28e71bceb5 100644 --- a/tools/schema/generator/gotemplates/alltemplates.go +++ b/tools/schema/generator/gotemplates/alltemplates.go @@ -40,5 +40,14 @@ import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" "goHeader": ` $#emit goPackage $#emit importWasmLib +`, + // ******************************* + "setVarType": ` +$#set varType wasmlib.TYPE_MAP +$#if array setVarTypeArray +`, + // ******************************* + "setVarTypeArray": ` +$#set varType $arrayTypeID|$fldTypeID `, } diff --git a/tools/schema/generator/gotemplates/proxy.go b/tools/schema/generator/gotemplates/proxy.go index 814a8abdf9..4ea6a2f3f0 100644 --- a/tools/schema/generator/gotemplates/proxy.go +++ b/tools/schema/generator/gotemplates/proxy.go @@ -18,7 +18,11 @@ $#if map proxyMap proxyMethods3 `, // ******************************* "proxyMethods3": ` -$#if basetype proxyBaseType proxyNewType +$#if basetype proxyBaseType proxyMethods4 +`, + // ******************************* + "proxyMethods4": ` +$#if typedef proxyTypeDef proxyStruct `, // ******************************* "setCoreVarID": ` @@ -59,7 +63,16 @@ func (s $TypeName) $FldName() wasmlib.Sc$mut$FldType { } `, // ******************************* - "proxyNewType": ` + "proxyTypeDef": ` +$#emit setVarType + +func (s $TypeName) $OldName() $mut$OldType { + subID := wasmlib.GetObjectID(s.id, $varID, $varType) + return $mut$OldType{objID: subID} +} +`, + // ******************************* + "proxyStruct": ` func (s $TypeName) $FldName() $mut$FldType { return $mut$FldType{objID: s.id, keyID: $varID} diff --git a/tools/schema/generator/gotemplates/typedefs.go b/tools/schema/generator/gotemplates/typedefs.go index 5ce1ff1ecc..a00a8be852 100644 --- a/tools/schema/generator/gotemplates/typedefs.go +++ b/tools/schema/generator/gotemplates/typedefs.go @@ -59,13 +59,11 @@ func (a $proxy) Get$FldType(index int32) wasmlib.Sc$mut$FldType { `, // ******************************* "typedefProxyArrayNewOtherType": ` -$#set OldType $FldType $#if typedef typedefProxyArrayNewOtherTypeTypeDef typedefProxyArrayNewOtherTypeStruct `, // ******************************* "typedefProxyArrayNewOtherTypeTypeDef": ` -$#set varType wasmlib.TYPE_MAP -$#if array setVarTypeArray +$#emit setVarType func (a $proxy) Get$OldType(index int32) $mut$OldType { subID := wasmlib.GetObjectID(a.objID, wasmlib.Key32(index), $varType) @@ -110,15 +108,11 @@ func (m $proxy) Get$FldType(key $fldMapKeyLangType) wasmlib.Sc$mut$FldType { `, // ******************************* "typedefProxyMapNewOtherType": ` -$#set OldType $FldType -$#set oldMapKeyLangType $fldMapKeyLangType -$#set oldMapKeyKey $fldMapKeyKey $#if typedef typedefProxyMapNewOtherTypeTypeDef typedefProxyMapNewOtherTypeStruct `, // ******************************* "typedefProxyMapNewOtherTypeTypeDef": ` -$#set varType wasmlib.TYPE_MAP -$#if array setVarTypeArray +$#emit setVarType func (m $proxy) Get$OldType(key $oldMapKeyLangType) $mut$OldType { subID := wasmlib.GetObjectID(m.objID, $oldMapKeyKey.KeyID(), $varType) @@ -131,9 +125,5 @@ func (m $proxy) Get$OldType(key $oldMapKeyLangType) $mut$OldType { func (m $proxy) Get$FldType(key $fldMapKeyLangType) $mut$FldType { return $mut$FldType{objID: m.objID, keyID: $fldMapKeyKey.KeyID()} } -`, - // ******************************* - "setVarTypeArray": ` -$#set varType $arrayTypeID|$fldTypeID `, } diff --git a/tools/schema/generator/rstemplates/alltemplates.go b/tools/schema/generator/rstemplates/alltemplates.go index 9dd49a85a0..17e47c1ade 100644 --- a/tools/schema/generator/rstemplates/alltemplates.go +++ b/tools/schema/generator/rstemplates/alltemplates.go @@ -89,5 +89,14 @@ use crate::typedefs::*; // ******************************* "useWasmLib": ` use wasmlib::*; +`, + // ******************************* + "setVarType": ` +$#set varType TYPE_MAP +$#if array setVarTypeArray +`, + // ******************************* + "setVarTypeArray": ` +$#set varType $arrayTypeID | $fldTypeID `, } diff --git a/tools/schema/generator/rstemplates/params.go b/tools/schema/generator/rstemplates/params.go index fe33636bfe..81c9a9253b 100644 --- a/tools/schema/generator/rstemplates/params.go +++ b/tools/schema/generator/rstemplates/params.go @@ -18,6 +18,7 @@ use wasmlib::host::*; use crate::*; use crate::keys::*; $#if structs useStructs +$#if typedefs useTypeDefs `, // ******************************* "paramsFunc": ` diff --git a/tools/schema/generator/rstemplates/proxy.go b/tools/schema/generator/rstemplates/proxy.go index 84c60b0936..9070f680a3 100644 --- a/tools/schema/generator/rstemplates/proxy.go +++ b/tools/schema/generator/rstemplates/proxy.go @@ -20,7 +20,11 @@ $#if map proxyMap proxyMethods3 `, // ******************************* "proxyMethods3": ` -$#if basetype proxyBaseType proxyNewType +$#if basetype proxyBaseType proxyMethods4 +`, + // ******************************* + "proxyMethods4": ` +$#if typedef proxyTypeDef proxyStruct `, // ******************************* "setCoreVarID": ` @@ -57,7 +61,15 @@ $#if this proxyMapThis proxyMapOther } `, // ******************************* - "proxyNewType": ` + "proxyTypeDef": ` +$#emit setVarType + pub fn $old_name(&self) -> $mut$OldType { + let sub_id = get_object_id(self.id, $varID, $varType); + $mut$OldType { obj_id: sub_id } + } +`, + // ******************************* + "proxyStruct": ` pub fn $fld_name(&self) -> $mut$FldType { $mut$FldType { obj_id: self.id, key_id: $varID } } diff --git a/tools/schema/generator/rstemplates/results.go b/tools/schema/generator/rstemplates/results.go index 54af672184..80b11aa37a 100644 --- a/tools/schema/generator/rstemplates/results.go +++ b/tools/schema/generator/rstemplates/results.go @@ -18,6 +18,7 @@ use wasmlib::host::*; use crate::*; use crate::keys::*; $#if structs useStructs +$#if typedefs useTypeDefs `, // ******************************* "resultsFunc": ` diff --git a/tools/schema/generator/rstemplates/structs.go b/tools/schema/generator/rstemplates/structs.go index 99bae78f23..10b7aae075 100644 --- a/tools/schema/generator/rstemplates/structs.go +++ b/tools/schema/generator/rstemplates/structs.go @@ -4,9 +4,11 @@ var structsRs = map[string]string{ // ******************************* "structs.rs": ` #![allow(dead_code)] +#![allow(unused_imports)] use wasmlib::*; use wasmlib::host::*; +$#if typedefs useTypeDefs $#each structs structType `, // ******************************* diff --git a/tools/schema/generator/rstemplates/typedefs.go b/tools/schema/generator/rstemplates/typedefs.go index ff6881477e..ce101ff8c1 100644 --- a/tools/schema/generator/rstemplates/typedefs.go +++ b/tools/schema/generator/rstemplates/typedefs.go @@ -65,14 +65,11 @@ $#set exist $proxy `, // ******************************* "typedefProxyArrayNewOtherType": ` -$#set OldType $FldType $#if typedef typedefProxyArrayNewOtherTypeTypeDef typedefProxyArrayNewOtherTypeStruct `, // ******************************* "typedefProxyArrayNewOtherTypeTypeDef": ` -$#set varType TYPE_MAP -$#if array setVarTypeArray - +$#emit setVarType pub fn Get$OldType(&self, index: i32) -> $mut$OldType { let sub_id = get_object_id(self.obj_id, Key32(index), $varType); $mut$OldType { obj_id: sub_id } @@ -117,16 +114,11 @@ $#set exist $proxy `, // ******************************* "typedefProxyMapNewOtherType": ` -$#set old_type $fld_type -$#set OldType $FldType -$#set oldMapKeyLangType $fldMapKeyLangType -$#set oldMapKeyKey $fldMapKeyKey $#if typedef typedefProxyMapNewOtherTypeTypeDef typedefProxyMapNewOtherTypeStruct `, // ******************************* "typedefProxyMapNewOtherTypeTypeDef": ` -$#set varType TYPE_MAP -$#if array setVarTypeArray +$#emit setVarType pub fn get_$old_type(&self, key: $oldMapKeyLangType) -> $mut$OldType { let sub_id = get_object_id(self.obj_id, key.get_key_id(), $varType); $mut$OldType { obj_id: sub_id } @@ -134,12 +126,8 @@ $#if array setVarTypeArray `, // ******************************* "typedefProxyMapNewOtherTypeStruct": ` - pub fn get_$old_type(&self, key: $oldMapKeyLangType) -> $mut$OldType { - $mut$OldType { obj_id: self.obj_id, key_id: key.get_key_id() } + pub fn get_$fld_type(&self, key: $fldMapKeyLangType) -> $mut$FldType { + $mut$FldType { obj_id: self.obj_id, key_id: key.get_key_id() } } -`, - // ******************************* - "setVarTypeArray": ` -$#set varType $arrayTypeID | $fldTypeID `, } diff --git a/tools/schema/generator/tstemplates/alltemplates.go b/tools/schema/generator/tstemplates/alltemplates.go index 88b494818c..5a670a947f 100644 --- a/tools/schema/generator/tstemplates/alltemplates.go +++ b/tools/schema/generator/tstemplates/alltemplates.go @@ -46,5 +46,14 @@ $#emit importSc "extends": "assemblyscript/std/assembly.json", "include": ["./*.ts"] } +`, + // ******************************* + "setVarType": ` +$#set varType wasmlib.TYPE_MAP +$#if array setVarTypeArray +`, + // ******************************* + "setVarTypeArray": ` +$#set varType $arrayTypeID|$fldTypeID `, } diff --git a/tools/schema/generator/tstemplates/proxy.go b/tools/schema/generator/tstemplates/proxy.go index 9f03571eee..1cef0b8798 100644 --- a/tools/schema/generator/tstemplates/proxy.go +++ b/tools/schema/generator/tstemplates/proxy.go @@ -20,7 +20,11 @@ $#if map proxyMap proxyMethods3 `, // ******************************* "proxyMethods3": ` -$#if basetype proxyBaseType proxyNewType +$#if basetype proxyBaseType proxyMethods4 +`, + // ******************************* + "proxyMethods4": ` +$#if typedef proxyTypeDef proxyStruct `, // ******************************* "setCoreVarID": ` @@ -57,7 +61,15 @@ $#if this proxyMapThis proxyMapOther } `, // ******************************* - "proxyNewType": ` + "proxyTypeDef": ` +$#emit setVarType + $oldName(): sc.$mut$OldType { + let subID = wasmlib.getObjectID(this.mapID, $varID, $varType); + return new sc.$mut$OldType(subID); + } +`, + // ******************************* + "proxyStruct": ` $fldName(): sc.$mut$FldType { return new sc.$mut$FldType(this.mapID, $varID); } diff --git a/tools/schema/generator/tstemplates/typedefs.go b/tools/schema/generator/tstemplates/typedefs.go index a087480dab..281f94e646 100644 --- a/tools/schema/generator/tstemplates/typedefs.go +++ b/tools/schema/generator/tstemplates/typedefs.go @@ -64,13 +64,11 @@ $#set exist $proxy `, // ******************************* "typedefProxyArrayNewOtherType": ` -$#set OldType $FldType $#if typedef typedefProxyArrayNewOtherTypeTypeDef typedefProxyArrayNewOtherTypeStruct `, // ******************************* "typedefProxyArrayNewOtherTypeTypeDef": ` -$#set varType wasmlib.TYPE_MAP -$#if array setVarTypeArray +$#emit setVarType Get$OldType(index: i32): sc.$mut$OldType { let subID = wasmlib.getObjectID(this.objID, new wasmlib.Key32(index), $varType); @@ -119,16 +117,11 @@ $#set exist $proxy `, // ******************************* "typedefProxyMapNewOtherType": ` -$#set oldType $fldType -$#set OldType $FldType -$#set oldMapKeyLangType $fldMapKeyLangType -$#set oldMapKeyKey $fldMapKeyKey $#if typedef typedefProxyMapNewOtherTypeTypeDef typedefProxyMapNewOtherTypeStruct `, // ******************************* "typedefProxyMapNewOtherTypeTypeDef": ` -$#set varType wasmlib.TYPE_MAP -$#if array setVarTypeArray +$#emit setVarType get$OldType(key: $oldMapKeyLangType): sc.$mut$OldType { let subID = wasmlib.getObjectID(this.objID, $oldMapKeyKey.getKeyID(), $varType); @@ -138,12 +131,8 @@ $#if array setVarTypeArray // ******************************* "typedefProxyMapNewOtherTypeStruct": ` - get$OldType(key: $oldMapKeyLangType): sc.$mut$OldType { - return new sc.$mut$OldType(this.objID, $oldMapKeyKey.getKeyID()); + get$FldType(key: $fldMapKeyLangType): sc.$mut$FldType { + return new sc.$mut$FldType(this.objID, $fldMapKeyKey.getKeyID()); } -`, - // ******************************* - "setVarTypeArray": ` -$#set varType $arrayTypeID|$fldTypeID `, } From 119af7ff322dfc024dd02d649fc7b72dcd83fe1e Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Mon, 22 Nov 2021 20:08:51 -0800 Subject: [PATCH 105/198] Update fairroulette service to account for default timestamp field --- .../fairroulette_client/fair_roulette_service.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/contracts/wasm/fairroulette/frontend/src/lib/fairroulette_client/fair_roulette_service.ts b/contracts/wasm/fairroulette/frontend/src/lib/fairroulette_client/fair_roulette_service.ts index ed5b5434c0..8c9e21baf0 100644 --- a/contracts/wasm/fairroulette/frontend/src/lib/fairroulette_client/fair_roulette_service.ts +++ b/contracts/wasm/fairroulette/frontend/src/lib/fairroulette_client/fair_roulette_service.ts @@ -64,9 +64,9 @@ export class FairRouletteService { const messageHandlers: MessageHandlers = { 'fairroulette.bet': (index) => { const bet: Bet = { - better: message[index + 1], - amount: Number(message[index + 2]), - betNumber: Number(message[index + 3]), + better: message[index + 2], + amount: Number(message[index + 3]), + betNumber: Number(message[index + 4]), }; this.emitter.emit('betPlaced', bet); @@ -74,8 +74,8 @@ export class FairRouletteService { 'fairroulette.payout': (index) => { const bet: Bet = { - better: message[index + 1], - amount: Number(message[index + 2]), + better: message[index + 2], + amount: Number(message[index + 3]), betNumber: undefined, }; @@ -83,7 +83,7 @@ export class FairRouletteService { }, 'fairroulette.round': (index) => { - this.emitter.emit('roundNumber', message[index + 1] || 0); + this.emitter.emit('roundNumber', message[index + 2] || 0); }, 'fairroulette.start': (index) => { @@ -95,7 +95,7 @@ export class FairRouletteService { }, 'fairroulette.winner': (index) => { - this.emitter.emit('winningNumber', message[index + 1] || 0); + this.emitter.emit('winningNumber', message[index + 2] || 0); }, }; From 3b63140d70b3512eb0c8d7987c53212cef92e953 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 23 Nov 2021 11:33:29 +0200 Subject: [PATCH 106/198] Committee peer group separated to different interface --- packages/chain/chain.go | 24 +++- packages/chain/chainimpl/chainimpl.go | 19 ++-- packages/chain/chainimpl/eventproc.go | 2 +- packages/chain/chainimpl/interface.go | 35 +----- packages/chain/chainpeering/chain_peers.go | 54 +++++++++ .../chainpeering/committee_peer_group.go | 78 +++++++++++++ packages/chain/committee/committee.go | 59 ++-------- packages/chain/committee/committee_test.go | 2 +- packages/chain/consensus/action.go | 6 +- .../consensus/commonsubset/commonsubset.go | 48 ++++---- .../commonsubset/commonsubset_test.go | 13 ++- .../commonsubset/commonsubsetcoordinator.go | 27 ++--- .../consensus/commonsubset/setup_test.go | 107 ------------------ packages/chain/consensus/consensus.go | 6 +- packages/chain/consensus/setup_test.go | 10 +- packages/chain/statemgr/eventproc.go | 2 +- packages/chain/statemgr/setup_test.go | 23 ++-- packages/chain/statemgr/statemgr.go | 8 +- packages/chain/statemgr/syncmgr.go | 2 +- packages/peering/domain/domain.go | 12 -- packages/peering/domain/domain_test.go | 8 +- packages/peering/peering.go | 1 - .../testutil/testchain/mock_chain_core.go | 24 +--- packages/webapi/request/request_test.go | 2 +- 24 files changed, 254 insertions(+), 318 deletions(-) create mode 100644 packages/chain/chainpeering/chain_peers.go create mode 100644 packages/chain/chainpeering/committee_peer_group.go delete mode 100644 packages/chain/consensus/commonsubset/setup_test.go diff --git a/packages/chain/chain.go b/packages/chain/chain.go index 8190487cef..11271586d6 100644 --- a/packages/chain/chain.go +++ b/packages/chain/chain.go @@ -24,9 +24,6 @@ import ( type ChainCore interface { ID() *iscp.ChainID GetCommitteeInfo() *CommitteeInfo - AttachToPeerMessages(receiver byte, fun func(recv *peering.PeerMessageIn)) - SendPeerMsgByNetID(netID string, msgReceiver byte, msgType byte, msgData []byte) - SendPeerMsgToRandomPeers(upToNumPeers uint16, msgReceiver byte, msgType byte, msgData []byte) StateCandidateToStateManager(state.VirtualStateAccess, ledgerstate.OutputID) Events() ChainEvents Processors() *processors.Cache @@ -66,6 +63,14 @@ type ChainEvents interface { ChainTransition() *events.Event } +type ChainPeers interface { + AttachToPeerMessages(receiver byte, fun func(recv *peering.PeerMessageIn)) + SendPeerMsgByNetID(netID string, msgReceiver byte, msgType byte, msgData []byte) + SendPeerMsgToRandomPeers(upToNumPeers int, msgReceiver byte, msgType byte, msgData []byte) + GetRandomPeers(upToNumPeers int) []string + Close() +} + type Chain interface { ChainCore ChainRequests @@ -79,12 +84,9 @@ type Committee interface { Quorum() uint16 OwnPeerIndex() uint16 DKShare() *tcrypto.DKShare - SendMsgByIndex(peerIdx uint16, msgReceiver byte, msgType byte, msgData []byte) error - SendMsgBroadcast(msgReceiver byte, msgType byte, msgData []byte, except ...uint16) IsAlivePeer(peerIndex uint16) bool QuorumIsAlive(quorum ...uint16) bool PeerStatus() []*PeerStatus - AttachToPeerMessages(receiver byte, fun func(recv *peering.PeerMessageGroupIn)) IsReady() bool Close() RunACSConsensus(value []byte, sessionID uint64, stateIndex uint32, callback func(sessionID uint64, acs [][]byte)) @@ -92,6 +94,16 @@ type Committee interface { GetRandomValidators(upToN int) []string } +type CommitteePeerGroup interface { + SendMsgByIndex(peerIdx uint16, msgReceiver byte, msgType byte, msgData []byte) error + SendMsgBroadcast(msgReceiver byte, msgType byte, msgData []byte, except ...uint16) + AttachToPeerMessages(receiver byte, fun func(recv *peering.PeerMessageGroupIn)) + SelfIndex() uint16 + AllNodes(except ...uint16) map[uint16]peering.PeerSender + OtherNodes(except ...uint16) map[uint16]peering.PeerSender + Close() +} + type NodeConnection interface { PullBacklog(addr *ledgerstate.AliasAddress) PullState(addr *ledgerstate.AliasAddress) diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index 1687c65273..51e8978503 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -13,6 +13,7 @@ import ( "github.com/iotaledger/hive.go/kvstore" "github.com/iotaledger/hive.go/logger" "github.com/iotaledger/wasp/packages/chain" + "github.com/iotaledger/wasp/packages/chain/chainpeering" "github.com/iotaledger/wasp/packages/chain/committee" "github.com/iotaledger/wasp/packages/chain/consensus" "github.com/iotaledger/wasp/packages/chain/mempool" @@ -68,14 +69,12 @@ type chainObj struct { blobProvider registry.BlobCache eventRequestProcessed *events.Event eventChainTransition *events.Event - peers *peering.PeerDomainProvider + chainPeers chain.ChainPeers offLedgerReqsAcksMutex sync.RWMutex offLedgerReqsAcks map[iscp.RequestID][]string offledgerBroadcastUpToNPeers int offledgerBroadcastInterval time.Duration pullMissingRequestsFromCommittee bool - peeringID peering.PeeringID - attachIDs []interface{} chainMetrics metrics.ChainMetrics dismissChainMsgPipe pipe.Pipe stateMsgPipe pipe.Pipe @@ -135,8 +134,6 @@ func NewChain( offledgerBroadcastUpToNPeers: offledgerBroadcastUpToNPeers, offledgerBroadcastInterval: offledgerBroadcastInterval, pullMissingRequestsFromCommittee: pullMissingRequestsFromCommittee, - peeringID: chainID.Array(), - attachIDs: make([]interface{}, 0), chainMetrics: chainMetrics, dismissChainMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), stateMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), @@ -154,9 +151,9 @@ func NewChain( log.Errorf("NewChain: %v", err) return nil } - ret.peers = &peers - ret.stateMgr = statemgr.New(db, ret, peers, ret.nodeConn) - ret.AttachToPeerMessages(chain.PeerMessageReceiverChain, ret.receiveChainPeerMessages) + ret.chainPeers = chainpeering.NewChainPeers(chainID.Array(), peers) + ret.stateMgr = statemgr.New(db, ret, ret.chainPeers, ret.nodeConn) + ret.chainPeers.AttachToPeerMessages(chain.PeerMessageReceiverChain, ret.receiveChainPeerMessages) go ret.handleMessagesLoop() ret.startTimer() return ret @@ -351,7 +348,7 @@ func (c *chainObj) getOwnCommitteeRecord(addr ledgerstate.Address) (*registry.Co func (c *chainObj) createNewCommitteeAndConsensus(cmtRec *registry.CommitteeRecord) error { c.log.Debugf("createNewCommitteeAndConsensus: creating a new committee...") - cmt, err := committee.New( + cmt, cmtPeerGroup, err := committee.New( cmtRec, c.chainID, c.netProvider, @@ -364,9 +361,9 @@ func (c *chainObj) createNewCommitteeAndConsensus(cmtRec *registry.CommitteeReco return xerrors.Errorf("createNewCommitteeAndConsensus: failed to create committee object for state address %s: %w", cmtRec.Address.Base58(), err) } - cmt.AttachToPeerMessages(chain.PeerMessageReceiverChain, c.receiveCommitteePeerMessages) + cmtPeerGroup.AttachToPeerMessages(chain.PeerMessageReceiverChain, c.receiveCommitteePeerMessages) c.log.Debugf("creating new consensus object...") - c.consensus = consensus.New(c, c.mempool, cmt, c.nodeConn, c.pullMissingRequestsFromCommittee, c.chainMetrics) + c.consensus = consensus.New(c, c.mempool, cmt, cmtPeerGroup, c.nodeConn, c.pullMissingRequestsFromCommittee, c.chainMetrics) c.setCommittee(cmt) c.log.Infof("NEW COMMITTEE OF VALIDATORS has been initialized for the state address %s", cmtRec.Address.Base58()) diff --git a/packages/chain/chainimpl/eventproc.go b/packages/chain/chainimpl/eventproc.go index e839d5d9a7..1f754ca0b4 100644 --- a/packages/chain/chainimpl/eventproc.go +++ b/packages/chain/chainimpl/eventproc.go @@ -174,7 +174,7 @@ func (c *chainObj) handleMissingRequestIDsMsg(msg *messages.MissingRequestIDsMsg c.log.Debugf("handleMissingRequestIDsMsg: finding reqID %s...", reqID.Base58()) if req := c.mempool.GetRequest(reqID); req != nil { resultMsg := &messages.MissingRequestMsg{Request: req} - c.SendPeerMsgByNetID(msg.SenderNetID, chain.PeerMessageReceiverChain, chain.PeerMsgTypeMissingRequest, resultMsg.Bytes()) + c.chainPeers.SendPeerMsgByNetID(msg.SenderNetID, chain.PeerMessageReceiverChain, chain.PeerMsgTypeMissingRequest, resultMsg.Bytes()) c.log.Warnf("handleMissingRequestIDsMsg: reqID %s sent to %v.", reqID.Base58(), msg.SenderNetID) } else { c.log.Warnf("handleMissingRequestIDsMsg: reqID %s not found.", reqID.Base58()) diff --git a/packages/chain/chainimpl/interface.go b/packages/chain/chainimpl/interface.go index e2d73d8eff..ba7f0bece7 100644 --- a/packages/chain/chainimpl/interface.go +++ b/packages/chain/chainimpl/interface.go @@ -14,7 +14,6 @@ import ( "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/coreutil" "github.com/iotaledger/wasp/packages/iscp/request" - "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/publisher" "github.com/iotaledger/wasp/packages/registry" "github.com/iotaledger/wasp/packages/state" @@ -82,9 +81,7 @@ func (c *chainObj) Dismiss(reason string) { } c.eventRequestProcessed.DetachAll() c.eventChainTransition.DetachAll() - for _, attachID := range c.attachIDs { - (*c.peers).Detach(attachID) - } + c.chainPeers.Close() }) publisher.Publish("dismissed_chain", c.chainID.Base58()) @@ -95,30 +92,6 @@ func (c *chainObj) IsDismissed() bool { return c.dismissed.Load() } -func (c *chainObj) AttachToPeerMessages(msgReceiver byte, fun func(recv *peering.PeerMessageIn)) { - c.attachIDs = append(c.attachIDs, (*c.peers).Attach(&c.peeringID, msgReceiver, fun)) -} - -func (c *chainObj) SendPeerMsgByNetID(netID string, msgReceiver, msgType byte, msgData []byte) { - (*c.peers).SendMsgByNetID(netID, &peering.PeerMessageData{ - PeeringID: c.peeringID, - Timestamp: time.Now().UnixNano(), - MsgReceiver: msgReceiver, - MsgType: msgType, - MsgData: msgData, - }) -} - -func (c *chainObj) SendPeerMsgToRandomPeers(upToNumPeers uint16, msgReceiver, msgType byte, msgData []byte) { - (*c.peers).SendMsgToRandomPeers(upToNumPeers, &peering.PeerMessageData{ - PeeringID: c.peeringID, - Timestamp: time.Now().UnixNano(), - MsgReceiver: msgReceiver, - MsgType: msgType, - MsgData: msgData, - }) -} - func (c *chainObj) StateCandidateToStateManager(virtualState state.VirtualStateAccess, outputID ledgerstate.OutputID) { c.stateMgr.EventStateCandidateMsg(virtualState, outputID) } @@ -139,7 +112,7 @@ func (c *chainObj) broadcastOffLedgerRequest(req *request.OffLedger) { Req: req, } committee := c.getCommittee() - getPeerIDs := (*c.peers).GetRandomPeers + getPeerIDs := c.chainPeers.GetRandomPeers if committee != nil { getPeerIDs = committee.GetRandomValidators @@ -150,7 +123,7 @@ func (c *chainObj) broadcastOffLedgerRequest(req *request.OffLedger) { for _, peerID := range peerIDs { if shouldSendToPeer(peerID, ackPeers) { c.log.Debugf("sending offledger request ID: reqID: %s, peerID: %s", req.ID().Base58(), peerID) - c.SendPeerMsgByNetID(peerID, chain.PeerMessageReceiverChain, chain.PeerMsgTypeOffLedgerRequest, msg.Bytes()) + c.chainPeers.SendPeerMsgByNetID(peerID, chain.PeerMessageReceiverChain, chain.PeerMsgTypeOffLedgerRequest, msg.Bytes()) } } } @@ -189,7 +162,7 @@ func (c *chainObj) sendRequestAcknowledgementMsg(reqID iscp.RequestID, peerID st return } msg := &messages.RequestAckMsg{ReqID: &reqID} - c.SendPeerMsgByNetID(peerID, chain.PeerMessageReceiverChain, chain.PeerMsgTypeRequestAck, msg.Bytes()) + c.chainPeers.SendPeerMsgByNetID(peerID, chain.PeerMessageReceiverChain, chain.PeerMsgTypeRequestAck, msg.Bytes()) } func (c *chainObj) ReceiveTransaction(tx *ledgerstate.Transaction) { diff --git a/packages/chain/chainpeering/chain_peers.go b/packages/chain/chainpeering/chain_peers.go new file mode 100644 index 0000000000..c01b1dbbcb --- /dev/null +++ b/packages/chain/chainpeering/chain_peers.go @@ -0,0 +1,54 @@ +package chainpeering + +import ( + "time" + + "github.com/iotaledger/wasp/packages/chain" + "github.com/iotaledger/wasp/packages/peering" +) + +type ChainPeersImpl struct { + peeringID peering.PeeringID + peers peering.PeerDomainProvider + attachIDs []interface{} +} + +var _ chain.ChainPeers = &ChainPeersImpl{} + +func NewChainPeers(peeringID peering.PeeringID, peers peering.PeerDomainProvider) chain.ChainPeers { + return &ChainPeersImpl{ + peeringID: peeringID, + peers: peers, + attachIDs: make([]interface{}, 0), + } +} + +func (cpiT *ChainPeersImpl) AttachToPeerMessages(receiver byte, fun func(recv *peering.PeerMessageIn)) { + cpiT.attachIDs = append(cpiT.attachIDs, cpiT.peers.Attach(&cpiT.peeringID, receiver, fun)) +} + +func (cpiT *ChainPeersImpl) SendPeerMsgByNetID(netID string, msgReceiver, msgType byte, msgData []byte) { + cpiT.peers.SendMsgByNetID(netID, &peering.PeerMessageData{ + PeeringID: cpiT.peeringID, + Timestamp: time.Now().UnixNano(), + MsgReceiver: msgReceiver, + MsgType: msgType, + MsgData: msgData, + }) +} + +func (cpiT *ChainPeersImpl) SendPeerMsgToRandomPeers(upToNumPeers int, msgReceiver, msgType byte, msgData []byte) { + for _, netID := range cpiT.GetRandomPeers(upToNumPeers) { + cpiT.SendPeerMsgByNetID(netID, msgReceiver, msgType, msgData) + } +} + +func (cpiT *ChainPeersImpl) GetRandomPeers(upToNumPeers int) []string { + return cpiT.peers.GetRandomPeers(upToNumPeers) +} + +func (cpiT *ChainPeersImpl) Close() { + for _, attachID := range cpiT.attachIDs { + cpiT.peers.Detach(attachID) + } +} diff --git a/packages/chain/chainpeering/committee_peer_group.go b/packages/chain/chainpeering/committee_peer_group.go new file mode 100644 index 0000000000..1d785dd0f1 --- /dev/null +++ b/packages/chain/chainpeering/committee_peer_group.go @@ -0,0 +1,78 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +package chainpeering + +import ( + "fmt" + "time" + + "github.com/iotaledger/wasp/packages/chain" + "github.com/iotaledger/wasp/packages/peering" +) + +type committeePeerGroup struct { + peeringID peering.PeeringID + group peering.GroupProvider + attachIDs []interface{} +} + +var _ chain.CommitteePeerGroup = &committeePeerGroup{} + +func NewCommitteePeerGroup(peeringID peering.PeeringID, group peering.GroupProvider) chain.CommitteePeerGroup { + return &committeePeerGroup{ + peeringID: peeringID, + group: group, + attachIDs: make([]interface{}, 0), + } +} + +func (cpgT *committeePeerGroup) SendMsgByIndex(peerIdx uint16, msgReceiver, msgType byte, msgData []byte) error { + if peer, ok := cpgT.group.OtherNodes()[peerIdx]; ok { + peer.SendMsg(&peering.PeerMessageNet{ + PeerMessageData: peering.PeerMessageData{ + PeeringID: cpgT.peeringID, + Timestamp: time.Now().UnixNano(), + MsgReceiver: msgReceiver, + MsgType: msgType, + MsgData: msgData, + }, + }) + return nil + } + return fmt.Errorf("SendMsg: wrong peer index") +} + +func (cpgT *committeePeerGroup) SendMsgBroadcast(msgReceiver, msgType byte, msgData []byte, except ...uint16) { + msg := &peering.PeerMessageData{ + PeeringID: cpgT.peeringID, + Timestamp: time.Now().UnixNano(), + MsgReceiver: msgReceiver, + MsgType: msgType, + MsgData: msgData, + } + cpgT.group.SendMsgBroadcast(msg, false, except...) +} + +func (cpgT *committeePeerGroup) AttachToPeerMessages(peerMsgReceiver byte, fun func(peerMsg *peering.PeerMessageGroupIn)) { + cpgT.attachIDs = append(cpgT.attachIDs, cpgT.group.Attach(&cpgT.peeringID, peerMsgReceiver, fun)) +} + +func (cpgT *committeePeerGroup) SelfIndex() uint16 { + return cpgT.group.SelfIndex() +} + +func (cpgT *committeePeerGroup) AllNodes(except ...uint16) map[uint16]peering.PeerSender { + return cpgT.group.AllNodes(except...) +} + +func (cpgT *committeePeerGroup) OtherNodes(except ...uint16) map[uint16]peering.PeerSender { + return cpgT.group.AllNodes(except...) +} + +func (cpgT *committeePeerGroup) Close() { + for _, attachID := range cpgT.attachIDs { + cpgT.group.Detach(attachID) + } + cpgT.group.Close() +} diff --git a/packages/chain/committee/committee.go b/packages/chain/committee/committee.go index 9b1f771581..1348815353 100644 --- a/packages/chain/committee/committee.go +++ b/packages/chain/committee/committee.go @@ -5,12 +5,12 @@ package committee import ( "crypto/rand" - "fmt" "time" "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/hive.go/logger" "github.com/iotaledger/wasp/packages/chain" + "github.com/iotaledger/wasp/packages/chain/chainpeering" "github.com/iotaledger/wasp/packages/chain/consensus/commonsubset" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/peering" @@ -25,14 +25,12 @@ type committee struct { isReady *atomic.Bool address ledgerstate.Address peerConfig registry.PeerNetworkConfigProvider - validatorNodes peering.GroupProvider + validatorNodes chain.CommitteePeerGroup acsRunner chain.AsynchronousCommonSubsetRunner - peeringID peering.PeeringID size uint16 quorum uint16 ownIndex uint16 dkshare *tcrypto.DKShare - attachIDs []interface{} log *logger.Logger } @@ -48,21 +46,21 @@ func New( dksProvider registry.DKShareRegistryProvider, log *logger.Logger, acsRunner ...chain.AsynchronousCommonSubsetRunner, // Only for mocking. -) (chain.Committee, error) { +) (chain.Committee, chain.CommitteePeerGroup, error) { // load DKShare from the registry dkshare, err := dksProvider.LoadDKShare(cmtRec.Address) if err != nil { - return nil, xerrors.Errorf("NewCommittee: failed loading DKShare for address %s: %w", cmtRec.Address.Base58(), err) + return nil, nil, xerrors.Errorf("NewCommittee: failed loading DKShare for address %s: %w", cmtRec.Address.Base58(), err) } if dkshare.Index == nil { - return nil, xerrors.Errorf("NewCommittee: wrong DKShare record for address %s: %w", cmtRec.Address.Base58(), err) + return nil, nil, xerrors.Errorf("NewCommittee: wrong DKShare record for address %s: %w", cmtRec.Address.Base58(), err) } if err := checkValidatorNodeIDs(peerConfig, dkshare.N, *dkshare.Index, cmtRec.Nodes); err != nil { - return nil, xerrors.Errorf("NewCommittee: %w", err) + return nil, nil, xerrors.Errorf("NewCommittee: %w", err) } var peers peering.GroupProvider if peers, err = netProvider.PeerGroup(cmtRec.Nodes); err != nil { - return nil, xerrors.Errorf("NewCommittee: failed to create peer group for committee: %+v: %w", cmtRec.Nodes, err) + return nil, nil, xerrors.Errorf("NewCommittee: failed to create peer group for committee: %+v: %w", cmtRec.Nodes, err) } log.Debugf("NewCommittee: peer group: %+v", cmtRec.Nodes) // peerGroupID is calculated by XORing chainID and stateAddr. @@ -78,14 +76,12 @@ func New( ret := &committee{ isReady: atomic.NewBool(false), address: cmtRec.Address, - validatorNodes: peers, - peeringID: peerGroupID, + validatorNodes: chainpeering.NewCommitteePeerGroup(peerGroupID, peers), peerConfig: peerConfig, size: dkshare.N, quorum: dkshare.T, ownIndex: *dkshare.Index, dkshare: dkshare, - attachIDs: make([]interface{}, 0), log: log, } if len(acsRunner) > 0 { @@ -94,16 +90,15 @@ func New( // That's the default implementation of the ACS. // We use it, if the mocked variant was not passed. ret.acsRunner = commonsubset.NewCommonSubsetCoordinator( - ret, netProvider, - peers, + ret.validatorNodes, dkshare, log, ) } go ret.waitReady(waitReady) - return ret, nil + return ret, ret.validatorNodes, nil } func (c *committee) Address() ledgerstate.Address { @@ -130,33 +125,6 @@ func (c *committee) DKShare() *tcrypto.DKShare { return c.dkshare } -func (c *committee) SendMsgByIndex(targetPeerIndex uint16, msgReceiver, msgType byte, msgData []byte) error { - if peer, ok := c.validatorNodes.OtherNodes()[targetPeerIndex]; ok { - peer.SendMsg(&peering.PeerMessageNet{ - PeerMessageData: peering.PeerMessageData{ - PeeringID: c.peeringID, - Timestamp: time.Now().UnixNano(), - MsgReceiver: msgReceiver, - MsgType: msgType, - MsgData: msgData, - }, - }) - return nil - } - return fmt.Errorf("SendMsg: wrong peer index") -} - -func (c *committee) SendMsgBroadcast(msgReceiver, msgType byte, msgData []byte, except ...uint16) { - msg := &peering.PeerMessageData{ - PeeringID: c.peeringID, - Timestamp: time.Now().UnixNano(), - MsgReceiver: msgReceiver, - MsgType: msgType, - MsgData: msgData, - } - c.validatorNodes.SendMsgBroadcast(msg, false, except...) -} - func (c *committee) IsAlivePeer(peerIndex uint16) bool { allNodes := c.validatorNodes.AllNodes() if int(peerIndex) >= len(allNodes) { @@ -208,16 +176,9 @@ func (c *committee) PeerStatus() []*chain.PeerStatus { return ret } -func (c *committee) AttachToPeerMessages(peerMsgReceiver byte, fun func(peerMsg *peering.PeerMessageGroupIn)) { - c.attachIDs = append(c.attachIDs, c.validatorNodes.Attach(&c.peeringID, peerMsgReceiver, fun)) -} - func (c *committee) Close() { c.acsRunner.Close() c.isReady.Store(false) - for _, attachID := range c.attachIDs { - c.validatorNodes.Detach(attachID) - } c.validatorNodes.Close() } diff --git a/packages/chain/committee/committee_test.go b/packages/chain/committee/committee_test.go index 53a4e74704..696af24d72 100644 --- a/packages/chain/committee/committee_test.go +++ b/packages/chain/committee/committee_test.go @@ -35,7 +35,7 @@ func TestCommitteeBasic(t *testing.T) { Address: stateAddr, Nodes: netIDs, } - c, err := New(cmtRec, nil, net0, cfg0, dksRegistries[0], log) + c, _, err := New(cmtRec, nil, net0, cfg0, dksRegistries[0], log) require.NoError(t, err) require.True(t, c.Address().Equals(stateAddr)) require.EqualValues(t, 4, c.Size()) diff --git a/packages/chain/consensus/action.go b/packages/chain/consensus/action.go index 5b20c20f65..b12649f6da 100644 --- a/packages/chain/consensus/action.go +++ b/packages/chain/consensus/action.go @@ -177,7 +177,7 @@ func (c *consensus) pollMissingRequests(missingRequestIndexes []int) { } c.log.Debugf("runVMIfNeeded: asking for missing requests, ids: [%v]", missingRequestIDsString) msg := &messages.MissingRequestIDsMsg{IDs: missingRequestIds} - c.committee.SendMsgBroadcast(chain.PeerMessageReceiverChain, chain.PeerMsgTypeMissingRequestIDs, msg.Bytes()) + c.committeePeerGroup.SendMsgBroadcast(chain.PeerMessageReceiverChain, chain.PeerMsgTypeMissingRequestIDs, msg.Bytes()) } // sortBatch deterministically sorts batch based on the value extracted from the consensus entropy @@ -264,7 +264,7 @@ func (c *consensus) broadcastSignedResultIfNeeded() { EssenceHash: signedResult.EssenceHash, SigShare: signedResult.SigShare, } - c.committee.SendMsgBroadcast(peerMessageReceiverConsensus, peerMsgTypeSignedResult, util.MustBytes(msg), c.resultSigAck...) + c.committeePeerGroup.SendMsgBroadcast(peerMessageReceiverConsensus, peerMsgTypeSignedResult, util.MustBytes(msg), c.resultSigAck...) c.delaySendingSignedResult = time.Now().Add(c.timers.BroadcastSignedResultRetry) c.log.Debugf("broadcastSignedResult: broadcasted: essence hash: %s, chain input %s", @@ -763,7 +763,7 @@ func (c *consensus) receiveSignedResult(msg *messages.SignedResultMsgIn) { ChainInputID: msg.ChainInputID, EssenceHash: msg.EssenceHash, } - if err := c.committee.SendMsgByIndex(msg.SenderIndex, peerMessageReceiverConsensus, peerMsgTypeSignedResultAck, util.MustBytes(msgAck)); err != nil { + if err := c.committeePeerGroup.SendMsgByIndex(msg.SenderIndex, peerMessageReceiverConsensus, peerMsgTypeSignedResultAck, util.MustBytes(msgAck)); err != nil { c.log.Errorf("receiveSignedResult: failed to send acknowledgement: %v", err) } } diff --git a/packages/chain/consensus/commonsubset/commonsubset.go b/packages/chain/consensus/commonsubset/commonsubset.go index bef1bfafab..da9f1e1f9c 100644 --- a/packages/chain/consensus/commonsubset/commonsubset.go +++ b/packages/chain/consensus/commonsubset/commonsubset.go @@ -40,7 +40,6 @@ import ( "github.com/iotaledger/hive.go/logger" "github.com/iotaledger/wasp/packages/chain" "github.com/iotaledger/wasp/packages/chain/consensus/commoncoin" - "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/tcrypto" "github.com/iotaledger/wasp/packages/util" "golang.org/x/xerrors" @@ -63,10 +62,10 @@ type CommonSubset struct { recvMsgBatches []map[uint32]uint32 // [PeerId]ReceivedMbID -> AckedInMb (0 -- unacked). It remains 0, if acked in non-data message. sentMsgBatches map[uint32]*msgBatch // BatchID -> MsgBatch - sessionID uint64 // Unique identifier for this consensus instance. Used to route messages. - stateIndex uint32 // Sequence number of the CS transaction we are agreeing on. - committee chain.Committee - netOwnIndex uint16 // Our index in the group. + sessionID uint64 // Unique identifier for this consensus instance. Used to route messages. + stateIndex uint32 // Sequence number of the CS transaction we are agreeing on. + committeePeerGroup chain.CommitteePeerGroup + netOwnIndex uint16 // Our index in the group. inputCh chan []byte // For our input to the consensus. recvCh chan *msgBatch // For incoming messages. @@ -79,15 +78,14 @@ type CommonSubset struct { func NewCommonSubset( sessionID uint64, stateIndex uint32, - committee chain.Committee, - netGroup peering.GroupProvider, + committeePeerGroup chain.CommitteePeerGroup, dkShare *tcrypto.DKShare, allRandom bool, // Set to true to have real CC rounds for each epoch. That's for testing mostly. outputCh chan map[uint16][]byte, log *logger.Logger, ) (*CommonSubset, error) { - ownIndex := netGroup.SelfIndex() - allNodes := netGroup.AllNodes() + ownIndex := committeePeerGroup.SelfIndex() + allNodes := committeePeerGroup.AllNodes() nodeCount := len(allNodes) nodes := make([]uint64, nodeCount) nodePos := 0 @@ -109,21 +107,21 @@ func NewCommonSubset( CommonCoin: commoncoin.NewBlsCommonCoin(dkShare, salt[:], allRandom), } cs := CommonSubset{ - impl: hbbft.NewACS(acsCfg), - batchCounter: 0, - missingAcks: make(map[uint32]time.Time), - pendingAcks: make([][]uint32, nodeCount), - recvMsgBatches: make([]map[uint32]uint32, nodeCount), - sentMsgBatches: make(map[uint32]*msgBatch), - sessionID: sessionID, - stateIndex: stateIndex, - committee: committee, - netOwnIndex: ownIndex, - inputCh: make(chan []byte, 1), - recvCh: make(chan *msgBatch, 1), - closeCh: make(chan bool), - outputCh: outputCh, - log: log, + impl: hbbft.NewACS(acsCfg), + batchCounter: 0, + missingAcks: make(map[uint32]time.Time), + pendingAcks: make([][]uint32, nodeCount), + recvMsgBatches: make([]map[uint32]uint32, nodeCount), + sentMsgBatches: make(map[uint32]*msgBatch), + sessionID: sessionID, + stateIndex: stateIndex, + committeePeerGroup: committeePeerGroup, + netOwnIndex: ownIndex, + inputCh: make(chan []byte, 1), + recvCh: make(chan *msgBatch, 1), + closeCh: make(chan bool), + outputCh: outputCh, + log: log, } for i := range cs.recvMsgBatches { cs.recvMsgBatches[i] = make(map[uint32]uint32) @@ -378,7 +376,7 @@ func (cs *CommonSubset) send(msgBatch *msgBatch) { return } cs.log.Debugf("ACS::IO - Sending a msgBatch=%+v", msgBatch) - if err := cs.committee.SendMsgByIndex(msgBatch.dst, peerMessageReceiverCommonSubset, peerMsgTypeBatch, msgBatch.Bytes()); err != nil { + if err := cs.committeePeerGroup.SendMsgByIndex(msgBatch.dst, peerMessageReceiverCommonSubset, peerMsgTypeBatch, msgBatch.Bytes()); err != nil { cs.log.Errorf("Error sending message batch %+v: %v", msgBatch, err) } } diff --git a/packages/chain/consensus/commonsubset/commonsubset_test.go b/packages/chain/consensus/commonsubset/commonsubset_test.go index 15e90c1184..862510b848 100644 --- a/packages/chain/consensus/commonsubset/commonsubset_test.go +++ b/packages/chain/consensus/commonsubset/commonsubset_test.go @@ -11,6 +11,7 @@ import ( "time" "github.com/iotaledger/hive.go/logger" + "github.com/iotaledger/wasp/packages/chain/chainpeering" "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/tcrypto" "github.com/iotaledger/wasp/packages/testutil" @@ -62,9 +63,9 @@ func testBasic(t *testing.T, peerCount, threshold uint16, allRandom bool) { for a := range acsPeers { group, err := networkProviders[a].PeerGroup(peerNetIDs) require.Nil(t, err) - cmt := NewCommitteeMock(peeringID, group, t) + cmt := chainpeering.NewCommitteePeerGroup(peeringID, group) acsLog := testlogger.WithLevel(log.Named(fmt.Sprintf("ACS[%02d]", a)), logger.LevelInfo, false) - acsPeers[a], err = NewCommonSubset(0, 0, cmt, group, dkShares[a], allRandom, nil, acsLog) + acsPeers[a], err = NewCommonSubset(0, 0, cmt, dkShares[a], allRandom, nil, acsLog) cmt.AttachToPeerMessages(peerMessageReceiverCommonSubset, makeReceiveCommitteePeerMessagesFun(acsPeers[a], log)) require.Nil(t, err) } @@ -112,9 +113,9 @@ func TestRandomized(t *testing.T) { for a := range acsPeers { group, err := networkProviders[a].PeerGroup(peerNetIDs) require.Nil(t, err) - cmt := NewCommitteeMock(peeringID, group, t) + cmt := chainpeering.NewCommitteePeerGroup(peeringID, group) acsLog := testlogger.WithLevel(log.Named(fmt.Sprintf("ACS[%02d]", a)), logger.LevelInfo, false) - acsPeers[a], err = NewCommonSubset(0, 0, cmt, group, dkShares[a], true, nil, acsLog) + acsPeers[a], err = NewCommonSubset(0, 0, cmt, dkShares[a], true, nil, acsLog) cmt.AttachToPeerMessages(peerMessageReceiverCommonSubset, makeReceiveCommitteePeerMessagesFun(acsPeers[a], log)) require.Nil(t, err) } @@ -212,7 +213,7 @@ func testCoordinator(t *testing.T, peerCount, threshold uint16) { group, err := networkProviders[i].PeerGroup(peerNetIDs) require.Nil(t, err) acsLog := testlogger.WithLevel(log.Named(fmt.Sprintf("CSC[%02d]", i)), logger.LevelInfo, false) - acsCoords[i] = NewCommonSubsetCoordinator(NewCommitteeMock(peeringID, group, t), networkProviders[i], group, dkShares[i], acsLog) + acsCoords[i] = NewCommonSubsetCoordinator(networkProviders[i], chainpeering.NewCommitteePeerGroup(peeringID, group), dkShares[i], acsLog) } t.Logf("ACS Nodes created.") @@ -273,7 +274,7 @@ func testRandomizedWithCC(t *testing.T, peerCount, threshold uint16) { require.Nil(t, err) dkShare, err := dkShares[i].LoadDKShare(dkAddress) require.Nil(t, err) - acsCoords[i] = NewCommonSubsetCoordinator(NewCommitteeMock(peeringID, group, t), networkProviders[i], group, dkShare, logs[i]) + acsCoords[i] = NewCommonSubsetCoordinator(networkProviders[i], chainpeering.NewCommitteePeerGroup(peeringID, group), dkShare, logs[i]) } t.Logf("ACS Nodes created.") diff --git a/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go b/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go index 59726d6624..2b9edc4974 100644 --- a/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go +++ b/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go @@ -52,29 +52,26 @@ type CommonSubsetCoordinator struct { currentStateIndex uint32 // Last state index passed by this node. lock sync.RWMutex - committee chain.Committee - netGroup peering.GroupProvider - dkShare *tcrypto.DKShare - log *logger.Logger + netGroup chain.CommitteePeerGroup + dkShare *tcrypto.DKShare + log *logger.Logger } func NewCommonSubsetCoordinator( - committee chain.Committee, net peering.NetworkProvider, - netGroup peering.GroupProvider, + netGroup chain.CommitteePeerGroup, dkShare *tcrypto.DKShare, log *logger.Logger, ) *CommonSubsetCoordinator { ret := &CommonSubsetCoordinator{ - csInsts: make(map[uint64]*CommonSubset), - csAsked: make(map[uint64]bool), - lock: sync.RWMutex{}, - committee: committee, - netGroup: netGroup, - dkShare: dkShare, - log: log, + csInsts: make(map[uint64]*CommonSubset), + csAsked: make(map[uint64]bool), + lock: sync.RWMutex{}, + netGroup: netGroup, + dkShare: dkShare, + log: log, } - committee.AttachToPeerMessages(peerMessageReceiverCommonSubset, ret.receiveCommitteePeerMessages) + netGroup.AttachToPeerMessages(peerMessageReceiverCommonSubset, ret.receiveCommitteePeerMessages) return ret } @@ -173,7 +170,7 @@ func (csc *CommonSubsetCoordinator) getOrCreateCS( var err error var newCS *CommonSubset outCh := make(chan map[uint16][]byte, 1) - if newCS, err = NewCommonSubset(sessionID, stateIndex, csc.committee, csc.netGroup, csc.dkShare, false, outCh, csc.log); err != nil { + if newCS, err = NewCommonSubset(sessionID, stateIndex, csc.netGroup, csc.dkShare, false, outCh, csc.log); err != nil { return nil, err } csc.csInsts[sessionID] = newCS diff --git a/packages/chain/consensus/commonsubset/setup_test.go b/packages/chain/consensus/commonsubset/setup_test.go deleted file mode 100644 index a7978f3f55..0000000000 --- a/packages/chain/consensus/commonsubset/setup_test.go +++ /dev/null @@ -1,107 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -package commonsubset - -import ( - "fmt" - "testing" - "time" - - "github.com/iotaledger/goshimmer/packages/ledgerstate" - "github.com/iotaledger/wasp/packages/chain" - "github.com/iotaledger/wasp/packages/peering" - "github.com/iotaledger/wasp/packages/tcrypto" -) - -type committeeMock struct { - peeringID peering.PeeringID - group peering.GroupProvider - t *testing.T -} - -var _ chain.Committee = &committeeMock{} - -func NewCommitteeMock(peeringID peering.PeeringID, group peering.GroupProvider, t *testing.T) chain.Committee { - return &committeeMock{ - peeringID: peeringID, - group: group, - t: t, - } -} - -func (cmT *committeeMock) Address() ledgerstate.Address { - panic("Not implemented") -} - -func (cmT *committeeMock) Size() uint16 { - panic("Not implemented") -} - -func (cmT *committeeMock) Quorum() uint16 { - panic("Not implemented") -} - -func (cmT *committeeMock) OwnPeerIndex() uint16 { - panic("Not implemented") -} - -func (cmT *committeeMock) DKShare() *tcrypto.DKShare { - panic("Not implemented") -} - -func (cmT *committeeMock) SendMsgByIndex(peerIdx uint16, msgReceiver, msgType byte, msgData []byte) error { - if peer, ok := cmT.group.OtherNodes()[peerIdx]; ok { - peer.SendMsg(&peering.PeerMessageNet{ - PeerMessageData: peering.PeerMessageData{ - PeeringID: cmT.peeringID, - Timestamp: time.Now().UnixNano(), - MsgReceiver: msgReceiver, - MsgType: msgType, - MsgData: msgData, - }, - }) - return nil - } - return fmt.Errorf("SendMsg: wrong peer index") -} - -func (cmT *committeeMock) SendMsgBroadcast(msgReceiver, msgType byte, msgData []byte, except ...uint16) { - panic("Not implemented") -} - -func (cmT *committeeMock) IsAlivePeer(peerIndex uint16) bool { - panic("Not implemented") -} - -func (cmT *committeeMock) QuorumIsAlive(quorum ...uint16) bool { - panic("Not implemented") -} - -func (cmT *committeeMock) PeerStatus() []*chain.PeerStatus { - panic("Not implemented") -} - -func (cmT *committeeMock) AttachToPeerMessages(peerMsgReceiver byte, fun func(peerMsg *peering.PeerMessageGroupIn)) { - cmT.group.Attach(&cmT.peeringID, peerMsgReceiver, fun) -} - -func (cmT *committeeMock) IsReady() bool { - panic("Not implemented") -} - -func (cmT *committeeMock) Close() { - panic("Not implemented") -} - -func (cmT *committeeMock) RunACSConsensus(value []byte, sessionID uint64, stateIndex uint32, callback func(sessionID uint64, acs [][]byte)) { - panic("Not implemented") -} - -func (cmT *committeeMock) GetOtherValidatorsPeerIDs() []string { - panic("Not implemented") -} - -func (cmT *committeeMock) GetRandomValidators(upToN int) []string { - panic("Not implemented") -} diff --git a/packages/chain/consensus/consensus.go b/packages/chain/consensus/consensus.go index 1c632ae0fa..2e172f9b9f 100644 --- a/packages/chain/consensus/consensus.go +++ b/packages/chain/consensus/consensus.go @@ -27,6 +27,7 @@ type consensus struct { isReady atomic.Bool chain chain.ChainCore committee chain.Committee + committeePeerGroup chain.CommitteePeerGroup mempool chain.Mempool nodeConn chain.NodeConnection vmRunner vm.VMRunner @@ -91,7 +92,7 @@ const ( maxMsgBuffer = 1000 ) -func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Committee, nodeConn chain.NodeConnection, pullMissingRequestsFromCommittee bool, consensusMetrics metrics.ConsensusMetrics, timersOpt ...ConsensusTimers) chain.Consensus { +func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Committee, peerGroup chain.CommitteePeerGroup, nodeConn chain.NodeConnection, pullMissingRequestsFromCommittee bool, consensusMetrics metrics.ConsensusMetrics, timersOpt ...ConsensusTimers) chain.Consensus { var timers ConsensusTimers if len(timersOpt) > 0 { timers = timersOpt[0] @@ -102,6 +103,7 @@ func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Commi ret := &consensus{ chain: chainCore, committee: committee, + committeePeerGroup: peerGroup, mempool: mempool, nodeConn: nodeConn, vmRunner: runvm.NewVMRunner(), @@ -120,7 +122,7 @@ func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Commi pullMissingRequestsFromCommittee: pullMissingRequestsFromCommittee, consensusMetrics: consensusMetrics, } - committee.AttachToPeerMessages(peerMessageReceiverConsensus, ret.receiveCommitteePeerMessages) + ret.committeePeerGroup.AttachToPeerMessages(peerMessageReceiverConsensus, ret.receiveCommitteePeerMessages) ret.refreshConsensusInfo() go ret.recvLoop() return ret diff --git a/packages/chain/consensus/setup_test.go b/packages/chain/consensus/setup_test.go index c8a674d03b..c8e8315cba 100644 --- a/packages/chain/consensus/setup_test.go +++ b/packages/chain/consensus/setup_test.go @@ -155,14 +155,12 @@ func (env *MockedEnv) CreateNodes(timers ConsensusTimers) { func (env *MockedEnv) NewNode(nodeIndex uint16, timers ConsensusTimers) *mockedNode { //nolint:revive nodeID := env.NodeIDs[nodeIndex] log := env.Log.Named(nodeID) - peers, err := env.NetworkProviders[nodeIndex].PeerDomain(env.NodeIDs) - require.NoError(env.T, err) ret := &mockedNode{ NodeID: nodeID, Env: env, NodeConn: testchain.NewMockedNodeConnection("Node_" + nodeID), store: mapdb.NewMapDB(), - ChainCore: testchain.NewMockedChainCore(env.T, env.ChainID, peers, log), + ChainCore: testchain.NewMockedChainCore(env.T, env.ChainID, log), stateSync: coreutil.NewChainStateSync(), Log: log, } @@ -219,7 +217,7 @@ func (env *MockedEnv) NewNode(nodeIndex uint16, timers ConsensusTimers) *mockedN Address: env.StateAddress, Nodes: env.NodeIDs, } - cmt, err := committee.New( + cmt, cmtPeerGroup, err := committee.New( cmtRec, env.ChainID, env.NetworkProviders[nodeIndex], @@ -229,7 +227,7 @@ func (env *MockedEnv) NewNode(nodeIndex uint16, timers ConsensusTimers) *mockedN acs..., ) require.NoError(env.T, err) - cmt.AttachToPeerMessages(peerMessageReceiverConsensus, func(peerMsg *peering.PeerMessageGroupIn) { + cmtPeerGroup.AttachToPeerMessages(peerMessageReceiverConsensus, func(peerMsg *peering.PeerMessageGroupIn) { log.Debugf("Consensus received peer message from %v of type %v", peerMsg.SenderNetID, peerMsg.MsgType) if peerMsg.MsgReceiver != peerMessageReceiverConsensus { env.T.Fatalf("Consensus does not accept peer messages of other receiver type %v, message type=%v", @@ -264,7 +262,7 @@ func (env *MockedEnv) NewNode(nodeIndex uint16, timers ConsensusTimers) *mockedN ret.stateSync.SetSolidIndex(0) require.NoError(env.T, err) - cons := New(ret.ChainCore, ret.Mempool, cmt, ret.NodeConn, true, metrics.DefaultChainMetrics(), timers) + cons := New(ret.ChainCore, ret.Mempool, cmt, cmtPeerGroup, ret.NodeConn, true, metrics.DefaultChainMetrics(), timers) cons.(*consensus).vmRunner = testchain.NewMockedVMRunner(env.T, log) ret.Consensus = cons diff --git a/packages/chain/statemgr/eventproc.go b/packages/chain/statemgr/eventproc.go index e010ee63b2..db7ed002e0 100644 --- a/packages/chain/statemgr/eventproc.go +++ b/packages/chain/statemgr/eventproc.go @@ -45,7 +45,7 @@ func (sm *stateManager) handleGetBlockMsg(msg *messages.GetBlockMsgIn) { sm.log.Debugf("handleGetBlockMsg: responding to peer %s by block %v", msg.SenderNetID, msg.BlockIndex) blockMsg := &messages.BlockMsg{BlockBytes: blockBytes} - sm.chain.SendPeerMsgByNetID(msg.SenderNetID, peerMessageReceiverStateManager, peerMsgTypeBlock, util.MustBytes(blockMsg)) + sm.chainPeers.SendPeerMsgByNetID(msg.SenderNetID, peerMessageReceiverStateManager, peerMsgTypeBlock, util.MustBytes(blockMsg)) } // EventBlockMsg diff --git a/packages/chain/statemgr/setup_test.go b/packages/chain/statemgr/setup_test.go index 923d8411ab..3189ff7d20 100644 --- a/packages/chain/statemgr/setup_test.go +++ b/packages/chain/statemgr/setup_test.go @@ -19,6 +19,7 @@ import ( "github.com/iotaledger/hive.go/kvstore/mapdb" "github.com/iotaledger/hive.go/logger" "github.com/iotaledger/wasp/packages/chain" + "github.com/iotaledger/wasp/packages/chain/chainpeering" "github.com/iotaledger/wasp/packages/chain/messages" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/coreutil" @@ -55,6 +56,7 @@ type MockedNode struct { store kvstore.KVStore NodeConn *testchain.MockedNodeConn ChainCore *testchain.MockedChainCore + ChainPeers chain.ChainPeers stateSync coreutil.ChainStateSync Peers peering.PeerDomainProvider StateManager chain.StateManager @@ -185,14 +187,15 @@ func (env *MockedEnv) NewMockedNode(nodeIndex int, timers StateManagerTimers) *M peers, err := env.NetworkProviders[nodeIndex].PeerDomain(env.NodeIDs) require.NoError(env.T, err) ret := &MockedNode{ - NetID: nodeID, - Env: env, - NodeConn: testchain.NewMockedNodeConnection("Node_" + nodeID), - store: mapdb.NewMapDB(), - stateSync: coreutil.NewChainStateSync(), - ChainCore: testchain.NewMockedChainCore(env.T, env.ChainID, peers, log), - Peers: peers, - Log: log, + NetID: nodeID, + Env: env, + NodeConn: testchain.NewMockedNodeConnection("Node_" + nodeID), + store: mapdb.NewMapDB(), + stateSync: coreutil.NewChainStateSync(), + ChainCore: testchain.NewMockedChainCore(env.T, env.ChainID, log), + ChainPeers: chainpeering.NewChainPeers(env.ChainID.Array(), peers), + Peers: peers, + Log: log, } ret.ChainCore.OnGlobalStateSync(func() coreutil.ChainStateSync { return ret.stateSync @@ -200,7 +203,7 @@ func (env *MockedEnv) NewMockedNode(nodeIndex int, timers StateManagerTimers) *M ret.ChainCore.OnGetStateReader(func() state.OptimisticStateReader { return state.NewOptimisticStateReader(ret.store, ret.stateSync) }) - ret.ChainCore.AttachToPeerMessages(peerMessageReceiverStateManager, func(peerMsg *peering.PeerMessageIn) { + ret.ChainPeers.AttachToPeerMessages(peerMessageReceiverStateManager, func(peerMsg *peering.PeerMessageIn) { log.Debugf("State manager recvEvent from %v of type %v", peerMsg.SenderNetID, peerMsg.MsgType) if peerMsg.MsgReceiver != peerMessageReceiverStateManager { env.T.Fatalf("State manager does not accept peer messages of other receiver type %v, message type=%v", @@ -229,7 +232,7 @@ func (env *MockedEnv) NewMockedNode(nodeIndex int, timers StateManagerTimers) *M }) } }) - ret.StateManager = New(ret.store, ret.ChainCore, ret.Peers, ret.NodeConn, timers) + ret.StateManager = New(ret.store, ret.ChainCore, ret.ChainPeers, ret.NodeConn, timers) ret.StateTransition = testchain.NewMockedStateTransition(env.T, env.OriginatorKeyPair) ret.StateTransition.OnNextState(func(vstate state.VirtualStateAccess, tx *ledgerstate.Transaction) { log.Debugf("MockedEnv.onNextState: state index %d", vstate.BlockIndex()) diff --git a/packages/chain/statemgr/statemgr.go b/packages/chain/statemgr/statemgr.go index 720da0c58a..8f273fcd56 100644 --- a/packages/chain/statemgr/statemgr.go +++ b/packages/chain/statemgr/statemgr.go @@ -25,7 +25,7 @@ type stateManager struct { ready *ready.Ready store kvstore.KVStore chain chain.ChainCore - peers peering.PeerDomainProvider + chainPeers chain.ChainPeers nodeConn chain.NodeConnection pullStateRetryTime time.Time solidState state.VirtualStateAccess @@ -59,7 +59,7 @@ const ( peerMsgTypeBlock ) -func New(store kvstore.KVStore, c chain.ChainCore, peers peering.PeerDomainProvider, nodeconn chain.NodeConnection, timersOpt ...StateManagerTimers) chain.StateManager { +func New(store kvstore.KVStore, c chain.ChainCore, peers chain.ChainPeers, nodeconn chain.NodeConnection, timersOpt ...StateManagerTimers) chain.StateManager { var timers StateManagerTimers if len(timersOpt) > 0 { timers = timersOpt[0] @@ -71,7 +71,7 @@ func New(store kvstore.KVStore, c chain.ChainCore, peers peering.PeerDomainProvi store: store, chain: c, nodeConn: nodeconn, - peers: peers, + chainPeers: peers, syncingBlocks: newSyncingBlocks(c.Log(), timers.GetBlockRetry), timers: timers, log: c.Log().Named("s"), @@ -83,7 +83,7 @@ func New(store kvstore.KVStore, c chain.ChainCore, peers peering.PeerDomainProvi eventStateCandidateMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), eventTimerMsgPipe: pipe.NewLimitInfinitePipe(1), } - c.AttachToPeerMessages(peerMessageReceiverStateManager, ret.receiveChainPeerMessages) + ret.chainPeers.AttachToPeerMessages(peerMessageReceiverStateManager, ret.receiveChainPeerMessages) go ret.initLoadState() return ret diff --git a/packages/chain/statemgr/syncmgr.go b/packages/chain/statemgr/syncmgr.go index 99d7b8e47e..c16ae67cda 100644 --- a/packages/chain/statemgr/syncmgr.go +++ b/packages/chain/statemgr/syncmgr.go @@ -87,7 +87,7 @@ func (sm *stateManager) doSyncActionIfNeeded() { // have to pull sm.log.Debugf("doSyncAction: requesting block index %v from %v random peers", i, numberOfNodesToRequestBlockFromConst) getBlockMsg := &messages.GetBlockMsg{BlockIndex: i} - sm.chain.SendPeerMsgToRandomPeers(numberOfNodesToRequestBlockFromConst, peerMessageReceiverStateManager, peerMsgTypeGetBlock, util.MustBytes(getBlockMsg)) + sm.chainPeers.SendPeerMsgToRandomPeers(numberOfNodesToRequestBlockFromConst, peerMessageReceiverStateManager, peerMsgTypeGetBlock, util.MustBytes(getBlockMsg)) sm.syncingBlocks.startSyncingIfNeeded(i) sm.syncingBlocks.setRequestBlockRetryTime(i, nowis.Add(sm.timers.GetBlockRetry)) if blockCandidatesCount == 0 { diff --git a/packages/peering/domain/domain.go b/packages/peering/domain/domain.go index 50106192ac..620ac535b2 100644 --- a/packages/peering/domain/domain.go +++ b/packages/peering/domain/domain.go @@ -64,18 +64,6 @@ func (d *DomainImpl) SendMsgByNetID(netID string, msg *peering.PeerMessageData) peer.SendMsg(&peering.PeerMessageNet{PeerMessageData: *msg}) } -func (d *DomainImpl) SendMsgToRandomPeers(upToNumPeers uint16, msg *peering.PeerMessageData) { - d.mutex.RLock() - defer d.mutex.RUnlock() - - if int(upToNumPeers) > len(d.nodes) { - upToNumPeers = uint16(len(d.nodes)) - } - for i := uint16(0); i < upToNumPeers; i++ { - d.SendMsgByNetID(d.netIDs[d.permutation.Next()], msg) - } -} - func (d *DomainImpl) GetRandomPeers(upToNumPeers int) []string { d.mutex.RLock() defer d.mutex.RUnlock() diff --git a/packages/peering/domain/domain_test.go b/packages/peering/domain/domain_test.go index 0db2d478fd..24b86282d8 100644 --- a/packages/peering/domain/domain_test.go +++ b/packages/peering/domain/domain_test.go @@ -104,8 +104,12 @@ func TestRandom(t *testing.T) { wg.Add(sendTo * 2) t.Log("----------------------------------") msg := &peering.PeerMessageData{PeeringID: peeringID, MsgReceiver: receiver, MsgType: 125} - d1.SendMsgToRandomPeers(sendTo, msg) - d2.SendMsgToRandomPeers(sendTo, msg) + for _, netID := range d1.GetRandomPeers(sendTo) { + d1.SendMsgByNetID(netID, msg) + } + for _, netID := range d2.GetRandomPeers(sendTo) { + d2.SendMsgByNetID(netID, msg) + } wg.Wait() } require.EqualValues(t, sendTo*5, r1) diff --git a/packages/peering/peering.go b/packages/peering/peering.go index f168587701..b256723fa4 100644 --- a/packages/peering/peering.go +++ b/packages/peering/peering.go @@ -90,7 +90,6 @@ type PeerDomainProvider interface { ReshufflePeers(seedBytes ...[]byte) GetRandomPeers(upToNumPeers int) []string PeerCollection - SendMsgToRandomPeers(upToNumPeers uint16, msg *PeerMessageData) Close() } diff --git a/packages/testutil/testchain/mock_chain_core.go b/packages/testutil/testchain/mock_chain_core.go index 48a35bf74d..ca9e30f5b2 100644 --- a/packages/testutil/testchain/mock_chain_core.go +++ b/packages/testutil/testchain/mock_chain_core.go @@ -24,7 +24,6 @@ type MockedChainCore struct { chainID *iscp.ChainID processors *processors.Cache peeringID peering.PeeringID - peers peering.PeerDomainProvider eventStateTransition *events.Event eventRequestProcessed *events.Event getNetIDsFun func() []string @@ -47,7 +46,7 @@ type MockedChainCore struct { var _ chain.ChainCore = &MockedChainCore{} -func NewMockedChainCore(t *testing.T, chainID *iscp.ChainID, peers peering.PeerDomainProvider, log *logger.Logger) *MockedChainCore { +func NewMockedChainCore(t *testing.T, chainID *iscp.ChainID, log *logger.Logger) *MockedChainCore { receiveFailFun := func(typee string, msg interface{}) { t.Fatalf("Receiving of %s is not implemented, but %v is received", typee, msg) } @@ -56,7 +55,6 @@ func NewMockedChainCore(t *testing.T, chainID *iscp.ChainID, peers peering.PeerD chainID: chainID, processors: processors.MustNew(processors.NewConfig(inccounter.Processor)), peeringID: chainID.Array(), - peers: peers, log: log, getNetIDsFun: func() []string { t.Fatalf("List of netIDs is not known") @@ -119,26 +117,6 @@ func (m *MockedChainCore) GetCommitteeInfo() *chain.CommitteeInfo { panic("implement me") } -func (m *MockedChainCore) AttachToPeerMessages(receiver byte, fun func(recv *peering.PeerMessageIn)) { - m.peers.Attach(&m.peeringID, receiver, fun) -} - -func (m *MockedChainCore) SendPeerMsgByNetID(netID string, msgReceiver, msgType byte, msgData []byte) { - m.peers.SendMsgByNetID(netID, &peering.PeerMessageData{ - PeeringID: m.peeringID, - MsgReceiver: msgReceiver, - MsgType: msgType, - MsgData: msgData, - }) -} - -func (m *MockedChainCore) SendPeerMsgToRandomPeers(upToNumPeers uint16, msgReceiver, msgType byte, msgData []byte) { - sendPeers := m.peers.GetRandomPeers(int(upToNumPeers)) - for _, netID := range sendPeers { - m.SendPeerMsgByNetID(netID, msgReceiver, msgType, msgData) - } -} - func (m *MockedChainCore) StateCandidateToStateManager(virtualState state.VirtualStateAccess, outputID ledgerstate.OutputID) { m.onStateCandidate(virtualState, outputID) } diff --git a/packages/webapi/request/request_test.go b/packages/webapi/request/request_test.go index 01ed18c15a..fed2e780e9 100644 --- a/packages/webapi/request/request_test.go +++ b/packages/webapi/request/request_test.go @@ -59,7 +59,7 @@ func (m *mockedChain) IsDismissed() bool { func createMockedGetChain(t *testing.T) chains.ChainProvider { return func(chainID *iscp.ChainID) chain.Chain { - chainCore := testchain.NewMockedChainCore(t, chainID, nil, testlogger.NewLogger(t)) + chainCore := testchain.NewMockedChainCore(t, chainID, testlogger.NewLogger(t)) chainCore.OnOffLedgerRequest(func(msg *messages.OffLedgerRequestMsgIn) { t.Logf("Offledger request %v received", msg) }) From cdd2129b26b645a9d001fe59958f2dbdf9bf6bb0 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 23 Nov 2021 11:41:36 +0200 Subject: [PATCH 107/198] Cleanup --- packages/peering/peer_message.go | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/packages/peering/peer_message.go b/packages/peering/peer_message.go index 247895bdb3..27e6167cbb 100644 --- a/packages/peering/peer_message.go +++ b/packages/peering/peer_message.go @@ -18,13 +18,6 @@ import ( "github.com/iotaledger/wasp/packages/util/pipe" ) -// RecvEvent stands for a received message along with -// the reference to its sender peer. -/*type RecvEvent struct { - From PeerSender - Msg *PeerMessage -}*/ - // PeerMessage is an envelope for all the messages exchanged via // the peering module. type PeerMessageData struct { @@ -117,10 +110,6 @@ func (m *PeerMessageData) bytes() ([]byte, error) { return buf.Bytes(), nil } -/*func (m *PeerMessage) IsUserMessage() bool { - return m.MsgType >= FirstUserMsgCode -}*/ - func (m *PeerMessageNet) GetHash() hashing.HashValue { mBytes, err := m.Bytes() if err != nil { From 94b76d11bd1b21c64aaaf486bc7eb574b8d23551 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 23 Nov 2021 12:59:08 +0200 Subject: [PATCH 108/198] Code simplified --- packages/dkg/node.go | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/packages/dkg/node.go b/packages/dkg/node.go index 4c0d94e9f8..37af023250 100644 --- a/packages/dkg/node.go +++ b/packages/dkg/node.go @@ -37,7 +37,6 @@ type Node struct { processes map[string]*proc // Only for introspection. procLock *sync.RWMutex // To guard access to the process pool. initMsgQueue chan *initiatorInitMsgIn // Incoming events processed async. - recvStopCh chan bool // To coordinate shutdown. attachID interface{} // Peering attach ID log *logger.Logger } @@ -65,7 +64,6 @@ func NewNode( processes: make(map[string]*proc), procLock: &sync.RWMutex{}, initMsgQueue: make(chan *initiatorInitMsgIn), - recvStopCh: make(chan bool), log: log, } n.attachID = netProvider.Attach(&initPeeringID, peerMessageReceiverDkgInit, n.receiveInitMessage) @@ -93,7 +91,6 @@ func (n *Node) receiveInitMessage(peerMsg *peering.PeerMessageIn) { } func (n *Node) Close() { - close(n.recvStopCh) close(n.initMsgQueue) n.netProvider.Detach(n.attachID) } @@ -267,15 +264,8 @@ func (n *Node) GenerateDistributedKey( // Async recv is needed to avoid locking on the even publisher (Recv vs Attach in proc). func (n *Node) recvLoop() { - for { - select { - case <-n.recvStopCh: - return - case recv, ok := <-n.initMsgQueue: - if ok { - n.onInitMsg(recv) - } - } + for recv := range n.initMsgQueue { + n.onInitMsg(recv) } } From 8a88391e7c4986f2cff8679e8a1135677e363185 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 23 Nov 2021 13:06:49 +0200 Subject: [PATCH 109/198] Tidying up --- packages/peering/lpp/lppPeer.go | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/packages/peering/lpp/lppPeer.go b/packages/peering/lpp/lppPeer.go index d3f846a756..99e572e5ea 100644 --- a/packages/peering/lpp/lppPeer.go +++ b/packages/peering/lpp/lppPeer.go @@ -41,18 +41,7 @@ var _ peering.PeerSender = &peer{} func newPeer(remoteNetID string, remotePubKey *ed25519.PublicKey, remoteLppID libp2ppeer.ID, n *netImpl) *peer { log := n.log.Named("peer:" + remoteNetID) messagePriorityFun := func(msg interface{}) bool { - peerMsg, ok := msg.(*peering.PeerMessageNet) - if ok { - return peerMsg.MsgType > 0 - /*switch peerMsg.MsgType { - case messages.MsgGetBlock, - messages.MsgBlock, - messages.MsgSignedResult, - messages.MsgSignedResultAck: - return true - default: - }*/ - } + // TODO: decide if prioritetisation is needed and implement it then. return false } p := &peer{ From 6151c064064e486a470560408c464a19128bcfbc Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 23 Nov 2021 15:51:45 +0200 Subject: [PATCH 110/198] Inner structure of node connection implementation should be private --- packages/chain/nodeconnimpl/nodeconnimpl.go | 26 ++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/chain/nodeconnimpl/nodeconnimpl.go b/packages/chain/nodeconnimpl/nodeconnimpl.go index e8965dd040..51f71f9bab 100644 --- a/packages/chain/nodeconnimpl/nodeconnimpl.go +++ b/packages/chain/nodeconnimpl/nodeconnimpl.go @@ -9,7 +9,7 @@ import ( "github.com/iotaledger/wasp/packages/chain" ) -type NodeConnImplementation struct { +type nodeConnImplementation struct { client *txstream_client.Client transactionHandlers map[ledgerstate.AliasAddress]chain.NodeConnectionHandleTransactionFun iStateHandlers map[ledgerstate.AliasAddress]chain.NodeConnectionHandleInclusionStateFun @@ -19,10 +19,10 @@ type NodeConnImplementation struct { log *logger.Logger // general chains logger } -var _ chain.NodeConnection = &NodeConnImplementation{} +var _ chain.NodeConnection = &nodeConnImplementation{} func NewNodeConnection(nodeConnClient *txstream_client.Client, log *logger.Logger) chain.NodeConnection { - ret := &NodeConnImplementation{ + ret := &nodeConnImplementation{ client: nodeConnClient, transactionHandlers: make(map[ledgerstate.AliasAddress]chain.NodeConnectionHandleTransactionFun), iStateHandlers: make(map[ledgerstate.AliasAddress]chain.NodeConnectionHandleInclusionStateFun), @@ -95,12 +95,12 @@ func NewNodeConnection(nodeConnClient *txstream_client.Client, log *logger.Logge // NOTE: NodeConnectionSender methods are logged through each chain logger in ChainNodeConnImplementation -func (n *NodeConnImplementation) PullState(addr *ledgerstate.AliasAddress) { +func (n *nodeConnImplementation) PullState(addr *ledgerstate.AliasAddress) { chain.CountMessageStats(&n.stats.OutPullState, addr) n.client.RequestUnspentAliasOutput(addr) } -func (n *NodeConnImplementation) PullTransactionInclusionState(addr ledgerstate.Address, txid ledgerstate.TransactionID) { +func (n *nodeConnImplementation) PullTransactionInclusionState(addr ledgerstate.Address, txid ledgerstate.TransactionID) { chain.CountMessageStats(&n.stats.OutPullTransactionInclusionState, struct { Address ledgerstate.Address TransactionID ledgerstate.TransactionID @@ -111,7 +111,7 @@ func (n *NodeConnImplementation) PullTransactionInclusionState(addr ledgerstate. n.client.RequestTxInclusionState(addr, txid) } -func (n *NodeConnImplementation) PullConfirmedOutput(addr ledgerstate.Address, outputID ledgerstate.OutputID) { +func (n *nodeConnImplementation) PullConfirmedOutput(addr ledgerstate.Address, outputID ledgerstate.OutputID) { chain.CountMessageStats(&n.stats.OutPullConfirmedOutput, struct { Address ledgerstate.Address OutputID ledgerstate.OutputID @@ -122,35 +122,35 @@ func (n *NodeConnImplementation) PullConfirmedOutput(addr ledgerstate.Address, o n.client.RequestConfirmedOutput(addr, outputID) } -func (n *NodeConnImplementation) PostTransaction(tx *ledgerstate.Transaction) { +func (n *nodeConnImplementation) PostTransaction(tx *ledgerstate.Transaction) { chain.CountMessageStats(&n.stats.OutPostTransaction, tx) n.client.PostTransaction(tx) } -func (n *NodeConnImplementation) AttachToTransactionReceived(addr *ledgerstate.AliasAddress, handler chain.NodeConnectionHandleTransactionFun) { +func (n *nodeConnImplementation) AttachToTransactionReceived(addr *ledgerstate.AliasAddress, handler chain.NodeConnectionHandleTransactionFun) { n.transactionHandlers[*addr] = handler } -func (n *NodeConnImplementation) AttachToInclusionStateReceived(addr *ledgerstate.AliasAddress, handler chain.NodeConnectionHandleInclusionStateFun) { +func (n *nodeConnImplementation) AttachToInclusionStateReceived(addr *ledgerstate.AliasAddress, handler chain.NodeConnectionHandleInclusionStateFun) { n.iStateHandlers[*addr] = handler } -func (n *NodeConnImplementation) AttachToOutputReceived(addr *ledgerstate.AliasAddress, handler chain.NodeConnectionHandleOutputFun) { +func (n *nodeConnImplementation) AttachToOutputReceived(addr *ledgerstate.AliasAddress, handler chain.NodeConnectionHandleOutputFun) { n.outputHandlers[*addr] = handler } -func (n *NodeConnImplementation) AttachToUnspentAliasOutputReceived(addr *ledgerstate.AliasAddress, handler chain.NodeConnectionHandleUnspentAliasOutputFun) { +func (n *nodeConnImplementation) AttachToUnspentAliasOutputReceived(addr *ledgerstate.AliasAddress, handler chain.NodeConnectionHandleUnspentAliasOutputFun) { n.unspentAOutputHandlers[*addr] = handler } -func (n *NodeConnImplementation) Subscribe(addr ledgerstate.Address) { +func (n *nodeConnImplementation) Subscribe(addr ledgerstate.Address) { n.log.Debugf("NodeConnnection::Subscribing to %v...", addr.String()) defer n.log.Debugf("NodeConnnection::Subscribing done") n.client.Subscribe(addr) n.stats.Subscribed = append(n.stats.Subscribed, addr) } -func (n *NodeConnImplementation) Unsubscribe(addr ledgerstate.Address) { +func (n *nodeConnImplementation) Unsubscribe(addr ledgerstate.Address) { n.log.Debugf("NodeConnnection::Unsubscribing from %v...", addr.String()) defer n.log.Debugf("NodeConnnection::Unsubscribing done") n.client.Unsubscribe(addr) From 6a75838add21837d31b71773e69c697aa78d64fb Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Tue, 23 Nov 2021 05:59:02 -0800 Subject: [PATCH 111/198] Small bugfix --- tools/schema/generator/rstemplates/typedefs.go | 2 +- tools/schema/generator/tstemplates/typedefs.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/schema/generator/rstemplates/typedefs.go b/tools/schema/generator/rstemplates/typedefs.go index ce101ff8c1..6f2b75378b 100644 --- a/tools/schema/generator/rstemplates/typedefs.go +++ b/tools/schema/generator/rstemplates/typedefs.go @@ -70,7 +70,7 @@ $#if typedef typedefProxyArrayNewOtherTypeTypeDef typedefProxyArrayNewOtherTypeS // ******************************* "typedefProxyArrayNewOtherTypeTypeDef": ` $#emit setVarType - pub fn Get$OldType(&self, index: i32) -> $mut$OldType { + pub fn get_$old_type(&self, index: i32) -> $mut$OldType { let sub_id = get_object_id(self.obj_id, Key32(index), $varType); $mut$OldType { obj_id: sub_id } } diff --git a/tools/schema/generator/tstemplates/typedefs.go b/tools/schema/generator/tstemplates/typedefs.go index 281f94e646..3e551b3027 100644 --- a/tools/schema/generator/tstemplates/typedefs.go +++ b/tools/schema/generator/tstemplates/typedefs.go @@ -70,7 +70,7 @@ $#if typedef typedefProxyArrayNewOtherTypeTypeDef typedefProxyArrayNewOtherTypeS "typedefProxyArrayNewOtherTypeTypeDef": ` $#emit setVarType - Get$OldType(index: i32): sc.$mut$OldType { + get$OldType(index: i32): sc.$mut$OldType { let subID = wasmlib.getObjectID(this.objID, new wasmlib.Key32(index), $varType); return new sc.$mut$OldType(subID); } From 5ce567e9c9c60de4b5f90c35cd602af4f3afaf28 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 23 Nov 2021 16:02:06 +0200 Subject: [PATCH 112/198] Separating chain node connection implementation from chain implementation --- packages/chain/chainimpl/chainimpl.go | 25 +++-- .../chain/chainimpl/chainimpl_nodeconn.go | 81 -------------- .../chain/nodeconnimpl/nodeconnimpl_chain.go | 100 ++++++++++++++++++ 3 files changed, 112 insertions(+), 94 deletions(-) delete mode 100644 packages/chain/chainimpl/chainimpl_nodeconn.go create mode 100644 packages/chain/nodeconnimpl/nodeconnimpl_chain.go diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index 0b08c3b101..3516f22ec7 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -17,6 +17,7 @@ import ( "github.com/iotaledger/wasp/packages/chain/consensus" "github.com/iotaledger/wasp/packages/chain/mempool" "github.com/iotaledger/wasp/packages/chain/messages" + "github.com/iotaledger/wasp/packages/chain/nodeconnimpl" "github.com/iotaledger/wasp/packages/chain/statemgr" "github.com/iotaledger/wasp/packages/hashing" "github.com/iotaledger/wasp/packages/iscp" @@ -39,12 +40,11 @@ import ( const maxMsgBuffer = 10000 var ( - _ chain.Chain = &chainObj{} - _ chain.ChainCore = &chainObj{} - _ chain.ChainEntry = &chainObj{} - _ chain.ChainRequests = &chainObj{} - _ chain.ChainEvents = &chainObj{} - _ chain.ChainNodeConnection = &chainObj{} + _ chain.Chain = &chainObj{} + _ chain.ChainCore = &chainObj{} + _ chain.ChainEntry = &chainObj{} + _ chain.ChainRequests = &chainObj{} + _ chain.ChainEvents = &chainObj{} ) type chainObj struct { @@ -61,7 +61,7 @@ type chainObj struct { stateMgr chain.StateManager consensus chain.Consensus log *logger.Logger - nodeConn chain.NodeConnection + nodeConn chain.ChainNodeConnection db kvstore.KVStore peerNetworkConfig registry.PeerNetworkConfigProvider netProvider peering.NetworkProvider @@ -77,7 +77,6 @@ type chainObj struct { offledgerBroadcastInterval time.Duration pullMissingRequestsFromCommittee bool chainMetrics metrics.ChainMetrics - stats *chain.NodeConnectionMessagesStats } type committeeStruct struct { @@ -127,7 +126,7 @@ func NewChain( msgPipe: pipe.NewLimitPriorityInfinitePipe(messagePriorityFun, maxMsgBuffer), chainID: chainID, log: chainLog, - nodeConn: nc, + nodeConn: nodeconnimpl.NewChainNodeConnection(chainID, nc, chainLog), db: db, chainStateSync: chainStateSync, stateReader: state.NewOptimisticStateReader(db, chainStateSync), @@ -150,15 +149,15 @@ func NewChain( } ret.committee.Store(&committeeStruct{}) ret.eventChainTransition.Attach(events.NewClosure(ret.processChainTransition)) - ret.AttachToTransactionReceived(ret.ReceiveTransaction) - ret.AttachToUnspentAliasOutputReceived(ret.ReceiveState) + ret.nodeConn.AttachToTransactionReceived(ret.ReceiveTransaction) + ret.nodeConn.AttachToUnspentAliasOutputReceived(ret.ReceiveState) peers, err := netProvider.PeerDomain(peerNetConfig.Neighbors()) if err != nil { log.Errorf("NewChain: %v", err) return nil } - ret.stateMgr = statemgr.New(db, ret, peers, ret) + ret.stateMgr = statemgr.New(db, ret, peers, ret.nodeConn) ret.peers = &peers var peeringID peering.PeeringID = ret.chainID.Array() peers.Attach(&peeringID, func(recv *peering.RecvEvent) { @@ -475,7 +474,7 @@ func (c *chainObj) createNewCommitteeAndConsensus(cmtRec *registry.CommitteeReco } cmt.Attach(c) c.log.Debugf("creating new consensus object...") - c.consensus = consensus.New(c, c.mempool, cmt, c, c.pullMissingRequestsFromCommittee, c.chainMetrics) + c.consensus = consensus.New(c, c.mempool, cmt, c.nodeConn, c.pullMissingRequestsFromCommittee, c.chainMetrics) c.setCommittee(cmt) c.log.Infof("NEW COMMITTEE OF VALIDATORS has been initialized for the state address %s", cmtRec.Address.Base58()) diff --git a/packages/chain/chainimpl/chainimpl_nodeconn.go b/packages/chain/chainimpl/chainimpl_nodeconn.go deleted file mode 100644 index afadb90df3..0000000000 --- a/packages/chain/chainimpl/chainimpl_nodeconn.go +++ /dev/null @@ -1,81 +0,0 @@ -// Provides implementations for chain.ChainNodeConnection methods -package chainimpl - -import ( - "time" - - "github.com/iotaledger/goshimmer/packages/ledgerstate" - "github.com/iotaledger/wasp/packages/chain" - "github.com/iotaledger/wasp/packages/iscp" -) - -func (c *chainObj) AttachToTransactionReceived(fun chain.NodeConnectionHandleTransactionFun) { - c.nodeConn.AttachToTransactionReceived(c.ID().AsAliasAddress(), func(tx *ledgerstate.Transaction) { - chain.CountMessageStats(&c.stats.InTransaction, tx) - fun(tx) - }) -} - -func (c *chainObj) AttachToInclusionStateReceived(fun chain.NodeConnectionHandleInclusionStateFun) { - c.nodeConn.AttachToInclusionStateReceived(c.ID().AsAliasAddress(), func(txID ledgerstate.TransactionID, iState ledgerstate.InclusionState) { - chain.CountMessageStats(&c.stats.InInclusionState, struct { - TransactionID ledgerstate.TransactionID - InclusionState ledgerstate.InclusionState - }{ - TransactionID: txID, - InclusionState: iState, - }) - fun(txID, iState) - }) -} - -func (c *chainObj) AttachToOutputReceived(fun chain.NodeConnectionHandleOutputFun) { - c.nodeConn.AttachToOutputReceived(c.ID().AsAliasAddress(), func(output ledgerstate.Output) { - chain.CountMessageStats(&c.stats.InOutput, output) - fun(output) - }) -} - -func (c *chainObj) AttachToUnspentAliasOutputReceived(fun chain.NodeConnectionHandleUnspentAliasOutputFun) { - c.nodeConn.AttachToUnspentAliasOutputReceived(c.ID().AsAliasAddress(), func(output *ledgerstate.AliasOutput, timestamp time.Time) { - chain.CountMessageStats(&c.stats.InUnspentAliasOutput, struct { - AliasOutput *ledgerstate.AliasOutput - Timestamp time.Time - }{ - AliasOutput: output, - Timestamp: timestamp, - }) - fun(output, timestamp) - }) -} - -func (c *chainObj) PullState() { - c.log.Debugf("ChainNodeConnection::PullState...") - chain.CountMessageStats(&c.stats.OutPullState, nil) - c.nodeConn.PullState(c.ID().AsAliasAddress()) - c.log.Debugf("ChainNodeConnection::PullState... Done") -} - -func (c *chainObj) PullTransactionInclusionState(txID ledgerstate.TransactionID) { - txIDStr := txID.Base58() - c.log.Debugf("ChainNodeConnImplementation::PullTransactionInclusionState(txID=%v)...", txIDStr) - chain.CountMessageStats(&c.stats.OutPullTransactionInclusionState, txID) - c.nodeConn.PullTransactionInclusionState(c.ID().AsAddress(), txID) - c.log.Debugf("ChainNodeConnImplementation::PullTransactionInclusionState(txID=%v)... Done", txIDStr) -} - -func (c *chainObj) PullConfirmedOutput(outputID ledgerstate.OutputID) { - outputIDStr := iscp.OID(outputID) - c.log.Debugf("ChainNodeConnImplementation::PullConfirmedOutput(outputID=%v)...", outputIDStr) - chain.CountMessageStats(&c.stats.OutPullConfirmedOutput, outputID) - c.nodeConn.PullConfirmedOutput(c.ID().AsAddress(), outputID) - c.log.Debugf("ChainNodeConnImplementation::PullConfirmedOutput(outputID=%v)... Done", outputIDStr) -} - -func (c *chainObj) PostTransaction(tx *ledgerstate.Transaction) { - txIDStr := tx.ID().Base58() - c.log.Debugf("ChainNodeConnImplementation::PostTransaction(txID=%s)...", txIDStr) - chain.CountMessageStats(&c.stats.OutPostTransaction, tx) - c.nodeConn.PostTransaction(tx) - c.log.Debugf("ChainNodeConnImplementation::PostTransaction(txID=%s)... Done", txIDStr) -} diff --git a/packages/chain/nodeconnimpl/nodeconnimpl_chain.go b/packages/chain/nodeconnimpl/nodeconnimpl_chain.go new file mode 100644 index 0000000000..6653ea22cc --- /dev/null +++ b/packages/chain/nodeconnimpl/nodeconnimpl_chain.go @@ -0,0 +1,100 @@ +// Provides implementations for chain.ChainNodeConnection methods +package nodeconnimpl + +import ( + "time" + + "github.com/iotaledger/goshimmer/packages/ledgerstate" + "github.com/iotaledger/hive.go/logger" + "github.com/iotaledger/wasp/packages/chain" + "github.com/iotaledger/wasp/packages/iscp" +) + +type chainNodeConnImplementation struct { + chainID *iscp.ChainID + nodeConn chain.NodeConnection + stats *chain.NodeConnectionMessagesStats + log *logger.Logger // logger for one chain +} + +var _ chain.ChainNodeConnection = &chainNodeConnImplementation{} + +func NewChainNodeConnection(chainID *iscp.ChainID, nodeConn chain.NodeConnection, log *logger.Logger) chain.ChainNodeConnection { + return &chainNodeConnImplementation{ + chainID: chainID, + nodeConn: nodeConn, + stats: &chain.NodeConnectionMessagesStats{}, + log: log, + } +} + +func (c *chainNodeConnImplementation) AttachToTransactionReceived(fun chain.NodeConnectionHandleTransactionFun) { + c.nodeConn.AttachToTransactionReceived(c.chainID.AsAliasAddress(), func(tx *ledgerstate.Transaction) { + chain.CountMessageStats(&c.stats.InTransaction, tx) + fun(tx) + }) +} + +func (c *chainNodeConnImplementation) AttachToInclusionStateReceived(fun chain.NodeConnectionHandleInclusionStateFun) { + c.nodeConn.AttachToInclusionStateReceived(c.chainID.AsAliasAddress(), func(txID ledgerstate.TransactionID, iState ledgerstate.InclusionState) { + chain.CountMessageStats(&c.stats.InInclusionState, struct { + TransactionID ledgerstate.TransactionID + InclusionState ledgerstate.InclusionState + }{ + TransactionID: txID, + InclusionState: iState, + }) + fun(txID, iState) + }) +} + +func (c *chainNodeConnImplementation) AttachToOutputReceived(fun chain.NodeConnectionHandleOutputFun) { + c.nodeConn.AttachToOutputReceived(c.chainID.AsAliasAddress(), func(output ledgerstate.Output) { + chain.CountMessageStats(&c.stats.InOutput, output) + fun(output) + }) +} + +func (c *chainNodeConnImplementation) AttachToUnspentAliasOutputReceived(fun chain.NodeConnectionHandleUnspentAliasOutputFun) { + c.nodeConn.AttachToUnspentAliasOutputReceived(c.chainID.AsAliasAddress(), func(output *ledgerstate.AliasOutput, timestamp time.Time) { + chain.CountMessageStats(&c.stats.InUnspentAliasOutput, struct { + AliasOutput *ledgerstate.AliasOutput + Timestamp time.Time + }{ + AliasOutput: output, + Timestamp: timestamp, + }) + fun(output, timestamp) + }) +} + +func (c *chainNodeConnImplementation) PullState() { + c.log.Debugf("ChainNodeConnection::PullState...") + chain.CountMessageStats(&c.stats.OutPullState, nil) + c.nodeConn.PullState(c.chainID.AsAliasAddress()) + c.log.Debugf("ChainNodeConnection::PullState... Done") +} + +func (c *chainNodeConnImplementation) PullTransactionInclusionState(txID ledgerstate.TransactionID) { + txIDStr := txID.Base58() + c.log.Debugf("ChainNodeConnImplementation::PullTransactionInclusionState(txID=%v)...", txIDStr) + chain.CountMessageStats(&c.stats.OutPullTransactionInclusionState, txID) + c.nodeConn.PullTransactionInclusionState(c.chainID.AsAddress(), txID) + c.log.Debugf("ChainNodeConnImplementation::PullTransactionInclusionState(txID=%v)... Done", txIDStr) +} + +func (c *chainNodeConnImplementation) PullConfirmedOutput(outputID ledgerstate.OutputID) { + outputIDStr := iscp.OID(outputID) + c.log.Debugf("ChainNodeConnImplementation::PullConfirmedOutput(outputID=%v)...", outputIDStr) + chain.CountMessageStats(&c.stats.OutPullConfirmedOutput, outputID) + c.nodeConn.PullConfirmedOutput(c.chainID.AsAddress(), outputID) + c.log.Debugf("ChainNodeConnImplementation::PullConfirmedOutput(outputID=%v)... Done", outputIDStr) +} + +func (c *chainNodeConnImplementation) PostTransaction(tx *ledgerstate.Transaction) { + txIDStr := tx.ID().Base58() + c.log.Debugf("ChainNodeConnImplementation::PostTransaction(txID=%s)...", txIDStr) + chain.CountMessageStats(&c.stats.OutPostTransaction, tx) + c.nodeConn.PostTransaction(tx) + c.log.Debugf("ChainNodeConnImplementation::PostTransaction(txID=%s)... Done", txIDStr) +} From 94a6f8c2925409f40616e05e7cda5d293c2e36f7 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 23 Nov 2021 16:32:16 +0200 Subject: [PATCH 113/198] Chain node connection stats webservice... with bugs --- packages/chain/chain.go | 9 ++ packages/chain/chainimpl/chainimpl.go | 1 + packages/chain/chainimpl/stats.go | 13 +++ packages/chain/nodeconnimpl/nodeconnimpl.go | 4 + .../chain/nodeconnimpl/nodeconnimpl_chain.go | 4 + packages/chains/chains.go | 4 + packages/testutil/testchain/mock_nodeconn.go | 4 + packages/webapi/admapi/chainstats.go | 102 ++++++++++++++++++ packages/webapi/admapi/endpoints.go | 1 + packages/webapi/request/request_test.go | 10 +- packages/webapi/routes/routes.go | 8 ++ 11 files changed, 153 insertions(+), 7 deletions(-) create mode 100644 packages/chain/chainimpl/stats.go create mode 100644 packages/webapi/admapi/chainstats.go diff --git a/packages/chain/chain.go b/packages/chain/chain.go index e74c9e927f..6d27e0753b 100644 --- a/packages/chain/chain.go +++ b/packages/chain/chain.go @@ -51,6 +51,10 @@ type ChainRequests interface { EventRequestProcessed() *events.Event } +type ChainStats interface { + GetNodeConnectionStats() NodeConnectionMessagesStats +} + type ChainEvents interface { RequestProcessed() *events.Event ChainTransition() *events.Event @@ -60,6 +64,7 @@ type Chain interface { ChainCore ChainRequests ChainEntry + ChainStats } // Committee is ordered (indexed 0..size-1) list of peers which run the consensus @@ -102,6 +107,8 @@ type NodeConnection interface { PullTransactionInclusionState(addr ledgerstate.Address, txid ledgerstate.TransactionID) PullConfirmedOutput(addr ledgerstate.Address, outputID ledgerstate.OutputID) PostTransaction(tx *ledgerstate.Transaction) + + GetStats() NodeConnectionStats } type ChainNodeConnection interface { @@ -114,6 +121,8 @@ type ChainNodeConnection interface { PullTransactionInclusionState(txid ledgerstate.TransactionID) PullConfirmedOutput(outputID ledgerstate.OutputID) PostTransaction(tx *ledgerstate.Transaction) + + GetStats() NodeConnectionMessagesStats } type NodeConnectionMessageStats struct { diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index 3516f22ec7..93b1d7e0c9 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -45,6 +45,7 @@ var ( _ chain.ChainEntry = &chainObj{} _ chain.ChainRequests = &chainObj{} _ chain.ChainEvents = &chainObj{} + _ chain.ChainStats = &chainObj{} ) type chainObj struct { diff --git a/packages/chain/chainimpl/stats.go b/packages/chain/chainimpl/stats.go new file mode 100644 index 0000000000..7adf5cfe61 --- /dev/null +++ b/packages/chain/chainimpl/stats.go @@ -0,0 +1,13 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// Provides implementations for chain.ChainStats methods +package chainimpl + +import ( + "github.com/iotaledger/wasp/packages/chain" +) + +func (c *chainObj) GetNodeConnectionStats() chain.NodeConnectionMessagesStats { + return c.nodeConn.GetStats() +} diff --git a/packages/chain/nodeconnimpl/nodeconnimpl.go b/packages/chain/nodeconnimpl/nodeconnimpl.go index 51f71f9bab..1d04e738ee 100644 --- a/packages/chain/nodeconnimpl/nodeconnimpl.go +++ b/packages/chain/nodeconnimpl/nodeconnimpl.go @@ -162,3 +162,7 @@ func (n *nodeConnImplementation) Unsubscribe(addr ledgerstate.Address) { } } } + +func (n *nodeConnImplementation) GetStats() chain.NodeConnectionStats { + return *n.stats +} diff --git a/packages/chain/nodeconnimpl/nodeconnimpl_chain.go b/packages/chain/nodeconnimpl/nodeconnimpl_chain.go index 6653ea22cc..ab3b5a9fa0 100644 --- a/packages/chain/nodeconnimpl/nodeconnimpl_chain.go +++ b/packages/chain/nodeconnimpl/nodeconnimpl_chain.go @@ -98,3 +98,7 @@ func (c *chainNodeConnImplementation) PostTransaction(tx *ledgerstate.Transactio c.nodeConn.PostTransaction(tx) c.log.Debugf("ChainNodeConnImplementation::PostTransaction(txID=%s)... Done", txIDStr) } + +func (c *chainNodeConnImplementation) GetStats() chain.NodeConnectionMessagesStats { + return *c.stats +} diff --git a/packages/chains/chains.go b/packages/chains/chains.go index 6a37a96c4e..024d735458 100644 --- a/packages/chains/chains.go +++ b/packages/chains/chains.go @@ -188,3 +188,7 @@ func (c *Chains) Get(chainID *iscp.ChainID) chain.Chain { } return ret } + +func (c *Chains) GetNodeConnectionStats() chain.NodeConnectionStats { + return c.nodeConn.GetStats() +} diff --git a/packages/testutil/testchain/mock_nodeconn.go b/packages/testutil/testchain/mock_nodeconn.go index 41250427be..0b237ef3d6 100644 --- a/packages/testutil/testchain/mock_nodeconn.go +++ b/packages/testutil/testchain/mock_nodeconn.go @@ -61,3 +61,7 @@ func (m *MockedNodeConn) AttachToInclusionStateReceived(chain.NodeConnectionHand func (m *MockedNodeConn) AttachToOutputReceived(chain.NodeConnectionHandleOutputFun) {} func (m *MockedNodeConn) AttachToUnspentAliasOutputReceived(chain.NodeConnectionHandleUnspentAliasOutputFun) { } + +func (m *MockedNodeConn) GetStats() chain.NodeConnectionMessagesStats { + return chain.NodeConnectionMessagesStats{} +} diff --git a/packages/webapi/admapi/chainstats.go b/packages/webapi/admapi/chainstats.go new file mode 100644 index 0000000000..91b7f80f8c --- /dev/null +++ b/packages/webapi/admapi/chainstats.go @@ -0,0 +1,102 @@ +package admapi + +import ( + "fmt" + "net/http" + "time" + + "github.com/iotaledger/goshimmer/packages/ledgerstate" + "github.com/iotaledger/wasp/packages/chain" + "github.com/iotaledger/wasp/packages/chains" + "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/webapi/httperrors" + "github.com/iotaledger/wasp/packages/webapi/routes" + "github.com/labstack/echo/v4" + "github.com/pangpanglabs/echoswagger/v2" + "go.uber.org/atomic" +) + +func addChainStatsEndpoints(adm echoswagger.ApiGroup, chainsProvider chains.Provider) { + chainExample := chain.NodeConnectionMessagesStats{ + OutPullState: chain.NodeConnectionMessageStats{ + Total: *atomic.NewInt32(15), + LastEvent: time.Now().Add(-10 * time.Second), + LastMessage: "Last sent PullState message structure", + }, + OutPullTransactionInclusionState: chain.NodeConnectionMessageStats{ + Total: *atomic.NewInt32(28), + LastEvent: time.Now().Add(-5 * time.Second), + LastMessage: "Last sent PullTransactionInclusionState message structure", + }, + OutPullConfirmedOutput: chain.NodeConnectionMessageStats{ + Total: *atomic.NewInt32(132), + LastEvent: time.Now().Add(100 * time.Second), + LastMessage: "Last sent PullConfirmedOutput message structure", + }, + OutPostTransaction: chain.NodeConnectionMessageStats{ + Total: *atomic.NewInt32(3), + LastEvent: time.Now().Add(-2 * time.Millisecond), + LastMessage: "Last sent PostTransaction message structure", + }, + InTransaction: chain.NodeConnectionMessageStats{ + Total: *atomic.NewInt32(101), + LastEvent: time.Now().Add(-8 * time.Second), + LastMessage: "Last received Transaction message structure", + }, + InInclusionState: chain.NodeConnectionMessageStats{ + Total: *atomic.NewInt32(203), + LastEvent: time.Now().Add(-123 * time.Millisecond), + LastMessage: "Last received InclusionState message structure", + }, + InOutput: chain.NodeConnectionMessageStats{ + Total: *atomic.NewInt32(85), + LastEvent: time.Now().Add(-2 * time.Second), + LastMessage: "Last received Output message structure", + }, + InUnspentAliasOutput: chain.NodeConnectionMessageStats{ + Total: *atomic.NewInt32(999), + LastEvent: time.Now().Add(-1 * time.Second), + LastMessage: "Last received UnspentAliasOutput message structure", + }, + } + + example := chain.NodeConnectionStats{ + Subscribed: []ledgerstate.Address{iscp.RandomChainID().AsAddress(), iscp.RandomChainID().AsAddress()}, + NodeConnectionMessagesStats: chainExample, + } + + s := &chainStatsService{chainsProvider} + + adm.GET(routes.GetChainsStats(), s.handleGetChainsStats). + SetSummary("Get cummulative chains state statistics"). + AddResponse(http.StatusOK, "Chains Stats", example, nil) + + adm.GET(routes.GetChainStats(":chainID"), s.handleGetChainStats). + SetSummary("Get chain state statistics for the given chain ID"). + AddParamPath("", "chainID", "ChainID (base58)"). + AddResponse(http.StatusOK, "Chain Stats", chainExample, nil) +} + +type chainStatsService struct { + chains chains.Provider +} + +func (cssT *chainStatsService) handleGetChainsStats(c echo.Context) error { + stats := cssT.chains().GetNodeConnectionStats() + + return c.JSON(http.StatusOK, stats) +} + +func (cssT *chainStatsService) handleGetChainStats(c echo.Context) error { + chainID, err := iscp.ChainIDFromBase58(c.Param("chainID")) + if err != nil { + return httperrors.BadRequest(err.Error()) + } + theChain := cssT.chains().Get(chainID) + if theChain == nil { + return httperrors.NotFound(fmt.Sprintf("Active chain %s not found", chainID)) + } + stats := theChain.GetNodeConnectionStats() + + return c.JSON(http.StatusOK, stats) +} diff --git a/packages/webapi/admapi/endpoints.go b/packages/webapi/admapi/endpoints.go index 29fd066b48..abec74d261 100644 --- a/packages/webapi/admapi/endpoints.go +++ b/packages/webapi/admapi/endpoints.go @@ -40,6 +40,7 @@ func AddEndpoints( addShutdownEndpoint(adm, shutdown) addChainRecordEndpoints(adm, registryProvider) + addChainStatsEndpoints(adm, chainsProvider) addCommitteeRecordEndpoints(adm, registryProvider, chainsProvider) addChainEndpoints(adm, registryProvider, chainsProvider, metrics) addDKSharesEndpoints(adm, registryProvider, nodeProvider) diff --git a/packages/webapi/request/request_test.go b/packages/webapi/request/request_test.go index 08ce7ff381..cf970fcb82 100644 --- a/packages/webapi/request/request_test.go +++ b/packages/webapi/request/request_test.go @@ -36,23 +36,19 @@ func (m *mockedChain) ReceiveTransaction(_ *ledgerstate.Transaction) { panic("implement me") } -func (m *mockedChain) ReceiveInclusionState(_ ledgerstate.TransactionID, _ ledgerstate.InclusionState) { - panic("implement me") -} - func (m *mockedChain) ReceiveState(_ *ledgerstate.AliasOutput, _ time.Time) { panic("implement me") } -func (m *mockedChain) ReceiveOutput(_ ledgerstate.Output) { +func (m *mockedChain) Dismiss(_ string) { panic("implement me") } -func (m *mockedChain) Dismiss(_ string) { +func (m *mockedChain) IsDismissed() bool { panic("implement me") } -func (m *mockedChain) IsDismissed() bool { +func (m *mockedChain) GetNodeConnectionStats() chain.NodeConnectionMessagesStats { panic("implement me") } diff --git a/packages/webapi/routes/routes.go b/packages/webapi/routes/routes.go index 630e052cbd..550c7133d5 100644 --- a/packages/webapi/routes/routes.go +++ b/packages/webapi/routes/routes.go @@ -55,6 +55,14 @@ func GetCommitteeRecord(addr string) string { return "/adm/committeerecord/" + addr } +func GetChainsStats() string { + return "/adm/chain/stats" +} + +func GetChainStats(chainID string) string { + return "/adm/chain/" + chainID + "/stats" +} + func GetCommitteeForChain(chainID string) string { return "/adm/chain/" + chainID + "/committeerecord" } From 3e522bc086ad767e4054814b470573f21ff31c1e Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 23 Nov 2021 16:37:13 +0200 Subject: [PATCH 114/198] Cleanup --- packages/testutil/testchain/mock_chain_core.go | 9 --------- packages/webapi/request/request_test.go | 5 +++++ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/testutil/testchain/mock_chain_core.go b/packages/testutil/testchain/mock_chain_core.go index 25c80d1c14..38504440fe 100644 --- a/packages/testutil/testchain/mock_chain_core.go +++ b/packages/testutil/testchain/mock_chain_core.go @@ -11,11 +11,9 @@ import ( "github.com/iotaledger/wasp/packages/chain/messages" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/coreutil" - "github.com/iotaledger/wasp/packages/iscp/request" "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/state" "github.com/iotaledger/wasp/packages/vm/processors" - "go.uber.org/atomic" ) type MockedChainCore struct { @@ -193,10 +191,3 @@ func (m *MockedChainCore) OnGetStateReader(f func() state.OptimisticStateReader) func (m *MockedChainCore) OnGlobalStateSync(f func() coreutil.ChainStateSync) { m.onGlobalStateSync = f } - -func (m *MockedChainCore) GlobalSolidIndex() *atomic.Uint32 { - return nil -} - -func (m *MockedChainCore) ReceiveOffLedgerRequest(_ *request.OffLedger, _ string) { -} diff --git a/packages/webapi/request/request_test.go b/packages/webapi/request/request_test.go index cf970fcb82..64aa2bd6b6 100644 --- a/packages/webapi/request/request_test.go +++ b/packages/webapi/request/request_test.go @@ -11,6 +11,7 @@ import ( "github.com/iotaledger/wasp/packages/chains" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/colored" + "github.com/iotaledger/wasp/packages/iscp/request" util "github.com/iotaledger/wasp/packages/testutil" "github.com/iotaledger/wasp/packages/testutil/testchain" "github.com/iotaledger/wasp/packages/testutil/testlogger" @@ -40,6 +41,10 @@ func (m *mockedChain) ReceiveState(_ *ledgerstate.AliasOutput, _ time.Time) { panic("implement me") } +func (m *mockedChain) ReceiveOffLedgerRequest(_ *request.OffLedger, _ string) { + panic("implement me") +} + func (m *mockedChain) Dismiss(_ string) { panic("implement me") } From 72d85d63ee0bffab33abc9a0f6504c9941063a7e Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 23 Nov 2021 16:49:36 +0200 Subject: [PATCH 115/198] Short test fix --- packages/webapi/request/request_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/webapi/request/request_test.go b/packages/webapi/request/request_test.go index 64aa2bd6b6..fac8c39764 100644 --- a/packages/webapi/request/request_test.go +++ b/packages/webapi/request/request_test.go @@ -42,7 +42,6 @@ func (m *mockedChain) ReceiveState(_ *ledgerstate.AliasOutput, _ time.Time) { } func (m *mockedChain) ReceiveOffLedgerRequest(_ *request.OffLedger, _ string) { - panic("implement me") } func (m *mockedChain) Dismiss(_ string) { From a225b41c4f58770e2e7ecd35042819b706cf3912 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 23 Nov 2021 17:39:49 +0200 Subject: [PATCH 116/198] BugFix in node connection swagger model --- packages/chain/chain.go | 2 +- packages/webapi/admapi/chainstats.go | 47 +++++++------- .../webapi/model/node_connection_stats.go | 65 +++++++++++++++++++ 3 files changed, 90 insertions(+), 24 deletions(-) create mode 100644 packages/webapi/model/node_connection_stats.go diff --git a/packages/chain/chain.go b/packages/chain/chain.go index 6d27e0753b..6185c13e3c 100644 --- a/packages/chain/chain.go +++ b/packages/chain/chain.go @@ -126,7 +126,7 @@ type ChainNodeConnection interface { } type NodeConnectionMessageStats struct { - Total atomic.Int32 + Total atomic.Uint32 LastEvent time.Time LastMessage interface{} } diff --git a/packages/webapi/admapi/chainstats.go b/packages/webapi/admapi/chainstats.go index 91b7f80f8c..7b86dc5fe6 100644 --- a/packages/webapi/admapi/chainstats.go +++ b/packages/webapi/admapi/chainstats.go @@ -5,64 +5,65 @@ import ( "net/http" "time" - "github.com/iotaledger/goshimmer/packages/ledgerstate" - "github.com/iotaledger/wasp/packages/chain" "github.com/iotaledger/wasp/packages/chains" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/webapi/httperrors" + "github.com/iotaledger/wasp/packages/webapi/model" "github.com/iotaledger/wasp/packages/webapi/routes" "github.com/labstack/echo/v4" "github.com/pangpanglabs/echoswagger/v2" - "go.uber.org/atomic" ) func addChainStatsEndpoints(adm echoswagger.ApiGroup, chainsProvider chains.Provider) { - chainExample := chain.NodeConnectionMessagesStats{ - OutPullState: chain.NodeConnectionMessageStats{ - Total: *atomic.NewInt32(15), + chainExample := &model.NodeConnectionMessagesStats{ + OutPullState: &model.NodeConnectionMessageStats{ + Total: 15, LastEvent: time.Now().Add(-10 * time.Second), LastMessage: "Last sent PullState message structure", }, - OutPullTransactionInclusionState: chain.NodeConnectionMessageStats{ - Total: *atomic.NewInt32(28), + OutPullTransactionInclusionState: &model.NodeConnectionMessageStats{ + Total: 28, LastEvent: time.Now().Add(-5 * time.Second), LastMessage: "Last sent PullTransactionInclusionState message structure", }, - OutPullConfirmedOutput: chain.NodeConnectionMessageStats{ - Total: *atomic.NewInt32(132), + OutPullConfirmedOutput: &model.NodeConnectionMessageStats{ + Total: 132, LastEvent: time.Now().Add(100 * time.Second), LastMessage: "Last sent PullConfirmedOutput message structure", }, - OutPostTransaction: chain.NodeConnectionMessageStats{ - Total: *atomic.NewInt32(3), + OutPostTransaction: &model.NodeConnectionMessageStats{ + Total: 3, LastEvent: time.Now().Add(-2 * time.Millisecond), LastMessage: "Last sent PostTransaction message structure", }, - InTransaction: chain.NodeConnectionMessageStats{ - Total: *atomic.NewInt32(101), + InTransaction: &model.NodeConnectionMessageStats{ + Total: 101, LastEvent: time.Now().Add(-8 * time.Second), LastMessage: "Last received Transaction message structure", }, - InInclusionState: chain.NodeConnectionMessageStats{ - Total: *atomic.NewInt32(203), + InInclusionState: &model.NodeConnectionMessageStats{ + Total: 203, LastEvent: time.Now().Add(-123 * time.Millisecond), LastMessage: "Last received InclusionState message structure", }, - InOutput: chain.NodeConnectionMessageStats{ - Total: *atomic.NewInt32(85), + InOutput: &model.NodeConnectionMessageStats{ + Total: 85, LastEvent: time.Now().Add(-2 * time.Second), LastMessage: "Last received Output message structure", }, - InUnspentAliasOutput: chain.NodeConnectionMessageStats{ - Total: *atomic.NewInt32(999), + InUnspentAliasOutput: &model.NodeConnectionMessageStats{ + Total: 999, LastEvent: time.Now().Add(-1 * time.Second), LastMessage: "Last received UnspentAliasOutput message structure", }, } - example := chain.NodeConnectionStats{ - Subscribed: []ledgerstate.Address{iscp.RandomChainID().AsAddress(), iscp.RandomChainID().AsAddress()}, - NodeConnectionMessagesStats: chainExample, + example := &model.NodeConnectionStats{ + NodeConnectionMessagesStats: *chainExample, + Subscribed: []model.Address{ + model.NewAddress(iscp.RandomChainID().AsAddress()), + model.NewAddress(iscp.RandomChainID().AsAddress()), + }, } s := &chainStatsService{chainsProvider} diff --git a/packages/webapi/model/node_connection_stats.go b/packages/webapi/model/node_connection_stats.go new file mode 100644 index 0000000000..02ef630a7c --- /dev/null +++ b/packages/webapi/model/node_connection_stats.go @@ -0,0 +1,65 @@ +package model + +import ( + "fmt" + "time" + + "github.com/iotaledger/wasp/packages/chain" +) + +type NodeConnectionMessageStats struct { + Total uint32 `swagger:"desc(Total number of messages sent/received)"` + LastEvent time.Time `swagger:"desc(Last time the message was sent/received)"` + LastMessage string `swagger:"desc(The print out of the last message)"` +} + +type NodeConnectionMessagesStats struct { + OutPullState *NodeConnectionMessageStats `swagger:"desc(Stats of sent out PullState messages)"` + OutPullTransactionInclusionState *NodeConnectionMessageStats `swagger:"desc(Stats of sent out PullTransactionInclusionState messages)"` + OutPullConfirmedOutput *NodeConnectionMessageStats `swagger:"desc(Stats of sent out PullConfirmedOutput messages)"` + OutPostTransaction *NodeConnectionMessageStats `swagger:"desc(Stats of sent out PostTransaction messages)"` + + InTransaction *NodeConnectionMessageStats `swagger:"desc(Stats of received Transaction messages)"` + InInclusionState *NodeConnectionMessageStats `swagger:"desc(Stats of received InclusionState messages)"` + InOutput *NodeConnectionMessageStats `swagger:"desc(Stats of received Output messages)"` + InUnspentAliasOutput *NodeConnectionMessageStats `swagger:"desc(Stats of received UnspentAliasOutput messages)"` +} + +type NodeConnectionStats struct { + NodeConnectionMessagesStats + Subscribed []Address +} + +func NewNodeConnectionStats(stats *chain.NodeConnectionStats) *NodeConnectionStats { + ncms := NewNodeConnectionMessagesStats(&stats.NodeConnectionMessagesStats) + s := make([]Address, len(stats.Subscribed)) + for i := range s { + s[i] = NewAddress(stats.Subscribed[i]) + } + return &NodeConnectionStats{ + NodeConnectionMessagesStats: *ncms, + Subscribed: s, + } +} + +func NewNodeConnectionMessagesStats(stats *chain.NodeConnectionMessagesStats) *NodeConnectionMessagesStats { + return &NodeConnectionMessagesStats{ + OutPullState: NewNodeConnectionMessageStats(&stats.OutPullState), + OutPullTransactionInclusionState: NewNodeConnectionMessageStats(&stats.OutPullTransactionInclusionState), + OutPullConfirmedOutput: NewNodeConnectionMessageStats(&stats.OutPullConfirmedOutput), + OutPostTransaction: NewNodeConnectionMessageStats(&stats.OutPostTransaction), + + InTransaction: NewNodeConnectionMessageStats(&stats.InTransaction), + InInclusionState: NewNodeConnectionMessageStats(&stats.InInclusionState), + InOutput: NewNodeConnectionMessageStats(&stats.InOutput), + InUnspentAliasOutput: NewNodeConnectionMessageStats(&stats.InUnspentAliasOutput), + } +} + +func NewNodeConnectionMessageStats(stats *chain.NodeConnectionMessageStats) *NodeConnectionMessageStats { + return &NodeConnectionMessageStats{ + Total: stats.Total.Load(), + LastEvent: stats.LastEvent, + LastMessage: fmt.Sprintf("%v", stats.LastMessage), + } +} From 0a12d94fc14cc5ccd31f6b9025f97bc4c171ae7f Mon Sep 17 00:00:00 2001 From: "Marcelo R. Bianchi" Date: Tue, 23 Nov 2021 14:16:51 -0300 Subject: [PATCH 117/198] Undo deprecated GET in webapi callview --- packages/webapi/state/callview.go | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/webapi/state/callview.go b/packages/webapi/state/callview.go index 4a6c2ded75..2e206c9fb5 100644 --- a/packages/webapi/state/callview.go +++ b/packages/webapi/state/callview.go @@ -39,7 +39,6 @@ func AddEndpoints(server echoswagger.ApiRouter, allChains chains.Provider) { AddParamBody(dictExample, "params", "Parameters", false). AddResponse(http.StatusOK, "Result", dictExample, nil) - // Deprecated server.GET(routes.CallView(":chainID", ":contractHname", ":fname"), s.handleCallView). SetSummary("Call a view function on a contract"). AddParamPath("", "chainID", "ChainID (base58-encoded)"). From 7b00508b02b7f2a658a52d28a7c7028afe17760e Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Tue, 23 Nov 2021 16:38:30 -0800 Subject: [PATCH 118/198] Utility gas placeholder code plus bugfix --- packages/vm/wasmproc/sccontext.go | 2 +- packages/vm/wasmproc/scutility.go | 10 +++++++++- packages/vm/wasmsolo/solocontext.go | 18 ++++++++++++++++-- packages/vm/wasmsolo/solosccontext.go | 2 +- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/packages/vm/wasmproc/sccontext.go b/packages/vm/wasmproc/sccontext.go index 7f7e1d59bd..be62fc9233 100644 --- a/packages/vm/wasmproc/sccontext.go +++ b/packages/vm/wasmproc/sccontext.go @@ -143,7 +143,7 @@ func (o *ScContext) GetObjectID(keyID, typeID int32) int32 { wasmhost.KeyReturn: func() WaspObject { return NewScDict(o.host, dict.New()) }, wasmhost.KeyState: func() WaspObject { return NewScDict(o.host, o.wc.state()) }, wasmhost.KeyTransfers: func() WaspObject { return NewScTransfers(o.wc) }, - wasmhost.KeyUtility: func() WaspObject { return NewScUtility(o.wc) }, + wasmhost.KeyUtility: func() WaspObject { return NewScUtility(o.wc, nil) }, }) } diff --git a/packages/vm/wasmproc/scutility.go b/packages/vm/wasmproc/scutility.go index 1933238c02..12c3d827c4 100644 --- a/packages/vm/wasmproc/scutility.go +++ b/packages/vm/wasmproc/scutility.go @@ -16,7 +16,15 @@ type ScUtility struct { wc *WasmContext } -func NewScUtility(wc *WasmContext) *ScUtility { +func NewScUtility(wc *WasmContext, gasProcessor interface{}) *ScUtility { + //if gasProcessor == nil { + // if wc.ctx != nil { + // gasProcessor = wc.ctx.Gas() + // } else { + // gasProcessor = wc.ctxView.Gas() + // } + //} + //return &ScUtility{utils: sandbox.NewUtils(gasProcessor), wc: wc} return &ScUtility{utils: sandbox_utils.NewUtils(), wc: wc} } diff --git a/packages/vm/wasmsolo/solocontext.go b/packages/vm/wasmsolo/solocontext.go index d26e638a23..1bd87259dd 100644 --- a/packages/vm/wasmsolo/solocontext.go +++ b/packages/vm/wasmsolo/solocontext.go @@ -53,10 +53,24 @@ type SoloContext struct { } var ( + //_ iscp.Gas = &SoloContext{} _ wasmlib.ScFuncCallContext = &SoloContext{} _ wasmlib.ScViewCallContext = &SoloContext{} ) +func (ctx *SoloContext) Burn(i int64) { + // ignore gas for now +} + +func (ctx *SoloContext) Budget() int64 { + // ignore gas for now + return 0 +} + +func (ctx *SoloContext) SetBudget(i int64) { + // ignore gas for now +} + // NewSoloContext can be used to create a SoloContext associated with a smart contract // with minimal information and will verify successful creation before returning ctx. // It will start a default chain "chain1" before initializing the smart contract. @@ -338,7 +352,7 @@ func (ctx *SoloContext) upload(keyPair *ed25519.KeyPair) { wasmFile = "../pkg/" + wasmFile } - if *GoWasm { + if !exists || *GoWasm { wasmFile = ctx.scName + "_go.wasm" exists, _ = util.ExistsFilePath("../go/pkg/" + wasmFile) if exists { @@ -346,7 +360,7 @@ func (ctx *SoloContext) upload(keyPair *ed25519.KeyPair) { } } - if *TsWasm { + if !exists || *TsWasm { wasmFile = ctx.scName + "_ts.wasm" exists, _ = util.ExistsFilePath("../ts/pkg/" + wasmFile) if exists { diff --git a/packages/vm/wasmsolo/solosccontext.go b/packages/vm/wasmsolo/solosccontext.go index a1053a0be8..c6aabb0b24 100644 --- a/packages/vm/wasmsolo/solosccontext.go +++ b/packages/vm/wasmsolo/solosccontext.go @@ -51,7 +51,7 @@ func (o *SoloScContext) GetObjectID(keyID, typeID int32) int32 { wasmhost.KeyReturn: func() wasmproc.WaspObject { return wasmproc.NewScDict(&host.KvStoreHost, dict.New()) }, // wasmhost.KeyState: func() wasmproc.WaspObject { return wasmproc.NewScDict(o.host, o.vm.state()) }, // wasmhost.KeyTransfers: func() wasmproc.WaspObject { return wasmproc.NewScTransfers(o.vm) }, - wasmhost.KeyUtility: func() wasmproc.WaspObject { return wasmproc.NewScUtility(nil) }, + wasmhost.KeyUtility: func() wasmproc.WaspObject { return wasmproc.NewScUtility(nil, o.ctx) }, }) } From 060056c71be8844129905d1ffcc7c991dfbaaa72 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Wed, 24 Nov 2021 11:59:40 +0200 Subject: [PATCH 119/198] Timestamp removed from peer message --- packages/chain/chainpeering/chain_peers.go | 3 --- packages/chain/chainpeering/committee_peer_group.go | 3 --- packages/dkg/messages.go | 1 - packages/peering/peer_message.go | 7 ------- packages/peering/peering_test.go | 3 --- packages/testutil/peeringNetBehaviourDynamic_test.go | 9 +++------ packages/testutil/peeringNetworkProvider.go | 5 +++-- 7 files changed, 6 insertions(+), 25 deletions(-) diff --git a/packages/chain/chainpeering/chain_peers.go b/packages/chain/chainpeering/chain_peers.go index c01b1dbbcb..37da646e67 100644 --- a/packages/chain/chainpeering/chain_peers.go +++ b/packages/chain/chainpeering/chain_peers.go @@ -1,8 +1,6 @@ package chainpeering import ( - "time" - "github.com/iotaledger/wasp/packages/chain" "github.com/iotaledger/wasp/packages/peering" ) @@ -30,7 +28,6 @@ func (cpiT *ChainPeersImpl) AttachToPeerMessages(receiver byte, fun func(recv *p func (cpiT *ChainPeersImpl) SendPeerMsgByNetID(netID string, msgReceiver, msgType byte, msgData []byte) { cpiT.peers.SendMsgByNetID(netID, &peering.PeerMessageData{ PeeringID: cpiT.peeringID, - Timestamp: time.Now().UnixNano(), MsgReceiver: msgReceiver, MsgType: msgType, MsgData: msgData, diff --git a/packages/chain/chainpeering/committee_peer_group.go b/packages/chain/chainpeering/committee_peer_group.go index 1d785dd0f1..08cfd4e5f1 100644 --- a/packages/chain/chainpeering/committee_peer_group.go +++ b/packages/chain/chainpeering/committee_peer_group.go @@ -5,7 +5,6 @@ package chainpeering import ( "fmt" - "time" "github.com/iotaledger/wasp/packages/chain" "github.com/iotaledger/wasp/packages/peering" @@ -32,7 +31,6 @@ func (cpgT *committeePeerGroup) SendMsgByIndex(peerIdx uint16, msgReceiver, msgT peer.SendMsg(&peering.PeerMessageNet{ PeerMessageData: peering.PeerMessageData{ PeeringID: cpgT.peeringID, - Timestamp: time.Now().UnixNano(), MsgReceiver: msgReceiver, MsgType: msgType, MsgData: msgData, @@ -46,7 +44,6 @@ func (cpgT *committeePeerGroup) SendMsgByIndex(peerIdx uint16, msgReceiver, msgT func (cpgT *committeePeerGroup) SendMsgBroadcast(msgReceiver, msgType byte, msgData []byte, except ...uint16) { msg := &peering.PeerMessageData{ PeeringID: cpgT.peeringID, - Timestamp: time.Now().UnixNano(), MsgReceiver: msgReceiver, MsgType: msgType, MsgData: msgData, diff --git a/packages/dkg/messages.go b/packages/dkg/messages.go index 42ac4939ef..c0a01948e5 100644 --- a/packages/dkg/messages.go +++ b/packages/dkg/messages.go @@ -121,7 +121,6 @@ func makePeerMessage(peeringID peering.PeeringID, receiver, step byte, msg msgBy msg.SetStep(step) return &peering.PeerMessageData{ PeeringID: peeringID, - Timestamp: 0, // We do not use it in the DKG. MsgReceiver: receiver, MsgType: msg.MsgType(), MsgData: util.MustBytes(msg), diff --git a/packages/peering/peer_message.go b/packages/peering/peer_message.go index 27e6167cbb..11f9851e29 100644 --- a/packages/peering/peer_message.go +++ b/packages/peering/peer_message.go @@ -22,7 +22,6 @@ import ( // the peering module. type PeerMessageData struct { PeeringID PeeringID - Timestamp int64 MsgReceiver byte MsgType byte MsgData []byte @@ -50,9 +49,6 @@ func NewPeerMessageDataFromBytes(buf []byte) (*PeerMessageData, error) { var err error r := bytes.NewBuffer(buf) m := PeerMessageData{} - if err = util.ReadInt64(r, &m.Timestamp); err != nil { - return nil, err - } if m.MsgReceiver, err = util.ReadByte(r); err != nil { return nil, err } @@ -92,9 +88,6 @@ func (m *PeerMessageNet) Bytes() ([]byte, error) { func (m *PeerMessageData) bytes() ([]byte, error) { var buf bytes.Buffer - if err := util.WriteInt64(&buf, m.Timestamp); err != nil { - return nil, err - } if err := util.WriteByte(&buf, m.MsgReceiver); err != nil { return nil, err } diff --git a/packages/peering/peering_test.go b/packages/peering/peering_test.go index 626556cda9..cbe56aeaf9 100644 --- a/packages/peering/peering_test.go +++ b/packages/peering/peering_test.go @@ -3,7 +3,6 @@ package peering_test import ( "bytes" "testing" - "time" "github.com/iotaledger/wasp/packages/peering" "github.com/stretchr/testify/require" @@ -15,7 +14,6 @@ func TestPeerMessageCodec(t *testing.T) { src = &peering.PeerMessageNet{ PeerMessageData: peering.PeerMessageData{ PeeringID: peering.RandomPeeringID(), - Timestamp: time.Now().UnixNano(), MsgReceiver: byte(10), MsgType: peering.FirstUserMsgCode + 17, MsgData: []byte{1, 2, 3, 4, 5}, @@ -29,7 +27,6 @@ func TestPeerMessageCodec(t *testing.T) { require.Nil(t, err) require.NotNil(t, dst) require.EqualValues(t, src.PeeringID, dst.PeeringID) - require.Equal(t, src.Timestamp, dst.Timestamp) require.Equal(t, src.MsgReceiver, dst.MsgReceiver) require.Equal(t, src.MsgType, dst.MsgType) require.True(t, bytes.Equal(src.MsgData, dst.MsgData)) diff --git a/packages/testutil/peeringNetBehaviourDynamic_test.go b/packages/testutil/peeringNetBehaviourDynamic_test.go index a164672bb0..c54c10a920 100644 --- a/packages/testutil/peeringNetBehaviourDynamic_test.go +++ b/packages/testutil/peeringNetBehaviourDynamic_test.go @@ -8,7 +8,6 @@ import ( "time" "github.com/iotaledger/hive.go/logger" - "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/testutil/testlogger" "github.com/stretchr/testify/require" ) @@ -242,7 +241,7 @@ func testRecvLoop(outCh chan *peeringMsg, durations *[]time.Duration, stopCh cha case <-stopCh: return case msg := <-outCh: - *durations = append(*durations, time.Since(time.Unix(0, msg.msg.Timestamp))) + *durations = append(*durations, time.Since(time.Unix(0, msg.timestamp))) } } } @@ -257,9 +256,7 @@ func averageDuration(durations []time.Duration) int64 { func sendMessage(from *peeringNode, inCh chan *peeringMsg) { inCh <- &peeringMsg{ - from: from.netID, - msg: peering.PeerMessageData{ - Timestamp: time.Now().UnixNano(), - }, + from: from.netID, + timestamp: time.Now().UnixNano(), } } diff --git a/packages/testutil/peeringNetworkProvider.go b/packages/testutil/peeringNetworkProvider.go index c53e151fb6..b3c6b9787a 100644 --- a/packages/testutil/peeringNetworkProvider.go +++ b/packages/testutil/peeringNetworkProvider.go @@ -108,8 +108,9 @@ type peeringNode struct { } type peeringMsg struct { - from string - msg peering.PeerMessageData + from string + msg peering.PeerMessageData + timestamp int64 } type peeringCb struct { From 2e7d50ef28dba23f0f4a77bd89df81abf8128922 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Wed, 24 Nov 2021 12:21:58 +0200 Subject: [PATCH 120/198] Remove includingSelf parameter from GroupProvider Broadcast method --- .../chain/chainpeering/committee_peer_group.go | 2 +- packages/peering/group/group.go | 10 ++-------- packages/peering/group/group_test.go | 16 ++++++++-------- packages/peering/peering.go | 2 +- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/packages/chain/chainpeering/committee_peer_group.go b/packages/chain/chainpeering/committee_peer_group.go index 08cfd4e5f1..3f2aa1c462 100644 --- a/packages/chain/chainpeering/committee_peer_group.go +++ b/packages/chain/chainpeering/committee_peer_group.go @@ -48,7 +48,7 @@ func (cpgT *committeePeerGroup) SendMsgBroadcast(msgReceiver, msgType byte, msgD MsgType: msgType, MsgData: msgData, } - cpgT.group.SendMsgBroadcast(msg, false, except...) + cpgT.group.SendMsgBroadcast(msg, except...) } func (cpgT *committeePeerGroup) AttachToPeerMessages(peerMsgReceiver byte, fun func(peerMsg *peering.PeerMessageGroupIn)) { diff --git a/packages/peering/group/group.go b/packages/peering/group/group.go index f585ed5f3d..21615d2f1e 100644 --- a/packages/peering/group/group.go +++ b/packages/peering/group/group.go @@ -88,14 +88,8 @@ func (g *groupImpl) SendMsgByIndex(peerIdx uint16, msg *peering.PeerMessageData) } // Broadcast implements peering.GroupProvider. -func (g *groupImpl) SendMsgBroadcast(msg *peering.PeerMessageData, includingSelf bool, except ...uint16) { - var peers map[uint16]peering.PeerSender - if includingSelf { - peers = g.AllNodes(except...) - } else { - peers = g.OtherNodes(except...) - } - for i := range peers { +func (g *groupImpl) SendMsgBroadcast(msg *peering.PeerMessageData, except ...uint16) { + for i := range g.OtherNodes(except...) { g.SendMsgByIndex(i, msg) } } diff --git a/packages/peering/group/group_test.go b/packages/peering/group/group_test.go index 8a2c6ee284..c1b0ec9227 100644 --- a/packages/peering/group/group_test.go +++ b/packages/peering/group/group_test.go @@ -14,7 +14,7 @@ func TestGroupProvider(t *testing.T) { log := testlogger.NewLogger(t) defer log.Sync() - nodeCount := 3 + nodeCount := 4 netIDs, nodeIdentities := testpeers.SetupKeys(uint16(nodeCount)) nodes, netCloser := testpeers.SetupNet(netIDs, nodeIdentities, testutil.NewPeeringNetReliable(log), log) for i := range nodes { @@ -25,29 +25,29 @@ func TestGroupProvider(t *testing.T) { // Listen for messages on all the nodes. peeringID := peering.RandomPeeringID() receiver := byte(4) - doneCh0 := make(chan bool) doneCh1 := make(chan bool) doneCh2 := make(chan bool) - nodes[0].Attach(&peeringID, receiver, func(recv *peering.PeerMessageIn) { - doneCh0 <- true - }) + doneCh3 := make(chan bool) nodes[1].Attach(&peeringID, receiver, func(recv *peering.PeerMessageIn) { doneCh1 <- true }) nodes[2].Attach(&peeringID, receiver, func(recv *peering.PeerMessageIn) { doneCh2 <- true }) + nodes[3].Attach(&peeringID, receiver, func(recv *peering.PeerMessageIn) { + doneCh3 <- true + }) // // Create a group on one of nodes. var g peering.GroupProvider - g, err := nodes[1].PeerGroup(netIDs) + g, err := nodes[0].PeerGroup(netIDs) require.Nil(t, err) // // Broadcast a message and wait until it will be received on all the nodes. - g.SendMsgBroadcast(&peering.PeerMessageData{PeeringID: peeringID, MsgReceiver: receiver, MsgType: 125}, true) - <-doneCh0 + g.SendMsgBroadcast(&peering.PeerMessageData{PeeringID: peeringID, MsgReceiver: receiver, MsgType: 125}) <-doneCh1 <-doneCh2 + <-doneCh3 // // Done. g.Close() diff --git a/packages/peering/peering.go b/packages/peering/peering.go index b256723fa4..0f8419a736 100644 --- a/packages/peering/peering.go +++ b/packages/peering/peering.go @@ -70,7 +70,7 @@ type GroupProvider interface { Attach(peeringID *PeeringID, receiver byte, callback func(recv *PeerMessageGroupIn)) interface{} Detach(attachID interface{}) SendMsgByIndex(peerIdx uint16, msg *PeerMessageData) - SendMsgBroadcast(msg *PeerMessageData, includingSelf bool, except ...uint16) + SendMsgBroadcast(msg *PeerMessageData, except ...uint16) ExchangeRound( peers map[uint16]PeerSender, recvCh chan *PeerMessageIn, From 5d85539c407588e7e020024cdda72148ef0fd73a Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Wed, 24 Nov 2021 12:54:07 +0200 Subject: [PATCH 121/198] PeerSender parameter type altered --- packages/chain/chainpeering/committee_peer_group.go | 12 +++++------- packages/dkg/node.go | 12 ++++++------ packages/peering/domain/domain.go | 2 +- packages/peering/group/group.go | 2 +- packages/peering/lpp/lppNetImpl.go | 6 +++--- packages/peering/lpp/lppNetImpl_test.go | 6 +++--- packages/peering/lpp/lppPeer.go | 5 +++-- packages/peering/peering.go | 2 +- packages/testutil/peeringNetworkProvider.go | 8 +++++--- packages/testutil/peeringNetworkProvider_test.go | 8 ++++---- 10 files changed, 32 insertions(+), 31 deletions(-) diff --git a/packages/chain/chainpeering/committee_peer_group.go b/packages/chain/chainpeering/committee_peer_group.go index 3f2aa1c462..72ed7519b5 100644 --- a/packages/chain/chainpeering/committee_peer_group.go +++ b/packages/chain/chainpeering/committee_peer_group.go @@ -28,13 +28,11 @@ func NewCommitteePeerGroup(peeringID peering.PeeringID, group peering.GroupProvi func (cpgT *committeePeerGroup) SendMsgByIndex(peerIdx uint16, msgReceiver, msgType byte, msgData []byte) error { if peer, ok := cpgT.group.OtherNodes()[peerIdx]; ok { - peer.SendMsg(&peering.PeerMessageNet{ - PeerMessageData: peering.PeerMessageData{ - PeeringID: cpgT.peeringID, - MsgReceiver: msgReceiver, - MsgType: msgType, - MsgData: msgData, - }, + peer.SendMsg(&peering.PeerMessageData{ + PeeringID: cpgT.peeringID, + MsgReceiver: msgReceiver, + MsgType: msgType, + MsgData: msgData, }) return nil } diff --git a/packages/dkg/node.go b/packages/dkg/node.go index 37af023250..7b73ba5b02 100644 --- a/packages/dkg/node.go +++ b/packages/dkg/node.go @@ -153,7 +153,7 @@ func (n *Node) GenerateDistributedKey( if err = n.exchangeInitiatorAcks(netGroup, netGroup.AllNodes(), recvCh, rTimeout, gTimeout, rabinStep0Initialize, func(peerIdx uint16, peer peering.PeerSender) { n.log.Debugf("Initiator sends step=%v command to %v", rabinStep0Initialize, peer.NetID()) - peer.SendMsg(&peering.PeerMessageNet{PeerMessageData: *makePeerMessage(initPeeringID, peerMessageReceiverDkgInit, rabinStep0Initialize, &initiatorInitMsg{ + peer.SendMsg(makePeerMessage(initPeeringID, peerMessageReceiverDkgInit, rabinStep0Initialize, &initiatorInitMsg{ dkgRef: dkgID.String(), // It could be some other identifier. peeringID: dkgID, peerNetIDs: peerNetIDs, @@ -162,7 +162,7 @@ func (n *Node) GenerateDistributedKey( threshold: threshold, timeout: timeout, roundRetry: roundRetry, - })}) + })) }, ); err != nil { return nil, err @@ -194,7 +194,7 @@ func (n *Node) GenerateDistributedKey( if err = n.exchangeInitiatorMsgs(netGroup, netGroup.AllNodes(), recvCh, rTimeout, gTimeout, rabinStep6R6SendReconstructCommits, func(peerIdx uint16, peer peering.PeerSender) { n.log.Debugf("Initiator sends step=%v command to %v", rabinStep6R6SendReconstructCommits, peer.NetID()) - peer.SendMsg(&peering.PeerMessageNet{PeerMessageData: *makePeerMessage(dkgID, peerMessageReceiverDkg, rabinStep6R6SendReconstructCommits, &initiatorStepMsg{})}) + peer.SendMsg(makePeerMessage(dkgID, peerMessageReceiverDkg, rabinStep6R6SendReconstructCommits, &initiatorStepMsg{})) }, func(recv *peering.PeerMessageGroupIn, initMsg initiatorMsg) (bool, error) { switch msg := initMsg.(type) { @@ -242,9 +242,9 @@ func (n *Node) GenerateDistributedKey( if err = n.exchangeInitiatorAcks(netGroup, netGroup.AllNodes(), recvCh, rTimeout, gTimeout, rabinStep7CommitAndTerminate, func(peerIdx uint16, peer peering.PeerSender) { n.log.Debugf("Initiator sends step=%v command to %v", rabinStep7CommitAndTerminate, peer.NetID()) - peer.SendMsg(&peering.PeerMessageNet{PeerMessageData: *makePeerMessage(dkgID, peerMessageReceiverDkg, rabinStep7CommitAndTerminate, &initiatorDoneMsg{ + peer.SendMsg(makePeerMessage(dkgID, peerMessageReceiverDkg, rabinStep7CommitAndTerminate, &initiatorDoneMsg{ pubShares: publicShares, - })}) + })) }, ); err != nil { return nil, err @@ -320,7 +320,7 @@ func (n *Node) exchangeInitiatorStep( ) error { sendCB := func(peerIdx uint16, peer peering.PeerSender) { n.log.Debugf("Initiator sends step=%v command to %v", step, peer.NetID()) - peer.SendMsg(&peering.PeerMessageNet{PeerMessageData: *makePeerMessage(dkgID, peerMessageReceiverDkg, step, &initiatorStepMsg{})}) + peer.SendMsg(makePeerMessage(dkgID, peerMessageReceiverDkg, step, &initiatorStepMsg{})) } return n.exchangeInitiatorAcks(netGroup, peers, recvCh, retryTimeout, giveUpTimeout, step, sendCB) } diff --git a/packages/peering/domain/domain.go b/packages/peering/domain/domain.go index 620ac535b2..3aaf485e80 100644 --- a/packages/peering/domain/domain.go +++ b/packages/peering/domain/domain.go @@ -61,7 +61,7 @@ func (d *DomainImpl) SendMsgByNetID(netID string, msg *peering.PeerMessageData) d.log.Warnf("SendMsgByNetID: NetID %v is not in the domain", netID) return } - peer.SendMsg(&peering.PeerMessageNet{PeerMessageData: *msg}) + peer.SendMsg(msg) } func (d *DomainImpl) GetRandomPeers(upToNumPeers int) []string { diff --git a/packages/peering/group/group.go b/packages/peering/group/group.go index 21615d2f1e..c7be76e3d3 100644 --- a/packages/peering/group/group.go +++ b/packages/peering/group/group.go @@ -84,7 +84,7 @@ func (g *groupImpl) NetIDByIndex(index uint16) (string, error) { // SendMsgByIndex implements peering.GroupProvider. func (g *groupImpl) SendMsgByIndex(peerIdx uint16, msg *peering.PeerMessageData) { - g.nodes[peerIdx].SendMsg(&peering.PeerMessageNet{PeerMessageData: *msg}) + g.nodes[peerIdx].SendMsg(msg) } // Broadcast implements peering.GroupProvider. diff --git a/packages/peering/lpp/lppNetImpl.go b/packages/peering/lpp/lppNetImpl.go index fd51149891..70ab9f769c 100644 --- a/packages/peering/lpp/lppNetImpl.go +++ b/packages/peering/lpp/lppNetImpl.go @@ -352,7 +352,7 @@ func (n *netImpl) SendMsgByNetID(netID string, msg *peering.PeerMessageData) { n.log.Warnf("SendMsgByNetID: NetID %v is not in the network", netID) return } - peer.SendMsg(&peering.PeerMessageNet{PeerMessageData: *msg}) + peer.SendMsg(msg) } // Attach implements peering.NetworkProvider. @@ -413,9 +413,9 @@ func (n *netImpl) PubKey() *ed25519.PublicKey { } // SendMsg implements peering.PeerSender for the Self() node. -func (n *netImpl) SendMsg(msg *peering.PeerMessageNet) { +func (n *netImpl) SendMsg(msg *peering.PeerMessageData) { // Don't go via the network, if sending a message to self. - n.triggerRecvEvents(n.Self().NetID(), msg) + n.triggerRecvEvents(n.Self().NetID(), &peering.PeerMessageNet{PeerMessageData: *msg}) } func (n *netImpl) triggerRecvEvents(from string, msg *peering.PeerMessageNet) { diff --git a/packages/peering/lpp/lppNetImpl_test.go b/packages/peering/lpp/lppNetImpl_test.go index 8d091da17f..02e5294146 100644 --- a/packages/peering/lpp/lppNetImpl_test.go +++ b/packages/peering/lpp/lppNetImpl_test.go @@ -60,9 +60,9 @@ func TestLPPPeeringImpl(t *testing.T) { doneCh <- true }) - n0p2.SendMsg(&peering.PeerMessageNet{PeerMessageData: peering.PeerMessageData{PeeringID: chain1, MsgReceiver: receiver, MsgType: 125}}) - n1p1.SendMsg(&peering.PeerMessageNet{PeerMessageData: peering.PeerMessageData{PeeringID: chain1, MsgReceiver: receiver, MsgType: 125}}) - n2p0.SendMsg(&peering.PeerMessageNet{PeerMessageData: peering.PeerMessageData{PeeringID: chain2, MsgReceiver: receiver, MsgType: 125}}) + n0p2.SendMsg(&peering.PeerMessageData{PeeringID: chain1, MsgReceiver: receiver, MsgType: 125}) + n1p1.SendMsg(&peering.PeerMessageData{PeeringID: chain1, MsgReceiver: receiver, MsgType: 125}) + n2p0.SendMsg(&peering.PeerMessageData{PeeringID: chain2, MsgReceiver: receiver, MsgType: 125}) <-doneCh time.Sleep(100 * time.Millisecond) diff --git a/packages/peering/lpp/lppPeer.go b/packages/peering/lpp/lppPeer.go index 99e572e5ea..929747abce 100644 --- a/packages/peering/lpp/lppPeer.go +++ b/packages/peering/lpp/lppPeer.go @@ -114,16 +114,17 @@ func (p *peer) PubKey() *ed25519.PublicKey { // SendMsg implements peering.PeerSender interface for the remote peers. // The send operation is performed asynchronously. // The async sending helped to cope with sporadic deadlocks. -func (p *peer) SendMsg(msg *peering.PeerMessageNet) { +func (p *peer) SendMsg(msg *peering.PeerMessageData) { // p.accessLock.RLock() + msgNet := &peering.PeerMessageNet{PeerMessageData: *msg} if !p.trusted { p.log.Infof("Dropping outgoing message, because it was meant to send to a distrusted peer.") p.accessLock.RUnlock() return } p.accessLock.RUnlock() - p.sendPipe.In() <- msg + p.sendPipe.In() <- msgNet } func (p *peer) RecvMsg(msg *peering.PeerMessageNet) { diff --git a/packages/peering/peering.go b/packages/peering/peering.go index 0f8419a736..952e1ce855 100644 --- a/packages/peering/peering.go +++ b/packages/peering/peering.go @@ -107,7 +107,7 @@ type PeerSender interface { // SendMsg works in an asynchronous way, and therefore the // errors are not returned here. - SendMsg(msg *PeerMessageNet) + SendMsg(msg *PeerMessageData) // IsAlive indicates, if there is a working connection with the peer. // It is always an approximate state. diff --git a/packages/testutil/peeringNetworkProvider.go b/packages/testutil/peeringNetworkProvider.go index b3c6b9787a..93076ab0a7 100644 --- a/packages/testutil/peeringNetworkProvider.go +++ b/packages/testutil/peeringNetworkProvider.go @@ -240,7 +240,7 @@ func (p *peeringNetworkProvider) Detach(attachID interface{}) { func (p *peeringNetworkProvider) SendMsgByNetID(netID string, msg *peering.PeerMessageData) { s, err := p.PeerByNetID(netID) if err == nil { - s.SendMsg(&peering.PeerMessageNet{PeerMessageData: *msg}) + s.SendMsg(msg) } } @@ -289,6 +289,8 @@ type peeringSender struct { netProvider *peeringNetworkProvider } +var _ peering.PeerSender = &peeringSender{} + func newPeeringSender(node *peeringNode, netProvider *peeringNetworkProvider) *peeringSender { return &peeringSender{ node: node, @@ -307,8 +309,8 @@ func (p *peeringSender) PubKey() *ed25519.PublicKey { } // Send implements peering.PeerSender. -func (p *peeringSender) SendMsg(msg *peering.PeerMessageNet) { - p.node.sendMsg(p.netProvider.self.netID, &msg.PeerMessageData) +func (p *peeringSender) SendMsg(msg *peering.PeerMessageData) { + p.node.sendMsg(p.netProvider.self.netID, msg) } // IsAlive implements peering.PeerSender. diff --git a/packages/testutil/peeringNetworkProvider_test.go b/packages/testutil/peeringNetworkProvider_test.go index 7ab31d27c9..47229ac676 100644 --- a/packages/testutil/peeringNetworkProvider_test.go +++ b/packages/testutil/peeringNetworkProvider_test.go @@ -32,10 +32,10 @@ func TestFakeNetwork(t *testing.T) { var a, c peering.PeerSender a, _ = netProviders[1].PeerByNetID("a") c, _ = netProviders[1].PeerByNetID("c") - a.SendMsg(&peering.PeerMessageNet{PeerMessageData: peering.PeerMessageData{PeeringID: chain1, MsgReceiver: receiver, MsgType: 1}}) // Will be delivered. - a.SendMsg(&peering.PeerMessageNet{PeerMessageData: peering.PeerMessageData{PeeringID: chain2, MsgReceiver: receiver, MsgType: 2}}) // Will be dropped. - a.SendMsg(&peering.PeerMessageNet{PeerMessageData: peering.PeerMessageData{PeeringID: chain1, MsgReceiver: byte(5), MsgType: 3}}) // Will be dropped. - c.SendMsg(&peering.PeerMessageNet{PeerMessageData: peering.PeerMessageData{PeeringID: chain1, MsgReceiver: receiver, MsgType: 4}}) // Will be dropped. + a.SendMsg(&peering.PeerMessageData{PeeringID: chain1, MsgReceiver: receiver, MsgType: 1}) // Will be delivered. + a.SendMsg(&peering.PeerMessageData{PeeringID: chain2, MsgReceiver: receiver, MsgType: 2}) // Will be dropped. + a.SendMsg(&peering.PeerMessageData{PeeringID: chain1, MsgReceiver: byte(5), MsgType: 3}) // Will be dropped. + c.SendMsg(&peering.PeerMessageData{PeeringID: chain1, MsgReceiver: receiver, MsgType: 4}) // Will be dropped. // // Wait for the result. select { From 92086554235f26c91298f2fb4528c6ef93833698 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Wed, 24 Nov 2021 17:09:24 +0200 Subject: [PATCH 122/198] Lower usage of peering id moved to peering package --- packages/chain/chain.go | 19 ----- packages/chain/chainimpl/chainimpl.go | 11 ++- packages/chain/chainimpl/eventproc.go | 2 +- packages/chain/chainimpl/interface.go | 4 +- packages/chain/chainpeering/chain_peers.go | 51 ------------- .../chainpeering/committee_peer_group.go | 73 ------------------- packages/chain/committee/committee.go | 17 ++--- packages/chain/consensus/action.go | 4 +- .../consensus/commonsubset/commonsubset.go | 10 +-- .../commonsubset/commonsubset_test.go | 23 +++--- .../commonsubset/commonsubsetcoordinator.go | 7 +- packages/chain/consensus/consensus.go | 6 +- packages/chain/consensus/setup_test.go | 2 +- packages/chain/statemgr/eventproc.go | 2 +- packages/chain/statemgr/setup_test.go | 9 +-- packages/chain/statemgr/statemgr.go | 6 +- packages/dkg/node.go | 4 +- packages/dkg/proc.go | 14 ++-- packages/peering/domain/domain.go | 34 +++++++-- packages/peering/domain/domain_test.go | 18 ++--- packages/peering/group/group.go | 28 +++++-- packages/peering/group/group_test.go | 4 +- packages/peering/lpp/lppNetImpl.go | 8 +- packages/peering/peering.go | 25 +++---- packages/testutil/peeringNetworkProvider.go | 8 +- 25 files changed, 133 insertions(+), 256 deletions(-) delete mode 100644 packages/chain/chainpeering/chain_peers.go delete mode 100644 packages/chain/chainpeering/committee_peer_group.go diff --git a/packages/chain/chain.go b/packages/chain/chain.go index 11271586d6..d3f2a9b46f 100644 --- a/packages/chain/chain.go +++ b/packages/chain/chain.go @@ -14,7 +14,6 @@ import ( "github.com/iotaledger/wasp/packages/hashing" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/coreutil" - "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/state" "github.com/iotaledger/wasp/packages/tcrypto" "github.com/iotaledger/wasp/packages/util/ready" @@ -63,14 +62,6 @@ type ChainEvents interface { ChainTransition() *events.Event } -type ChainPeers interface { - AttachToPeerMessages(receiver byte, fun func(recv *peering.PeerMessageIn)) - SendPeerMsgByNetID(netID string, msgReceiver byte, msgType byte, msgData []byte) - SendPeerMsgToRandomPeers(upToNumPeers int, msgReceiver byte, msgType byte, msgData []byte) - GetRandomPeers(upToNumPeers int) []string - Close() -} - type Chain interface { ChainCore ChainRequests @@ -94,16 +85,6 @@ type Committee interface { GetRandomValidators(upToN int) []string } -type CommitteePeerGroup interface { - SendMsgByIndex(peerIdx uint16, msgReceiver byte, msgType byte, msgData []byte) error - SendMsgBroadcast(msgReceiver byte, msgType byte, msgData []byte, except ...uint16) - AttachToPeerMessages(receiver byte, fun func(recv *peering.PeerMessageGroupIn)) - SelfIndex() uint16 - AllNodes(except ...uint16) map[uint16]peering.PeerSender - OtherNodes(except ...uint16) map[uint16]peering.PeerSender - Close() -} - type NodeConnection interface { PullBacklog(addr *ledgerstate.AliasAddress) PullState(addr *ledgerstate.AliasAddress) diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index 51e8978503..4d59c8ccb3 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -13,7 +13,6 @@ import ( "github.com/iotaledger/hive.go/kvstore" "github.com/iotaledger/hive.go/logger" "github.com/iotaledger/wasp/packages/chain" - "github.com/iotaledger/wasp/packages/chain/chainpeering" "github.com/iotaledger/wasp/packages/chain/committee" "github.com/iotaledger/wasp/packages/chain/consensus" "github.com/iotaledger/wasp/packages/chain/mempool" @@ -69,7 +68,7 @@ type chainObj struct { blobProvider registry.BlobCache eventRequestProcessed *events.Event eventChainTransition *events.Event - chainPeers chain.ChainPeers + chainPeers peering.PeerDomainProvider offLedgerReqsAcksMutex sync.RWMutex offLedgerReqsAcks map[iscp.RequestID][]string offledgerBroadcastUpToNPeers int @@ -146,14 +145,14 @@ func NewChain( ret.committee.Store(&committeeStruct{}) ret.eventChainTransition.Attach(events.NewClosure(ret.processChainTransition)) - peers, err := netProvider.PeerDomain(peerNetConfig.Neighbors()) + var err error + ret.chainPeers, err = netProvider.PeerDomain(chainID.Array(), peerNetConfig.Neighbors()) if err != nil { log.Errorf("NewChain: %v", err) return nil } - ret.chainPeers = chainpeering.NewChainPeers(chainID.Array(), peers) ret.stateMgr = statemgr.New(db, ret, ret.chainPeers, ret.nodeConn) - ret.chainPeers.AttachToPeerMessages(chain.PeerMessageReceiverChain, ret.receiveChainPeerMessages) + ret.chainPeers.Attach(chain.PeerMessageReceiverChain, ret.receiveChainPeerMessages) go ret.handleMessagesLoop() ret.startTimer() return ret @@ -361,7 +360,7 @@ func (c *chainObj) createNewCommitteeAndConsensus(cmtRec *registry.CommitteeReco return xerrors.Errorf("createNewCommitteeAndConsensus: failed to create committee object for state address %s: %w", cmtRec.Address.Base58(), err) } - cmtPeerGroup.AttachToPeerMessages(chain.PeerMessageReceiverChain, c.receiveCommitteePeerMessages) + cmtPeerGroup.Attach(chain.PeerMessageReceiverChain, c.receiveCommitteePeerMessages) c.log.Debugf("creating new consensus object...") c.consensus = consensus.New(c, c.mempool, cmt, cmtPeerGroup, c.nodeConn, c.pullMissingRequestsFromCommittee, c.chainMetrics) c.setCommittee(cmt) diff --git a/packages/chain/chainimpl/eventproc.go b/packages/chain/chainimpl/eventproc.go index 1f754ca0b4..44a58dcf55 100644 --- a/packages/chain/chainimpl/eventproc.go +++ b/packages/chain/chainimpl/eventproc.go @@ -174,7 +174,7 @@ func (c *chainObj) handleMissingRequestIDsMsg(msg *messages.MissingRequestIDsMsg c.log.Debugf("handleMissingRequestIDsMsg: finding reqID %s...", reqID.Base58()) if req := c.mempool.GetRequest(reqID); req != nil { resultMsg := &messages.MissingRequestMsg{Request: req} - c.chainPeers.SendPeerMsgByNetID(msg.SenderNetID, chain.PeerMessageReceiverChain, chain.PeerMsgTypeMissingRequest, resultMsg.Bytes()) + c.chainPeers.SendMsgByNetID(msg.SenderNetID, chain.PeerMessageReceiverChain, chain.PeerMsgTypeMissingRequest, resultMsg.Bytes()) c.log.Warnf("handleMissingRequestIDsMsg: reqID %s sent to %v.", reqID.Base58(), msg.SenderNetID) } else { c.log.Warnf("handleMissingRequestIDsMsg: reqID %s not found.", reqID.Base58()) diff --git a/packages/chain/chainimpl/interface.go b/packages/chain/chainimpl/interface.go index ba7f0bece7..35908826d9 100644 --- a/packages/chain/chainimpl/interface.go +++ b/packages/chain/chainimpl/interface.go @@ -123,7 +123,7 @@ func (c *chainObj) broadcastOffLedgerRequest(req *request.OffLedger) { for _, peerID := range peerIDs { if shouldSendToPeer(peerID, ackPeers) { c.log.Debugf("sending offledger request ID: reqID: %s, peerID: %s", req.ID().Base58(), peerID) - c.chainPeers.SendPeerMsgByNetID(peerID, chain.PeerMessageReceiverChain, chain.PeerMsgTypeOffLedgerRequest, msg.Bytes()) + c.chainPeers.SendMsgByNetID(peerID, chain.PeerMessageReceiverChain, chain.PeerMsgTypeOffLedgerRequest, msg.Bytes()) } } } @@ -162,7 +162,7 @@ func (c *chainObj) sendRequestAcknowledgementMsg(reqID iscp.RequestID, peerID st return } msg := &messages.RequestAckMsg{ReqID: &reqID} - c.chainPeers.SendPeerMsgByNetID(peerID, chain.PeerMessageReceiverChain, chain.PeerMsgTypeRequestAck, msg.Bytes()) + c.chainPeers.SendMsgByNetID(peerID, chain.PeerMessageReceiverChain, chain.PeerMsgTypeRequestAck, msg.Bytes()) } func (c *chainObj) ReceiveTransaction(tx *ledgerstate.Transaction) { diff --git a/packages/chain/chainpeering/chain_peers.go b/packages/chain/chainpeering/chain_peers.go deleted file mode 100644 index 37da646e67..0000000000 --- a/packages/chain/chainpeering/chain_peers.go +++ /dev/null @@ -1,51 +0,0 @@ -package chainpeering - -import ( - "github.com/iotaledger/wasp/packages/chain" - "github.com/iotaledger/wasp/packages/peering" -) - -type ChainPeersImpl struct { - peeringID peering.PeeringID - peers peering.PeerDomainProvider - attachIDs []interface{} -} - -var _ chain.ChainPeers = &ChainPeersImpl{} - -func NewChainPeers(peeringID peering.PeeringID, peers peering.PeerDomainProvider) chain.ChainPeers { - return &ChainPeersImpl{ - peeringID: peeringID, - peers: peers, - attachIDs: make([]interface{}, 0), - } -} - -func (cpiT *ChainPeersImpl) AttachToPeerMessages(receiver byte, fun func(recv *peering.PeerMessageIn)) { - cpiT.attachIDs = append(cpiT.attachIDs, cpiT.peers.Attach(&cpiT.peeringID, receiver, fun)) -} - -func (cpiT *ChainPeersImpl) SendPeerMsgByNetID(netID string, msgReceiver, msgType byte, msgData []byte) { - cpiT.peers.SendMsgByNetID(netID, &peering.PeerMessageData{ - PeeringID: cpiT.peeringID, - MsgReceiver: msgReceiver, - MsgType: msgType, - MsgData: msgData, - }) -} - -func (cpiT *ChainPeersImpl) SendPeerMsgToRandomPeers(upToNumPeers int, msgReceiver, msgType byte, msgData []byte) { - for _, netID := range cpiT.GetRandomPeers(upToNumPeers) { - cpiT.SendPeerMsgByNetID(netID, msgReceiver, msgType, msgData) - } -} - -func (cpiT *ChainPeersImpl) GetRandomPeers(upToNumPeers int) []string { - return cpiT.peers.GetRandomPeers(upToNumPeers) -} - -func (cpiT *ChainPeersImpl) Close() { - for _, attachID := range cpiT.attachIDs { - cpiT.peers.Detach(attachID) - } -} diff --git a/packages/chain/chainpeering/committee_peer_group.go b/packages/chain/chainpeering/committee_peer_group.go deleted file mode 100644 index 72ed7519b5..0000000000 --- a/packages/chain/chainpeering/committee_peer_group.go +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -package chainpeering - -import ( - "fmt" - - "github.com/iotaledger/wasp/packages/chain" - "github.com/iotaledger/wasp/packages/peering" -) - -type committeePeerGroup struct { - peeringID peering.PeeringID - group peering.GroupProvider - attachIDs []interface{} -} - -var _ chain.CommitteePeerGroup = &committeePeerGroup{} - -func NewCommitteePeerGroup(peeringID peering.PeeringID, group peering.GroupProvider) chain.CommitteePeerGroup { - return &committeePeerGroup{ - peeringID: peeringID, - group: group, - attachIDs: make([]interface{}, 0), - } -} - -func (cpgT *committeePeerGroup) SendMsgByIndex(peerIdx uint16, msgReceiver, msgType byte, msgData []byte) error { - if peer, ok := cpgT.group.OtherNodes()[peerIdx]; ok { - peer.SendMsg(&peering.PeerMessageData{ - PeeringID: cpgT.peeringID, - MsgReceiver: msgReceiver, - MsgType: msgType, - MsgData: msgData, - }) - return nil - } - return fmt.Errorf("SendMsg: wrong peer index") -} - -func (cpgT *committeePeerGroup) SendMsgBroadcast(msgReceiver, msgType byte, msgData []byte, except ...uint16) { - msg := &peering.PeerMessageData{ - PeeringID: cpgT.peeringID, - MsgReceiver: msgReceiver, - MsgType: msgType, - MsgData: msgData, - } - cpgT.group.SendMsgBroadcast(msg, except...) -} - -func (cpgT *committeePeerGroup) AttachToPeerMessages(peerMsgReceiver byte, fun func(peerMsg *peering.PeerMessageGroupIn)) { - cpgT.attachIDs = append(cpgT.attachIDs, cpgT.group.Attach(&cpgT.peeringID, peerMsgReceiver, fun)) -} - -func (cpgT *committeePeerGroup) SelfIndex() uint16 { - return cpgT.group.SelfIndex() -} - -func (cpgT *committeePeerGroup) AllNodes(except ...uint16) map[uint16]peering.PeerSender { - return cpgT.group.AllNodes(except...) -} - -func (cpgT *committeePeerGroup) OtherNodes(except ...uint16) map[uint16]peering.PeerSender { - return cpgT.group.AllNodes(except...) -} - -func (cpgT *committeePeerGroup) Close() { - for _, attachID := range cpgT.attachIDs { - cpgT.group.Detach(attachID) - } - cpgT.group.Close() -} diff --git a/packages/chain/committee/committee.go b/packages/chain/committee/committee.go index 1348815353..027422dbda 100644 --- a/packages/chain/committee/committee.go +++ b/packages/chain/committee/committee.go @@ -10,7 +10,6 @@ import ( "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/hive.go/logger" "github.com/iotaledger/wasp/packages/chain" - "github.com/iotaledger/wasp/packages/chain/chainpeering" "github.com/iotaledger/wasp/packages/chain/consensus/commonsubset" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/peering" @@ -25,7 +24,7 @@ type committee struct { isReady *atomic.Bool address ledgerstate.Address peerConfig registry.PeerNetworkConfigProvider - validatorNodes chain.CommitteePeerGroup + validatorNodes peering.GroupProvider acsRunner chain.AsynchronousCommonSubsetRunner size uint16 quorum uint16 @@ -46,7 +45,7 @@ func New( dksProvider registry.DKShareRegistryProvider, log *logger.Logger, acsRunner ...chain.AsynchronousCommonSubsetRunner, // Only for mocking. -) (chain.Committee, chain.CommitteePeerGroup, error) { +) (chain.Committee, peering.GroupProvider, error) { // load DKShare from the registry dkshare, err := dksProvider.LoadDKShare(cmtRec.Address) if err != nil { @@ -58,11 +57,6 @@ func New( if err := checkValidatorNodeIDs(peerConfig, dkshare.N, *dkshare.Index, cmtRec.Nodes); err != nil { return nil, nil, xerrors.Errorf("NewCommittee: %w", err) } - var peers peering.GroupProvider - if peers, err = netProvider.PeerGroup(cmtRec.Nodes); err != nil { - return nil, nil, xerrors.Errorf("NewCommittee: failed to create peer group for committee: %+v: %w", cmtRec.Nodes, err) - } - log.Debugf("NewCommittee: peer group: %+v", cmtRec.Nodes) // peerGroupID is calculated by XORing chainID and stateAddr. // It allows to use same statAddr for different chains peerGroupID := cmtRec.Address.Array() @@ -73,10 +67,15 @@ func New( for i := range peerGroupID { peerGroupID[i] ^= chainArr[i] } + var peers peering.GroupProvider + if peers, err = netProvider.PeerGroup(peerGroupID, cmtRec.Nodes); err != nil { + return nil, nil, xerrors.Errorf("NewCommittee: failed to create peer group for committee: %+v: %w", cmtRec.Nodes, err) + } + log.Debugf("NewCommittee: peer group: %+v", cmtRec.Nodes) ret := &committee{ isReady: atomic.NewBool(false), address: cmtRec.Address, - validatorNodes: chainpeering.NewCommitteePeerGroup(peerGroupID, peers), + validatorNodes: peers, peerConfig: peerConfig, size: dkshare.N, quorum: dkshare.T, diff --git a/packages/chain/consensus/action.go b/packages/chain/consensus/action.go index b12649f6da..00435c383a 100644 --- a/packages/chain/consensus/action.go +++ b/packages/chain/consensus/action.go @@ -763,9 +763,7 @@ func (c *consensus) receiveSignedResult(msg *messages.SignedResultMsgIn) { ChainInputID: msg.ChainInputID, EssenceHash: msg.EssenceHash, } - if err := c.committeePeerGroup.SendMsgByIndex(msg.SenderIndex, peerMessageReceiverConsensus, peerMsgTypeSignedResultAck, util.MustBytes(msgAck)); err != nil { - c.log.Errorf("receiveSignedResult: failed to send acknowledgement: %v", err) - } + c.committeePeerGroup.SendMsgByIndex(msg.SenderIndex, peerMessageReceiverConsensus, peerMsgTypeSignedResultAck, util.MustBytes(msgAck)) } func (c *consensus) receiveSignedResultAck(msg *messages.SignedResultAckMsgIn) { diff --git a/packages/chain/consensus/commonsubset/commonsubset.go b/packages/chain/consensus/commonsubset/commonsubset.go index da9f1e1f9c..0a8540cb71 100644 --- a/packages/chain/consensus/commonsubset/commonsubset.go +++ b/packages/chain/consensus/commonsubset/commonsubset.go @@ -38,8 +38,8 @@ import ( "github.com/anthdm/hbbft" "github.com/iotaledger/hive.go/logger" - "github.com/iotaledger/wasp/packages/chain" "github.com/iotaledger/wasp/packages/chain/consensus/commoncoin" + "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/tcrypto" "github.com/iotaledger/wasp/packages/util" "golang.org/x/xerrors" @@ -64,7 +64,7 @@ type CommonSubset struct { sessionID uint64 // Unique identifier for this consensus instance. Used to route messages. stateIndex uint32 // Sequence number of the CS transaction we are agreeing on. - committeePeerGroup chain.CommitteePeerGroup + committeePeerGroup peering.GroupProvider netOwnIndex uint16 // Our index in the group. inputCh chan []byte // For our input to the consensus. @@ -78,7 +78,7 @@ type CommonSubset struct { func NewCommonSubset( sessionID uint64, stateIndex uint32, - committeePeerGroup chain.CommitteePeerGroup, + committeePeerGroup peering.GroupProvider, dkShare *tcrypto.DKShare, allRandom bool, // Set to true to have real CC rounds for each epoch. That's for testing mostly. outputCh chan map[uint16][]byte, @@ -376,9 +376,7 @@ func (cs *CommonSubset) send(msgBatch *msgBatch) { return } cs.log.Debugf("ACS::IO - Sending a msgBatch=%+v", msgBatch) - if err := cs.committeePeerGroup.SendMsgByIndex(msgBatch.dst, peerMessageReceiverCommonSubset, peerMsgTypeBatch, msgBatch.Bytes()); err != nil { - cs.log.Errorf("Error sending message batch %+v: %v", msgBatch, err) - } + cs.committeePeerGroup.SendMsgByIndex(msgBatch.dst, peerMessageReceiverCommonSubset, peerMsgTypeBatch, msgBatch.Bytes()) } // endregion /////////////////////////////////////////////////////////////////// diff --git a/packages/chain/consensus/commonsubset/commonsubset_test.go b/packages/chain/consensus/commonsubset/commonsubset_test.go index 862510b848..8a8c6d0c72 100644 --- a/packages/chain/consensus/commonsubset/commonsubset_test.go +++ b/packages/chain/consensus/commonsubset/commonsubset_test.go @@ -11,7 +11,6 @@ import ( "time" "github.com/iotaledger/hive.go/logger" - "github.com/iotaledger/wasp/packages/chain/chainpeering" "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/tcrypto" "github.com/iotaledger/wasp/packages/testutil" @@ -61,12 +60,11 @@ func testBasic(t *testing.T, peerCount, threshold uint16, allRandom bool) { acsPeers := make([]*CommonSubset, peerCount) for a := range acsPeers { - group, err := networkProviders[a].PeerGroup(peerNetIDs) + group, err := networkProviders[a].PeerGroup(peeringID, peerNetIDs) require.Nil(t, err) - cmt := chainpeering.NewCommitteePeerGroup(peeringID, group) acsLog := testlogger.WithLevel(log.Named(fmt.Sprintf("ACS[%02d]", a)), logger.LevelInfo, false) - acsPeers[a], err = NewCommonSubset(0, 0, cmt, dkShares[a], allRandom, nil, acsLog) - cmt.AttachToPeerMessages(peerMessageReceiverCommonSubset, makeReceiveCommitteePeerMessagesFun(acsPeers[a], log)) + acsPeers[a], err = NewCommonSubset(0, 0, group, dkShares[a], allRandom, nil, acsLog) + group.Attach(peerMessageReceiverCommonSubset, makeReceiveCommitteePeerMessagesFun(acsPeers[a], log)) require.Nil(t, err) } t.Logf("ACS Nodes created.") @@ -111,12 +109,11 @@ func TestRandomized(t *testing.T) { acsPeers := make([]*CommonSubset, peerCount) for a := range acsPeers { - group, err := networkProviders[a].PeerGroup(peerNetIDs) + group, err := networkProviders[a].PeerGroup(peeringID, peerNetIDs) require.Nil(t, err) - cmt := chainpeering.NewCommitteePeerGroup(peeringID, group) acsLog := testlogger.WithLevel(log.Named(fmt.Sprintf("ACS[%02d]", a)), logger.LevelInfo, false) - acsPeers[a], err = NewCommonSubset(0, 0, cmt, dkShares[a], true, nil, acsLog) - cmt.AttachToPeerMessages(peerMessageReceiverCommonSubset, makeReceiveCommitteePeerMessagesFun(acsPeers[a], log)) + acsPeers[a], err = NewCommonSubset(0, 0, group, dkShares[a], true, nil, acsLog) + group.Attach(peerMessageReceiverCommonSubset, makeReceiveCommitteePeerMessagesFun(acsPeers[a], log)) require.Nil(t, err) } t.Logf("ACS Nodes created.") @@ -210,10 +207,10 @@ func testCoordinator(t *testing.T, peerCount, threshold uint16) { acsCoords := make([]*CommonSubsetCoordinator, peerCount) for i := range acsCoords { - group, err := networkProviders[i].PeerGroup(peerNetIDs) + group, err := networkProviders[i].PeerGroup(peeringID, peerNetIDs) require.Nil(t, err) acsLog := testlogger.WithLevel(log.Named(fmt.Sprintf("CSC[%02d]", i)), logger.LevelInfo, false) - acsCoords[i] = NewCommonSubsetCoordinator(networkProviders[i], chainpeering.NewCommitteePeerGroup(peeringID, group), dkShares[i], acsLog) + acsCoords[i] = NewCommonSubsetCoordinator(networkProviders[i], group, dkShares[i], acsLog) } t.Logf("ACS Nodes created.") @@ -270,11 +267,11 @@ func testRandomizedWithCC(t *testing.T, peerCount, threshold uint16) { dkAddress, dkShares := testpeers.SetupDkgPregenerated(t, threshold, peerNetIDs, tcrypto.DefaultSuite()) acsCoords := make([]*CommonSubsetCoordinator, peerCount) for i := range acsCoords { - group, err := networkProviders[i].PeerGroup(peerNetIDs) + group, err := networkProviders[i].PeerGroup(peeringID, peerNetIDs) require.Nil(t, err) dkShare, err := dkShares[i].LoadDKShare(dkAddress) require.Nil(t, err) - acsCoords[i] = NewCommonSubsetCoordinator(networkProviders[i], chainpeering.NewCommitteePeerGroup(peeringID, group), dkShare, logs[i]) + acsCoords[i] = NewCommonSubsetCoordinator(networkProviders[i], group, dkShare, logs[i]) } t.Logf("ACS Nodes created.") diff --git a/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go b/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go index 2b9edc4974..b794fbe9f2 100644 --- a/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go +++ b/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go @@ -8,7 +8,6 @@ import ( "sync" "github.com/iotaledger/hive.go/logger" - "github.com/iotaledger/wasp/packages/chain" "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/tcrypto" "golang.org/x/xerrors" @@ -52,14 +51,14 @@ type CommonSubsetCoordinator struct { currentStateIndex uint32 // Last state index passed by this node. lock sync.RWMutex - netGroup chain.CommitteePeerGroup + netGroup peering.GroupProvider dkShare *tcrypto.DKShare log *logger.Logger } func NewCommonSubsetCoordinator( net peering.NetworkProvider, - netGroup chain.CommitteePeerGroup, + netGroup peering.GroupProvider, dkShare *tcrypto.DKShare, log *logger.Logger, ) *CommonSubsetCoordinator { @@ -71,7 +70,7 @@ func NewCommonSubsetCoordinator( dkShare: dkShare, log: log, } - netGroup.AttachToPeerMessages(peerMessageReceiverCommonSubset, ret.receiveCommitteePeerMessages) + netGroup.Attach(peerMessageReceiverCommonSubset, ret.receiveCommitteePeerMessages) return ret } diff --git a/packages/chain/consensus/consensus.go b/packages/chain/consensus/consensus.go index 2e172f9b9f..cc22002d84 100644 --- a/packages/chain/consensus/consensus.go +++ b/packages/chain/consensus/consensus.go @@ -27,7 +27,7 @@ type consensus struct { isReady atomic.Bool chain chain.ChainCore committee chain.Committee - committeePeerGroup chain.CommitteePeerGroup + committeePeerGroup peering.GroupProvider mempool chain.Mempool nodeConn chain.NodeConnection vmRunner vm.VMRunner @@ -92,7 +92,7 @@ const ( maxMsgBuffer = 1000 ) -func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Committee, peerGroup chain.CommitteePeerGroup, nodeConn chain.NodeConnection, pullMissingRequestsFromCommittee bool, consensusMetrics metrics.ConsensusMetrics, timersOpt ...ConsensusTimers) chain.Consensus { +func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Committee, peerGroup peering.GroupProvider, nodeConn chain.NodeConnection, pullMissingRequestsFromCommittee bool, consensusMetrics metrics.ConsensusMetrics, timersOpt ...ConsensusTimers) chain.Consensus { var timers ConsensusTimers if len(timersOpt) > 0 { timers = timersOpt[0] @@ -122,7 +122,7 @@ func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Commi pullMissingRequestsFromCommittee: pullMissingRequestsFromCommittee, consensusMetrics: consensusMetrics, } - ret.committeePeerGroup.AttachToPeerMessages(peerMessageReceiverConsensus, ret.receiveCommitteePeerMessages) + ret.committeePeerGroup.Attach(peerMessageReceiverConsensus, ret.receiveCommitteePeerMessages) ret.refreshConsensusInfo() go ret.recvLoop() return ret diff --git a/packages/chain/consensus/setup_test.go b/packages/chain/consensus/setup_test.go index c8e8315cba..c353edcbb1 100644 --- a/packages/chain/consensus/setup_test.go +++ b/packages/chain/consensus/setup_test.go @@ -227,7 +227,7 @@ func (env *MockedEnv) NewNode(nodeIndex uint16, timers ConsensusTimers) *mockedN acs..., ) require.NoError(env.T, err) - cmtPeerGroup.AttachToPeerMessages(peerMessageReceiverConsensus, func(peerMsg *peering.PeerMessageGroupIn) { + cmtPeerGroup.Attach(peerMessageReceiverConsensus, func(peerMsg *peering.PeerMessageGroupIn) { log.Debugf("Consensus received peer message from %v of type %v", peerMsg.SenderNetID, peerMsg.MsgType) if peerMsg.MsgReceiver != peerMessageReceiverConsensus { env.T.Fatalf("Consensus does not accept peer messages of other receiver type %v, message type=%v", diff --git a/packages/chain/statemgr/eventproc.go b/packages/chain/statemgr/eventproc.go index db7ed002e0..4893203407 100644 --- a/packages/chain/statemgr/eventproc.go +++ b/packages/chain/statemgr/eventproc.go @@ -45,7 +45,7 @@ func (sm *stateManager) handleGetBlockMsg(msg *messages.GetBlockMsgIn) { sm.log.Debugf("handleGetBlockMsg: responding to peer %s by block %v", msg.SenderNetID, msg.BlockIndex) blockMsg := &messages.BlockMsg{BlockBytes: blockBytes} - sm.chainPeers.SendPeerMsgByNetID(msg.SenderNetID, peerMessageReceiverStateManager, peerMsgTypeBlock, util.MustBytes(blockMsg)) + sm.chainPeers.SendMsgByNetID(msg.SenderNetID, peerMessageReceiverStateManager, peerMsgTypeBlock, util.MustBytes(blockMsg)) } // EventBlockMsg diff --git a/packages/chain/statemgr/setup_test.go b/packages/chain/statemgr/setup_test.go index 3189ff7d20..44597ba915 100644 --- a/packages/chain/statemgr/setup_test.go +++ b/packages/chain/statemgr/setup_test.go @@ -19,7 +19,6 @@ import ( "github.com/iotaledger/hive.go/kvstore/mapdb" "github.com/iotaledger/hive.go/logger" "github.com/iotaledger/wasp/packages/chain" - "github.com/iotaledger/wasp/packages/chain/chainpeering" "github.com/iotaledger/wasp/packages/chain/messages" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/coreutil" @@ -56,7 +55,7 @@ type MockedNode struct { store kvstore.KVStore NodeConn *testchain.MockedNodeConn ChainCore *testchain.MockedChainCore - ChainPeers chain.ChainPeers + ChainPeers peering.PeerDomainProvider stateSync coreutil.ChainStateSync Peers peering.PeerDomainProvider StateManager chain.StateManager @@ -184,7 +183,7 @@ func (env *MockedEnv) PullConfirmedOutputFromLedger(addr ledgerstate.Address, ou func (env *MockedEnv) NewMockedNode(nodeIndex int, timers StateManagerTimers) *MockedNode { nodeID := env.NodeIDs[nodeIndex] log := env.Log.Named(nodeID) - peers, err := env.NetworkProviders[nodeIndex].PeerDomain(env.NodeIDs) + peers, err := env.NetworkProviders[nodeIndex].PeerDomain(env.ChainID.Array(), env.NodeIDs) require.NoError(env.T, err) ret := &MockedNode{ NetID: nodeID, @@ -193,7 +192,7 @@ func (env *MockedEnv) NewMockedNode(nodeIndex int, timers StateManagerTimers) *M store: mapdb.NewMapDB(), stateSync: coreutil.NewChainStateSync(), ChainCore: testchain.NewMockedChainCore(env.T, env.ChainID, log), - ChainPeers: chainpeering.NewChainPeers(env.ChainID.Array(), peers), + ChainPeers: peers, Peers: peers, Log: log, } @@ -203,7 +202,7 @@ func (env *MockedEnv) NewMockedNode(nodeIndex int, timers StateManagerTimers) *M ret.ChainCore.OnGetStateReader(func() state.OptimisticStateReader { return state.NewOptimisticStateReader(ret.store, ret.stateSync) }) - ret.ChainPeers.AttachToPeerMessages(peerMessageReceiverStateManager, func(peerMsg *peering.PeerMessageIn) { + ret.ChainPeers.Attach(peerMessageReceiverStateManager, func(peerMsg *peering.PeerMessageIn) { log.Debugf("State manager recvEvent from %v of type %v", peerMsg.SenderNetID, peerMsg.MsgType) if peerMsg.MsgReceiver != peerMessageReceiverStateManager { env.T.Fatalf("State manager does not accept peer messages of other receiver type %v, message type=%v", diff --git a/packages/chain/statemgr/statemgr.go b/packages/chain/statemgr/statemgr.go index 8f273fcd56..3eee0022c4 100644 --- a/packages/chain/statemgr/statemgr.go +++ b/packages/chain/statemgr/statemgr.go @@ -25,7 +25,7 @@ type stateManager struct { ready *ready.Ready store kvstore.KVStore chain chain.ChainCore - chainPeers chain.ChainPeers + chainPeers peering.PeerDomainProvider nodeConn chain.NodeConnection pullStateRetryTime time.Time solidState state.VirtualStateAccess @@ -59,7 +59,7 @@ const ( peerMsgTypeBlock ) -func New(store kvstore.KVStore, c chain.ChainCore, peers chain.ChainPeers, nodeconn chain.NodeConnection, timersOpt ...StateManagerTimers) chain.StateManager { +func New(store kvstore.KVStore, c chain.ChainCore, peers peering.PeerDomainProvider, nodeconn chain.NodeConnection, timersOpt ...StateManagerTimers) chain.StateManager { var timers StateManagerTimers if len(timersOpt) > 0 { timers = timersOpt[0] @@ -83,7 +83,7 @@ func New(store kvstore.KVStore, c chain.ChainCore, peers chain.ChainPeers, nodec eventStateCandidateMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), eventTimerMsgPipe: pipe.NewLimitInfinitePipe(1), } - ret.chainPeers.AttachToPeerMessages(peerMessageReceiverStateManager, ret.receiveChainPeerMessages) + ret.chainPeers.Attach(peerMessageReceiverStateManager, ret.receiveChainPeerMessages) go ret.initLoadState() return ret diff --git a/packages/dkg/node.go b/packages/dkg/node.go index 7b73ba5b02..c542670c76 100644 --- a/packages/dkg/node.go +++ b/packages/dkg/node.go @@ -121,12 +121,12 @@ func (n *Node) GenerateDistributedKey( } // // Setup network connections. + dkgID := peering.RandomPeeringID() var netGroup peering.GroupProvider - if netGroup, err = n.netProvider.PeerGroup(peerNetIDs); err != nil { + if netGroup, err = n.netProvider.PeerGroup(dkgID, peerNetIDs); err != nil { return nil, err } defer netGroup.Close() - dkgID := peering.RandomPeeringID() recvCh := make(chan *peering.PeerMessageIn, peerCount*2) attachID := n.netProvider.Attach(&dkgID, peerMessageReceiverDkg, func(recv *peering.PeerMessageIn) { recvCh <- recv diff --git a/packages/dkg/proc.go b/packages/dkg/proc.go index dbe0a1882f..11d2db029e 100644 --- a/packages/dkg/proc.go +++ b/packages/dkg/proc.go @@ -62,7 +62,7 @@ func onInitiatorInit(dkgID peering.PeeringID, msg *initiatorInitMsg, node *Node) var err error var netGroup peering.GroupProvider - if netGroup, err = node.netProvider.PeerGroup(msg.peerNetIDs); err != nil { + if netGroup, err = node.netProvider.PeerGroup(dkgID, msg.peerNetIDs); err != nil { return nil, err } var dkgImpl *rabin_dkg.DistKeyGenerator @@ -146,7 +146,7 @@ func onInitiatorInit(dkgID peering.PeeringID, msg *initiatorInitMsg, node *Node) ) } go p.processLoop(msg.timeout, p.steps[rabinStep7CommitAndTerminate].doneCh) - p.attachID = p.netGroup.Attach(&dkgID, peerMessageReceiverDkg, p.onPeerMessage) + p.attachID = p.netGroup.Attach(peerMessageReceiverDkg, p.onPeerMessage) stepsStart <- make(map[uint16]*peering.PeerMessageData) return &p, nil } @@ -726,7 +726,7 @@ func (s *procStep) run() { if s.initResp != nil { if isDkgInitProcRecvMsg(recv.MsgType) { s.log.Debugf("[%v -%v-> %v] Resending initiator response.", s.proc.myNetID, s.initResp.MsgType, recv.SenderNetID) - s.proc.netGroup.SendMsgByIndex(recv.SenderIndex, s.initResp) + s.proc.netGroup.SendMsgByIndex(recv.SenderIndex, s.initResp.MsgReceiver, s.initResp.MsgType, s.initResp.MsgData) continue } if isDkgRabinEchoMsg(recv.MsgType) { @@ -755,7 +755,7 @@ func (s *procStep) run() { for i := range s.sentMsgs { netID, _ := s.proc.netGroup.NetIDByIndex(i) s.log.Debugf("[%v -%v-> %v] Sending peer message (first).", s.proc.myNetID, s.sentMsgs[i].MsgType, netID) - s.proc.netGroup.SendMsgByIndex(i, s.sentMsgs[i]) + s.proc.netGroup.SendMsgByIndex(i, s.sentMsgs[i].MsgReceiver, s.sentMsgs[i].MsgType, s.sentMsgs[i].MsgData) } if s.haveAll() { s.makeDone() @@ -787,7 +787,7 @@ func (s *procStep) run() { if s.recvMsgs[i] == nil { netID, _ := s.proc.netGroup.NetIDByIndex(i) s.log.Debugf("[%v -%v-> %v] Resending peer message (retry).", s.proc.myNetID, s.sentMsgs[i].MsgType, netID) - s.proc.netGroup.SendMsgByIndex(i, s.sentMsgs[i]) + s.proc.netGroup.SendMsgByIndex(i, s.sentMsgs[i].MsgReceiver, s.sentMsgs[i].MsgType, s.sentMsgs[i].MsgData) } } continue @@ -806,7 +806,7 @@ func (s *procStep) sendEcho(recv *peering.PeerMessageGroupIn) { return } s.log.Debugf("[%v -%v-> %v] Resending peer message (echo).", s.proc.myNetID, echoMsg.MsgType, recv.SenderNetID) - s.proc.netGroup.SendMsgByIndex(recv.SenderIndex, &echoMsg) + s.proc.netGroup.SendMsgByIndex(recv.SenderIndex, echoMsg.MsgReceiver, echoMsg.MsgType, echoMsg.MsgData) return } s.log.Warnf("[%v -%v-> %v] Unable to send echo message, is was not produced yet.", s.proc.myNetID, recv.MsgType, recv.SenderNetID) @@ -838,7 +838,7 @@ func (s *procStep) markDone(initResp *peering.PeerMessageData) { s.doneCh <- s.recvMsgs // Activate the next step. s.initResp = initResp // Store the response for later resends. if s.initRecv != nil { - s.proc.netGroup.SendMsgByIndex(s.initRecv.SenderIndex, initResp) // Send response to the initiator. + s.proc.netGroup.SendMsgByIndex(s.initRecv.SenderIndex, initResp.MsgReceiver, initResp.MsgType, initResp.MsgData) // Send response to the initiator. } else { s.log.Panicf("Step %v/%v closed with no initiator message.", s.proc.myNetID, s.step) } diff --git a/packages/peering/domain/domain.go b/packages/peering/domain/domain.go index 3aaf485e80..14bbc71cae 100644 --- a/packages/peering/domain/domain.go +++ b/packages/peering/domain/domain.go @@ -15,6 +15,8 @@ type DomainImpl struct { nodes map[string]peering.PeerSender permutation *util.Permutation16 netIDs []string + peeringID peering.PeeringID + attachIDs []interface{} log *logger.Logger mutex *sync.RWMutex } @@ -22,12 +24,14 @@ type DomainImpl struct { var _ peering.PeerDomainProvider = &DomainImpl{} // NewPeerDomain creates a collection. Ignores self -func NewPeerDomain(netProvider peering.NetworkProvider, initialNodes []peering.PeerSender, log *logger.Logger) *DomainImpl { +func NewPeerDomain(netProvider peering.NetworkProvider, peeringID peering.PeeringID, initialNodes []peering.PeerSender, log *logger.Logger) *DomainImpl { ret := &DomainImpl{ netProvider: netProvider, nodes: make(map[string]peering.PeerSender), permutation: util.NewPermutation16(uint16(len(initialNodes)), nil), netIDs: make([]string, 0, len(initialNodes)), + peeringID: peeringID, + attachIDs: make([]interface{}, 0), log: log, mutex: &sync.RWMutex{}, } @@ -38,7 +42,7 @@ func NewPeerDomain(netProvider peering.NetworkProvider, initialNodes []peering.P return ret } -func NewPeerDomainByNetIDs(netProvider peering.NetworkProvider, peerNetIDs []string, log *logger.Logger) (*DomainImpl, error) { +func NewPeerDomainByNetIDs(netProvider peering.NetworkProvider, peeringID peering.PeeringID, peerNetIDs []string, log *logger.Logger) (*DomainImpl, error) { peers := make([]peering.PeerSender, 0, len(peerNetIDs)) for _, nid := range peerNetIDs { if nid == netProvider.Self().NetID() { @@ -50,10 +54,10 @@ func NewPeerDomainByNetIDs(netProvider peering.NetworkProvider, peerNetIDs []str } peers = append(peers, peer) } - return NewPeerDomain(netProvider, peers, log), nil + return NewPeerDomain(netProvider, peeringID, peers, log), nil } -func (d *DomainImpl) SendMsgByNetID(netID string, msg *peering.PeerMessageData) { +func (d *DomainImpl) SendMsgByNetID(netID string, msgReceiver, msgType byte, msgData []byte) { d.mutex.RLock() defer d.mutex.RUnlock() peer, ok := d.nodes[netID] @@ -61,7 +65,18 @@ func (d *DomainImpl) SendMsgByNetID(netID string, msg *peering.PeerMessageData) d.log.Warnf("SendMsgByNetID: NetID %v is not in the domain", netID) return } - peer.SendMsg(msg) + peer.SendMsg(&peering.PeerMessageData{ + PeeringID: d.peeringID, + MsgReceiver: msgReceiver, + MsgType: msgType, + MsgData: msgData, + }) +} + +func (d *DomainImpl) SendPeerMsgToRandomPeers(upToNumPeers int, msgReceiver, msgType byte, msgData []byte) { + for _, netID := range d.GetRandomPeers(upToNumPeers) { + d.SendMsgByNetID(netID, msgReceiver, msgType, msgData) + } } func (d *DomainImpl) GetRandomPeers(upToNumPeers int) []string { @@ -127,8 +142,8 @@ func (d *DomainImpl) reshufflePeers(seedBytes ...[]byte) { d.permutation.Shuffle(seedB) } -func (d *DomainImpl) Attach(peeringID *peering.PeeringID, receiver byte, callback func(recv *peering.PeerMessageIn)) interface{} { - return d.netProvider.Attach(peeringID, receiver, func(recv *peering.PeerMessageIn) { +func (d *DomainImpl) Attach(receiver byte, callback func(recv *peering.PeerMessageIn)) interface{} { + attachID := d.netProvider.Attach(&d.peeringID, receiver, func(recv *peering.PeerMessageIn) { if recv.SenderNetID == d.netProvider.Self().NetID() { d.log.Warnf("dropping message for receiver=%v MsgType=%v from %v: message from self.", recv.MsgReceiver, recv.MsgType, recv.SenderNetID) @@ -142,6 +157,8 @@ func (d *DomainImpl) Attach(peeringID *peering.PeeringID, receiver byte, callbac } callback(recv) }) + d.attachIDs = append(d.attachIDs, attachID) + return attachID } func (d *DomainImpl) Detach(attachID interface{}) { @@ -149,6 +166,9 @@ func (d *DomainImpl) Detach(attachID interface{}) { } func (d *DomainImpl) Close() { + for _, attachID := range d.attachIDs { + d.Detach(attachID) + } for i := range d.nodes { d.nodes[i].Close() } diff --git a/packages/peering/domain/domain_test.go b/packages/peering/domain/domain_test.go index 24b86282d8..c5f1611808 100644 --- a/packages/peering/domain/domain_test.go +++ b/packages/peering/domain/domain_test.go @@ -44,13 +44,12 @@ func TestDomainProvider(t *testing.T) { // // Create a group on one of nodes. var d peering.PeerDomainProvider - d, err := nodes[1].PeerDomain(netIDs) + d, err := nodes[1].PeerDomain(peeringID, netIDs) require.Nil(t, err) require.NotNil(t, d) - msg := &peering.PeerMessageData{PeeringID: peeringID, MsgReceiver: receiver, MsgType: 125} - d.SendMsgByNetID(netIDs[0], msg) - d.SendMsgByNetID(netIDs[2], msg) + d.SendMsgByNetID(netIDs[0], receiver, 125, []byte{}) + d.SendMsgByNetID(netIDs[2], receiver, 125, []byte{}) <-doneCh0 <-doneCh2 // @@ -69,13 +68,14 @@ func TestRandom(t *testing.T) { for i := range nodes { go nodes[i].Run(make(<-chan struct{})) } + peeringID := peering.RandomPeeringID() // Create a group on 2 of nodes. - d1, err := nodes[1].PeerDomain(netIDs) + d1, err := nodes[1].PeerDomain(peeringID, netIDs) require.NoError(t, err) require.NotNil(t, d1) - d2, err := nodes[2].PeerDomain(netIDs) + d2, err := nodes[2].PeerDomain(peeringID, netIDs) require.NoError(t, err) require.NotNil(t, d1) @@ -83,7 +83,6 @@ func TestRandom(t *testing.T) { // Listen for messages on all the nodes. var wg sync.WaitGroup var r1, r2 int - peeringID := peering.RandomPeeringID() receiver := byte(8) for i := range nodes { ii := i @@ -103,12 +102,11 @@ func TestRandom(t *testing.T) { for i := 0; i < 5; i++ { wg.Add(sendTo * 2) t.Log("----------------------------------") - msg := &peering.PeerMessageData{PeeringID: peeringID, MsgReceiver: receiver, MsgType: 125} for _, netID := range d1.GetRandomPeers(sendTo) { - d1.SendMsgByNetID(netID, msg) + d1.SendMsgByNetID(netID, receiver, 125, []byte{}) } for _, netID := range d2.GetRandomPeers(sendTo) { - d2.SendMsgByNetID(netID, msg) + d2.SendMsgByNetID(netID, receiver, 125, []byte{}) } wg.Wait() } diff --git a/packages/peering/group/group.go b/packages/peering/group/group.go index c7be76e3d3..b931e34ba2 100644 --- a/packages/peering/group/group.go +++ b/packages/peering/group/group.go @@ -24,6 +24,8 @@ type groupImpl struct { nodes []peering.PeerSender other map[uint16]peering.PeerSender selfIndex uint16 + peeringID peering.PeeringID + attachIDs []interface{} log *logger.Logger } @@ -31,7 +33,7 @@ var _ peering.GroupProvider = &groupImpl{} // NewPeeringGroupProvider creates a generic peering group. // That should be used as a helper for peering implementations. -func NewPeeringGroupProvider(netProvider peering.NetworkProvider, nodes []peering.PeerSender, log *logger.Logger) (peering.GroupProvider, error) { +func NewPeeringGroupProvider(netProvider peering.NetworkProvider, peeringID peering.PeeringID, nodes []peering.PeerSender, log *logger.Logger) (peering.GroupProvider, error) { other := make(map[uint16]peering.PeerSender) selfFound := false selfIndex := uint16(0) @@ -51,6 +53,8 @@ func NewPeeringGroupProvider(netProvider peering.NetworkProvider, nodes []peerin nodes: nodes, other: other, selfIndex: selfIndex, + peeringID: peeringID, + attachIDs: make([]interface{}, 0), log: log, }, nil } @@ -83,14 +87,19 @@ func (g *groupImpl) NetIDByIndex(index uint16) (string, error) { } // SendMsgByIndex implements peering.GroupProvider. -func (g *groupImpl) SendMsgByIndex(peerIdx uint16, msg *peering.PeerMessageData) { - g.nodes[peerIdx].SendMsg(msg) +func (g *groupImpl) SendMsgByIndex(peerIdx uint16, msgReceiver, msgType byte, msgData []byte) { + g.nodes[peerIdx].SendMsg(&peering.PeerMessageData{ + PeeringID: g.peeringID, + MsgReceiver: msgReceiver, + MsgType: msgType, + MsgData: msgData, + }) } // Broadcast implements peering.GroupProvider. -func (g *groupImpl) SendMsgBroadcast(msg *peering.PeerMessageData, except ...uint16) { +func (g *groupImpl) SendMsgBroadcast(msgReceiver, msgType byte, msgData []byte, except ...uint16) { for i := range g.OtherNodes(except...) { - g.SendMsgByIndex(i, msg) + g.SendMsgByIndex(i, msgReceiver, msgType, msgData) } } @@ -223,8 +232,8 @@ func (g *groupImpl) OtherNodes(except ...uint16) map[uint16]peering.PeerSender { // Attach starts listening for messages. Messages in this case will be filtered // to those received from nodes in the group only. SenderIndex will be filled // for the messages according to the message source. -func (g *groupImpl) Attach(peeringID *peering.PeeringID, receiver byte, callback func(recv *peering.PeerMessageGroupIn)) interface{} { - return g.netProvider.Attach(peeringID, receiver, func(recv *peering.PeerMessageIn) { +func (g *groupImpl) Attach(receiver byte, callback func(recv *peering.PeerMessageGroupIn)) interface{} { + attachID := g.netProvider.Attach(&g.peeringID, receiver, func(recv *peering.PeerMessageIn) { idx, err := g.PeerIndexByNetID(recv.SenderNetID) if idx == NotInGroup { err = xerrors.Errorf("sender does not belong to the group") @@ -240,6 +249,8 @@ func (g *groupImpl) Attach(peeringID *peering.PeeringID, receiver byte, callback } callback(gRecv) }) + g.attachIDs = append(g.attachIDs, attachID) + return attachID } // Detach terminates listening for messages. @@ -249,6 +260,9 @@ func (g *groupImpl) Detach(attachID interface{}) { // Close implements peering.GroupProvider. func (g *groupImpl) Close() { + for _, attachID := range g.attachIDs { + g.Detach(attachID) + } for i := range g.nodes { g.nodes[i].Close() } diff --git a/packages/peering/group/group_test.go b/packages/peering/group/group_test.go index c1b0ec9227..02659f5359 100644 --- a/packages/peering/group/group_test.go +++ b/packages/peering/group/group_test.go @@ -40,11 +40,11 @@ func TestGroupProvider(t *testing.T) { // // Create a group on one of nodes. var g peering.GroupProvider - g, err := nodes[0].PeerGroup(netIDs) + g, err := nodes[0].PeerGroup(peeringID, netIDs) require.Nil(t, err) // // Broadcast a message and wait until it will be received on all the nodes. - g.SendMsgBroadcast(&peering.PeerMessageData{PeeringID: peeringID, MsgReceiver: receiver, MsgType: 125}) + g.SendMsgBroadcast(receiver, 125, []byte{}) <-doneCh1 <-doneCh2 <-doneCh3 diff --git a/packages/peering/lpp/lppNetImpl.go b/packages/peering/lpp/lppNetImpl.go index 70ab9f769c..6cd4faf086 100644 --- a/packages/peering/lpp/lppNetImpl.go +++ b/packages/peering/lpp/lppNetImpl.go @@ -319,7 +319,7 @@ func (n *netImpl) Self() peering.PeerSender { } // Group creates peering.GroupProvider. -func (n *netImpl) PeerGroup(peerNetIDs []string) (peering.GroupProvider, error) { +func (n *netImpl) PeerGroup(peeringID peering.PeeringID, peerNetIDs []string) (peering.GroupProvider, error) { var err error groupPeers := make([]peering.PeerSender, len(peerNetIDs)) for i := range peerNetIDs { @@ -327,11 +327,11 @@ func (n *netImpl) PeerGroup(peerNetIDs []string) (peering.GroupProvider, error) return nil, err } } - return group.NewPeeringGroupProvider(n, groupPeers, n.log) + return group.NewPeeringGroupProvider(n, peeringID, groupPeers, n.log) } // Domain creates peering.PeerDomainProvider. -func (n *netImpl) PeerDomain(peerNetIDs []string) (peering.PeerDomainProvider, error) { +func (n *netImpl) PeerDomain(peeringID peering.PeeringID, peerNetIDs []string) (peering.PeerDomainProvider, error) { peers := make([]peering.PeerSender, 0, len(peerNetIDs)) for _, nid := range peerNetIDs { if nid == n.Self().NetID() { @@ -343,7 +343,7 @@ func (n *netImpl) PeerDomain(peerNetIDs []string) (peering.PeerDomainProvider, e } peers = append(peers, p) } - return domain.NewPeerDomain(n, peers, n.log), nil + return domain.NewPeerDomain(n, peeringID, peers, n.log), nil } func (n *netImpl) SendMsgByNetID(netID string, msg *peering.PeerMessageData) { diff --git a/packages/peering/peering.go b/packages/peering/peering.go index 952e1ce855..02a5ef49c6 100644 --- a/packages/peering/peering.go +++ b/packages/peering/peering.go @@ -31,12 +31,14 @@ const ( type NetworkProvider interface { Run(stopCh <-chan struct{}) Self() PeerSender - PeerGroup(peerAddrs []string) (GroupProvider, error) - PeerDomain(peerAddrs []string) (PeerDomainProvider, error) + PeerGroup(peeringID PeeringID, peerAddrs []string) (GroupProvider, error) + PeerDomain(peeringID PeeringID, peerAddrs []string) (PeerDomainProvider, error) PeerByNetID(peerNetID string) (PeerSender, error) PeerByPubKey(peerPub *ed25519.PublicKey) (PeerSender, error) PeerStatus() []PeerStatusProvider - PeerCollection + Attach(peeringID *PeeringID, receiver byte, callback func(recv *PeerMessageIn)) interface{} + Detach(attachID interface{}) + SendMsgByNetID(netID string, msg *PeerMessageData) } // TrustedNetworkManager is used maintain a configuration which peers are trusted. @@ -50,12 +52,6 @@ type TrustedNetworkManager interface { TrustedPeers() ([]*TrustedPeer, error) } -type PeerCollection interface { - Attach(peeringID *PeeringID, receiver byte, callback func(recv *PeerMessageIn)) interface{} - Detach(attachID interface{}) - SendMsgByNetID(netID string, msg *PeerMessageData) -} - // GroupProvider stands for a subset of a peer-to-peer network // that is responsible for achieving some common goal, eg, // consensus committee, DKG group, etc. @@ -67,10 +63,10 @@ type GroupProvider interface { PeerIndex(peer PeerSender) (uint16, error) PeerIndexByNetID(peerNetID string) (uint16, error) NetIDByIndex(index uint16) (string, error) - Attach(peeringID *PeeringID, receiver byte, callback func(recv *PeerMessageGroupIn)) interface{} + Attach(receiver byte, callback func(recv *PeerMessageGroupIn)) interface{} Detach(attachID interface{}) - SendMsgByIndex(peerIdx uint16, msg *PeerMessageData) - SendMsgBroadcast(msg *PeerMessageData, except ...uint16) + SendMsgByIndex(peerIdx uint16, msgReceiver byte, msgType byte, msgData []byte) + SendMsgBroadcast(msgReceiver byte, msgType byte, msgData []byte, except ...uint16) ExchangeRound( peers map[uint16]PeerSender, recvCh chan *PeerMessageIn, @@ -89,7 +85,10 @@ type GroupProvider interface { type PeerDomainProvider interface { ReshufflePeers(seedBytes ...[]byte) GetRandomPeers(upToNumPeers int) []string - PeerCollection + Attach(receiver byte, callback func(recv *PeerMessageIn)) interface{} + Detach(attachID interface{}) + SendMsgByNetID(netID string, msgReceiver byte, msgType byte, msgData []byte) + SendPeerMsgToRandomPeers(upToNumPeers int, msgReceiver byte, msgType byte, msgData []byte) Close() } diff --git a/packages/testutil/peeringNetworkProvider.go b/packages/testutil/peeringNetworkProvider.go index 93076ab0a7..2ad8e92466 100644 --- a/packages/testutil/peeringNetworkProvider.go +++ b/packages/testutil/peeringNetworkProvider.go @@ -200,7 +200,7 @@ func (p *peeringNetworkProvider) Self() peering.PeerSender { } // Group implements peering.NetworkProvider. -func (p *peeringNetworkProvider) PeerGroup(peerAddrs []string) (peering.GroupProvider, error) { +func (p *peeringNetworkProvider) PeerGroup(peeringID peering.PeeringID, peerAddrs []string) (peering.GroupProvider, error) { peers := make([]peering.PeerSender, len(peerAddrs)) for i := range peerAddrs { n := p.network.nodeByNetID(peerAddrs[i]) @@ -209,12 +209,12 @@ func (p *peeringNetworkProvider) PeerGroup(peerAddrs []string) (peering.GroupPro } peers[i] = p.senders[i] } - return group.NewPeeringGroupProvider(p, peers, p.network.log) + return group.NewPeeringGroupProvider(p, peeringID, peers, p.network.log) } // Domain creates peering.PeerDomainProvider. -func (p *peeringNetworkProvider) PeerDomain(peerNetIDs []string) (peering.PeerDomainProvider, error) { - return domain.NewPeerDomainByNetIDs(p, peerNetIDs, p.network.log) +func (p *peeringNetworkProvider) PeerDomain(peeringID peering.PeeringID, peerNetIDs []string) (peering.PeerDomainProvider, error) { + return domain.NewPeerDomainByNetIDs(p, peeringID, peerNetIDs, p.network.log) } // Attach implements peering.NetworkProvider. From 1edce0ec0c243c810acf90326b25404666d5f5e5 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Thu, 25 Nov 2021 13:37:46 +0200 Subject: [PATCH 123/198] Chain can be dissmissed only once --- packages/chain/chainimpl/chainimpl.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index 4d59c8ccb3..3a2035240d 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -134,7 +134,7 @@ func NewChain( offledgerBroadcastInterval: offledgerBroadcastInterval, pullMissingRequestsFromCommittee: pullMissingRequestsFromCommittee, chainMetrics: chainMetrics, - dismissChainMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), + dismissChainMsgPipe: pipe.NewLimitInfinitePipe(1), stateMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), offLedgerRequestPeerMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), requestAckPeerMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), From 68692fa56439ccde185800ac87f363f91b34630f Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Thu, 25 Nov 2021 15:44:21 +0200 Subject: [PATCH 124/198] BugFix: metrics restored --- packages/chain/chainimpl/eventproc.go | 7 +++++++ tools/cluster/templates/waspconfig.go | 2 +- tools/cluster/tests/spam_test.go | 5 ++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/chain/chainimpl/eventproc.go b/packages/chain/chainimpl/eventproc.go index 44a58dcf55..72bae3e83d 100644 --- a/packages/chain/chainimpl/eventproc.go +++ b/packages/chain/chainimpl/eventproc.go @@ -81,6 +81,7 @@ func (c *chainObj) handleMessagesLoop() { func (c *chainObj) EnqueueDismissChain(reason string) { c.dismissChainMsgPipe.In() <- DismissChainMsg{Reason: reason} + c.chainMetrics.CountMessages() } func (c *chainObj) handleDismissChain(msg DismissChainMsg) { @@ -93,6 +94,7 @@ func (c *chainObj) EnqueueLedgerState(chainOutput *ledgerstate.AliasOutput, time ChainOutput: chainOutput, Timestamp: timestamp, } + c.chainMetrics.CountMessages() } // handleLedgerState processes the only chain output which exists on the chain's address @@ -123,6 +125,7 @@ func (c *chainObj) handleLedgerState(msg *messages.StateMsg) { func (c *chainObj) EnqueueOffLedgerRequestMsg(msg *messages.OffLedgerRequestMsgIn) { c.offLedgerRequestPeerMsgPipe.In() <- msg + c.chainMetrics.CountMessages() } func (c *chainObj) handleOffLedgerRequestMsg(msg *messages.OffLedgerRequestMsgIn) { @@ -149,6 +152,7 @@ func (c *chainObj) isRequestValid(req *request.OffLedger) bool { func (c *chainObj) EnqueueRequestAckMsg(msg *messages.RequestAckMsgIn) { c.requestAckPeerMsgPipe.In() <- msg + c.chainMetrics.CountMessages() } func (c *chainObj) handleRequestAckPeerMsg(msg *messages.RequestAckMsgIn) { @@ -162,6 +166,7 @@ func (c *chainObj) handleRequestAckPeerMsg(msg *messages.RequestAckMsgIn) { func (c *chainObj) EnqueueMissingRequestIDsMsg(msg *messages.MissingRequestIDsMsgIn) { c.missingRequestIDsPeerMsgPipe.In() <- msg + c.chainMetrics.CountMessages() } func (c *chainObj) handleMissingRequestIDsMsg(msg *messages.MissingRequestIDsMsgIn) { @@ -185,6 +190,7 @@ func (c *chainObj) handleMissingRequestIDsMsg(msg *messages.MissingRequestIDsMsg func (c *chainObj) EnqueueMissingRequestMsg(msg *messages.MissingRequestMsg) { c.missingRequestPeerMsgPipe.In() <- msg + c.chainMetrics.CountMessages() } func (c *chainObj) handleMissingRequestMsg(msg *messages.MissingRequestMsg) { @@ -203,6 +209,7 @@ func (c *chainObj) handleMissingRequestMsg(msg *messages.MissingRequestMsg) { func (c *chainObj) EnqueueTimerTick(tick int) { c.timerTickMsgPipe.In() <- messages.TimerTick(tick) + c.chainMetrics.CountMessages() } func (c *chainObj) handleTimerTick(msg messages.TimerTick) { diff --git a/tools/cluster/templates/waspconfig.go b/tools/cluster/templates/waspconfig.go index c5875d905b..250b71b439 100644 --- a/tools/cluster/templates/waspconfig.go +++ b/tools/cluster/templates/waspconfig.go @@ -16,7 +16,7 @@ type WaspConfigParams struct { const WaspConfig = ` { "database": { - "inMemory": true, + "inMemory": false, "directory": "waspdb" }, "logger": { diff --git a/tools/cluster/tests/spam_test.go b/tools/cluster/tests/spam_test.go index 3c5baa2dce..f06046a975 100644 --- a/tools/cluster/tests/spam_test.go +++ b/tools/cluster/tests/spam_test.go @@ -10,7 +10,6 @@ import ( "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/colored" "github.com/iotaledger/wasp/packages/kv/dict" - "github.com/iotaledger/wasp/packages/testutil" "github.com/iotaledger/wasp/packages/util" "github.com/iotaledger/wasp/packages/vm/core/accounts" "github.com/iotaledger/wasp/packages/vm/core/blocklog" @@ -21,7 +20,7 @@ import ( const numRequests = 100000 func TestSpamOnledger(t *testing.T) { - testutil.RunHeavy(t) + // testutil.RunHeavy(t) env := setupAdvancedInccounterTest(t, 1, []int{0}) keyPair, _ := env.getOrCreateAddress() @@ -47,7 +46,7 @@ const maxParallelRequests = 700 // !! WARNING !! - this test should only be run with `database.inMemory` set to `false`. Otherwise it is WAY slower, and will probably time out or take a LONG time func TestSpamOffledger(t *testing.T) { - testutil.RunHeavy(t) + // testutil.RunHeavy(t) // single wasp node committee, to test if publishing can break state transitions env := setupAdvancedInccounterTest(t, 1, []int{0}) From 844638464e70ad177f7d4681103e9d33e917d297 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Thu, 25 Nov 2021 05:44:59 -0800 Subject: [PATCH 125/198] Implement Bool/Int8/Uint8/16/32/64 phase 1 --- contracts/wasm/Cargo.lock | 31 +- contracts/wasm/dividend/test/dividend_bg.wasm | Bin 32298 -> 32303 bytes .../test/donatewithfeedback_bg.wasm | Bin 36517 -> 36521 bytes contracts/wasm/erc20/test/erc20_bg.wasm | Bin 35397 -> 35451 bytes .../wasm/fairauction/test/fairauction_bg.wasm | Bin 42734 -> 42696 bytes .../fairroulette/test/fairroulette_bg.wasm | Bin 40130 -> 40136 bytes .../wasm/helloworld/test/helloworld_bg.wasm | Bin 15362 -> 15362 bytes .../wasm/inccounter/test/inccounter_bg.wasm | Bin 37054 -> 37011 bytes .../wasm/inccounter/test/inccounter_test.go | 7 +- contracts/wasm/testcore/test/testcore_bg.wasm | Bin 53216 -> 53154 bytes .../wasm/testwasmlib/test/testwasmlib_bg.wasm | Bin 39591 -> 39537 bytes contracts/wasm/timestamp/Cargo.toml | 3 +- .../wasm/timestamp/test/timestamp_bg.wasm | Bin 28126 -> 28155 bytes .../tokenregistry/test/tokenregistry_bg.wasm | Bin 32022 -> 32026 bytes .../test/example_tutorial_bg.wasm | Bin 16802 -> 16802 bytes packages/kv/codec/int.go | 29 + packages/util/rwutil.go | 36 ++ .../sbtests/sbtestsc/testcore_bg.wasm | Bin 53216 -> 53154 bytes packages/vm/wasmhost/kvstorehost.go | 89 +++- packages/vm/wasmlib/go/wasmlib/context.go | 2 + packages/vm/wasmlib/go/wasmlib/host.go | 26 +- packages/vm/wasmlib/go/wasmlib/immutable.go | 285 ++++++++++ packages/vm/wasmlib/go/wasmlib/mutable.go | 371 +++++++++++++ packages/vm/wasmlib/src/bytes.rs | 2 +- packages/vm/wasmlib/src/context.rs | 12 +- packages/vm/wasmlib/src/contract.rs | 8 +- packages/vm/wasmlib/src/coreroot/results.rs | 4 +- packages/vm/wasmlib/src/events.rs | 2 +- packages/vm/wasmlib/src/hashtypes.rs | 2 +- packages/vm/wasmlib/src/host.rs | 26 +- packages/vm/wasmlib/src/immutable.rs | 378 ++++++++++++- packages/vm/wasmlib/src/mutable.rs | 485 ++++++++++++++++- packages/vm/wasmlib/ts/wasmlib/host.ts | 26 +- packages/vm/wasmlib/ts/wasmlib/immutable.ts | 384 +++++++++++++- packages/vm/wasmlib/ts/wasmlib/mutable.ts | 501 +++++++++++++++++- packages/vm/wasmproc/scbalances.go | 6 +- packages/vm/wasmproc/sccontext.go | 32 +- packages/vm/wasmproc/scdict.go | 71 +-- packages/vm/wasmproc/sctransfer.go | 10 +- packages/vm/wasmproc/scutility.go | 8 +- packages/vm/wasmsolo/solosccontext.go | 32 +- tools/cluster/tests/wasm/inccounter_bg.wasm | Bin 37054 -> 37011 bytes .../generator/clienttemplates/alltemplates.go | 16 + .../generator/clienttemplates/events.go | 67 +++ tools/schema/generator/emitter.go | 36 +- tools/schema/generator/generator.go | 42 +- tools/schema/generator/generator_client.go | 55 ++ tools/schema/generator/generator_go.go | 60 +-- tools/schema/generator/generator_rust.go | 83 +-- tools/schema/generator/generator_ts.go | 75 +-- .../generator/gotemplates/alltemplates.go | 69 ++- .../schema/generator/gotemplates/typedefs.go | 12 +- .../generator/rstemplates/alltemplates.go | 97 +++- tools/schema/generator/rstemplates/events.go | 4 +- tools/schema/generator/rstemplates/structs.go | 2 +- .../schema/generator/rstemplates/typedefs.go | 6 +- tools/schema/generator/templates.go | 4 +- .../generator/tstemplates/alltemplates.go | 88 ++- .../schema/generator/tstemplates/typedefs.go | 12 +- tools/schema/generator/utils.go | 37 -- tools/schema/main.go | 64 ++- tools/schema/{generator => model}/field.go | 8 +- tools/schema/{generator => model}/schema.go | 41 +- 63 files changed, 3184 insertions(+), 562 deletions(-) create mode 100644 tools/schema/generator/clienttemplates/alltemplates.go create mode 100644 tools/schema/generator/clienttemplates/events.go create mode 100644 tools/schema/generator/generator_client.go rename tools/schema/{generator => model}/field.go (92%) rename tools/schema/{generator => model}/schema.go (91%) diff --git a/contracts/wasm/Cargo.lock b/contracts/wasm/Cargo.lock index 107782c9da..a466f074ce 100644 --- a/contracts/wasm/Cargo.lock +++ b/contracts/wasm/Cargo.lock @@ -34,7 +34,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib 0.1.0", + "wasmlib", "wee_alloc", ] @@ -44,7 +44,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib 0.1.0", + "wasmlib", "wee_alloc", ] @@ -54,7 +54,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib 0.1.0", + "wasmlib", "wee_alloc", ] @@ -64,7 +64,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib 0.1.0", + "wasmlib", "wee_alloc", ] @@ -74,7 +74,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib 0.1.0", + "wasmlib", "wee_alloc", ] @@ -84,7 +84,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib 0.1.0", + "wasmlib", "wee_alloc", ] @@ -94,7 +94,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib 0.1.0", + "wasmlib", "wee_alloc", ] @@ -175,7 +175,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib 0.1.0", + "wasmlib", "wee_alloc", ] @@ -185,7 +185,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib 0.1.0", + "wasmlib", "wee_alloc", ] @@ -195,7 +195,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib 0.1.0 (git+https://github.com/iotaledger/wasp?branch=develop)", + "wasmlib", "wee_alloc", ] @@ -205,7 +205,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen-test", - "wasmlib 0.1.0", + "wasmlib", "wee_alloc", ] @@ -313,15 +313,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "wasmlib" -version = "0.1.0" -source = "git+https://github.com/iotaledger/wasp?branch=develop#5a3a452307070ea2895e7c4da2f05989c662aad1" -dependencies = [ - "console_error_panic_hook", - "wasm-bindgen", -] - [[package]] name = "web-sys" version = "0.3.47" diff --git a/contracts/wasm/dividend/test/dividend_bg.wasm b/contracts/wasm/dividend/test/dividend_bg.wasm index a7caea24529037c9b6d93d4accfc904899bb3234..6399772b022e6e55917ec9ae09e3cbf3d67bb839 100644 GIT binary patch delta 5320 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 delta 5843 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 delta 3188 zcmZuzeNdHE8b8l@?*-)L;z95et@mCKK@f3^dkIrHAcBA?4r-#}2O@R>m88`CxYx3@ zT`To*l(E_rY;$&7g}Jrsrd#an)a>lE#kNiDwCv_Ijb%Dbe>iPBI<>#^0_kqO%z4iH zeDIv-Y=mc2qQVl;?x@JMNq6({3pgg41+S+*qU6;kj_dVK!9vu4jIT(J5GH6EdE%IgN1 z(oJi-Y1hPx(_r?DoZm%l=~?wpQ0qxLMTh7~DpAi+6uK@-%B(p|8C54Ju{$cm{b-i!~^>J2kD*mlDI03XZSVHId z*THH2Pf-O`ioCqK*Q>7&bC$kS?}Im0$~S^D5ppOLM97;$)fD2_Lid9H+m+-OO`aQa zJiAK868+IW#2!#P5Yp!&JV+IkyVXiCon%CyMzqTnU2?5JRVa46=+6|_dkh|8++3Uu zj2tR<=risuo7CC%ZL3%4Ts{)H=$ecqy6I?eYldIBK(cu|0U&$4!Q1R&P3 z!sM(Q;q22xa5hRw8~i$Ll-7?c8(gL5N0hR}{5e8Lqq5ypbKg0)Hkb#oz$XU*aT5SR z`yB;XbeOqFkph*|hxpyv(Q$4R2l$Ixe`-InbB90xp?xmHcP!pv_Z;aHL79dNq9@k1 z_za3 zgNa%CCUoIxLIk|PF7OPeLJMVa)v`LW z_=RPY6OwiRGbZrZ+smZn4fT!5-@}to+H3q_ee{Q-JNU5`e}RYEm4%@DS2j>0UtXC* zwX9YZp`G(r<$W(XxvD5_4$w|HA_b)>2xkg=KN0bJ%R`kEl-Y>N!B{&|Jq|o$<_xH_ zgDAS?SUHvxvXpt#Dy()p5Sn&?cm~ZO?QksqWYuDns<5F9HQmuLmwNd1hUoy%mkpCs z&v2h`&_z$SOfY+b%8B)^zDbzJvuht1Wj;4SInI%#6p~3O?JJzKZtd9D48q2O#U*eF zHPY`xfJ&cQw-h(wH|tvI@7&bbifj43#(a98X}!4*n;P%pht{8_C{JiQ4@m#5X*s0R zHY}CVBb>is37CIucx-*MqzLWFz&x}BDAPbD8I75YB3Z&O9ds#ZVs&H)$r=CxqzEBd zHB5jq*(j-WZ!{Y1*%`8oA>sB?q0;Els{>X<<%3sT-<%%r-u)`byPC%*--Be_avAhw z^7ZB#ezCc>x`kv!A3EpaJmB$r^})e+$1@LrI{?P zJ^=~JjJ`4e$T~x{Uw>o^fHFVG2 z_-TM1sk`jyM7Oy#T|;cUF==fk0|QWyB!qwlA_U&nnrSU^B#&(Sg?-Znst3{aa9>*v zQ20e#6sT|6^b)XrTe@?7 zZeY?*76<}2>kx|z!(17d%CK5vr-IX$_`NM#5)PU#WQsn?Rqc%y(8WFNH7Wi07UHuR zZzmYTdL`KRV4Zz@x;2Pf`$nww!6xsB%~A+lN5aPq+ZOPY?OF0eiY?rJf)a#(vhX{O zhqpaa01xXdSd012VlSfvUJe;6JCAds1AJ#CRgZB|wiyzwB zQCwZVe0BZclM0zoVaWM_^*bf;}Na->ANOBU(85U zLh{+2`N_o&L;dc#uHDq!w++ebaX5Pmr4fj`8A1ZsOmKO4tyt#BP)Y{BK5hU2 diff --git a/contracts/wasm/fairauction/test/fairauction_bg.wasm b/contracts/wasm/fairauction/test/fairauction_bg.wasm index b8430b6a5ad4fbf866735d4db35affb0aba8e6ee..c8537ddcaaf0c0b37e3fe8065397e374510c0d7e 100644 GIT binary patch delta 12775 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 Wy8rxii<8RED=2)Hx=2ljH~%lGb%wJ5 delta 12759 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 diff --git a/contracts/wasm/fairroulette/test/fairroulette_bg.wasm b/contracts/wasm/fairroulette/test/fairroulette_bg.wasm index 34691270e0264c2683990179f8bcbd9419f944cf..a091d5d23ee1626b7ec805008452ec20a72afa48 100644 GIT binary patch delta 7852 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 L4n)uHPD%Yg^ql5O delta 7798 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 delta 127 zcmZpwXsX!YsN=yc!05>2&f?(6=$P!t>$tP=0E45D00TFWpX3OVWX3KT2bN@kOK$Ge vS;ow%E5NA4=os$EyV=6v3nL@%WL=|7M&8ZSjWz%|n>|d*nSj&*GbdI6VXGb* diff --git a/contracts/wasm/inccounter/test/inccounter_bg.wasm b/contracts/wasm/inccounter/test/inccounter_bg.wasm index 743e62f03da1de233b905cfb13e44ac2d2adda21..d2b4cc258cc1a65fbdcde0670a576746103b5a79 100644 GIT binary patch delta 10654 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 G_WuSdE~wi8 delta 10603 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 diff --git a/contracts/wasm/inccounter/test/inccounter_test.go b/contracts/wasm/inccounter/test/inccounter_test.go index 737be142aa..0cae80b4ab 100644 --- a/contracts/wasm/inccounter/test/inccounter_test.go +++ b/contracts/wasm/inccounter/test/inccounter_test.go @@ -156,19 +156,22 @@ func TestLeb128(t *testing.T) { } func TestLoop(t *testing.T) { - if *wasmsolo.GoDebug || *wasmsolo.GoWasmEdge || wasmhost.DisableWasmTimeout { - // no timeout possible with WasmGoVM because goroutines cannot be killed + if *wasmsolo.GoDebug || *wasmsolo.GoWasmEdge { + // no timeout possible because goroutines cannot be killed // or because there is no way to interrupt the Wasm code t.SkipNow() } ctx := setupTest(t) + save := wasmhost.DisableWasmTimeout + wasmhost.DisableWasmTimeout = false wasmhost.WasmTimeout = 1 * time.Second endlessLoop := inccounter.ScFuncs.EndlessLoop(ctx) endlessLoop.Func.TransferIotas(1).Post() require.Error(t, ctx.Err) require.Contains(t, ctx.Err.Error(), "interrupt") + wasmhost.DisableWasmTimeout = save inccounter.ScFuncs.Increment(ctx).Func.TransferIotas(1).Post() require.NoError(t, ctx.Err) diff --git a/contracts/wasm/testcore/test/testcore_bg.wasm b/contracts/wasm/testcore/test/testcore_bg.wasm index 58ca27e22cffa55c31b1d3decdad7878830f7355..614212c5fff4f869285456479ee4696c739c529d 100644 GIT binary patch delta 12574 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 Dzy#e7 delta 12395 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 aMBMPUCtj#G{B-2`nTZ^#P5kN5Gyel43a!=v diff --git a/contracts/wasm/timestamp/Cargo.toml b/contracts/wasm/timestamp/Cargo.toml index b2d4fb23c1..1484bd0a63 100644 --- a/contracts/wasm/timestamp/Cargo.toml +++ b/contracts/wasm/timestamp/Cargo.toml @@ -14,7 +14,8 @@ crate-type = ["cdylib", "rlib"] default = ["console_error_panic_hook"] [dependencies] -wasmlib = { git = "https://github.com/iotaledger/wasp", branch = "develop" } +wasmlib = { path = "../../../packages/vm/wasmlib" } +#wasmlib = { git = "https://github.com/iotaledger/wasp", branch = "develop" } console_error_panic_hook = { version = "0.1.6", optional = true } wee_alloc = { version = "0.4.5", optional = true } diff --git a/contracts/wasm/timestamp/test/timestamp_bg.wasm b/contracts/wasm/timestamp/test/timestamp_bg.wasm index 2e287139bc7cccd58754b687bc1e1b5423c56518..cb253ab2b2288c137bbea2dbf5dce142c7740ed5 100644 GIT binary patch delta 5583 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 diff --git a/contracts/wasm/tokenregistry/test/tokenregistry_bg.wasm b/contracts/wasm/tokenregistry/test/tokenregistry_bg.wasm index 9d3657940e12530e22ef18a355daf144c4fdd088..78cfa8a72d18d7dcd7ba57347035745ae9cd3eb9 100644 GIT binary patch delta 2573 zcmZuzdu)@}6~E_xcI@P{lg~-W12Xd2c^O=iFy;_Q+vJ7>3W?hWLPA1G=41}Vkhi-H zZ6Z#?BY`$ed%7&DXa^C~nA8rU4{g=Pn3+&FO|BFq{@B!xQi)1vUDu+en<;4QTsxtx ztF3#_JVH=`Y~5FJS8Vm9+;$fnlavTK&Vljr+Q6&-M?8b_7BRvGwJNl9Vlh zP($G0);h*szFKGEoCD^) z3320fe9^VWGIlz`HruUu*;R;Yp~}ZjV@_e-`jgWUrd2Uj9G;|7JmO8sH!@Y{x}rTw zR1xPu{GXMvzwmW4%p1w8M*$Aw3C~Wrh97#m;iggl$Pmx6YrKM&>!5=u54t%M!=hN@ z_-<+2D!X4OoE9KjTujsg#e22N_k02Qo>r-!1%m; znTdyI(dKnZQs&K*#OKY+4$nqdd^0tq^M(~JMevXyUD#VrInH@kOT)i&93w3vUk$rq2DdkQ;O}^- z@hJ7x>~p~pbo(A3AVp zr^tV#E>e$N)M}rd$Ey*MgiObed}(>tzBHga41+Fdmq;aw+LO-I2$dCw8zV@cH>#hk z12smn3Z6;Oj~SCseIMX0v@{K*-<)9a$N-#wlnvWlo5@d5qTK3H;lRU)dgD z2E+w?t2z8t!AhfbX9Iu@J9n*uP55q$EB)SKa!;o+^q@E+*HZ|sYaf{GX&r?ae$ZM* zO-kEU1fQXoTvZtWqb&s)QOUUx_4cqb9G4ZhW$b-uj>I**4M#d_+8GrIU;K#U8_E0zs4*9kj=nESy}8 z%Lo`0hKGWJUNjchE|~}jl1P`>p@IobLj=&dFcobffcD7kmY`*Fnp?z`#r;fjKM641 zMEfn8IL+z<(3$0ax+3?J+9i{R_cMt!i4D3*S32)fM)mdEV`vG~T9Oj)I6fWNXIV-i5~${d6uB2vc$DrWC_nCmw5-Z z9cl(~;w=85=aBW9{K<9DBkS8+0~{y!Hqv|W-rj)vo?DUkG{V&184b@CaWLcUpbvi^ zT*c8c8&mvj~_|*G<4pR_4M_57bo9Uy9P9VbZ;C(pWvwJ{ma>@iVku zMZ-=*29hHcCwe;_J?2EJg^SuAywjVH?!E!Xx+IO|k@RCqG@s}?{CVFodU)6NXPEDh zj-#)yGCSB%zbW46YfdhGe66 zARAyg9vR$}+?bs3>AjoNSjo sh6Urf;SsZQOw*W~*ajMsF7d6jmI;g*%MON=6nTYIFfkED{NdPt0fQp67ytkO delta 2595 zcmZuzeNa@_6~E`cx9-B*g~x|{L{i^ASp-);%ybbYX1NM}Ax7{6!3476YFxV5M-O1^0i1l@-Wc4srk=5p@%bZT*_qB)d-|iRg3;ysqQQQqjeK0M z0_PkHVJu_w8!!e7cQ7DjlUrb9KaGQa>)6)NRS^b3y;_)$e$nWi5Cs#cn6 zLZVY=rdrKkBAHk7t&~<3ieO?uSF9H+qW~VfRy9A}mh?7sZr!Vzt@1}_(dlzbR_QB} ztjSlD|LAOtC6Z}TgE!7G6~Uu|Y=gcks_~LHl|8FY{v@KccyF5uTcHQY>G;c>pB=<05>cb9g;FK|Pxo7PBe8?95d^J$IOmJsCTJpYixMa=gHXx-;8$s9jPEiIEn6oVkf zt)Khf1-OYFG|EvcV|f_tiIyIpz=JD1eEKYYQC~3YU$RS%&W4gi)g8G{*YnIwK^UkH z!9AR+H~6PVWf;7U_6F}v#HUBU>L3+i{iNYDrFbQkQWesJiQZ{3LV6FKA6%r4i#WTI8L#0RvQ&`EuB%{gG!z}j!i9{$m|4MwqLofrOu``5iebG0>@Z~#l2 zUKk+I3BF3L6Ck>1gV+(;AY11e$=iiADqnBxNEp?xG4eY3YcMf5$om>-=W8@YnvqGP zZgTNNH{ye&&cHu5WftA|%7N}M^qJBxS;}?P*Sj;$Q(FnRF@p4I%fG%Jv^eRic`iXe zZXJJdFThXH-rSr0FfkDW2wjO+Lp;FYX5TzllbS3`5#xsm@#Tz}Hi8Vnh>nyArYm@- zc@rpD-QrO*MEtPT*%AP-;nj_KIj7{QpIA+D_;#Y}=hJAJuAJVDROzm^-P``#9Pb$oWDR`*h)l zkD#Nyoe!PBkK3QY{q4 z%_j31ip(diDVL}7slp{uL3ij{=R=xF?3Eobfu2AR7#)oL5W{OT771q{CDs z&Sxw)@ehHk_`B_X{PFgAjuq6S9x7&-)-|rh=nbsqDyialxvLD-rd;dGuGs(w(H>lG zwo~EiBzIlM9l4BZo^Qy>R=}NyX(G5{|!_``dNjlvj(zv z6BQ7pheogAt{3h7lwPYDrf1eh=k8++quLm@k01e;pG`^A$4RU?JE@(>>lYjHis)RmKvmr zlPG_@INZ~iw!yA5gQQ-()w3dNbVhoPG;X3%T-56ao7LBw50Hn$eJjdVr|B%4Ozp%? z;*mgjSI`KCcNn|FJA!+SW2Bb}+VNhW*L9wxJd!>n?!r4gxq5#zQrR1bMuU;CJiOc3 z99f(-J6%s4lR;d%$MJ^|Z{Y@#WWOE6W$)XG%dO*hD^lx8#f*}+gtYGwcM$)OxSW^l z6J$!fz1M+l{h3*J$>Jf4oUA;$yVkz`0h@b3*I6lvjYN{CY diff --git a/documentation/tutorial-examples/test/example_tutorial_bg.wasm b/documentation/tutorial-examples/test/example_tutorial_bg.wasm index 4071d5a1a5c09380b2f40fd322900009b4e830e2..1b1051f5422a09c40684da0f211c16144065f4ee 100644 GIT binary patch delta 481 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 Dzy#e7 delta 12395 zcmbVS3w%_?)xUG^CfQ`OVG=@K3(4J0LN+A9fDj&nWCDTk2B9j*tF62?T0sy+gbflQ z$iu*Zf*=n8K>0`HX3v~BLvyc~o9Z%Z^o1+Vi#BoY zsA!iKZ5WKXwU`*qWf+>~X8195m+Zw_`Ix3@I-1dj7Ofe2oZ*Rz(ljI1NQ{^FvVrMF z6o{h?mx~BpF2lta5?;+}^grSHGn?7*zu1%PDYk~SdZ7Ou55B{WvXyKr zTg#qiZ?T7d$7bJr|2j6~QT8rN+{V_k_t-P+@9b-~8H0a|EBtFTYV;btC;gOs&8FAr zoAC4)x_-}sQx@a*1C|t8q`$)QIxl7a!(L_!^)S8ufPKy?H?g06%f4Wru+eFMV}HQF zMS4Q6&oPXAV4s2}m`Jj~{0Yl2q>JUNK4&k6tREwVC`h`tUoQeTYR*?c*@WvgiDm6Y~L!XP&$(`Yi;twm086ER^Xv@Gw3HQmre zbY&!j5Vq-&=nG$Bff!p`0bVJlh63!G#hWY?fb6y& z&Dc*cA$_N3Q;WA7G_ zc)rX_^0U9l{z=23-E~QYuK7COE8j`lc8#*@mbUEb8oro8CsCp}1TE~q^V%2|9fpFc z;WU;4b(){)mO{T##zFM^4W;0Vq-t2g2>F35Fwvv3Razn2E6dU*#ec+9&;xrg{ob@b ztU+E$8%Ha!{L#;x^*boxxUPISy+_6k=xooH$I^TIE&&P$dUg0`Pq%qiwU;tPEDI3Aau)v7b_ zAvqWnuKQi2pQiuu?xK7>E9m}+dELH8`{c(-GvV*^0Cy+zMAmBS0Rv(4S1t7H<1ZW&a#5Cp8 zAb0uiD|lZ4@(t&)rsEbHH|Fgd$n1TYiHF1^v?%6-*MlLn!B;V8BDw`36l{-9r#plC z(T!Iw49UQKLEZL1N_5|eu#h31)kXDzdX3+$dBmAl>NQayR#97dBfN=QWG}HFAd^OZ zJ9bvK&rff+iSn!4C~%)+I!BnrznO1l^}cn~!##NU+D^IKxjWBHx)o%h8} z-;=j85e$LPK8KI|D8C3}65ILM*}9^3ajf-W;&&eW)Wb37VGljX5e50-Qy>WHoNmed z98rIv+0>`C5SqC2;brU*Ud#Az7~%$9RnUQ#SLr4CQj9S1>&Ojd)GCfxWKbU|@RIjw zK4_*jW*S(@ZwojijxY4F+PYxj$QX9FoO|Q%bDP*T$U=bGmO7jprr;FEB1onjA8 zcVm2lTZa71#;4(32%qM4iQp4ybg%rPi-k`t=RNF6rinN_Tfl z3%@~lC$7{&)^vVe*=2$s7^I7(j?0k!;CjQl7*k-524(V3VeAG4|0QRjZ4yq|$q>(At zj@;vnl*hZLR=la`ju2hywRHO(I(vqoHG}EQV2%8cM*8@9S$s?KElw1g7HOJ8TCXPg z#|S^Lxg$0?#q_X11O@dR5iRq26}DDW6MKbju!z>E6M0{+ z^sr*U9X*}`JHTAIc!@+wutbRrhq^Tp@gI8$O;kET9H3!Qd;{w%e%-isjB4&pn!Rut zQ|e{MWUEp?`=e}gYg!Y<7Gxqaznu?;ah83q*RdH^hNEof|IjT(xvgGn$bYI|Y$-~+ zeQ9$E${`}Bjm0pcr5~$gNMvid8H4|an)`u?t!TyM#+sISWi8oxc}rOU*f*}MP1p(4 zI~(2a4d$Sra+zaVNEknafwa{9*anxuHtCj+G${HX06wBWzytxFq7TDoODn-Yf_Anq zVS9JN0sL*;v%?GIKLC2f{vZ=J*xA7b^5&iz3AQkj2PSOLQ}jVvZF3*B5s%n|+(tS@ zZW4JU*lpo$)FbkGCTz4*GHtx|JhnRzQ ziX2X(H-@$?Qj^#Oxs7$lSR(XKP}fqNA^0PxtLf8;pzc7q1$B9Vxwd`p%5}uFx0lEc zHU=DuL*mFrX$x*dX!+8K;-gjRxXwhY9v{nsiJAU!{b`T zT(h2|7R$MVX)#3=>Fiitzl!BXYosPPP`w-_wl-k3)G|bt*sB`y%Ykiwypry^PE>^N zCswN11eKaA#rDI9uw$`cc;IOzue~5szSuW2;K%C0^1G%ie~b>X;P!(vI$JXQ2MU{V zqlG;~MrdV2_a+v~(L7ZKGs4L0n24nUm~|AxsW0;EN72YCAVJADD2vJO2B+Y-)oMs~ z9*%g81tk_RoReKhJQCurfL@NmhR&WxPUGrz2)iLorI$C>G^A;CTu>8z}dhz>KPp@XRpIX!Y#>tQE2(E++LVBip^ za#W7w0#yUtF4lDz`kl@u$>Q5Ku%FBKZVM!Sh>`}0Dj2_t^E&^l)JM!^qh!^Hw#YBG zkH}-k<$EJCQeKCpX`=&@3=<8GKg;h&q-NIAtI|sTJ^dp3Kr&K%8X@U4G6+s%M>Zq0 zP^l^5%8|ixC*pxLcY+(8aIhFU+o%I1id=L)cQvxdoRl5|YM?T8YU8za-;bQFx0r-b z(M1&#OJ7CcOp=T47*lbD4rQ93s)H!-pc>;;fKVBs>dR$DwM*)bwMr^+PDugPM5`wr zdi=Pq;Lcd)ew$8P2F~I=MvX*@zhcw^ea$YJGI|U9?$#G z!AI4#xhtDB7q4#Un45JktfBJ4c;Vt#A{#QB=iBR9Vw|1haN ztP?vq8!{J7P79Vpiz*)rhWII{HgfdbU>z+{Wuz4Ath{$}Fu4y7<|2$Dl~o&s@%iDp z=O^bgusks(w_+a{lp)t5(~x6WKzRg6tlY_Rfzn2I0y!BIyHW*+8_4)&VHjVQPE9Uu z;u`i_PA-Bue}z%x84$Klqi4wKsktf6AP5m*34U)*^&=O#Ftv3g7Xiw31(&YZr50+l zjcg~jgxG8wsTWgXk!Hbt8g0$Z5ftmOshg%Dn2m?RAdl=YHgouXBlFjZd8V_Mfcge| zNh9@XqV`+V#UY+5u24r?t8P$Q2@HHvN0OeciDFa&b6~vPPlF&^5tJ>cs;a`uOkt>k zfLcrQb12plRFdNc)!*P0YFY=_=1Rb-Xds!12HJX^$`cI~@JU?vp#3wP zyqGX<{BoRn>AL=<{Pw;Ps1ppG*0$x|-I$B^djPxGsv5FpS`I>M_q0?xI8mWe)Eu`; zRR6HTQ=P?Nc?w;D_yX!fU3AMqIjCvgXTc?MMLL@ttA^lo0>^BCSK3P~6mVD(?h+Tf z4po)g$P3o0069gg+6Hb@1t#njC}2&Q{uB18JV^JtC;*V{nh|JsmTHW8 zJTy)URv!rzwz(Ry&4qoKu{!c30Me?Xku%GGGSJB zOQqhRLL4`#B_2rHXO_Q!j=30==3uANnTwyXJL$E+*#>dAQP$4N3-ehJ!WH7P^m%2P zGHAdk_i7oY(MgAwbvM~A-W~hWTvI23bu1jFg?BwD3{!{w=@!p*>kZgL)_CQPW68tt zF^f7(qXgWrZ-GFEVKDt#Mlc{(&q|krAN01k0G~Ith&1w^2aCej&H2+C&)J0QKBnu| z_eQfa;L5=^CA@>_+lgL^$D@d#P?4quqEym?trJ^`#*ILf2oFFPwlQQOolMwY^GD0H zhi+wtyyKzVi3ws8c2A0heM)Q%I#lpQt8?8T1ju6eC~(xV88h)e-vG9i!T^-TP`-i? zQZYh3{FJ=#P|I+W5NX6K?Ya%hc6o9D@_XLI<%y?d;pL1m8)-=usJ@rL6iDz&U^Z77 z>tb+Pa*3XXAH=Oo@KJPk!yWJwPe0I*sl%y#aDy@puAspcP~*SG4_sKSiJJ?4pxzuN z4^a*Po5JQUQ7n7RF1{UB#%D&b!Vf%wqwTU<^bzs`wraeJB3Ys_4L&L%C?hjXgY~1x z<8UL7Q*RE#r{u3^_bT{MSHZ2$ zKa?jQ9uSY}HN4OYYuRp22d2p}bA0J=28bI&0B@MlA`VOurEWxN?VOw1pCgSU;P%ij zj%L<53JtP2j5r0|k+aJf`T3l*fph?LHoG*u2D%%frkS(A#^fyUlV-IE%ypmmy#&bM z>c#{I1WBaV9r0-*N@KN%)NBTu8TbOeC+<-J|JT#6pW{ulQ z<5EpMGH$;$Zo)h@P8T$;=-M&%T#aMwxiE$umOJK6N2;F@UZ(DC<-6f*1k_jI&bSAw z7Nn?r-NCo7o#o3zRc+i?w?G)iHTkD1vzX!pnm}pXAUZ5d z=I60EIc|Qw?7bj6br11M!aHPA4bS5F2s)sUL-PxpP`&V6BUSx2Jnu&bsD?k9rBDv+jFq&&oXi*;7VIa%`9I6rxS!1uIkbO^G;q-YaBE!!;&vmJFWEKFhDiJ06a zm)z{+3*g(-T`r-6QWNacpwh54uEK{ho#5oK{O6*!1FNv%X{|q9NobA#mC;)M-cO&y(?ZC`X=M(nJ2{@s4bVJhP;yELlQN zQs`*6K^X`TI8H+tC_*5i-Z6p&Ma4Fup7D(?pDDsgUrNR;WT(;4Dy zoV@>uo6{Ws1k%}1X4j?;Jdx_7x=32naHSAM80G>y|MrBBy(&GmW$Z3Fq_z#*eb@?o zmRh+YHN$pqryj$z#L{(SV8Gp*wV8@Cz5BoOdfEYO$B!`SCO#u3DPYoJg~i0*-jTjB zWa_VtF4)&2UZHUFse!5PD^xQiQ6O&Q^!D$@cMvNHtXo@$APOqaaO(_&Bt^&0Oh&}U zw2;iHk}L$E<=$>TEU!|mfJTX!0iV-o+oU1njCdf1rs0`lZT4VE$Euep$de%Cq3UE= zy3!q4Xd{fEWPF&YY#0H*o5We_XoX?tR;J2jD`OM}C6`2UPloxeVn-tuU0#DRb{QN@ zdWqV#=*Uw{NX?MomgZ-%Mk%g4kn*33<#bTWvehMru1e|gOC&3Z9Q7wr*r6$pF%S#% zop(3Fv@t#y#RuwC_)95+;=>SJ4wePjjNXy$@I>J!boSb+@oRn`gX+lQI5OPJ;=*CvSz*G0bF$Gso&FCg}i$ zsTIb%@dEB?eaL%yJ*epuu1Bm{fX7TciaP4dv{(QqG*5-)cbEZwha7E`D8OfQqaBnr zlJfO{A?691&`&A7l`tA&u84(xpll>~^1UaY8Zty@k-zFA2PSCqTiz?E7SzeqafDL2 zlu9#@d! zPRFjn9|FkPYuaWt(JanDq>6f~{(dqaW0P>AKe)ypsb?v>$V+QFP&OeF&)c4ce($T!xuNmH%{B1>9KahvTa)oXL(;_wWaiT>i+!mjF%Jzyj^ zGE2y@_eIQ6AeO!a2UV|>-_T6TX_PZT9eleS@^nhEGBcPh`s3y8I!E0~+4fgV)IJF| zsy?ErQ1^6#`uH-r>ghS~V!o~rA=Y!95BE{)GBdyi1p$f=MhX1mOl+#f_zXnjiglTO zdhH~hw$7F?@eYw#f7>Db>ymR8K83bl#a~&qRg$rZr-|+KE(h$~>oZ$LX5)*PxJYjT zYNAy4HgeunG)Av)?IJQ_ESIm3F_j3-xjw(a;%XDRYsfwTOnH1gt?cvlZ4%YtJKiKe zq=4h&rSF+^|5UY8(G9=}1=}G_ZIriRHTmc>Wrc+nHd<~E7PP@R2&>Q){2oR>#fUuo zOnGUwjv}}^Bx?Kx`Zn$$ z&(f!LdLQ0!bJT9sM+@cR4f*o?hR$q-OxgIB{^=HZc4J5OoaCEwV(3E$ZSRSjQWDP3 zBQM3m$0F>*V?Ok+^iL(^28K^Ue z7il}lg>pP8&^jcTs4#|{RzZyPY`HCr5wB2~a?puapTH9~RI2@muV@D%$Z7&(wX4xb z{zwEbQ==Kddrb*`wH5@l*^1TGcq$+uJVAZ5qY#JV>xZF*U9PDReR)Dcsl1VU* z9^QVYMI6&a6&QMsrpwX;x5|tAGO!uR=+`onG|sgOP19S0Sz_?STtpqj zb(2hgy)y1Rs0N_*0h7yLpT`DC?;E#xi_t;;LgDVY}(|!`q`M7SzMgNFhCtRIzCF3GVO61}q3%=F yeZ~H4^t`(NChrx@LXv)mD__2KV0_}}6iX#J=<(tjEju5~k~= int32(len(h.objIDToObj)) { - panic("FindObject: invalid objID") + h.Panicf("FindObject: invalid objID") } return h.objIDToObj[objID] } @@ -93,22 +99,28 @@ func (h *KvStoreHost) GetBytes(objID, keyID, typeID int32) []byte { } bytes := obj.GetBytes(keyID, typeID) switch typeID { + case OBJTYPE_INT8: + val8, err := codec.DecodeInt8(bytes, 0) + if err != nil { + h.Panicf("GetBytes: invalid int8") + } + h.Tracef("GetBytes o%d k%d = %db", objID, keyID, val8) case OBJTYPE_INT16: val16, err := codec.DecodeInt16(bytes, 0) if err != nil { - panic("GetBytes: invalid int16") + h.Panicf("GetBytes: invalid int16") } h.Tracef("GetBytes o%d k%d = %ds", objID, keyID, val16) case OBJTYPE_INT32: val32, err := codec.DecodeInt32(bytes, 0) if err != nil { - panic("GetBytes: invalid int32") + h.Panicf("GetBytes: invalid int32") } h.Tracef("GetBytes o%d k%d = %di", objID, keyID, val32) case OBJTYPE_INT64: val64, err := codec.DecodeInt64(bytes, 0) if err != nil { - panic("GetBytes: invalid int64") + h.Panicf("GetBytes: invalid int64") } h.Tracef("GetBytes o%d k%d = %dl", objID, keyID, val64) case OBJTYPE_STRING: @@ -213,25 +225,37 @@ func (h *KvStoreHost) GetObjectID(objID, keyID, typeID int32) int32 { return subID } +func (h *KvStoreHost) Panicf(format string, args ...interface{}) { + err := fmt.Errorf(format, args...) + h.Tracef(err.Error()) + panic(err) +} + func (h *KvStoreHost) SetBytes(objID, keyID, typeID int32, bytes []byte) { h.FindObject(objID).SetBytes(keyID, typeID, bytes) switch typeID { + case OBJTYPE_INT8: + val8, err := codec.DecodeInt8(bytes, 0) + if err != nil { + h.Panicf("SetBytes: invalid int8") + } + h.Tracef("SetBytes o%d k%d v=%db", objID, keyID, val8) case OBJTYPE_INT16: val16, err := codec.DecodeInt16(bytes, 0) if err != nil { - panic("SetBytes: invalid int16") + h.Panicf("SetBytes: invalid int16") } h.Tracef("SetBytes o%d k%d v=%ds", objID, keyID, val16) case OBJTYPE_INT32: val32, err := codec.DecodeInt32(bytes, 0) if err != nil { - panic("SetBytes: invalid int32") + h.Panicf("SetBytes: invalid int32") } h.Tracef("SetBytes o%d k%d v=%di", objID, keyID, val32) case OBJTYPE_INT64: val64, err := codec.DecodeInt64(bytes, 0) if err != nil { - panic("SetBytes: invalid int64") + h.Panicf("SetBytes: invalid int64") } h.Tracef("SetBytes o%d k%d v=%dl", objID, keyID, val64) case OBJTYPE_STRING: @@ -261,3 +285,32 @@ func (h *KvStoreHost) TrackObject(obj HostObject) int32 { h.objIDToObj = append(h.objIDToObj, obj) return objID } + +func (h *KvStoreHost) TypeCheck(typeID int32, bytes []byte) { + typeSize := TypeSizes[typeID] + if typeSize != 0 && typeSize != len(bytes) { + h.Panicf("TypeCheck: invalid type size") + } + switch typeID { + case OBJTYPE_ADDRESS: + // address bytes must start with valid address type + if ledgerstate.AddressType(bytes[0]) > ledgerstate.AliasAddressType { + h.Panicf("TypeCheck: invalid address type") + } + case OBJTYPE_AGENT_ID: + // address bytes in agent id must start with valid address type + if ledgerstate.AddressType(bytes[0]) > ledgerstate.AliasAddressType { + h.Panicf("TypeCheck: invalid agent id address type") + } + case OBJTYPE_CHAIN_ID: + // chain id must be alias address + if ledgerstate.AddressType(bytes[0]) != ledgerstate.AliasAddressType { + h.Panicf("TypeCheck: invalid chain id address type") + } + case OBJTYPE_REQUEST_ID: + outputIndex := binary.LittleEndian.Uint16(bytes[ledgerstate.TransactionIDLength:]) + if outputIndex > ledgerstate.MaxOutputCount { + h.Panicf("TypeCheck: invalid request id output index") + } + } +} diff --git a/packages/vm/wasmlib/go/wasmlib/context.go b/packages/vm/wasmlib/go/wasmlib/context.go index cc9474198a..5d21804ddd 100644 --- a/packages/vm/wasmlib/go/wasmlib/context.go +++ b/packages/vm/wasmlib/go/wasmlib/context.go @@ -321,6 +321,8 @@ func (ctx ScFuncContext) PostSelf(hFunction ScHname, params *ScMutableMap, trans ctx.Post(ctx.ChainID(), ctx.Contract(), hFunction, params, transfer, delay) } +// TODO expose Entropy function + // generates a random value from 0 to max (exclusive max) using a deterministic RNG func (ctx ScFuncContext) Random(max int64) int64 { state := ScMutableMap{objID: OBJ_ID_STATE} diff --git a/packages/vm/wasmlib/go/wasmlib/host.go b/packages/vm/wasmlib/go/wasmlib/host.go index 899305216f..2f84973267 100644 --- a/packages/vm/wasmlib/go/wasmlib/host.go +++ b/packages/vm/wasmlib/go/wasmlib/host.go @@ -14,17 +14,19 @@ const ( TYPE_ADDRESS int32 = 1 TYPE_AGENT_ID int32 = 2 - TYPE_BYTES int32 = 3 - TYPE_CHAIN_ID int32 = 4 - TYPE_COLOR int32 = 5 - TYPE_HASH int32 = 6 - TYPE_HNAME int32 = 7 - TYPE_INT16 int32 = 8 - TYPE_INT32 int32 = 9 - TYPE_INT64 int32 = 10 - TYPE_MAP int32 = 11 - TYPE_REQUEST_ID int32 = 12 - TYPE_STRING int32 = 13 + TYPE_BOOL int32 = 3 + TYPE_BYTES int32 = 4 + TYPE_CHAIN_ID int32 = 5 + TYPE_COLOR int32 = 6 + TYPE_HASH int32 = 7 + TYPE_HNAME int32 = 8 + TYPE_INT8 int32 = 9 + TYPE_INT16 int32 = 10 + TYPE_INT32 int32 = 11 + TYPE_INT64 int32 = 12 + TYPE_MAP int32 = 13 + TYPE_REQUEST_ID int32 = 14 + TYPE_STRING int32 = 15 OBJ_ID_NULL int32 = 0 OBJ_ID_ROOT int32 = 1 @@ -33,7 +35,7 @@ const ( OBJ_ID_RESULTS int32 = 4 ) -var TypeSizes = [...]uint8{0, 33, 37, 0, 33, 32, 32, 4, 2, 4, 8, 0, 34, 0} +var TypeSizes = [...]uint8{0, 33, 37, 1, 0, 33, 32, 32, 4, 1, 2, 4, 8, 0, 34, 0} type ( ScFuncContextFunction func(ScFuncContext) diff --git a/packages/vm/wasmlib/go/wasmlib/immutable.go b/packages/vm/wasmlib/go/wasmlib/immutable.go index e1b5b4f446..2dbc8ea7de 100644 --- a/packages/vm/wasmlib/go/wasmlib/immutable.go +++ b/packages/vm/wasmlib/go/wasmlib/immutable.go @@ -82,6 +82,47 @@ func (o ScImmutableAgentIDArray) Length() int32 { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ +type ScImmutableBool struct { + objID int32 + keyID Key32 +} + +func NewScImmutableBool(objID int32, keyID Key32) ScImmutableBool { + return ScImmutableBool{objID: objID, keyID: keyID} +} + +func (o ScImmutableBool) Exists() bool { + return Exists(o.objID, o.keyID, TYPE_BOOL) +} + +func (o ScImmutableBool) String() string { + if o.Value() { + return "1" + } + return "0" +} + +func (o ScImmutableBool) Value() bool { + bytes := GetBytes(o.objID, o.keyID, TYPE_BOOL) + return bytes[0] != 0 +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +type ScImmutableBoolArray struct { + objID int32 +} + +func (o ScImmutableBoolArray) GetBool(index int32) ScImmutableBool { + return ScImmutableBool{objID: o.objID, keyID: Key32(index)} +} + +func (o ScImmutableBoolArray) Length() int32 { + return GetLength(o.objID) +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + type ScImmutableBytes struct { objID int32 keyID Key32 @@ -267,6 +308,44 @@ func (o ScImmutableHnameArray) Length() int32 { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ +type ScImmutableInt8 struct { + objID int32 + keyID Key32 +} + +func NewScImmutableInt8(objID int32, keyID Key32) ScImmutableInt8 { + return ScImmutableInt8{objID: objID, keyID: keyID} +} + +func (o ScImmutableInt8) Exists() bool { + return Exists(o.objID, o.keyID, TYPE_INT8) +} + +func (o ScImmutableInt8) String() string { + return strconv.FormatInt(int64(o.Value()), 10) +} + +func (o ScImmutableInt8) Value() int8 { + bytes := GetBytes(o.objID, o.keyID, TYPE_INT8) + return int8(bytes[0]) +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +type ScImmutableInt8Array struct { + objID int32 +} + +func (o ScImmutableInt8Array) GetInt8(index int32) ScImmutableInt8 { + return ScImmutableInt8{objID: o.objID, keyID: Key32(index)} +} + +func (o ScImmutableInt8Array) Length() int32 { + return GetLength(o.objID) +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + type ScImmutableInt16 struct { objID int32 keyID Key32 @@ -407,6 +486,15 @@ func (o ScImmutableMap) GetAgentIDArray(key MapKey) ScImmutableAgentIDArray { return ScImmutableAgentIDArray{objID: arrID} } +func (o ScImmutableMap) GetBool(key MapKey) ScImmutableBool { + return ScImmutableBool{objID: o.objID, keyID: key.KeyID()} +} + +func (o ScImmutableMap) GetBoolArray(key MapKey) ScImmutableBoolArray { + arrID := GetObjectID(o.objID, key.KeyID(), TYPE_BOOL|TYPE_ARRAY) + return ScImmutableBoolArray{objID: arrID} +} + func (o ScImmutableMap) GetBytes(key MapKey) ScImmutableBytes { return ScImmutableBytes{objID: o.objID, keyID: key.KeyID()} } @@ -452,6 +540,15 @@ func (o ScImmutableMap) GetHnameArray(key MapKey) ScImmutableHnameArray { return ScImmutableHnameArray{objID: arrID} } +func (o ScImmutableMap) GetInt8(key MapKey) ScImmutableInt8 { + return ScImmutableInt8{objID: o.objID, keyID: key.KeyID()} +} + +func (o ScImmutableMap) GetInt8Array(key MapKey) ScImmutableInt8Array { + arrID := GetObjectID(o.objID, key.KeyID(), TYPE_INT8|TYPE_ARRAY) + return ScImmutableInt8Array{objID: arrID} +} + func (o ScImmutableMap) GetInt16(key MapKey) ScImmutableInt16 { return ScImmutableInt16{objID: o.objID, keyID: key.KeyID()} } @@ -507,6 +604,42 @@ func (o ScImmutableMap) GetStringArray(key MapKey) ScImmutableStringArray { return ScImmutableStringArray{objID: arrID} } +func (o ScImmutableMap) GetUint8(key MapKey) ScImmutableUint8 { + return ScImmutableUint8{objID: o.objID, keyID: key.KeyID()} +} + +func (o ScImmutableMap) GetUint8Array(key MapKey) ScImmutableUint8Array { + arrID := GetObjectID(o.objID, key.KeyID(), TYPE_INT8|TYPE_ARRAY) + return ScImmutableUint8Array{objID: arrID} +} + +func (o ScImmutableMap) GetUint16(key MapKey) ScImmutableUint16 { + return ScImmutableUint16{objID: o.objID, keyID: key.KeyID()} +} + +func (o ScImmutableMap) GetUint16Array(key MapKey) ScImmutableUint16Array { + arrID := GetObjectID(o.objID, key.KeyID(), TYPE_INT16|TYPE_ARRAY) + return ScImmutableUint16Array{objID: arrID} +} + +func (o ScImmutableMap) GetUint32(key MapKey) ScImmutableUint32 { + return ScImmutableUint32{objID: o.objID, keyID: key.KeyID()} +} + +func (o ScImmutableMap) GetUint32Array(key MapKey) ScImmutableUint32Array { + arrID := GetObjectID(o.objID, key.KeyID(), TYPE_INT32|TYPE_ARRAY) + return ScImmutableUint32Array{objID: arrID} +} + +func (o ScImmutableMap) GetUint64(key MapKey) ScImmutableUint64 { + return ScImmutableUint64{objID: o.objID, keyID: key.KeyID()} +} + +func (o ScImmutableMap) GetUint64Array(key MapKey) ScImmutableUint64Array { + arrID := GetObjectID(o.objID, key.KeyID(), TYPE_INT64|TYPE_ARRAY) + return ScImmutableUint64Array{objID: arrID} +} + func (o ScImmutableMap) MapID() int32 { return o.objID } @@ -603,3 +736,155 @@ func (o ScImmutableStringArray) GetString(index int32) ScImmutableString { func (o ScImmutableStringArray) Length() int32 { return GetLength(o.objID) } + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +type ScImmutableUint8 struct { + objID int32 + keyID Key32 +} + +func NewScImmutableUint8(objID int32, keyID Key32) ScImmutableUint8 { + return ScImmutableUint8{objID: objID, keyID: keyID} +} + +func (o ScImmutableUint8) Exists() bool { + return Exists(o.objID, o.keyID, TYPE_INT8) +} + +func (o ScImmutableUint8) String() string { + return strconv.FormatUint(uint64(o.Value()), 10) +} + +func (o ScImmutableUint8) Value() uint8 { + bytes := GetBytes(o.objID, o.keyID, TYPE_INT8) + return bytes[0] +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +type ScImmutableUint8Array struct { + objID int32 +} + +func (o ScImmutableUint8Array) GetUint8(index int32) ScImmutableUint8 { + return ScImmutableUint8{objID: o.objID, keyID: Key32(index)} +} + +func (o ScImmutableUint8Array) Length() int32 { + return GetLength(o.objID) +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +type ScImmutableUint16 struct { + objID int32 + keyID Key32 +} + +func NewScImmutableUint16(objID int32, keyID Key32) ScImmutableUint16 { + return ScImmutableUint16{objID: objID, keyID: keyID} +} + +func (o ScImmutableUint16) Exists() bool { + return Exists(o.objID, o.keyID, TYPE_INT16) +} + +func (o ScImmutableUint16) String() string { + return strconv.FormatUint(uint64(o.Value()), 10) +} + +func (o ScImmutableUint16) Value() uint16 { + bytes := GetBytes(o.objID, o.keyID, TYPE_INT16) + return binary.LittleEndian.Uint16(bytes) +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +type ScImmutableUint16Array struct { + objID int32 +} + +func (o ScImmutableUint16Array) GetUint16(index int32) ScImmutableUint16 { + return ScImmutableUint16{objID: o.objID, keyID: Key32(index)} +} + +func (o ScImmutableUint16Array) Length() int32 { + return GetLength(o.objID) +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +type ScImmutableUint32 struct { + objID int32 + keyID Key32 +} + +func NewScImmutableUint32(objID int32, keyID Key32) ScImmutableUint32 { + return ScImmutableUint32{objID: objID, keyID: keyID} +} + +func (o ScImmutableUint32) Exists() bool { + return Exists(o.objID, o.keyID, TYPE_INT32) +} + +func (o ScImmutableUint32) String() string { + return strconv.FormatUint(uint64(o.Value()), 10) +} + +func (o ScImmutableUint32) Value() uint32 { + bytes := GetBytes(o.objID, o.keyID, TYPE_INT32) + return binary.LittleEndian.Uint32(bytes) +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +type ScImmutableUint32Array struct { + objID int32 +} + +func (o ScImmutableUint32Array) GetUint32(index int32) ScImmutableUint32 { + return ScImmutableUint32{objID: o.objID, keyID: Key32(index)} +} + +func (o ScImmutableUint32Array) Length() int32 { + return GetLength(o.objID) +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +type ScImmutableUint64 struct { + objID int32 + keyID Key32 +} + +func NewScImmutableUint64(objID int32, keyID Key32) ScImmutableUint64 { + return ScImmutableUint64{objID: objID, keyID: keyID} +} + +func (o ScImmutableUint64) Exists() bool { + return Exists(o.objID, o.keyID, TYPE_INT64) +} + +func (o ScImmutableUint64) String() string { + return strconv.FormatUint(o.Value(), 10) +} + +func (o ScImmutableUint64) Value() uint64 { + bytes := GetBytes(o.objID, o.keyID, TYPE_INT64) + return binary.LittleEndian.Uint64(bytes) +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +type ScImmutableUint64Array struct { + objID int32 +} + +func (o ScImmutableUint64Array) GetUint64(index int32) ScImmutableUint64 { + return ScImmutableUint64{objID: o.objID, keyID: Key32(index)} +} + +func (o ScImmutableUint64Array) Length() int32 { + return GetLength(o.objID) +} diff --git a/packages/vm/wasmlib/go/wasmlib/mutable.go b/packages/vm/wasmlib/go/wasmlib/mutable.go index 362aedb48a..5fa2237590 100644 --- a/packages/vm/wasmlib/go/wasmlib/mutable.go +++ b/packages/vm/wasmlib/go/wasmlib/mutable.go @@ -110,6 +110,63 @@ func (o ScMutableAgentIDArray) Length() int32 { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ +type ScMutableBool struct { + objID int32 + keyID Key32 +} + +func NewScMutableBool(objID int32, keyID Key32) ScMutableBool { + return ScMutableBool{objID: objID, keyID: keyID} +} + +func (o ScMutableBool) Exists() bool { + return Exists(o.objID, o.keyID, TYPE_BOOL) +} + +func (o ScMutableBool) SetValue(value bool) { + bytes := make([]byte, 1) + if value { + bytes[0] = 1 + } + SetBytes(o.objID, o.keyID, TYPE_BOOL, bytes) +} + +func (o ScMutableBool) String() string { + if o.Value() { + return "1" + } + return "0" +} + +func (o ScMutableBool) Value() bool { + bytes := GetBytes(o.objID, o.keyID, TYPE_BOOL) + return bytes[0] != 0 +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +type ScMutableBoolArray struct { + objID int32 +} + +func (o ScMutableBoolArray) Clear() { + Clear(o.objID) +} + +func (o ScMutableBoolArray) GetBool(index int32) ScMutableBool { + return ScMutableBool{objID: o.objID, keyID: Key32(index)} +} + +func (o ScMutableBoolArray) Immutable() ScImmutableBoolArray { + return ScImmutableBoolArray(o) +} + +func (o ScMutableBoolArray) Length() int32 { + return GetLength(o.objID) +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + type ScMutableBytes struct { objID int32 keyID Key32 @@ -355,6 +412,58 @@ func (o ScMutableHnameArray) Length() int32 { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ +type ScMutableInt8 struct { + objID int32 + keyID Key32 +} + +func NewScMutableInt8(objID int32, keyID Key32) ScMutableInt8 { + return ScMutableInt8{objID: objID, keyID: keyID} +} + +func (o ScMutableInt8) Exists() bool { + return Exists(o.objID, o.keyID, TYPE_INT8) +} + +func (o ScMutableInt8) SetValue(value int8) { + bytes := make([]byte, 1) + bytes[0] = byte(value) + SetBytes(o.objID, o.keyID, TYPE_INT8, bytes) +} + +func (o ScMutableInt8) String() string { + return strconv.FormatInt(int64(o.Value()), 10) +} + +func (o ScMutableInt8) Value() int8 { + bytes := GetBytes(o.objID, o.keyID, TYPE_INT8) + return int8(bytes[0]) +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +type ScMutableInt8Array struct { + objID int32 +} + +func (o ScMutableInt8Array) Clear() { + Clear(o.objID) +} + +func (o ScMutableInt8Array) GetInt8(index int32) ScMutableInt8 { + return ScMutableInt8{objID: o.objID, keyID: Key32(index)} +} + +func (o ScMutableInt8Array) Immutable() ScImmutableInt8Array { + return ScImmutableInt8Array(o) +} + +func (o ScMutableInt8Array) Length() int32 { + return GetLength(o.objID) +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + type ScMutableInt16 struct { objID int32 keyID Key32 @@ -546,6 +655,15 @@ func (o ScMutableMap) GetAgentIDArray(key MapKey) ScMutableAgentIDArray { return ScMutableAgentIDArray{objID: arrID} } +func (o ScMutableMap) GetBool(key MapKey) ScMutableBool { + return ScMutableBool{objID: o.objID, keyID: key.KeyID()} +} + +func (o ScMutableMap) GetBoolArray(key MapKey) ScMutableBoolArray { + arrID := GetObjectID(o.objID, key.KeyID(), TYPE_BOOL|TYPE_ARRAY) + return ScMutableBoolArray{objID: arrID} +} + func (o ScMutableMap) GetBytes(key MapKey) ScMutableBytes { return ScMutableBytes{objID: o.objID, keyID: key.KeyID()} } @@ -591,6 +709,15 @@ func (o ScMutableMap) GetHnameArray(key MapKey) ScMutableHnameArray { return ScMutableHnameArray{objID: arrID} } +func (o ScMutableMap) GetInt8(key MapKey) ScMutableInt8 { + return ScMutableInt8{objID: o.objID, keyID: key.KeyID()} +} + +func (o ScMutableMap) GetInt8Array(key MapKey) ScMutableInt8Array { + arrID := GetObjectID(o.objID, key.KeyID(), TYPE_INT8|TYPE_ARRAY) + return ScMutableInt8Array{objID: arrID} +} + func (o ScMutableMap) GetInt16(key MapKey) ScMutableInt16 { return ScMutableInt16{objID: o.objID, keyID: key.KeyID()} } @@ -646,6 +773,42 @@ func (o ScMutableMap) GetStringArray(key MapKey) ScMutableStringArray { return ScMutableStringArray{objID: arrID} } +func (o ScMutableMap) GetUint8(key MapKey) ScMutableUint8 { + return ScMutableUint8{objID: o.objID, keyID: key.KeyID()} +} + +func (o ScMutableMap) GetUint8Array(key MapKey) ScMutableUint8Array { + arrID := GetObjectID(o.objID, key.KeyID(), TYPE_INT8|TYPE_ARRAY) + return ScMutableUint8Array{objID: arrID} +} + +func (o ScMutableMap) GetUint16(key MapKey) ScMutableUint16 { + return ScMutableUint16{objID: o.objID, keyID: key.KeyID()} +} + +func (o ScMutableMap) GetUint16Array(key MapKey) ScMutableUint16Array { + arrID := GetObjectID(o.objID, key.KeyID(), TYPE_INT16|TYPE_ARRAY) + return ScMutableUint16Array{objID: arrID} +} + +func (o ScMutableMap) GetUint32(key MapKey) ScMutableUint32 { + return ScMutableUint32{objID: o.objID, keyID: key.KeyID()} +} + +func (o ScMutableMap) GetUint32Array(key MapKey) ScMutableUint32Array { + arrID := GetObjectID(o.objID, key.KeyID(), TYPE_INT32|TYPE_ARRAY) + return ScMutableUint32Array{objID: arrID} +} + +func (o ScMutableMap) GetUint64(key MapKey) ScMutableUint64 { + return ScMutableUint64{objID: o.objID, keyID: key.KeyID()} +} + +func (o ScMutableMap) GetUint64Array(key MapKey) ScMutableUint64Array { + arrID := GetObjectID(o.objID, key.KeyID(), TYPE_INT64|TYPE_ARRAY) + return ScMutableUint64Array{objID: arrID} +} + func (o ScMutableMap) Immutable() ScImmutableMap { return ScImmutableMap(o) } @@ -778,3 +941,211 @@ func (o ScMutableStringArray) Immutable() ScImmutableStringArray { func (o ScMutableStringArray) Length() int32 { return GetLength(o.objID) } + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +type ScMutableUint8 struct { + objID int32 + keyID Key32 +} + +func NewScMutableUint8(objID int32, keyID Key32) ScMutableUint8 { + return ScMutableUint8{objID: objID, keyID: keyID} +} + +func (o ScMutableUint8) Exists() bool { + return Exists(o.objID, o.keyID, TYPE_INT8) +} + +func (o ScMutableUint8) SetValue(value uint8) { + bytes := make([]byte, 1) + bytes[0] = value + SetBytes(o.objID, o.keyID, TYPE_INT8, bytes) +} + +func (o ScMutableUint8) String() string { + return strconv.FormatUint(uint64(o.Value()), 10) +} + +func (o ScMutableUint8) Value() uint8 { + bytes := GetBytes(o.objID, o.keyID, TYPE_INT8) + return bytes[0] +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +type ScMutableUint8Array struct { + objID int32 +} + +func (o ScMutableUint8Array) Clear() { + Clear(o.objID) +} + +func (o ScMutableUint8Array) GetUint8(index int32) ScMutableUint8 { + return ScMutableUint8{objID: o.objID, keyID: Key32(index)} +} + +func (o ScMutableUint8Array) Immutable() ScImmutableUint8Array { + return ScImmutableUint8Array(o) +} + +func (o ScMutableUint8Array) Length() int32 { + return GetLength(o.objID) +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +type ScMutableUint16 struct { + objID int32 + keyID Key32 +} + +func NewScMutableUint16(objID int32, keyID Key32) ScMutableUint16 { + return ScMutableUint16{objID: objID, keyID: keyID} +} + +func (o ScMutableUint16) Exists() bool { + return Exists(o.objID, o.keyID, TYPE_INT16) +} + +func (o ScMutableUint16) SetValue(value uint16) { + bytes := make([]byte, 2) + binary.LittleEndian.PutUint16(bytes, value) + SetBytes(o.objID, o.keyID, TYPE_INT16, bytes) +} + +func (o ScMutableUint16) String() string { + return strconv.FormatUint(uint64(o.Value()), 10) +} + +func (o ScMutableUint16) Value() uint16 { + bytes := GetBytes(o.objID, o.keyID, TYPE_INT16) + return binary.LittleEndian.Uint16(bytes) +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +type ScMutableUint16Array struct { + objID int32 +} + +func (o ScMutableUint16Array) Clear() { + Clear(o.objID) +} + +func (o ScMutableUint16Array) GetUint16(index int32) ScMutableUint16 { + return ScMutableUint16{objID: o.objID, keyID: Key32(index)} +} + +func (o ScMutableUint16Array) Immutable() ScImmutableUint16Array { + return ScImmutableUint16Array(o) +} + +func (o ScMutableUint16Array) Length() int32 { + return GetLength(o.objID) +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +type ScMutableUint32 struct { + objID int32 + keyID Key32 +} + +func NewScMutableUint32(objID int32, keyID Key32) ScMutableUint32 { + return ScMutableUint32{objID: objID, keyID: keyID} +} + +func (o ScMutableUint32) Exists() bool { + return Exists(o.objID, o.keyID, TYPE_INT32) +} + +func (o ScMutableUint32) SetValue(value uint32) { + bytes := make([]byte, 4) + binary.LittleEndian.PutUint32(bytes, value) + SetBytes(o.objID, o.keyID, TYPE_INT32, bytes) +} + +func (o ScMutableUint32) String() string { + return strconv.FormatUint(uint64(o.Value()), 10) +} + +func (o ScMutableUint32) Value() uint32 { + bytes := GetBytes(o.objID, o.keyID, TYPE_INT32) + return binary.LittleEndian.Uint32(bytes) +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +type ScMutableUint32Array struct { + objID int32 +} + +func (o ScMutableUint32Array) Clear() { + Clear(o.objID) +} + +func (o ScMutableUint32Array) GetUint32(index int32) ScMutableUint32 { + return ScMutableUint32{objID: o.objID, keyID: Key32(index)} +} + +func (o ScMutableUint32Array) Immutable() ScImmutableUint32Array { + return ScImmutableUint32Array(o) +} + +func (o ScMutableUint32Array) Length() int32 { + return GetLength(o.objID) +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +type ScMutableUint64 struct { + objID int32 + keyID Key32 +} + +func NewScMutableUint64(objID int32, keyID Key32) ScMutableUint64 { + return ScMutableUint64{objID: objID, keyID: keyID} +} + +func (o ScMutableUint64) Exists() bool { + return Exists(o.objID, o.keyID, TYPE_INT64) +} + +func (o ScMutableUint64) SetValue(value uint64) { + bytes := make([]byte, 8) + binary.LittleEndian.PutUint64(bytes, value) + SetBytes(o.objID, o.keyID, TYPE_INT64, bytes) +} + +func (o ScMutableUint64) String() string { + return strconv.FormatUint(o.Value(), 10) +} + +func (o ScMutableUint64) Value() uint64 { + bytes := GetBytes(o.objID, o.keyID, TYPE_INT64) + return binary.LittleEndian.Uint64(bytes) +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +type ScMutableUint64Array struct { + objID int32 +} + +func (o ScMutableUint64Array) Clear() { + Clear(o.objID) +} + +func (o ScMutableUint64Array) GetUint64(index int32) ScMutableUint64 { + return ScMutableUint64{objID: o.objID, keyID: Key32(index)} +} + +func (o ScMutableUint64Array) Immutable() ScImmutableUint64Array { + return ScImmutableUint64Array(o) +} + +func (o ScMutableUint64Array) Length() int32 { + return GetLength(o.objID) +} diff --git a/packages/vm/wasmlib/src/bytes.rs b/packages/vm/wasmlib/src/bytes.rs index 69768bb791..50d582bb6d 100644 --- a/packages/vm/wasmlib/src/bytes.rs +++ b/packages/vm/wasmlib/src/bytes.rs @@ -178,7 +178,7 @@ impl BytesEncoder { } // encodes an ScHname into the byte buffer - pub fn hname(&mut self, value: &ScHname) -> &BytesEncoder { + pub fn hname(&mut self, value: ScHname) -> &BytesEncoder { self.bytes(&value.to_bytes()) } diff --git a/packages/vm/wasmlib/src/context.rs b/packages/vm/wasmlib/src/context.rs index 59707638d5..25df6bd915 100644 --- a/packages/vm/wasmlib/src/context.rs +++ b/packages/vm/wasmlib/src/context.rs @@ -274,8 +274,8 @@ impl ScFuncContext { // passing the provided parameters and token transfers to it pub fn call(&self, hcontract: ScHname, hfunction: ScHname, params: Option, transfer: Option) -> ScImmutableMap { let mut encode = BytesEncoder::new(); - encode.hname(&hcontract); - encode.hname(&hfunction); + encode.hname(hcontract); + encode.hname(hfunction); if let Some(params) = params { encode.int32(params.map_id()); } else { @@ -336,8 +336,8 @@ impl ScFuncContext { pub fn post(&self, chain_id: &ScChainID, hcontract: ScHname, hfunction: ScHname, params: Option, transfer: ScTransfers, delay: i32) { let mut encode = BytesEncoder::new(); encode.chain_id(chain_id); - encode.hname(&hcontract); - encode.hname(&hfunction); + encode.hname(hcontract); + encode.hname(hfunction); if let Some(params) = ¶ms { encode.int32(params.map_id()); } else { @@ -406,8 +406,8 @@ impl ScViewContext { // passing the provided parameters to it pub fn call(&self, hcontract: ScHname, hfunction: ScHname, params: Option) -> ScImmutableMap { let mut encode = BytesEncoder::new(); - encode.hname(&hcontract); - encode.hname(&hfunction); + encode.hname(hcontract); + encode.hname(hfunction); if let Some(params) = params { encode.int32(params.map_id()); } else { diff --git a/packages/vm/wasmlib/src/contract.rs b/packages/vm/wasmlib/src/contract.rs index 9f99d8bbab..66b349ffa4 100644 --- a/packages/vm/wasmlib/src/contract.rs +++ b/packages/vm/wasmlib/src/contract.rs @@ -57,8 +57,8 @@ impl ScView { fn call_with_transfer(&self, transfer_id: i32) { let mut encode = BytesEncoder::new(); - encode.hname(&self.h_contract); - encode.hname(&self.h_function); + encode.hname(self.h_contract); + encode.hname(self.h_function); encode.int32(self.id(self.params_id)); encode.int32(transfer_id); ROOT.get_bytes(&KEY_CALL).set_value(&encode.data()); @@ -163,8 +163,8 @@ impl ScFunc { pub fn post_to_chain(&self, chain_id: ScChainID) { let mut encode = BytesEncoder::new(); encode.chain_id(&chain_id); - encode.hname(&self.view.h_contract); - encode.hname(&self.view.h_function); + encode.hname(self.view.h_contract); + encode.hname(self.view.h_function); encode.int32(self.view.id(self.view.params_id)); encode.int32(self.transfer_id); encode.int32(self.delay); diff --git a/packages/vm/wasmlib/src/coreroot/results.rs b/packages/vm/wasmlib/src/coreroot/results.rs index 7014cfb78c..9a4f88fdb5 100644 --- a/packages/vm/wasmlib/src/coreroot/results.rs +++ b/packages/vm/wasmlib/src/coreroot/results.rs @@ -47,7 +47,7 @@ pub struct MapHnameToImmutableBytes { } impl MapHnameToImmutableBytes { - pub fn get_bytes(&self, key: &ScHname) -> ScImmutableBytes { + pub fn get_bytes(&self, key: ScHname) -> ScImmutableBytes { ScImmutableBytes::new(self.obj_id, key.get_key_id()) } } @@ -73,7 +73,7 @@ impl MapHnameToMutableBytes { clear(self.obj_id); } - pub fn get_bytes(&self, key: &ScHname) -> ScMutableBytes { + pub fn get_bytes(&self, key: ScHname) -> ScMutableBytes { ScMutableBytes::new(self.obj_id, key.get_key_id()) } } diff --git a/packages/vm/wasmlib/src/events.rs b/packages/vm/wasmlib/src/events.rs index 5f889c7fd4..fc7193d1bb 100644 --- a/packages/vm/wasmlib/src/events.rs +++ b/packages/vm/wasmlib/src/events.rs @@ -55,7 +55,7 @@ impl EventEncoder { } // encodes an ScHname into the byte buffer - pub fn hname(&mut self, value: &ScHname) -> &EventEncoder { + pub fn hname(&mut self, value: ScHname) -> &EventEncoder { self.string(&value.to_string()) } diff --git a/packages/vm/wasmlib/src/hashtypes.rs b/packages/vm/wasmlib/src/hashtypes.rs index 21cbb6e71e..e4803bca17 100644 --- a/packages/vm/wasmlib/src/hashtypes.rs +++ b/packages/vm/wasmlib/src/hashtypes.rs @@ -58,7 +58,7 @@ pub struct ScAgentID { impl ScAgentID { // construct from address and contract name hash - pub fn new(address: &ScAddress, hname: &ScHname) -> ScAgentID { + pub fn new(address: &ScAddress, hname: ScHname) -> ScAgentID { let mut agent_id = ScAgentID { id: [0; 37] }; agent_id.id[..33].copy_from_slice(&address.to_bytes()); agent_id.id[33..].copy_from_slice(&hname.to_bytes()); diff --git a/packages/vm/wasmlib/src/host.rs b/packages/vm/wasmlib/src/host.rs index 49849bfe7a..6952a06cd8 100644 --- a/packages/vm/wasmlib/src/host.rs +++ b/packages/vm/wasmlib/src/host.rs @@ -14,17 +14,19 @@ pub const TYPE_CALL: i32 = 0x40; pub const TYPE_ADDRESS: i32 = 1; pub const TYPE_AGENT_ID: i32 = 2; -pub const TYPE_BYTES: i32 = 3; -pub const TYPE_CHAIN_ID: i32 = 4; -pub const TYPE_COLOR: i32 = 5; -pub const TYPE_HASH: i32 = 6; -pub const TYPE_HNAME: i32 = 7; -pub const TYPE_INT16: i32 = 8; -pub const TYPE_INT32: i32 = 9; -pub const TYPE_INT64: i32 = 10; -pub const TYPE_MAP: i32 = 11; -pub const TYPE_REQUEST_ID: i32 = 12; -pub const TYPE_STRING: i32 = 13; +pub const TYPE_BOOL: i32 = 3; +pub const TYPE_BYTES: i32 = 4; +pub const TYPE_CHAIN_ID: i32 = 5; +pub const TYPE_COLOR: i32 = 6; +pub const TYPE_HASH: i32 = 7; +pub const TYPE_HNAME: i32 = 8; +pub const TYPE_INT8: i32 = 9; +pub const TYPE_INT16: i32 = 10; +pub const TYPE_INT32: i32 = 11; +pub const TYPE_INT64: i32 = 12; +pub const TYPE_MAP: i32 = 13; +pub const TYPE_REQUEST_ID: i32 = 14; +pub const TYPE_STRING: i32 = 15; pub const OBJ_ID_NULL: i32 = 0; pub const OBJ_ID_ROOT: i32 = 1; @@ -33,7 +35,7 @@ pub const OBJ_ID_PARAMS: i32 = 3; pub const OBJ_ID_RESULTS: i32 = 4; // size in bytes of predefined types, indexed by the TYPE_* consts -const TYPE_SIZES: &[u8] = &[0, 33, 37, 0, 33, 32, 32, 4, 2, 4, 8, 0, 34, 0]; +const TYPE_SIZES: &[u8] = &[0, 33, 37, 1, 0, 33, 32, 32, 4, 1, 2, 4, 8, 0, 34, 0]; // These 4 external functions are funneling the entire WasmLib functionality // to their counterparts on the host. diff --git a/packages/vm/wasmlib/src/immutable.rs b/packages/vm/wasmlib/src/immutable.rs index 1391e749a0..577c1b0a00 100644 --- a/packages/vm/wasmlib/src/immutable.rs +++ b/packages/vm/wasmlib/src/immutable.rs @@ -106,6 +106,55 @@ impl ScImmutableAgentIDArray { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ +// value proxy for immutable Bool in host container +pub struct ScImmutableBool { + obj_id: i32, + key_id: Key32, +} + +impl ScImmutableBool { + pub fn new(obj_id: i32, key_id: Key32) -> ScImmutableBool { + ScImmutableBool { obj_id, key_id } + } + + // check if value exists in host container + pub fn exists(&self) -> bool { + exists(self.obj_id, self.key_id, TYPE_BOOL) + } + + // human-readable string representation + pub fn to_string(&self) -> String { + self.value().to_string() + } + + // get value from host container + pub fn value(&self) -> bool { + let bytes = get_bytes(self.obj_id, self.key_id, TYPE_BOOL); + bytes[0] != 0 + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for immutable array of Bool +pub struct ScImmutableBoolArray { + pub(crate) obj_id: i32, +} + +impl ScImmutableBoolArray { + // get value proxy for item at index, index can be 0..length()-1 + pub fn get_bool(&self, index: i32) -> ScImmutableBool { + ScImmutableBool { obj_id: self.obj_id, key_id: Key32(index) } + } + + // number of items in array + pub fn length(&self) -> i32 { + get_length(self.obj_id) + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + // value proxy for immutable bytes array in host container pub struct ScImmutableBytes { obj_id: i32, @@ -346,7 +395,56 @@ impl ScImmutableHnameArray { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// value proxy for immutable int16 in host container +// value proxy for immutable Int8 in host container +pub struct ScImmutableInt8 { + obj_id: i32, + key_id: Key32, +} + +impl ScImmutableInt8 { + pub fn new(obj_id: i32, key_id: Key32) -> ScImmutableInt8 { + ScImmutableInt8 { obj_id, key_id } + } + + // check if value exists in host container + pub fn exists(&self) -> bool { + exists(self.obj_id, self.key_id, TYPE_INT8) + } + + // human-readable string representation + pub fn to_string(&self) -> String { + self.value().to_string() + } + + // get value from host container + pub fn value(&self) -> i8 { + let bytes = get_bytes(self.obj_id, self.key_id, TYPE_INT8); + bytes[0] as i8 + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for immutable array of Int8 +pub struct ScImmutableInt8Array { + pub(crate) obj_id: i32, +} + +impl ScImmutableInt8Array { + // get value proxy for item at index, index can be 0..length()-1 + pub fn get_int8(&self, index: i32) -> ScImmutableInt8 { + ScImmutableInt8 { obj_id: self.obj_id, key_id: Key32(index) } + } + + // number of items in array + pub fn length(&self) -> i32 { + get_length(self.obj_id) + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for immutable Int16 in host container pub struct ScImmutableInt16 { obj_id: i32, key_id: Key32, @@ -376,7 +474,7 @@ impl ScImmutableInt16 { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// array proxy for immutable array of int16 +// array proxy for immutable array of Int16 pub struct ScImmutableInt16Array { pub(crate) obj_id: i32, } @@ -395,7 +493,7 @@ impl ScImmutableInt16Array { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// value proxy for immutable int32 in host container +// value proxy for immutable Int32 in host container pub struct ScImmutableInt32 { obj_id: i32, key_id: Key32, @@ -425,7 +523,7 @@ impl ScImmutableInt32 { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// array proxy for immutable array of int32 +// array proxy for immutable array of Int32 pub struct ScImmutableInt32Array { pub(crate) obj_id: i32, } @@ -444,7 +542,7 @@ impl ScImmutableInt32Array { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// value proxy for immutable int64 in host container +// value proxy for immutable Int64 in host container pub struct ScImmutableInt64 { obj_id: i32, key_id: Key32, @@ -474,7 +572,7 @@ impl ScImmutableInt64 { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// array proxy for immutable array of int64 +// array proxy for immutable array of Int64 pub struct ScImmutableInt64Array { pub(crate) obj_id: i32, } @@ -525,6 +623,17 @@ impl ScImmutableMap { ScImmutableAgentIDArray { obj_id: arr_id } } + // get value proxy for immutable Bool field specified by key + pub fn get_bool(&self, key: &T) -> ScImmutableBool { + ScImmutableBool { obj_id: self.obj_id, key_id: key.get_key_id() } + } + + // get array proxy for ScImmutableBoolArray specified by key + pub fn get_bool_array(&self, key: &T) -> ScImmutableBoolArray { + let arr_id = get_object_id(self.obj_id, key.get_key_id(), TYPE_BOOL | TYPE_ARRAY); + ScImmutableBoolArray { obj_id: arr_id } + } + // get value proxy for immutable bytes array field specified by key pub fn get_bytes(&self, key: &T) -> ScImmutableBytes { ScImmutableBytes { obj_id: self.obj_id, key_id: key.get_key_id() } @@ -580,7 +689,18 @@ impl ScImmutableMap { ScImmutableHnameArray { obj_id: arr_id } } - // get value proxy for immutable int16 field specified by key + // get value proxy for immutable Int8 field specified by key + pub fn get_int8(&self, key: &T) -> ScImmutableInt8 { + ScImmutableInt8 { obj_id: self.obj_id, key_id: key.get_key_id() } + } + + // get array proxy for ScImmutableInt8Array specified by key + pub fn get_int8_array(&self, key: &T) -> ScImmutableInt8Array { + let arr_id = get_object_id(self.obj_id, key.get_key_id(), TYPE_INT8 | TYPE_ARRAY); + ScImmutableInt8Array { obj_id: arr_id } + } + + // get value proxy for immutable Int16 field specified by key pub fn get_int16(&self, key: &T) -> ScImmutableInt16 { ScImmutableInt16 { obj_id: self.obj_id, key_id: key.get_key_id() } } @@ -591,7 +711,7 @@ impl ScImmutableMap { ScImmutableInt16Array { obj_id: arr_id } } - // get value proxy for immutable int32 field specified by key + // get value proxy for immutable Int32 field specified by key pub fn get_int32(&self, key: &T) -> ScImmutableInt32 { ScImmutableInt32 { obj_id: self.obj_id, key_id: key.get_key_id() } } @@ -602,7 +722,7 @@ impl ScImmutableMap { ScImmutableInt32Array { obj_id: arr_id } } - // get value proxy for immutable int64 field specified by key + // get value proxy for immutable Int64 field specified by key pub fn get_int64(&self, key: &T) -> ScImmutableInt64 { ScImmutableInt64 { obj_id: self.obj_id, key_id: key.get_key_id() } } @@ -647,6 +767,50 @@ impl ScImmutableMap { ScImmutableStringArray { obj_id: arr_id } } + // get value proxy for immutable Uint8 field specified by key + pub fn get_uint8(&self, key: &T) -> ScImmutableUint8 { + ScImmutableUint8 { obj_id: self.obj_id, key_id: key.get_key_id() } + } + + // get array proxy for ScImmutableUint8Array specified by key + pub fn get_uint8_array(&self, key: &T) -> ScImmutableUint8Array { + let arr_id = get_object_id(self.obj_id, key.get_key_id(), TYPE_INT8 | TYPE_ARRAY); + ScImmutableUint8Array { obj_id: arr_id } + } + + // get value proxy for immutable Uint16 field specified by key + pub fn get_uint16(&self, key: &T) -> ScImmutableUint16 { + ScImmutableUint16 { obj_id: self.obj_id, key_id: key.get_key_id() } + } + + // get array proxy for ScImmutableUint16Array specified by key + pub fn get_uint16_array(&self, key: &T) -> ScImmutableUint16Array { + let arr_id = get_object_id(self.obj_id, key.get_key_id(), TYPE_INT16 | TYPE_ARRAY); + ScImmutableUint16Array { obj_id: arr_id } + } + + // get value proxy for immutable Uint32 field specified by key + pub fn get_uint32(&self, key: &T) -> ScImmutableUint32 { + ScImmutableUint32 { obj_id: self.obj_id, key_id: key.get_key_id() } + } + + // get array proxy for ScImmutableUint32Array specified by key + pub fn get_uint32_array(&self, key: &T) -> ScImmutableUint32Array { + let arr_id = get_object_id(self.obj_id, key.get_key_id(), TYPE_INT32 | TYPE_ARRAY); + ScImmutableUint32Array { obj_id: arr_id } + } + + // get value proxy for immutable Uint64 field specified by key + pub fn get_uint64(&self, key: &T) -> ScImmutableUint64 { + ScImmutableUint64 { obj_id: self.obj_id, key_id: key.get_key_id() } + } + + // get array proxy for ScImmutableUint64Array specified by key + pub fn get_uint64_array(&self, key: &T) -> ScImmutableUint64Array { + let arr_id = get_object_id(self.obj_id, key.get_key_id(), TYPE_INT64 | TYPE_ARRAY); + ScImmutableUint64Array { obj_id: arr_id } + } + pub fn map_id(&self) -> i32 { self.obj_id } @@ -766,3 +930,199 @@ impl ScImmutableStringArray { get_length(self.obj_id) } } + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for immutable Uint8 in host container +pub struct ScImmutableUint8 { + obj_id: i32, + key_id: Key32, +} + +impl ScImmutableUint8 { + pub fn new(obj_id: i32, key_id: Key32) -> ScImmutableUint8 { + ScImmutableUint8 { obj_id, key_id } + } + + // check if value exists in host container + pub fn exists(&self) -> bool { + exists(self.obj_id, self.key_id, TYPE_INT8) + } + + // human-readable string representation + pub fn to_string(&self) -> String { + self.value().to_string() + } + + // get value from host container + pub fn value(&self) -> u8 { + let bytes = get_bytes(self.obj_id, self.key_id, TYPE_INT8); + bytes[0] + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for immutable array of Uint8 +pub struct ScImmutableUint8Array { + pub(crate) obj_id: i32, +} + +impl ScImmutableUint8Array { + // get value proxy for item at index, index can be 0..length()-1 + pub fn get_uint8(&self, index: i32) -> ScImmutableUint8 { + ScImmutableUint8 { obj_id: self.obj_id, key_id: Key32(index) } + } + + // number of items in array + pub fn length(&self) -> i32 { + get_length(self.obj_id) + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for immutable Uint16 in host container +pub struct ScImmutableUint16 { + obj_id: i32, + key_id: Key32, +} + +impl ScImmutableUint16 { + pub fn new(obj_id: i32, key_id: Key32) -> ScImmutableUint16 { + ScImmutableUint16 { obj_id, key_id } + } + + // check if value exists in host container + pub fn exists(&self) -> bool { + exists(self.obj_id, self.key_id, TYPE_INT16) + } + + // human-readable string representation + pub fn to_string(&self) -> String { + self.value().to_string() + } + + // get value from host container + pub fn value(&self) -> u16 { + let bytes = get_bytes(self.obj_id, self.key_id, TYPE_INT16); + u16::from_le_bytes(bytes.try_into().expect("invalid u16 length")) + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for immutable array of Uint16 +pub struct ScImmutableUint16Array { + pub(crate) obj_id: i32, +} + +impl ScImmutableUint16Array { + // get value proxy for item at index, index can be 0..length()-1 + pub fn get_uint16(&self, index: i32) -> ScImmutableUint16 { + ScImmutableUint16 { obj_id: self.obj_id, key_id: Key32(index) } + } + + // number of items in array + pub fn length(&self) -> i32 { + get_length(self.obj_id) + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for immutable Uint32 in host container +pub struct ScImmutableUint32 { + obj_id: i32, + key_id: Key32, +} + +impl ScImmutableUint32 { + pub fn new(obj_id: i32, key_id: Key32) -> ScImmutableUint32 { + ScImmutableUint32 { obj_id, key_id } + } + + // check if value exists in host container + pub fn exists(&self) -> bool { + exists(self.obj_id, self.key_id, TYPE_INT32) + } + + // human-readable string representation + pub fn to_string(&self) -> String { + self.value().to_string() + } + + // get value from host container + pub fn value(&self) -> u32 { + let bytes = get_bytes(self.obj_id, self.key_id, TYPE_INT32); + u32::from_le_bytes(bytes.try_into().expect("invalid u32 length")) + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for immutable array of Uint32 +pub struct ScImmutableUint32Array { + pub(crate) obj_id: i32, +} + +impl ScImmutableUint32Array { + // get value proxy for item at index, index can be 0..length()-1 + pub fn get_uint32(&self, index: i32) -> ScImmutableUint32 { + ScImmutableUint32 { obj_id: self.obj_id, key_id: Key32(index) } + } + + // number of items in array + pub fn length(&self) -> i32 { + get_length(self.obj_id) + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for immutable Uint64 in host container +pub struct ScImmutableUint64 { + obj_id: i32, + key_id: Key32, +} + +impl ScImmutableUint64 { + pub fn new(obj_id: i32, key_id: Key32) -> ScImmutableUint64 { + ScImmutableUint64 { obj_id, key_id } + } + + // check if value exists in host container + pub fn exists(&self) -> bool { + exists(self.obj_id, self.key_id, TYPE_INT64) + } + + // human-readable string representation + pub fn to_string(&self) -> String { + self.value().to_string() + } + + // get value from host container + pub fn value(&self) -> u64 { + let bytes = get_bytes(self.obj_id, self.key_id, TYPE_INT64); + u64::from_le_bytes(bytes.try_into().expect("invalid u64 length")) + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for immutable array of Uint64 +pub struct ScImmutableUint64Array { + pub(crate) obj_id: i32, +} + +impl ScImmutableUint64Array { + // get value proxy for item at index, index can be 0..length()-1 + pub fn get_uint64(&self, index: i32) -> ScImmutableUint64 { + ScImmutableUint64 { obj_id: self.obj_id, key_id: Key32(index) } + } + + // number of items in array + pub fn length(&self) -> i32 { + get_length(self.obj_id) + } +} diff --git a/packages/vm/wasmlib/src/mutable.rs b/packages/vm/wasmlib/src/mutable.rs index a2a1afcf67..9c0625eef3 100644 --- a/packages/vm/wasmlib/src/mutable.rs +++ b/packages/vm/wasmlib/src/mutable.rs @@ -141,6 +141,72 @@ impl ScMutableAgentIDArray { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ +// value proxy for mutable Bool in host container +pub struct ScMutableBool { + obj_id: i32, + key_id: Key32, +} + +impl ScMutableBool { + pub fn new(obj_id: i32, key_id: Key32) -> ScMutableBool { + ScMutableBool { obj_id, key_id } + } + + // check if value exists in host container + pub fn exists(&self) -> bool { + exists(self.obj_id, self.key_id, TYPE_BOOL) + } + + // set value in host container + pub fn set_value(&self, val: bool) { + let bytes = [val as u8]; + set_bytes(self.obj_id, self.key_id, TYPE_BOOL, &bytes); + } + + // human-readable string representation + pub fn to_string(&self) -> String { + self.value().to_string() + } + + // retrieve value from host container + pub fn value(&self) -> bool { + let bytes = get_bytes(self.obj_id, self.key_id, TYPE_BOOL); + bytes[0] != 0 + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for mutable array of Bool +pub struct ScMutableBoolArray { + pub(crate) obj_id: i32, +} + +impl ScMutableBoolArray { + // empty the array + pub fn clear(&self) { + clear(self.obj_id); + } + + // get value proxy for item at index, index can be 0..length() + // when index equals length() a new item is appended + pub fn get_bool(&self, index: i32) -> ScMutableBool { + ScMutableBool { obj_id: self.obj_id, key_id: Key32(index) } + } + + // get immutable version of array proxy + pub fn immutable(&self) -> ScImmutableBoolArray { + ScImmutableBoolArray { obj_id: self.obj_id } + } + + // number of items in array + pub fn length(&self) -> i32 { + get_length(self.obj_id) + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + // value proxy for mutable bytes array in host container pub struct ScMutableBytes { obj_id: i32, @@ -461,7 +527,73 @@ impl ScMutableHnameArray { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// value proxy for mutable int16 in host container +// value proxy for mutable Int8 in host container +pub struct ScMutableInt8 { + obj_id: i32, + key_id: Key32, +} + +impl ScMutableInt8 { + pub fn new(obj_id: i32, key_id: Key32) -> ScMutableInt8 { + ScMutableInt8 { obj_id, key_id } + } + + // check if value exists in host container + pub fn exists(&self) -> bool { + exists(self.obj_id, self.key_id, TYPE_INT8) + } + + // set value in host container + pub fn set_value(&self, val: i8) { + let bytes = [val as u8]; + set_bytes(self.obj_id, self.key_id, TYPE_INT8, &bytes); + } + + // human-readable string representation + pub fn to_string(&self) -> String { + self.value().to_string() + } + + // retrieve value from host container + pub fn value(&self) -> i8 { + let bytes = get_bytes(self.obj_id, self.key_id, TYPE_INT8); + bytes[0] as i8 + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for mutable array of Int8 +pub struct ScMutableInt8Array { + pub(crate) obj_id: i32, +} + +impl ScMutableInt8Array { + // empty the array + pub fn clear(&self) { + clear(self.obj_id); + } + + // get value proxy for item at index, index can be 0..length() + // when index equals length() a new item is appended + pub fn get_int8(&self, index: i32) -> ScMutableInt8 { + ScMutableInt8 { obj_id: self.obj_id, key_id: Key32(index) } + } + + // get immutable version of array proxy + pub fn immutable(&self) -> ScImmutableInt8Array { + ScImmutableInt8Array { obj_id: self.obj_id } + } + + // number of items in array + pub fn length(&self) -> i32 { + get_length(self.obj_id) + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for mutable Int16 in host container pub struct ScMutableInt16 { obj_id: i32, key_id: Key32, @@ -496,7 +628,7 @@ impl ScMutableInt16 { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// array proxy for mutable array of int16 +// array proxy for mutable array of Int16 pub struct ScMutableInt16Array { pub(crate) obj_id: i32, } @@ -526,7 +658,7 @@ impl ScMutableInt16Array { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// value proxy for mutable int32 in host container +// value proxy for mutable Int32 in host container pub struct ScMutableInt32 { obj_id: i32, key_id: Key32, @@ -561,7 +693,7 @@ impl ScMutableInt32 { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// array proxy for mutable array of int32 +// array proxy for mutable array of Int32 pub struct ScMutableInt32Array { pub(crate) obj_id: i32, } @@ -591,7 +723,7 @@ impl ScMutableInt32Array { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// value proxy for mutable int64 in host container +// value proxy for mutable Int64 in host container pub struct ScMutableInt64 { obj_id: i32, key_id: Key32, @@ -626,7 +758,7 @@ impl ScMutableInt64 { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// array proxy for mutable array of int64 +// array proxy for mutable array of Int64 pub struct ScMutableInt64Array { pub(crate) obj_id: i32, } @@ -700,6 +832,17 @@ impl ScMutableMap { ScMutableAgentIDArray { obj_id: arr_id } } + // get value proxy for mutable Bool field specified by key + pub fn get_bool(&self, key: &T) -> ScMutableBool { + ScMutableBool { obj_id: self.obj_id, key_id: key.get_key_id() } + } + + // get array proxy for ScMutableBoolArray specified by key + pub fn get_bool_array(&self, key: &T) -> ScMutableBoolArray { + let arr_id = get_object_id(self.obj_id, key.get_key_id(), TYPE_BOOL | TYPE_ARRAY); + ScMutableBoolArray { obj_id: arr_id } + } + // get value proxy for mutable bytes array field specified by key pub fn get_bytes(&self, key: &T) -> ScMutableBytes { ScMutableBytes { obj_id: self.obj_id, key_id: key.get_key_id() } @@ -755,7 +898,18 @@ impl ScMutableMap { ScMutableHnameArray { obj_id: arr_id } } - // get value proxy for mutable int16 field specified by key + // get value proxy for mutable Int8 field specified by key + pub fn get_int8(&self, key: &T) -> ScMutableInt8 { + ScMutableInt8 { obj_id: self.obj_id, key_id: key.get_key_id() } + } + + // get array proxy for ScMutableInt8Array specified by key + pub fn get_int8_array(&self, key: &T) -> ScMutableInt8Array { + let arr_id = get_object_id(self.obj_id, key.get_key_id(), TYPE_INT8 | TYPE_ARRAY); + ScMutableInt8Array { obj_id: arr_id } + } + + // get value proxy for mutable Int16 field specified by key pub fn get_int16(&self, key: &T) -> ScMutableInt16 { ScMutableInt16 { obj_id: self.obj_id, key_id: key.get_key_id() } } @@ -766,9 +920,9 @@ impl ScMutableMap { ScMutableInt16Array { obj_id: arr_id } } - // get value proxy for mutable int64 field specified by key - pub fn get_int64(&self, key: &T) -> ScMutableInt64 { - ScMutableInt64 { obj_id: self.obj_id, key_id: key.get_key_id() } + // get value proxy for mutable Int32 field specified by key + pub fn get_int32(&self, key: &T) -> ScMutableInt32 { + ScMutableInt32 { obj_id: self.obj_id, key_id: key.get_key_id() } } // get array proxy for ScMutableInt32Array specified by key @@ -777,9 +931,9 @@ impl ScMutableMap { ScMutableInt32Array { obj_id: arr_id } } - // get value proxy for mutable int32 field specified by key - pub fn get_int32(&self, key: &T) -> ScMutableInt32 { - ScMutableInt32 { obj_id: self.obj_id, key_id: key.get_key_id() } + // get value proxy for mutable Int64 field specified by key + pub fn get_int64(&self, key: &T) -> ScMutableInt64 { + ScMutableInt64 { obj_id: self.obj_id, key_id: key.get_key_id() } } // get array proxy for ScMutableInt64Array specified by key @@ -822,6 +976,50 @@ impl ScMutableMap { ScMutableStringArray { obj_id: arr_id } } + // get value proxy for mutable Uint8 field specified by key + pub fn get_uint8(&self, key: &T) -> ScMutableUint8 { + ScMutableUint8 { obj_id: self.obj_id, key_id: key.get_key_id() } + } + + // get array proxy for ScMutableUint8Array specified by key + pub fn get_uint8_array(&self, key: &T) -> ScMutableUint8Array { + let arr_id = get_object_id(self.obj_id, key.get_key_id(), TYPE_INT8 | TYPE_ARRAY); + ScMutableUint8Array { obj_id: arr_id } + } + + // get value proxy for mutable Uint16 field specified by key + pub fn get_uint16(&self, key: &T) -> ScMutableUint16 { + ScMutableUint16 { obj_id: self.obj_id, key_id: key.get_key_id() } + } + + // get array proxy for ScMutableUint16Array specified by key + pub fn get_uint16_array(&self, key: &T) -> ScMutableUint16Array { + let arr_id = get_object_id(self.obj_id, key.get_key_id(), TYPE_INT16 | TYPE_ARRAY); + ScMutableUint16Array { obj_id: arr_id } + } + + // get value proxy for mutable Uint32 field specified by key + pub fn get_uint32(&self, key: &T) -> ScMutableUint32 { + ScMutableUint32 { obj_id: self.obj_id, key_id: key.get_key_id() } + } + + // get array proxy for ScMutableUint32Array specified by key + pub fn get_uint32_array(&self, key: &T) -> ScMutableUint32Array { + let arr_id = get_object_id(self.obj_id, key.get_key_id(), TYPE_INT32 | TYPE_ARRAY); + ScMutableUint32Array { obj_id: arr_id } + } + + // get value proxy for mutable Uint64 field specified by key + pub fn get_uint64(&self, key: &T) -> ScMutableUint64 { + ScMutableUint64 { obj_id: self.obj_id, key_id: key.get_key_id() } + } + + // get array proxy for ScMutableUint64Array specified by key + pub fn get_uint64_array(&self, key: &T) -> ScMutableUint64Array { + let arr_id = get_object_id(self.obj_id, key.get_key_id(), TYPE_INT64 | TYPE_ARRAY); + ScMutableUint64Array { obj_id: arr_id } + } + // get immutable version of map proxy pub fn immutable(&self) -> ScImmutableMap { ScImmutableMap { obj_id: self.obj_id } @@ -991,3 +1189,264 @@ impl ScMutableStringArray { get_length(self.obj_id) } } + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for mutable Uint8 in host container +pub struct ScMutableUint8 { + obj_id: i32, + key_id: Key32, +} + +impl ScMutableUint8 { + pub fn new(obj_id: i32, key_id: Key32) -> ScMutableUint8 { + ScMutableUint8 { obj_id, key_id } + } + + // check if value exists in host container + pub fn exists(&self) -> bool { + exists(self.obj_id, self.key_id, TYPE_INT8) + } + + // set value in host container + pub fn set_value(&self, val: u8) { + let bytes = [val]; + set_bytes(self.obj_id, self.key_id, TYPE_INT8, &bytes); + } + + // human-readable string representation + pub fn to_string(&self) -> String { + self.value().to_string() + } + + // retrieve value from host container + pub fn value(&self) -> u8 { + let bytes = get_bytes(self.obj_id, self.key_id, TYPE_INT8); + bytes[0] + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for mutable array of Uint8 +pub struct ScMutableUint8Array { + pub(crate) obj_id: i32, +} + +impl ScMutableUint8Array { + // empty the array + pub fn clear(&self) { + clear(self.obj_id); + } + + // get value proxy for item at index, index can be 0..length() + // when index equals length() a new item is appended + pub fn get_uint8(&self, index: i32) -> ScMutableUint8 { + ScMutableUint8 { obj_id: self.obj_id, key_id: Key32(index) } + } + + // get immutable version of array proxy + pub fn immutable(&self) -> ScImmutableUint8Array { + ScImmutableUint8Array { obj_id: self.obj_id } + } + + // number of items in array + pub fn length(&self) -> i32 { + get_length(self.obj_id) + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for mutable Uint16 in host container +pub struct ScMutableUint16 { + obj_id: i32, + key_id: Key32, +} + +impl ScMutableUint16 { + pub fn new(obj_id: i32, key_id: Key32) -> ScMutableUint16 { + ScMutableUint16 { obj_id, key_id } + } + + // check if value exists in host container + pub fn exists(&self) -> bool { + exists(self.obj_id, self.key_id, TYPE_INT16) + } + + // set value in host container + pub fn set_value(&self, val: u16) { + set_bytes(self.obj_id, self.key_id, TYPE_INT16, &val.to_le_bytes()); + } + + // human-readable string representation + pub fn to_string(&self) -> String { + self.value().to_string() + } + + // retrieve value from host container + pub fn value(&self) -> u16 { + let bytes = get_bytes(self.obj_id, self.key_id, TYPE_INT16); + u16::from_le_bytes(bytes.try_into().expect("invalid u16 length")) + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for mutable array of Uint16 +pub struct ScMutableUint16Array { + pub(crate) obj_id: i32, +} + +impl ScMutableUint16Array { + // empty the array + pub fn clear(&self) { + clear(self.obj_id); + } + + // get value proxy for item at index, index can be 0..length() + // when index equals length() a new item is appended + pub fn get_uint16(&self, index: i32) -> ScMutableUint16 { + ScMutableUint16 { obj_id: self.obj_id, key_id: Key32(index) } + } + + // get immutable version of array proxy + pub fn immutable(&self) -> ScImmutableUint16Array { + ScImmutableUint16Array { obj_id: self.obj_id } + } + + // number of items in array + pub fn length(&self) -> i32 { + get_length(self.obj_id) + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for mutable Uint32 in host container +pub struct ScMutableUint32 { + obj_id: i32, + key_id: Key32, +} + +impl ScMutableUint32 { + pub fn new(obj_id: i32, key_id: Key32) -> ScMutableUint32 { + ScMutableUint32 { obj_id, key_id } + } + + // check if value exists in host container + pub fn exists(&self) -> bool { + exists(self.obj_id, self.key_id, TYPE_INT32) + } + + // set value in host container + pub fn set_value(&self, val: u32) { + set_bytes(self.obj_id, self.key_id, TYPE_INT32, &val.to_le_bytes()); + } + + // human-readable string representation + pub fn to_string(&self) -> String { + self.value().to_string() + } + + // retrieve value from host container + pub fn value(&self) -> u32 { + let bytes = get_bytes(self.obj_id, self.key_id, TYPE_INT32); + u32::from_le_bytes(bytes.try_into().expect("invalid u32 length")) + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for mutable array of Uint32 +pub struct ScMutableUint32Array { + pub(crate) obj_id: i32, +} + +impl ScMutableUint32Array { + // empty the array + pub fn clear(&self) { + clear(self.obj_id); + } + + // get value proxy for item at index, index can be 0..length() + // when index equals length() a new item is appended + pub fn get_uint32(&self, index: i32) -> ScMutableUint32 { + ScMutableUint32 { obj_id: self.obj_id, key_id: Key32(index) } + } + + // get immutable version of array proxy + pub fn immutable(&self) -> ScImmutableUint32Array { + ScImmutableUint32Array { obj_id: self.obj_id } + } + + // number of items in array + pub fn length(&self) -> i32 { + get_length(self.obj_id) + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for mutable Uint64 in host container +pub struct ScMutableUint64 { + obj_id: i32, + key_id: Key32, +} + +impl ScMutableUint64 { + pub fn new(obj_id: i32, key_id: Key32) -> ScMutableUint64 { + ScMutableUint64 { obj_id, key_id } + } + + // check if value exists in host container + pub fn exists(&self) -> bool { + exists(self.obj_id, self.key_id, TYPE_INT64) + } + + // set value in host container + pub fn set_value(&self, val: u64) { + set_bytes(self.obj_id, self.key_id, TYPE_INT64, &val.to_le_bytes()); + } + + // human-readable string representation + pub fn to_string(&self) -> String { + self.value().to_string() + } + + // retrieve value from host container + pub fn value(&self) -> u64 { + let bytes = get_bytes(self.obj_id, self.key_id, TYPE_INT64); + u64::from_le_bytes(bytes.try_into().expect("invalid ui64 length")) + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for mutable Uint64 +pub struct ScMutableUint64Array { + pub(crate) obj_id: i32, +} + +impl ScMutableUint64Array { + // empty the array + pub fn clear(&self) { + clear(self.obj_id); + } + + // get value proxy for item at index, index can be 0..length() + // when index equals length() a new item is appended + pub fn get_uint64(&self, index: i32) -> ScMutableUint64 { + ScMutableUint64 { obj_id: self.obj_id, key_id: Key32(index) } + } + + // get immutable version of array proxy + pub fn immutable(&self) -> ScImmutableUint64Array { + ScImmutableUint64Array { obj_id: self.obj_id } + } + + // number of items in array + pub fn length(&self) -> i32 { + get_length(self.obj_id) + } +} diff --git a/packages/vm/wasmlib/ts/wasmlib/host.ts b/packages/vm/wasmlib/ts/wasmlib/host.ts index 426741ae3a..ee6d6f0d74 100644 --- a/packages/vm/wasmlib/ts/wasmlib/host.ts +++ b/packages/vm/wasmlib/ts/wasmlib/host.ts @@ -15,17 +15,19 @@ export const TYPE_CALL: i32 = 0x40; export const TYPE_ADDRESS: i32 = 1; export const TYPE_AGENT_ID: i32 = 2; -export const TYPE_BYTES: i32 = 3; -export const TYPE_CHAIN_ID: i32 = 4; -export const TYPE_COLOR: i32 = 5; -export const TYPE_HASH: i32 = 6; -export const TYPE_HNAME: i32 = 7; -export const TYPE_INT16: i32 = 8; -export const TYPE_INT32: i32 = 9; -export const TYPE_INT64: i32 = 10; -export const TYPE_MAP: i32 = 11; -export const TYPE_REQUEST_ID: i32 = 12; -export const TYPE_STRING: i32 = 13; +export const TYPE_BOOL: i32 = 3; +export const TYPE_BYTES: i32 = 4; +export const TYPE_CHAIN_ID: i32 = 5; +export const TYPE_COLOR: i32 = 6; +export const TYPE_HASH: i32 = 7; +export const TYPE_HNAME: i32 = 8; +export const TYPE_INT8: i32 = 9; +export const TYPE_INT16: i32 = 10; +export const TYPE_INT32: i32 = 11; +export const TYPE_INT64: i32 = 12; +export const TYPE_MAP: i32 = 13; +export const TYPE_REQUEST_ID: i32 = 14; +export const TYPE_STRING: i32 = 15; export const OBJ_ID_NULL: i32 = 0; export const OBJ_ID_ROOT: i32 = 1; @@ -34,7 +36,7 @@ export const OBJ_ID_PARAMS: i32 = 3; export const OBJ_ID_RESULTS: i32 = 4; // size in bytes of predefined types, indexed by the TYPE_* consts -const TYPE_SIZES: u8[] = [0, 33, 37, 0, 33, 32, 32, 4, 2, 4, 8, 0, 34, 0]; +const TYPE_SIZES: u8[] = [0, 33, 37, 1, 0, 33, 32, 32, 4, 1, 2, 4, 8, 0, 34, 0]; // These 4 external functions are funneling the entire WasmLib functionality diff --git a/packages/vm/wasmlib/ts/wasmlib/immutable.ts b/packages/vm/wasmlib/ts/wasmlib/immutable.ts index 104b77c43f..3c11983d60 100644 --- a/packages/vm/wasmlib/ts/wasmlib/immutable.ts +++ b/packages/vm/wasmlib/ts/wasmlib/immutable.ts @@ -108,6 +108,56 @@ export class ScImmutableAgentIDArray { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ +// value proxy for immutable Bool in host container +export class ScImmutableBool { + objID: i32; + keyID: Key32; + + constructor(objID: i32, keyID: Key32) { + this.objID = objID; + this.keyID = keyID; + } + + // check if value exists in host container + exists(): boolean { + return exists(this.objID, this.keyID, host.TYPE_BOOL); + } + + // human-readable string representation + toString(): string { + return this.value().toString(); + } + + // get value from host container + value(): boolean { + let bytes = getBytes(this.objID, this.keyID, host.TYPE_BOOL); + return bytes[0] != 0; + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for immutable array of Bool +export class ScImmutableBoolArray { + objID: i32; + + constructor(id: i32) { + this.objID = id; + } + + // get value proxy for item at index, index can be 0..length()-1 + getBool(index: i32): ScImmutableBool { + return new ScImmutableBool(this.objID, new Key32(index)); + } + + // number of items in array + length(): i32 { + return getLength(this.objID); + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + // value proxy for immutable bytes array in host container export class ScImmutableBytes { objID: i32; @@ -353,7 +403,57 @@ export class ScImmutableHnameArray { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// value proxy for immutable int16 in host container +// value proxy for immutable Int8 in host container +export class ScImmutableInt8 { + objID: i32; + keyID: Key32; + + constructor(objID: i32, keyID: Key32) { + this.objID = objID; + this.keyID = keyID; + } + + // check if value exists in host container + exists(): boolean { + return exists(this.objID, this.keyID, host.TYPE_INT8); + } + + // human-readable string representation + toString(): string { + return this.value().toString(); + } + + // get value from host container + value(): i8 { + let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT8); + return bytes[0] as i8; + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for immutable array of Int8 +export class ScImmutableInt8Array { + objID: i32; + + constructor(id: i32) { + this.objID = id; + } + + // get value proxy for item at index, index can be 0..length()-1 + getInt8(index: i32): ScImmutableInt8 { + return new ScImmutableInt8(this.objID, new Key32(index)); + } + + // number of items in array + length(): i32 { + return getLength(this.objID); + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for immutable Int16 in host container export class ScImmutableInt16 { objID: i32; keyID: Key32; @@ -382,7 +482,7 @@ export class ScImmutableInt16 { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// array proxy for immutable array of int16 +// array proxy for immutable array of Int16 export class ScImmutableInt16Array { objID: i32; @@ -403,7 +503,7 @@ export class ScImmutableInt16Array { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// value proxy for immutable int32 in host container +// value proxy for immutable Int32 in host container export class ScImmutableInt32 { objID: i32; keyID: Key32; @@ -432,7 +532,7 @@ export class ScImmutableInt32 { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// array proxy for immutable array of int32 +// array proxy for immutable array of Int32 export class ScImmutableInt32Array { objID: i32; @@ -453,7 +553,7 @@ export class ScImmutableInt32Array { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// value proxy for immutable int64 in host container +// value proxy for immutable Int64 in host container export class ScImmutableInt64 { objID: i32; keyID: Key32; @@ -482,7 +582,7 @@ export class ScImmutableInt64 { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// array proxy for immutable array of int64 +// array proxy for immutable array of Int64 export class ScImmutableInt64Array { objID: i32; @@ -537,6 +637,17 @@ export class ScImmutableMap { return new ScImmutableAgentIDArray(arrID); } + // get value proxy for immutable Bool field specified by key + getBool(key: MapKey): ScImmutableBool { + return new ScImmutableBool(this.objID, key.getKeyID()); + } + + // get array proxy for ScImmutableBoolArray specified by key + getBoolArray(key: MapKey): ScImmutableBoolArray { + let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_BOOL | host.TYPE_ARRAY); + return new ScImmutableBoolArray(arrID); + } + // get value proxy for immutable bytes array field specified by key getBytes(key: MapKey): ScImmutableBytes { return new ScImmutableBytes(this.objID, key.getKeyID()); @@ -592,7 +703,18 @@ export class ScImmutableMap { return new ScImmutableHnameArray(arrID); } - // get value proxy for immutable int16 field specified by key + // get value proxy for immutable Int8 field specified by key + getInt8(key: MapKey): ScImmutableInt8 { + return new ScImmutableInt8(this.objID, key.getKeyID()); + } + + // get array proxy for ScImmutableInt8Array specified by key + getInt8Array(key: MapKey): ScImmutableInt8Array { + let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT8 | host.TYPE_ARRAY); + return new ScImmutableInt8Array(arrID); + } + + // get value proxy for immutable Int16 field specified by key getInt16(key: MapKey): ScImmutableInt16 { return new ScImmutableInt16(this.objID, key.getKeyID()); } @@ -603,7 +725,7 @@ export class ScImmutableMap { return new ScImmutableInt16Array(arrID); } - // get value proxy for immutable int32 field specified by key + // get value proxy for immutable Int32 field specified by key getInt32(key: MapKey): ScImmutableInt32 { return new ScImmutableInt32(this.objID, key.getKeyID()); } @@ -614,7 +736,7 @@ export class ScImmutableMap { return new ScImmutableInt32Array(arrID); } - // get value proxy for immutable int64 field specified by key + // get value proxy for immutable Int64 field specified by key getInt64(key: MapKey): ScImmutableInt64 { return new ScImmutableInt64(this.objID, key.getKeyID()); } @@ -659,6 +781,50 @@ export class ScImmutableMap { return new ScImmutableStringArray(arrID); } + // get value proxy for immutable Uint8 field specified by key + getUint8(key: MapKey): ScImmutableUint8 { + return new ScImmutableUint8(this.objID, key.getKeyID()); + } + + // get array proxy for ScImmutableUint8Array specified by key + getUint8Array(key: MapKey): ScImmutableUint8Array { + let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT8 | host.TYPE_ARRAY); + return new ScImmutableUint8Array(arrID); + } + + // get value proxy for immutable Uint16 field specified by key + getUint16(key: MapKey): ScImmutableUint16 { + return new ScImmutableUint16(this.objID, key.getKeyID()); + } + + // get array proxy for ScImmutableUint16Array specified by key + getUint16Array(key: MapKey): ScImmutableUint16Array { + let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT16 | host.TYPE_ARRAY); + return new ScImmutableUint16Array(arrID); + } + + // get value proxy for immutable Uint32 field specified by key + getUint32(key: MapKey): ScImmutableUint32 { + return new ScImmutableUint32(this.objID, key.getKeyID()); + } + + // get array proxy for ScImmutableUint32Array specified by key + getUint32Array(key: MapKey): ScImmutableUint32Array { + let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT32 | host.TYPE_ARRAY); + return new ScImmutableUint32Array(arrID); + } + + // get value proxy for immutable Uint64 field specified by key + getUint64(key: MapKey): ScImmutableUint64 { + return new ScImmutableUint64(this.objID, key.getKeyID()); + } + + // get array proxy for ScImmutableUint64Array specified by key + getUint64Array(key: MapKey): ScImmutableUint64Array { + let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT64 | host.TYPE_ARRAY); + return new ScImmutableUint64Array(arrID); + } + mapID(): i32 { return this.objID; } @@ -782,3 +948,203 @@ export class ScImmutableStringArray { return getLength(this.objID); } } + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for immutable Uint8 in host container +export class ScImmutableUint8 { + objID: i32; + keyID: Key32; + + constructor(objID: i32, keyID: Key32) { + this.objID = objID; + this.keyID = keyID; + } + + // check if value exists in host container + exists(): boolean { + return exists(this.objID, this.keyID, host.TYPE_INT8); + } + + // human-readable string representation + toString(): string { + return this.value().toString(); + } + + // get value from host container + value(): u8 { + let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT8); + return bytes[0] as u8; + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for immutable array of Uint8 +export class ScImmutableUint8Array { + objID: i32; + + constructor(id: i32) { + this.objID = id; + } + + // get value proxy for item at index, index can be 0..length()-1 + getUint8(index: i32): ScImmutableUint8 { + return new ScImmutableUint8(this.objID, new Key32(index)); + } + + // number of items in array + length(): u32 { + return getLength(this.objID); + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for immutable Uint16 in host container +export class ScImmutableUint16 { + objID: i32; + keyID: Key32; + + constructor(objID: i32, keyID: Key32) { + this.objID = objID; + this.keyID = keyID; + } + + // check if value exists in host container + exists(): boolean { + return exists(this.objID, this.keyID, host.TYPE_INT16); + } + + // human-readable string representation + toString(): string { + return this.value().toString(); + } + + // get value from host container + value(): u16 { + let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT16); + return Convert.toI16(bytes) as u16; + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for immutable array of Uint16 +export class ScImmutableUint16Array { + objID: i32; + + constructor(id: i32) { + this.objID = id; + } + + // get value proxy for item at index, index can be 0..length()-1 + getUint16(index: i32): ScImmutableUint16 { + return new ScImmutableUint16(this.objID, new Key32(index)); + } + + // number of items in array + length(): i32 { + return getLength(this.objID); + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for immutable Uint32 in host container +export class ScImmutableUint32 { + objID: i32; + keyID: Key32; + + constructor(objID: i32, keyID: Key32) { + this.objID = objID; + this.keyID = keyID; + } + + // check if value exists in host container + exists(): boolean { + return exists(this.objID, this.keyID, host.TYPE_INT32); + } + + // human-readable string representation + toString(): string { + return this.value().toString(); + } + + // get value from host container + value(): u32 { + let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT32); + return Convert.toI32(bytes) as u32; + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for immutable array of Uint32 +export class ScImmutableUint32Array { + objID: i32; + + constructor(id: i32) { + this.objID = id; + } + + // get value proxy for item at index, index can be 0..length()-1 + getUint32(index: i32): ScImmutableUint32 { + return new ScImmutableUint32(this.objID, new Key32(index)); + } + + // number of items in array + length(): i32 { + return getLength(this.objID); + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for immutable Uint64 in host container +export class ScImmutableUint64 { + objID: i32; + keyID: Key32; + + constructor(objID: i32, keyID: Key32) { + this.objID = objID; + this.keyID = keyID; + } + + // check if value exists in host container + exists(): boolean { + return exists(this.objID, this.keyID, host.TYPE_INT64); + } + + // human-readable string representation + toString(): string { + return this.value().toString(); + } + + // get value from host container + value(): u64 { + let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT64); + return Convert.toI64(bytes) as u64; + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for immutable array of Uint64 +export class ScImmutableUint64Array { + objID: i32; + + constructor(id: i32) { + this.objID = id; + } + + // get value proxy for item at index, index can be 0..length()-1 + getUint64(index: i32): ScImmutableUint64 { + return new ScImmutableUint64(this.objID, new Key32(index)); + } + + // number of items in array + length(): i32 { + return getLength(this.objID); + } +} diff --git a/packages/vm/wasmlib/ts/wasmlib/mutable.ts b/packages/vm/wasmlib/ts/wasmlib/mutable.ts index 0162310e97..1943567016 100644 --- a/packages/vm/wasmlib/ts/wasmlib/mutable.ts +++ b/packages/vm/wasmlib/ts/wasmlib/mutable.ts @@ -11,18 +11,24 @@ import {callFunc, clear, exists, getBytes, getLength, getObjectID, setBytes} fro import { ScImmutableAddressArray, ScImmutableAgentIDArray, + ScImmutableBoolArray, ScImmutableBytesArray, ScImmutableChainIDArray, ScImmutableColorArray, ScImmutableHashArray, ScImmutableHnameArray, + ScImmutableInt8Array, ScImmutableInt16Array, ScImmutableInt32Array, ScImmutableInt64Array, ScImmutableMap, ScImmutableMapArray, ScImmutableRequestIDArray, - ScImmutableStringArray + ScImmutableStringArray, + ScImmutableUint8Array, + ScImmutableUint16Array, + ScImmutableUint32Array, + ScImmutableUint64Array, } from "./immutable"; import {Key32, KEY_MAPS, MapKey} from "./keys"; @@ -158,6 +164,73 @@ export class ScMutableAgentIDArray { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ +// value proxy for mutable Bool in host container +export class ScMutableBool { + objID: i32; + keyID: Key32; + + constructor(objID: i32, keyID: Key32) { + this.objID = objID; + this.keyID = keyID; + } + + // check if value exists in host container + exists(): boolean { + return exists(this.objID, this.keyID, host.TYPE_BOOL); + } + + // set value in host container + setValue(val: boolean): void { + let bytes: u8[] = [(val ? 1 : 0) as u8] + setBytes(this.objID, this.keyID, host.TYPE_BOOL, bytes); + } + + // human-readable string representation + toString(): string { + return this.value().toString(); + } + + // retrieve value from host container + value(): boolean { + let bytes = getBytes(this.objID, this.keyID, host.TYPE_BOOL); + return bytes[0] != 0; + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for mutable array of Bool +export class ScMutableBoolArray { + objID: i32; + + constructor(id: i32) { + this.objID = id; + } + + // empty the array + clear(): void { + clear(this.objID); + } + + // get value proxy for item at index, index can be 0..length() + // when index equals length() a new item is appended + getBool(index: i32): ScMutableBool { + return new ScMutableBool(this.objID, new Key32(index)); + } + + // get immutable version of array proxy + immutable(): ScImmutableBoolArray { + return new ScImmutableBoolArray(this.objID); + } + + // number of items in array + length(): i32 { + return getLength(this.objID); + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + // value proxy for mutable bytes array in host container export class ScMutableBytes { objID: i32; @@ -483,7 +556,74 @@ export class ScMutableHnameArray { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// value proxy for mutable int16 in host container +// value proxy for mutable Int8 in host container +export class ScMutableInt8 { + objID: i32; + keyID: Key32; + + constructor(objID: i32, keyID: Key32) { + this.objID = objID; + this.keyID = keyID; + } + + // check if value exists in host container + exists(): boolean { + return exists(this.objID, this.keyID, host.TYPE_INT8); + } + + // set value in host container + setValue(val: i8): void { + let bytes: u8[] = [val as u8]; + setBytes(this.objID, this.keyID, host.TYPE_INT8, bytes); + } + + // human-readable string representation + toString(): string { + return this.value().toString(); + } + + // retrieve value from host container + value(): i8 { + let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT8); + return bytes[0] as i8; + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for mutable array of Int8 +export class ScMutableInt8Array { + objID: i32; + + constructor(id: i32) { + this.objID = id; + } + + // empty the array + clear(): void { + clear(this.objID); + } + + // get value proxy for item at index, index can be 0..length() + // when index equals length() a new item is appended + getInt8(index: i32): ScMutableInt8 { + return new ScMutableInt8(this.objID, new Key32(index)); + } + + // get immutable version of array proxy + immutable(): ScImmutableInt8Array { + return new ScImmutableInt8Array(this.objID); + } + + // number of items in array + length(): i32 { + return getLength(this.objID); + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for mutable Int16 in host container export class ScMutableInt16 { objID: i32; keyID: Key32; @@ -516,7 +656,7 @@ export class ScMutableInt16 { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// array proxy for mutable array of int16 +// array proxy for mutable array of Int16 export class ScMutableInt16Array { objID: i32; @@ -548,7 +688,7 @@ export class ScMutableInt16Array { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// value proxy for mutable int32 in host container +// value proxy for mutable Int32 in host container export class ScMutableInt32 { objID: i32; keyID: Key32; @@ -581,7 +721,7 @@ export class ScMutableInt32 { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// array proxy for mutable array of int32 +// array proxy for mutable array of Int32 export class ScMutableInt32Array { objID: i32; @@ -613,7 +753,7 @@ export class ScMutableInt32Array { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// value proxy for mutable int64 in host container +// value proxy for mutable Int64 in host container export class ScMutableInt64 { objID: i32; keyID: Key32; @@ -646,7 +786,7 @@ export class ScMutableInt64 { // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ -// array proxy for mutable array of int64 +// array proxy for mutable array of Int64 export class ScMutableInt64Array { objID: i32; @@ -723,7 +863,18 @@ export class ScMutableMap { return new ScMutableAgentIDArray(arrID); } - // get value proxy for mutable bytes array field specified by key + // get value proxy for mutable Bool field specified by key + getBool(key: MapKey): ScMutableBool { + return new ScMutableBool(this.objID, key.getKeyID()); + } + + // get array proxy for ScMutableBoolArray specified by key + getBoolArray(key: MapKey): ScMutableBoolArray { + let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_BOOL | host.TYPE_ARRAY); + return new ScMutableBoolArray(arrID); + } + + // get value proxy for mutable Bytes array field specified by key getBytes(key: MapKey): ScMutableBytes { return new ScMutableBytes(this.objID, key.getKeyID()); } @@ -778,7 +929,18 @@ export class ScMutableMap { return new ScMutableHnameArray(arrID); } - // get value proxy for mutable int16 field specified by key + // get value proxy for mutable Int8 field specified by key + getInt8(key: MapKey): ScMutableInt8 { + return new ScMutableInt8(this.objID, key.getKeyID()); + } + + // get array proxy for ScMutableInt8Array specified by key + getInt8Array(key: MapKey): ScMutableInt8Array { + let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT8 | host.TYPE_ARRAY); + return new ScMutableInt8Array(arrID); + } + + // get value proxy for mutable Int16 field specified by key getInt16(key: MapKey): ScMutableInt16 { return new ScMutableInt16(this.objID, key.getKeyID()); } @@ -789,9 +951,9 @@ export class ScMutableMap { return new ScMutableInt16Array(arrID); } - // get value proxy for mutable int64 field specified by key - getInt64(key: MapKey): ScMutableInt64 { - return new ScMutableInt64(this.objID, key.getKeyID()); + // get value proxy for mutable Int32 field specified by key + getInt32(key: MapKey): ScMutableInt32 { + return new ScMutableInt32(this.objID, key.getKeyID()); } // get array proxy for ScMutableInt32Array specified by key @@ -800,9 +962,9 @@ export class ScMutableMap { return new ScMutableInt32Array(arrID); } - // get value proxy for mutable int32 field specified by key - getInt32(key: MapKey): ScMutableInt32 { - return new ScMutableInt32(this.objID, key.getKeyID()); + // get value proxy for mutable Int64 field specified by key + getInt64(key: MapKey): ScMutableInt64 { + return new ScMutableInt64(this.objID, key.getKeyID()); } // get array proxy for ScMutableInt64Array specified by key @@ -845,6 +1007,50 @@ export class ScMutableMap { return new ScMutableStringArray(arrID); } + // get value proxy for mutable Uint8 field specified by key + getUint8(key: MapKey): ScMutableUint8 { + return new ScMutableUint8(this.objID, key.getKeyID()); + } + + // get array proxy for ScMutableUint8Array specified by key + getUint8Array(key: MapKey): ScMutableUint8Array { + let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT8 | host.TYPE_ARRAY); + return new ScMutableUint8Array(arrID); + } + + // get value proxy for mutable Uint16 field specified by key + getUint16(key: MapKey): ScMutableUint16 { + return new ScMutableUint16(this.objID, key.getKeyID()); + } + + // get array proxy for ScMutableUint16Array specified by key + getUint16Array(key: MapKey): ScMutableUint16Array { + let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT16 | host.TYPE_ARRAY); + return new ScMutableUint16Array(arrID); + } + + // get value proxy for mutable Uint32 field specified by key + getUint32(key: MapKey): ScMutableUint32 { + return new ScMutableUint32(this.objID, key.getKeyID()); + } + + // get array proxy for ScMutableUint32Array specified by key + getUint32Array(key: MapKey): ScMutableUint32Array { + let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT32 | host.TYPE_ARRAY); + return new ScMutableUint32Array(arrID); + } + + // get value proxy for mutable Uint64 field specified by key + getUint64(key: MapKey): ScMutableUint64 { + return new ScMutableUint64(this.objID, key.getKeyID()); + } + + // get array proxy for ScMutableUint64Array specified by key + getUint64Array(key: MapKey): ScMutableUint64Array { + let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT64 | host.TYPE_ARRAY); + return new ScMutableUint64Array(arrID); + } + // get immutable version of map proxy immutable(): ScImmutableMap { return new ScImmutableMap(this.objID); @@ -1018,3 +1224,268 @@ export class ScMutableStringArray { return getLength(this.objID); } } + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for mutable Uint8 in host container +export class ScMutableUint8 { + objID: i32; + keyID: Key32; + + constructor(objID: i32, keyID: Key32) { + this.objID = objID; + this.keyID = keyID; + } + + // check if value exists in host container + exists(): boolean { + return exists(this.objID, this.keyID, host.TYPE_INT8); + } + + // set value in host container + setValue(val: u8): void { + let bytes: u8[] = [val as u8]; + setBytes(this.objID, this.keyID, host.TYPE_INT8, bytes); + } + + // human-readable string representation + toString(): string { + return this.value().toString(); + } + + // retrieve value from host container + value(): u8 { + let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT8); + return bytes[0] as u8; + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for mutable array of Uint8 +export class ScMutableUint8Array { + objID: i32; + + constructor(id: i32) { + this.objID = id; + } + + // empty the array + clear(): void { + clear(this.objID); + } + + // get value proxy for item at index, index can be 0..length() + // when index equals length() a new item is appended + getUint8(index: i32): ScMutableUint8 { + return new ScMutableUint8(this.objID, new Key32(index)); + } + + // get immutable version of array proxy + immutable(): ScImmutableUint8Array { + return new ScImmutableUint8Array(this.objID); + } + + // number of items in array + length(): i32 { + return getLength(this.objID); + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for mutable Uint16 in host container +export class ScMutableUint16 { + objID: i32; + keyID: Key32; + + constructor(objID: i32, keyID: Key32) { + this.objID = objID; + this.keyID = keyID; + } + + // check if value exists in host container + exists(): boolean { + return exists(this.objID, this.keyID, host.TYPE_INT16); + } + + // set value in host container + setValue(val: u16): void { + setBytes(this.objID, this.keyID, host.TYPE_INT16, Convert.fromI16(val)); + } + + // human-readable string representation + toString(): string { + return this.value().toString(); + } + + // retrieve value from host container + value(): u16 { + let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT16); + return Convert.toI16(bytes) as u16; + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for mutable array of Uint16 +export class ScMutableUint16Array { + objID: i32; + + constructor(id: i32) { + this.objID = id; + } + + // empty the array + clear(): void { + clear(this.objID); + } + + // get value proxy for item at index, index can be 0..length() + // when index equals length() a new item is appended + getUint16(index: i32): ScMutableUint16 { + return new ScMutableUint16(this.objID, new Key32(index)); + } + + // get immutable version of array proxy + immutable(): ScImmutableUint16Array { + return new ScImmutableUint16Array(this.objID); + } + + // number of items in array + length(): i32 { + return getLength(this.objID); + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for mutable Uint32 in host container +export class ScMutableUint32 { + objID: i32; + keyID: Key32; + + constructor(objID: i32, keyID: Key32) { + this.objID = objID; + this.keyID = keyID; + } + + // check if value exists in host container + exists(): boolean { + return exists(this.objID, this.keyID, host.TYPE_INT32); + } + + // set value in host container + setValue(val: u32): void { + setBytes(this.objID, this.keyID, host.TYPE_INT32, Convert.fromI32(val)); + } + + // human-readable string representation + toString(): string { + return this.value().toString(); + } + + // retrieve value from host container + value(): u32 { + let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT32); + return Convert.toI32(bytes) as u32; + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for mutable array of Uint32 +export class ScMutableUint32Array { + objID: i32; + + constructor(id: i32) { + this.objID = id; + } + + // empty the array + clear(): void { + clear(this.objID); + } + + // get value proxy for item at index, index can be 0..length() + // when index equals length() a new item is appended + getUint32(index: i32): ScMutableUint32 { + return new ScMutableUint32(this.objID, new Key32(index)); + } + + // get immutable version of array proxy + immutable(): ScImmutableUint32Array { + return new ScImmutableUint32Array(this.objID); + } + + // number of items in array + length(): i32 { + return getLength(this.objID); + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// value proxy for mutable Uint64 in host container +export class ScMutableUint64 { + objID: i32; + keyID: Key32; + + constructor(objID: i32, keyID: Key32) { + this.objID = objID; + this.keyID = keyID; + } + + // check if value exists in host container + exists(): boolean { + return exists(this.objID, this.keyID, host.TYPE_INT64); + } + + // set value in host container + setValue(val: u64): void { + setBytes(this.objID, this.keyID, host.TYPE_INT64, Convert.fromI64(val)); + } + + // human-readable string representation + toString(): string { + return this.value().toString(); + } + + // retrieve value from host container + value(): u64 { + let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT64); + return Convert.toI64(bytes) as u64; + } +} + +// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ + +// array proxy for mutable array of Uint64 +export class ScMutableUint64Array { + objID: i32; + + constructor(id: i32) { + this.objID = id; + } + + // empty the array + clear(): void { + clear(this.objID); + } + + // get value proxy for item at index, index can be 0..length() + // when index equals length() a new item is appended + getUint64(index: i32): ScMutableUint64 { + return new ScMutableUint64(this.objID, new Key32(index)); + } + + // get immutable version of array proxy + immutable(): ScImmutableUint64Array { + return new ScImmutableUint64Array(this.objID); + } + + // number of items in array + length(): i32 { + return getLength(this.objID); + } +} diff --git a/packages/vm/wasmproc/scbalances.go b/packages/vm/wasmproc/scbalances.go index 1821c6ed7e..ee02afb615 100644 --- a/packages/vm/wasmproc/scbalances.go +++ b/packages/vm/wasmproc/scbalances.go @@ -20,12 +20,12 @@ func NewScBalances(wc *WasmContext, keyID int32) *ScDict { switch keyID { case wasmhost.KeyIncoming: if wc.ctx == nil { - o.Panic("no incoming() on views") + o.Panicf("no incoming() on views") } return loadBalances(o, wc.ctx.IncomingTransfer()) case wasmhost.KeyMinted: if wc.ctx == nil { - o.Panic("no minted() on views") + o.Panicf("no minted() on views") } return loadBalances(o, wc.ctx.Minted()) @@ -35,7 +35,7 @@ func NewScBalances(wc *WasmContext, keyID int32) *ScDict { } return loadBalances(o, wc.ctxView.Balances()) } - o.Panic("unknown balances: %s", wc.GetKeyStringFromID(keyID)) + o.Panicf("unknown balances: %s", wc.GetKeyStringFromID(keyID)) return nil } diff --git a/packages/vm/wasmproc/sccontext.go b/packages/vm/wasmproc/sccontext.go index be62fc9233..c0556303aa 100644 --- a/packages/vm/wasmproc/sccontext.go +++ b/packages/vm/wasmproc/sccontext.go @@ -71,7 +71,7 @@ func (o *ScContext) Exists(keyID, typeID int32) bool { func (o *ScContext) GetBytes(keyID, typeID int32) []byte { if o.wc == nil { - o.Panic("missing context") + o.Panicf("missing context") } ctx := o.wc.ctx if ctx == nil { @@ -105,7 +105,7 @@ func (o *ScContext) GetBytes(keyID, typeID int32) []byte { func (o *ScContext) getBytesForView(keyID, typeID int32) []byte { ctx := o.wc.ctxView if ctx == nil { - o.Panic("missing context") + o.Panicf("missing context") } switch keyID { case wasmhost.KeyAccountID: @@ -176,11 +176,11 @@ func (o *ScContext) processCall(bytes []byte) { decode := NewBytesDecoder(bytes) contract, err := iscp.HnameFromBytes(decode.Bytes()) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } function, err := iscp.HnameFromBytes(decode.Bytes()) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } params := o.getParams(decode.Int32()) transfer := o.getTransfer(decode.Int32()) @@ -188,7 +188,7 @@ func (o *ScContext) processCall(bytes []byte) { o.Tracef("CALL c'%s' f'%s'", contract.String(), function.String()) results, err := o.processCallUnlocked(contract, function, params, transfer) if err != nil { - o.Panic("failed to invoke call: %v", err) + o.Panicf("failed to invoke call: %v", err) } resultsID := o.GetObjectID(wasmhost.KeyReturn, wasmhost.OBJTYPE_MAP) o.host.FindObject(resultsID).(*ScDict).kvStore = results @@ -208,7 +208,7 @@ func (o *ScContext) processDeploy(bytes []byte) { decode := NewBytesDecoder(bytes) programHash, err := hashing.HashValueFromBytes(decode.Bytes()) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } name := string(decode.Bytes()) description := string(decode.Bytes()) @@ -216,7 +216,7 @@ func (o *ScContext) processDeploy(bytes []byte) { o.Tracef("DEPLOY c'%s' f'%s'", name, description) err = o.processDeployUnlocked(programHash, name, description, params) if err != nil { - o.Panic("failed to deploy: %v", err) + o.Panicf("failed to deploy: %v", err) } } @@ -231,21 +231,21 @@ func (o *ScContext) processPost(bytes []byte) { decode := NewBytesDecoder(bytes) chainID, err := iscp.ChainIDFromBytes(decode.Bytes()) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } contract, err := iscp.HnameFromBytes(decode.Bytes()) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } function, err := iscp.HnameFromBytes(decode.Bytes()) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } o.Tracef("POST c'%s' f'%s'", contract.String(), function.String()) params := o.getParams(decode.Int32()) transferID := decode.Int32() if transferID == 0 { - o.Panic("transfer is required for post") + o.Panicf("transfer is required for post") } transfer := o.getTransfer(transferID) metadata := &iscp.SendMetadata{ @@ -256,13 +256,13 @@ func (o *ScContext) processPost(bytes []byte) { delay := decode.Int32() if delay == 0 { if !o.wc.ctx.Send(chainID.AsAddress(), transfer, metadata) { - o.Panic("failed to send to %s", chainID.AsAddress().String()) + o.Panicf("failed to send to %s", chainID.AsAddress().String()) } return } if delay < 0 { - o.Panic("invalid delay: %d", delay) + o.Panicf("invalid delay: %d", delay) } timeLock := time.Unix(0, o.wc.ctx.GetTimestamp()) @@ -271,7 +271,7 @@ func (o *ScContext) processPost(bytes []byte) { TimeLock: uint32(timeLock.Unix()), } if !o.wc.ctx.Send(chainID.AsAddress(), transfer, metadata, options) { - o.Panic("failed to send to %s", chainID.AsAddress().String()) + o.Panicf("failed to send to %s", chainID.AsAddress().String()) } } @@ -296,11 +296,11 @@ func (o *ScContext) getTransfer(transferID int32) colored.Balances { transferDict.MustIterate("", func(key kv.Key, value []byte) bool { col, err := codec.DecodeColor([]byte(key)) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } amount, err := codec.DecodeUint64(value) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } o.Tracef(" XFER %d '%s'", amount, col.String()) transfer.Set(col, amount) diff --git a/packages/vm/wasmproc/scdict.go b/packages/vm/wasmproc/scdict.go index dbab9ee07a..3808eb2298 100644 --- a/packages/vm/wasmproc/scdict.go +++ b/packages/vm/wasmproc/scdict.go @@ -8,7 +8,6 @@ import ( "fmt" "strings" - "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/wasp/packages/kv" "github.com/iotaledger/wasp/packages/kv/codec" "github.com/iotaledger/wasp/packages/vm/wasmhost" @@ -22,7 +21,7 @@ type ( type WaspObject interface { wasmhost.HostObject InitObj(id int32, keyID int32, owner *ScDict) - Panic(format string, args ...interface{}) + Panicf(format string, args ...interface{}) FindOrMakeObjectID(keyID int32, factory ObjFactory) int32 NestedKey() string Suffix(keyID int32) string @@ -30,10 +29,10 @@ type WaspObject interface { func GetArrayObjectID(arrayObj WaspObject, index, typeID int32, factory ObjFactory) int32 { if !arrayObj.Exists(index, typeID) { - arrayObj.Panic("GetArrayObjectID: invalid index") + arrayObj.Panicf("GetArrayObjectID: invalid index") } if typeID != arrayObj.GetTypeID(index) { - arrayObj.Panic("GetArrayObjectID: invalid type") + arrayObj.Panicf("GetArrayObjectID: invalid type") } return arrayObj.FindOrMakeObjectID(index, factory) } @@ -41,10 +40,10 @@ func GetArrayObjectID(arrayObj WaspObject, index, typeID int32, factory ObjFacto func GetMapObjectID(mapObj WaspObject, keyID, typeID int32, factories ObjFactories) int32 { factory, ok := factories[keyID] if !ok { - mapObj.Panic("GetMapObjectID: invalid key") + mapObj.Panicf("GetMapObjectID: invalid key") } if typeID != mapObj.GetTypeID(keyID) { - mapObj.Panic("GetMapObjectID: invalid type") + mapObj.Panicf("GetMapObjectID: invalid type") } return mapObj.FindOrMakeObjectID(keyID, factory) } @@ -69,8 +68,6 @@ type ScDict struct { var _ WaspObject = &ScDict{} -var typeSizes = [...]int{0, 33, 37, 0, 33, 32, 32, 4, 2, 4, 8, 0, 34, 0} - func NewScDict(host *wasmhost.KvStoreHost, kvStore kv.KVStore) *ScDict { return &ScDict{host: host, kvStore: kvStore} } @@ -104,7 +101,7 @@ func (o *ScDict) InitObj(id, keyID int32, owner *ScDict) { if (o.typeID&wasmhost.OBJTYPE_ARRAY) != 0 && o.kvStore != nil { err := o.getArrayLength() if err != nil { - o.Panic("InitObj: %v", err) + o.Panicf("InitObj: %v", err) } } o.Tracef("InitObj %s", o.name) @@ -113,7 +110,7 @@ func (o *ScDict) InitObj(id, keyID int32, owner *ScDict) { } func (o *ScDict) CallFunc(keyID int32, params []byte) []byte { - o.Panic("CallFunc: invalid call") + o.Panicf("CallFunc: invalid call") return nil } @@ -166,14 +163,14 @@ func (o *ScDict) GetBytes(keyID, typeID int32) []byte { return codec.EncodeInt32(o.length) } bytes := o.kvStore.MustGet(o.key(keyID, typeID)) - o.typeCheck(typeID, bytes) + o.host.TypeCheck(typeID, bytes) return bytes } func (o *ScDict) GetObjectID(keyID, typeID int32) int32 { o.validate(keyID, typeID) if (typeID&wasmhost.OBJTYPE_ARRAY) == 0 && typeID != wasmhost.OBJTYPE_MAP { - o.Panic("GetObjectID: invalid type") + o.Panicf("GetObjectID: invalid type") } return GetMapObjectID(o, keyID, typeID, ObjFactories{ keyID: func() WaspObject { return &ScDict{} }, @@ -193,7 +190,7 @@ func (o *ScDict) GetTypeID(keyID int32) int32 { } func (o *ScDict) InvalidKey(keyID int32) { - o.Panic("invalid key: %d", keyID) + o.Panicf("invalid key: %d", keyID) } func (o *ScDict) key(keyID, typeID int32) kv.Key { @@ -221,11 +218,8 @@ func (o *ScDict) Owner() WaspObject { return o.host.FindObject(o.ownerID).(WaspObject) } -//nolint:goprintffuncname -func (o *ScDict) Panic(format string, args ...interface{}) { - err := o.name + "." + fmt.Sprintf(format, args...) - o.Tracef(err) - panic(err) +func (o *ScDict) Panicf(format string, args ...interface{}) { + o.host.Panicf(o.name+"."+format, args...) } func (o *ScDict) SetBytes(keyID, typeID int32, bytes []byte) { @@ -244,7 +238,7 @@ func (o *ScDict) SetBytes(keyID, typeID int32, bytes []byte) { } key := o.key(keyID, typeID) - o.typeCheck(typeID, bytes) + o.host.TypeCheck(typeID, bytes) o.kvStore.Set(key, bytes) } @@ -268,38 +262,9 @@ func (o *ScDict) Tracef(format string, a ...interface{}) { o.host.Tracef(format, a...) } -func (o *ScDict) typeCheck(typeID int32, bytes []byte) { - typeSize := typeSizes[typeID] - if typeSize != 0 && typeSize != len(bytes) { - o.Panic("typeCheck: invalid type size") - } - switch typeID { - case wasmhost.OBJTYPE_ADDRESS: - // address bytes must start with valid address type - if ledgerstate.AddressType(bytes[0]) > ledgerstate.AliasAddressType { - o.Panic("typeCheck: invalid address type") - } - case wasmhost.OBJTYPE_AGENT_ID: - // address bytes in agent id must start with valid address type - if ledgerstate.AddressType(bytes[0]) > ledgerstate.AliasAddressType { - o.Panic("typeCheck: invalid agent id address type") - } - case wasmhost.OBJTYPE_CHAIN_ID: - // chain id must be alias address - if ledgerstate.AddressType(bytes[0]) != ledgerstate.AliasAddressType { - o.Panic("typeCheck: invalid chain id address type") - } - case wasmhost.OBJTYPE_REQUEST_ID: - outputIndex := binary.LittleEndian.Uint16(bytes[ledgerstate.TransactionIDLength:]) - if outputIndex > ledgerstate.MaxOutputCount { - o.Panic("typeCheck: invalid request id output index") - } - } -} - func (o *ScDict) validate(keyID, typeID int32) { if o.kvStore == nil { - o.Panic("validate: Missing kvstore") + o.Panicf("validate: Missing kvstore") } if typeID == -1 { return @@ -315,10 +280,10 @@ func (o *ScDict) validate(keyID, typeID int32) { case wasmhost.OBJTYPE_COLOR: case wasmhost.OBJTYPE_HASH: default: - o.Panic("validate: Invalid byte type") + o.Panicf("validate: Invalid byte type") } } else if arrayTypeID != typeID { - o.Panic("validate: Invalid type") + o.Panicf("validate: Invalid type") } if keyID == o.length { switch o.kvStore.(type) { @@ -332,7 +297,7 @@ func (o *ScDict) validate(keyID, typeID int32) { } } if keyID < 0 || keyID >= o.length { - o.Panic("validate: Invalid index") + o.Panicf("validate: Invalid index") } return } @@ -344,7 +309,7 @@ func (o *ScDict) validate(keyID, typeID int32) { return } if fieldType != typeID { - o.Panic("validate: Invalid access") + o.Panicf("validate: Invalid access") } } diff --git a/packages/vm/wasmproc/sctransfer.go b/packages/vm/wasmproc/sctransfer.go index 567624cd28..30ff36e3c4 100644 --- a/packages/vm/wasmproc/sctransfer.go +++ b/packages/vm/wasmproc/sctransfer.go @@ -50,18 +50,18 @@ func (o *ScTransferInfo) Invoke(balances int32) { } col, err := codec.DecodeColor([]byte(key)) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } amount, err := codec.DecodeUint64(value) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } o.Tracef("TRANSFER #%d c'%s' a'%s'", value, col.String(), o.address.Base58()) transfer.Set(col, amount) return true }) if !o.wc.ctx.Send(o.address, transfer, nil) { - o.Panic("failed to send to %s", o.address.Base58()) + o.Panicf("failed to send to %s", o.address.Base58()) } } @@ -71,12 +71,12 @@ func (o *ScTransferInfo) SetBytes(keyID, typeID int32, bytes []byte) { var err error o.address, _, err = ledgerstate.AddressFromBytes(bytes) if err != nil { - o.Panic("SetBytes: invalid address: " + err.Error()) + o.Panicf("SetBytes: invalid address: " + err.Error()) } case wasmhost.KeyBalances: balanceMapID, err := codec.DecodeInt32(bytes, 0) if err != nil { - o.Panic("SetBytes: invalid balance map id: " + err.Error()) + o.Panicf("SetBytes: invalid balance map id: " + err.Error()) } o.Invoke(balanceMapID) default: diff --git a/packages/vm/wasmproc/scutility.go b/packages/vm/wasmproc/scutility.go index 12c3d827c4..2cf6c16d4a 100644 --- a/packages/vm/wasmproc/scutility.go +++ b/packages/vm/wasmproc/scutility.go @@ -34,7 +34,7 @@ func (o *ScUtility) CallFunc(keyID int32, bytes []byte) []byte { case wasmhost.KeyBase58Decode: base58Decoded, err := utils.Base58().Decode(string(bytes)) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } return base58Decoded case wasmhost.KeyBase58Encode: @@ -42,7 +42,7 @@ func (o *ScUtility) CallFunc(keyID int32, bytes []byte) []byte { case wasmhost.KeyBlsAddress: address, err := utils.BLS().AddressFromPublicKey(bytes) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } return address.Bytes() case wasmhost.KeyBlsAggregate: @@ -56,7 +56,7 @@ func (o *ScUtility) CallFunc(keyID int32, bytes []byte) []byte { case wasmhost.KeyEd25519Address: address, err := utils.ED25519().AddressFromPublicKey(bytes) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } return address.Bytes() case wasmhost.KeyEd25519Valid: @@ -98,7 +98,7 @@ func (o *ScUtility) aggregateBLSSignatures(bytes []byte) []byte { } pubKeyBin, sigBin, err := o.utils.BLS().AggregateBLSSignatures(pubKeysBin, sigsBin) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } return NewBytesEncoder().Bytes(pubKeyBin).Bytes(sigBin).Data() } diff --git a/packages/vm/wasmsolo/solosccontext.go b/packages/vm/wasmsolo/solosccontext.go index c6aabb0b24..b355b0232f 100644 --- a/packages/vm/wasmsolo/solosccontext.go +++ b/packages/vm/wasmsolo/solosccontext.go @@ -74,11 +74,11 @@ func (o *SoloScContext) processCall(bytes []byte) { decode := wasmproc.NewBytesDecoder(bytes) contract, err := iscp.HnameFromBytes(decode.Bytes()) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } function, err := iscp.HnameFromBytes(decode.Bytes()) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } paramsID := decode.Int32() transferID := decode.Int32() @@ -90,7 +90,7 @@ func (o *SoloScContext) processCall(bytes []byte) { ctx := o.ctx funcName := ctx.wc.FunctionFromCode(uint32(function)) if funcName == "" { - o.Panic("unknown function") + o.Panicf("unknown function") } o.Tracef("CALL %s.%s", ctx.scName, funcName) params := o.getParams(paramsID) @@ -99,7 +99,7 @@ func (o *SoloScContext) processCall(bytes []byte) { _ = wasmhost.Connect(ctx.wc) ctx.Err = err if err != nil { - // o.Panic("failed to invoke call: " + err.Error()) + // o.Panicf("failed to invoke call: " + err.Error()) return } returnID := o.GetObjectID(wasmhost.KeyReturn, wasmhost.OBJTYPE_MAP) @@ -110,18 +110,18 @@ func (o *SoloScContext) processPost(bytes []byte) { decode := wasmproc.NewBytesDecoder(bytes) chainID, err := iscp.ChainIDFromBytes(decode.Bytes()) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } if !chainID.Equals(o.ctx.Chain.ChainID) { - o.Panic("invalid chainID") + o.Panicf("invalid chainID") } contract, err := iscp.HnameFromBytes(decode.Bytes()) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } function, err := iscp.HnameFromBytes(decode.Bytes()) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } paramsID := decode.Int32() transferID := decode.Int32() @@ -135,13 +135,13 @@ func (o *SoloScContext) processPost(bytes []byte) { //delay := decode.Int32() //if delay == 0 { // if !o.vm.ctx.Send(chainID.AsAddress(), transfer, metadata) { - // o.Panic("failed to send to %s", chainID.AsAddress().String()) + // o.Panicf("failed to send to %s", chainID.AsAddress().String()) // } // return //} // //if delay < -1 { - // o.Panic("invalid delay: %d", delay) + // o.Panicf("invalid delay: %d", delay) //} // //timeLock := time.Unix(0, o.vm.ctx.GetTimestamp()) @@ -150,7 +150,7 @@ func (o *SoloScContext) processPost(bytes []byte) { // TimeLock: uint32(timeLock.Unix()), //} //if !o.vm.ctx.Send(chainID.AsAddress(), transfer, metadata, options) { - // o.Panic("failed to send to %s", chainID.AsAddress().String()) + // o.Panicf("failed to send to %s", chainID.AsAddress().String()) //} } @@ -175,11 +175,11 @@ func (o *SoloScContext) getTransfer(transferID int32) colored.Balances { transferDict.MustIterate("", func(key kv.Key, value []byte) bool { color, err := codec.DecodeColor([]byte(key)) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } amount, err := codec.DecodeUint64(value) if err != nil { - o.Panic(err.Error()) + o.Panicf(err.Error()) } o.Tracef(" XFER %d '%s'", amount, color.String()) transfer[color] = amount @@ -190,15 +190,15 @@ func (o *SoloScContext) getTransfer(transferID int32) colored.Balances { func (o *SoloScContext) postSync(contract, function iscp.Hname, paramsID, transferID, delay int32) { if delay != 0 { - o.Panic("unsupported nonzero delay for SoloContext") + o.Panicf("unsupported nonzero delay for SoloContext") } ctx := o.ctx if contract != iscp.Hn(ctx.scName) { - o.Panic("invalid contract") + o.Panicf("invalid contract") } funcName := ctx.wc.FunctionFromCode(uint32(function)) if funcName == "" { - o.Panic("unknown function") + o.Panicf("unknown function") } o.Tracef("POST %s.%s", ctx.scName, funcName) params := o.getParams(paramsID) diff --git a/tools/cluster/tests/wasm/inccounter_bg.wasm b/tools/cluster/tests/wasm/inccounter_bg.wasm index 743e62f03da1de233b905cfb13e44ac2d2adda21..d2b4cc258cc1a65fbdcde0670a576746103b5a79 100644 GIT binary patch delta 10654 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 G_WuSdE~wi8 delta 10603 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 diff --git a/tools/schema/generator/clienttemplates/alltemplates.go b/tools/schema/generator/clienttemplates/alltemplates.go new file mode 100644 index 0000000000..85f01722c5 --- /dev/null +++ b/tools/schema/generator/clienttemplates/alltemplates.go @@ -0,0 +1,16 @@ +package clienttemplates + +import "github.com/iotaledger/wasp/tools/schema/model" + +var Templates = []map[string]string{ + common, + eventsTs, +} + +var TypeDependent = model.StringMapMap{} + +var common = map[string]string{ + // ******************************* + "tmp": ` +tmp`, +} diff --git a/tools/schema/generator/clienttemplates/events.go b/tools/schema/generator/clienttemplates/events.go new file mode 100644 index 0000000000..2888b2fdc5 --- /dev/null +++ b/tools/schema/generator/clienttemplates/events.go @@ -0,0 +1,67 @@ +package clienttemplates + +var eventsTs = map[string]string{ + // ******************************* + "events.ts": ` + +type Address = string; +type AgentID = string; +type ChainID = string; +type Color = string; +type Hash = string; +type Hname = string; +type Int16 = number; +type Int32 = number; +type Int64 = bigint; +type RequestID = string; +type String = string; + +export class $Package$+Events { +$#each events eventConst +} +$#each events eventInterface + + private handleVmMessage(message: string[]): void { + const messageHandlers: MessageHandlers = { +$#each events eventHandler + }; + + const topicIndex = 3; + const topic = message[topicIndex]; + + if (typeof messageHandlers[topic] != 'undefined') { + messageHandlers[topic](topicIndex); + } + } +`, + // ******************************* + "eventConst": ` + public static readonly EVENT_$EVT_NAME: string = '$package.$evtName'; +`, + // ******************************* + "eventInterface": ` + +export interface Event$EvtName { + timestamp: Int32; +$#each event eventInterfaceField +} +`, + // ******************************* + "eventInterfaceField": ` + $fldName: $FldType; +`, + // ******************************* + "eventHandler": ` + EVENT_$EVT_NAME: (index) => { + const evt: Event$EvtName = { + timestamp: message[index + 1], +$#each event eventHandlerField + }; + this.emitter.emit(EVENT_$EVT_NAME, evt); + }, +`, + // ******************************* + "eventHandlerField": ` + $fldName: message[index + 2], +`, +} diff --git a/tools/schema/generator/emitter.go b/tools/schema/generator/emitter.go index 5f96245fe7..e103295461 100644 --- a/tools/schema/generator/emitter.go +++ b/tools/schema/generator/emitter.go @@ -7,6 +7,7 @@ import ( "strings" "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/tools/schema/model" ) const enableLog = false @@ -38,7 +39,7 @@ const ( KeyView = "view" ) -var emitKeyRegExp = regexp.MustCompile(`\$[a-zA-Z_]+`) +var emitKeyRegExp = regexp.MustCompile(`\$[a-zA-Z_][a-zA-Z_0-9]*`) func (g *GenBase) indent() { g.tab++ @@ -154,7 +155,7 @@ func (g *GenBase) emitEach(line string) { } } -func (g *GenBase) emitEachEvent(events []*Struct, template string) { +func (g *GenBase) emitEachEvent(events []*model.Struct, template string) { for _, g.currentEvent = range events { g.log("currentEvent: " + g.currentEvent.Name) g.setMultiKeyValues("evtName", g.currentEvent.Name) @@ -162,7 +163,7 @@ func (g *GenBase) emitEachEvent(events []*Struct, template string) { } } -func (g *GenBase) emitEachField(fields []*Field, template string) { +func (g *GenBase) emitEachField(fields []*model.Field, template string) { g.maxCamelFldLen = 0 g.maxSnakeFldLen = 0 for _, g.currentField = range fields { @@ -183,7 +184,7 @@ func (g *GenBase) emitEachField(fields []*Field, template string) { } } -func (g *GenBase) emitEachFunc(funcs []*Func, template string) { +func (g *GenBase) emitEachFunc(funcs []*model.Func, template string) { g.maxCamelFuncLen = 0 g.maxSnakeFuncLen = 0 for _, g.currentFunc = range funcs { @@ -205,7 +206,7 @@ func (g *GenBase) emitEachFunc(funcs []*Func, template string) { } func (g *GenBase) emitEachMandatoryField(template string) { - mandatoryFields := make([]*Field, 0) + mandatoryFields := make([]*model.Field, 0) for _, g.currentField = range g.currentFunc.Params { if !g.currentField.Optional { mandatoryFields = append(mandatoryFields, g.currentField) @@ -214,7 +215,7 @@ func (g *GenBase) emitEachMandatoryField(template string) { g.emitEachField(mandatoryFields, template) } -func (g *GenBase) emitEachStruct(structs []*Struct, template string) { +func (g *GenBase) emitEachStruct(structs []*model.Struct, template string) { for _, g.currentStruct = range structs { g.log("currentStruct: " + g.currentStruct.Name) g.setMultiKeyValues("strName", g.currentStruct.Name) @@ -378,7 +379,7 @@ func (g *GenBase) setCommonKeys() { } func (g *GenBase) setFieldKeys(pad bool) { - tmp := make(map[string]string) + tmp := make(model.StringMap) for k, v := range g.keys { if len(k) < 3 { continue @@ -407,6 +408,27 @@ func (g *GenBase) setFieldKeys(pad bool) { g.keys["fldPad"] = spaces[:g.maxCamelFldLen-len(g.keys["fldName"])] g.keys["fld_pad"] = spaces[:g.maxSnakeFldLen-len(g.keys["fld_name"])] } + + for fieldName, typeValues := range g.typeDependent { + fieldValue := typeValues[g.currentField.Type] + if fieldValue == "" { + // get default value for this field + // TODO make this smarter w.r.t. maps and arrays? + fieldValue = typeValues[""] + } + g.keys[fieldName] = fieldValue + + if fieldName[:3] == "fld" { + // we also want the 'fldKey' variant to facilitate the map key type + fieldValue = typeValues[g.currentField.MapKey] + if fieldValue == "" { + // get default value for this field + // TODO make this smarter w.r.t. maps and arrays? + fieldValue = typeValues[""] + } + g.keys["fldKey"+fieldName[3:]] = fieldValue + } + } } func (g *GenBase) setFuncKeys() { diff --git a/tools/schema/generator/generator.go b/tools/schema/generator/generator.go index 47e4e556d5..0515a5dc85 100644 --- a/tools/schema/generator/generator.go +++ b/tools/schema/generator/generator.go @@ -9,31 +9,33 @@ import ( "os" "regexp" "strings" + + "github.com/iotaledger/wasp/tools/schema/model" ) // TODO nested structs // TODO handle case where owner is type AgentID[] type Generator interface { - init(s *Schema) - funcName(f *Func) string + init(s *model.Schema) + funcName(f *model.Func) string generateLanguageSpecificFiles() error setFieldKeys(pad bool) setFuncKeys() } type GenBase struct { - currentEvent *Struct - currentField *Field - currentFunc *Func - currentStruct *Struct + currentEvent *model.Struct + currentField *model.Field + currentFunc *model.Func + currentStruct *model.Struct emitters map[string]func(g *GenBase) extension string file *os.File folder string funcRegexp *regexp.Regexp gen Generator - keys map[string]string + keys model.StringMap language string maxCamelFuncLen int maxSnakeFuncLen int @@ -41,27 +43,29 @@ type GenBase struct { maxSnakeFldLen int newTypes map[string]bool rootFolder string - s *Schema + s *model.Schema tab int - templates map[string]string + templates model.StringMap + typeDependent model.StringMapMap } const spaces = " " -func (g *GenBase) init(s *Schema, templates []map[string]string) { +func (g *GenBase) init(s *model.Schema, typeDependent model.StringMapMap, templates []map[string]string) { g.s = s g.emitters = map[string]func(g *GenBase){} g.newTypes = map[string]bool{} - g.keys = map[string]string{} + g.keys = model.StringMap{} g.setCommonKeys() - g.templates = map[string]string{} + g.typeDependent = typeDependent + g.templates = model.StringMap{} g.addTemplates(commonTemplates) for _, template := range templates { g.addTemplates(template) } } -func (g *GenBase) addTemplates(t map[string]string) { +func (g *GenBase) addTemplates(t model.StringMap) { for k, v := range t { g.templates[k] = v } @@ -105,11 +109,11 @@ func (g *GenBase) exists(path string) (err error) { return err } -func (g *GenBase) funcName(f *Func) string { +func (g *GenBase) funcName(f *model.Func) string { return f.Kind + capitalize(f.Name) } -func (g *GenBase) Generate(s *Schema) error { +func (g *GenBase) Generate(s *model.Schema) error { g.gen.init(s) g.folder = g.rootFolder + "/" @@ -210,7 +214,7 @@ func (g *GenBase) generateFuncs() error { // append missing SC functions to existing code file // scan existing file for function names - existing := make(StringMap) + existing := make(model.StringMap) lines := make([]string, 0) err := g.scanExistingCode(scFileName, &existing, &lines) if err != nil { @@ -244,6 +248,10 @@ func (g *GenBase) generateFuncs() error { return os.Remove(scOriginal) } +func (g *GenBase) generateLanguageSpecificFiles() error { + return nil +} + func (g *GenBase) generateTests() error { err := os.MkdirAll("test", 0o755) if err != nil { @@ -271,7 +279,7 @@ func (g *GenBase) println(a ...interface{}) { _, _ = fmt.Fprintln(g.file, a...) } -func (g *GenBase) scanExistingCode(path string, existing *StringMap, lines *[]string) error { +func (g *GenBase) scanExistingCode(path string, existing *model.StringMap, lines *[]string) error { return g.openFile(path, func() error { scanner := bufio.NewScanner(g.file) for scanner.Scan() { diff --git a/tools/schema/generator/generator_client.go b/tools/schema/generator/generator_client.go new file mode 100644 index 0000000000..c010e5df8a --- /dev/null +++ b/tools/schema/generator/generator_client.go @@ -0,0 +1,55 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +package generator + +import ( + "fmt" + "os" + + "github.com/iotaledger/wasp/tools/schema/generator/clienttemplates" + "github.com/iotaledger/wasp/tools/schema/model" +) + +type ClientGenerator struct { + GenBase +} + +func NewClientGenerator() *ClientGenerator { + g := &ClientGenerator{} + g.extension = ".ts" + g.language = "Client" + g.rootFolder = "client" + g.gen = g + return g +} + +func (g *ClientGenerator) init(s *model.Schema) { + g.GenBase.init(s, clienttemplates.TypeDependent, clienttemplates.Templates) +} + +func (g *ClientGenerator) Generate(s *model.Schema) error { + g.gen.init(s) + + g.folder = g.rootFolder + "/" + err := os.MkdirAll(g.folder, 0o755) + if err != nil { + return err + } + info, err := os.Stat(g.folder + "events" + g.extension) + if err == nil && info.ModTime().After(s.SchemaTime) { + fmt.Printf("skipping %s code generation\n", g.language) + return nil + } + + fmt.Printf("generating %s code\n", g.language) + return g.generateCode() +} + +func (g *ClientGenerator) generateCode() error { + err := g.createSourceFile("events", len(g.s.Events) != 0) + if err != nil { + return err + } + return nil +} diff --git a/tools/schema/generator/generator_go.go b/tools/schema/generator/generator_go.go index 0822ed05c2..16a1dfe25d 100644 --- a/tools/schema/generator/generator_go.go +++ b/tools/schema/generator/generator_go.go @@ -7,50 +7,9 @@ import ( "regexp" "github.com/iotaledger/wasp/tools/schema/generator/gotemplates" + "github.com/iotaledger/wasp/tools/schema/model" ) -var goTypes = StringMap{ - "Address": "wasmlib.ScAddress", - "AgentID": "wasmlib.ScAgentID", - "ChainID": "wasmlib.ScChainID", - "Color": "wasmlib.ScColor", - "Hash": "wasmlib.ScHash", - "Hname": "wasmlib.ScHname", - "Int16": "int16", - "Int32": "int32", - "Int64": "int64", - "RequestID": "wasmlib.ScRequestID", - "String": "string", -} - -var goKeys = StringMap{ - "Address": "key", - "AgentID": "key", - "ChainID": "key", - "Color": "key", - "Hash": "key", - "Hname": "key", - "Int16": "??TODO", - "Int32": "wasmlib.Key32(key)", - "Int64": "??TODO", - "RequestID": "key", - "String": "wasmlib.Key(key)", -} - -var goTypeIds = StringMap{ - "Address": "wasmlib.TYPE_ADDRESS", - "AgentID": "wasmlib.TYPE_AGENT_ID", - "ChainID": "wasmlib.TYPE_CHAIN_ID", - "Color": "wasmlib.TYPE_COLOR", - "Hash": "wasmlib.TYPE_HASH", - "Hname": "wasmlib.TYPE_HNAME", - "Int16": "wasmlib.TYPE_INT16", - "Int32": "wasmlib.TYPE_INT32", - "Int64": "wasmlib.TYPE_INT64", - "RequestID": "wasmlib.TYPE_REQUEST_ID", - "String": "wasmlib.TYPE_STRING", -} - type GoGenerator struct { GenBase } @@ -65,23 +24,10 @@ func NewGoGenerator() *GoGenerator { return g } -func (g *GoGenerator) init(s *Schema) { - g.GenBase.init(s, gotemplates.GoTemplates) +func (g *GoGenerator) init(s *model.Schema) { + g.GenBase.init(s, gotemplates.TypeDependent, gotemplates.Templates) } func (g *GoGenerator) generateLanguageSpecificFiles() error { return g.createSourceFile("../main", !g.s.CoreContracts) } - -func (g *GoGenerator) setFieldKeys(pad bool) { - g.GenBase.setFieldKeys(pad) - - fldTypeID := goTypeIds[g.currentField.Type] - if fldTypeID == "" { - fldTypeID = "wasmlib.TYPE_BYTES" - } - g.keys["fldTypeID"] = fldTypeID - g.keys["fldLangType"] = goTypes[g.currentField.Type] - g.keys["fldMapKeyLangType"] = goTypes[g.currentField.MapKey] - g.keys["fldMapKeyKey"] = goKeys[g.currentField.MapKey] -} diff --git a/tools/schema/generator/generator_rust.go b/tools/schema/generator/generator_rust.go index 3db51f13c8..363aa11fc5 100644 --- a/tools/schema/generator/generator_rust.go +++ b/tools/schema/generator/generator_rust.go @@ -7,64 +7,9 @@ import ( "regexp" "github.com/iotaledger/wasp/tools/schema/generator/rstemplates" + "github.com/iotaledger/wasp/tools/schema/model" ) -var rustTypes = StringMap{ - "Address": "ScAddress", - "AgentID": "ScAgentID", - "ChainID": "ScChainID", - "Color": "ScColor", - "Hash": "ScHash", - "Hname": "ScHname", - "Int16": "i16", - "Int32": "i32", - "Int64": "i64", - "RequestID": "ScRequestID", - "String": "String", -} - -var rustKeyTypes = StringMap{ - "Address": "&ScAddress", - "AgentID": "&ScAgentID", - "ChainID": "&ScChainID", - "Color": "&ScColor", - "Hash": "&ScHash", - "Hname": "&ScHname", - "Int16": "??TODO", - "Int32": "i32", - "Int64": "??TODO", - "RequestID": "&ScRequestID", - "String": "&str", -} - -var rustKeys = StringMap{ - "Address": "key", - "AgentID": "key", - "ChainID": "key", - "Color": "key", - "Hash": "key", - "Hname": "key", - "Int16": "??TODO", - "Int32": "Key32(int32)", - "Int64": "??TODO", - "RequestID": "key", - "String": "key", -} - -var rustTypeIds = StringMap{ - "Address": "TYPE_ADDRESS", - "AgentID": "TYPE_AGENT_ID", - "ChainID": "TYPE_CHAIN_ID", - "Color": "TYPE_COLOR", - "Hash": "TYPE_HASH", - "Hname": "TYPE_HNAME", - "Int16": "TYPE_INT16", - "Int32": "TYPE_INT32", - "Int64": "TYPE_INT64", - "RequestID": "TYPE_REQUEST_ID", - "String": "TYPE_STRING", -} - type RustGenerator struct { GenBase } @@ -79,11 +24,11 @@ func NewRustGenerator() *RustGenerator { return g } -func (g *RustGenerator) init(s *Schema) { - g.GenBase.init(s, rstemplates.RsTemplates) +func (g *RustGenerator) init(s *model.Schema) { + g.GenBase.init(s, rstemplates.TypeDependent, rstemplates.Templates) } -func (g *RustGenerator) funcName(f *Func) string { +func (g *RustGenerator) funcName(f *model.Func) string { return snake(g.GenBase.funcName(f)) } @@ -97,23 +42,3 @@ func (g *RustGenerator) generateLanguageSpecificFiles() error { g.emit(cargoToml) }) } - -func (g *RustGenerator) setFieldKeys(pad bool) { - g.GenBase.setFieldKeys(pad) - - field := g.currentField - fldRef := "&" - if field.Type == "Hname" || field.Type == "Int64" || field.Type == "Int32" || field.Type == "Int16" { - fldRef = "" - } - g.keys["ref"] = fldRef - - fldTypeID := rustTypeIds[field.Type] - if fldTypeID == "" { - fldTypeID = "TYPE_BYTES" - } - g.keys["fldTypeID"] = fldTypeID - g.keys["fldLangType"] = rustTypes[field.Type] - g.keys["fldMapKeyLangType"] = rustKeyTypes[field.MapKey] - g.keys["fldMapKeyKey"] = rustKeys[field.MapKey] -} diff --git a/tools/schema/generator/generator_ts.go b/tools/schema/generator/generator_ts.go index 192f3ce4c1..bf4e3b384f 100644 --- a/tools/schema/generator/generator_ts.go +++ b/tools/schema/generator/generator_ts.go @@ -7,64 +7,9 @@ import ( "regexp" "github.com/iotaledger/wasp/tools/schema/generator/tstemplates" + "github.com/iotaledger/wasp/tools/schema/model" ) -var tsTypes = StringMap{ - "Address": "wasmlib.ScAddress", - "AgentID": "wasmlib.ScAgentID", - "ChainID": "wasmlib.ScChainID", - "Color": "wasmlib.ScColor", - "Hash": "wasmlib.ScHash", - "Hname": "wasmlib.ScHname", - "Int16": "i16", - "Int32": "i32", - "Int64": "i64", - "RequestID": "wasmlib.ScRequestID", - "String": "string", -} - -var tsInits = StringMap{ - "Address": "new wasmlib.ScAddress()", - "AgentID": "new wasmlib.ScAgentID()", - "ChainID": "new wasmlib.ScChainID()", - "Color": "new wasmlib.ScColor(0)", - "Hash": "new wasmlib.ScHash()", - "Hname": "new wasmlib.ScHname(0)", - "Int16": "0", - "Int32": "0", - "Int64": "0", - "RequestID": "new wasmlib.ScRequestID()", - "String": "\"\"", -} - -var tsKeys = StringMap{ - "Address": "key", - "AgentID": "key", - "ChainID": "key", - "Color": "key", - "Hash": "key", - "Hname": "key", - "Int16": "??TODO", - "Int32": "new wasmlib.Key32(key)", - "Int64": "??TODO", - "RequestID": "key", - "String": "wasmlib.Key32.fromString(key)", -} - -var tsTypeIds = StringMap{ - "Address": "wasmlib.TYPE_ADDRESS", - "AgentID": "wasmlib.TYPE_AGENT_ID", - "ChainID": "wasmlib.TYPE_CHAIN_ID", - "Color": "wasmlib.TYPE_COLOR", - "Hash": "wasmlib.TYPE_HASH", - "Hname": "wasmlib.TYPE_HNAME", - "Int16": "wasmlib.TYPE_INT16", - "Int32": "wasmlib.TYPE_INT32", - "Int64": "wasmlib.TYPE_INT64", - "RequestID": "wasmlib.TYPE_REQUEST_ID", - "String": "wasmlib.TYPE_STRING", -} - type TypeScriptGenerator struct { GenBase } @@ -79,8 +24,8 @@ func NewTypeScriptGenerator() *TypeScriptGenerator { return g } -func (g *TypeScriptGenerator) init(s *Schema) { - g.GenBase.init(s, tstemplates.TsTemplates) +func (g *TypeScriptGenerator) init(s *model.Schema) { + g.GenBase.init(s, tstemplates.TypeDependent, tstemplates.Templates) } func (g *TypeScriptGenerator) generateLanguageSpecificFiles() error { @@ -94,17 +39,3 @@ func (g *TypeScriptGenerator) generateLanguageSpecificFiles() error { g.emit(tsconfig) }) } - -func (g *TypeScriptGenerator) setFieldKeys(pad bool) { - g.GenBase.setFieldKeys(pad) - - fldTypeID := tsTypeIds[g.currentField.Type] - if fldTypeID == "" { - fldTypeID = "wasmlib.TYPE_BYTES" - } - g.keys["fldTypeID"] = fldTypeID - g.keys["fldTypeInit"] = tsInits[g.currentField.Type] - g.keys["fldLangType"] = tsTypes[g.currentField.Type] - g.keys["fldMapKeyLangType"] = tsTypes[g.currentField.MapKey] - g.keys["fldMapKeyKey"] = tsKeys[g.currentField.MapKey] -} diff --git a/tools/schema/generator/gotemplates/alltemplates.go b/tools/schema/generator/gotemplates/alltemplates.go index 28e71bceb5..f4c097223b 100644 --- a/tools/schema/generator/gotemplates/alltemplates.go +++ b/tools/schema/generator/gotemplates/alltemplates.go @@ -1,7 +1,9 @@ package gotemplates -var GoTemplates = []map[string]string{ - goCommon, +import "github.com/iotaledger/wasp/tools/schema/model" + +var Templates = []map[string]string{ + common, constsGo, contractGo, eventsGo, @@ -17,7 +19,68 @@ var GoTemplates = []map[string]string{ typedefsGo, } -var goCommon = map[string]string{ +var TypeDependent = model.StringMapMap{ + "fldLangType": { + "Address": "wasmlib.ScAddress", + "AgentID": "wasmlib.ScAgentID", + "Bool": "bool", + "ChainID": "wasmlib.ScChainID", + "Color": "wasmlib.ScColor", + "Hash": "wasmlib.ScHash", + "Hname": "wasmlib.ScHname", + "Int8": "int8", + "Int16": "int16", + "Int32": "int32", + "Int64": "int64", + "RequestID": "wasmlib.ScRequestID", + "String": "string", + "Uint8": "uint8", + "Uint16": "uint16", + "Uint32": "uint32", + "Uint64": "uint64", + }, + "fldTypeID": { + "Address": "wasmlib.TYPE_ADDRESS", + "AgentID": "wasmlib.TYPE_AGENT_ID", + "Bool": "wasmlib.TYPE_BOOL", + "ChainID": "wasmlib.TYPE_CHAIN_ID", + "Color": "wasmlib.TYPE_COLOR", + "Hash": "wasmlib.TYPE_HASH", + "Hname": "wasmlib.TYPE_HNAME", + "Int8": "wasmlib.TYPE_INT8", + "Int16": "wasmlib.TYPE_INT16", + "Int32": "wasmlib.TYPE_INT32", + "Int64": "wasmlib.TYPE_INT64", + "RequestID": "wasmlib.TYPE_REQUEST_ID", + "String": "wasmlib.TYPE_STRING", + "Uint8": "wasmlib.TYPE_INT8", + "Uint16": "wasmlib.TYPE_INT16", + "Uint32": "wasmlib.TYPE_INT32", + "Uint64": "wasmlib.TYPE_INT64", + "": "wasmlib.TYPE_BYTES", + }, + "fldToKey32": { + "Address": "key", + "AgentID": "key", + "Bool": "wasmlib.Key32(key)", + "ChainID": "key", + "Color": "key", + "Hash": "key", + "Hname": "key", + "Int8": "wasmlib.Key32(key)", + "Int16": "wasmlib.Key32(key)", + "Int32": "wasmlib.Key32(key)", + "Int64": "wasmlib.Key32(key)", + "RequestID": "key", + "String": "wasmlib.Key(key)", + "Uint8": "wasmlib.Key32(key)", + "Uint16": "wasmlib.Key32(key)", + "Uint32": "wasmlib.Key32(key)", + "Uint64": "wasmlib.Key32(key)", + }, +} + +var common = map[string]string{ // ******************************* "initGlobals": ` $#set arrayTypeID wasmlib.TYPE_ARRAY diff --git a/tools/schema/generator/gotemplates/typedefs.go b/tools/schema/generator/gotemplates/typedefs.go index a00a8be852..f4448dfda9 100644 --- a/tools/schema/generator/gotemplates/typedefs.go +++ b/tools/schema/generator/gotemplates/typedefs.go @@ -102,8 +102,8 @@ func (m $proxy) Clear() { // ******************************* "typedefProxyMapNewBaseType": ` -func (m $proxy) Get$FldType(key $fldMapKeyLangType) wasmlib.Sc$mut$FldType { - return wasmlib.NewSc$mut$FldType(m.objID, $fldMapKeyKey.KeyID()) +func (m $proxy) Get$FldType(key $fldKeyLangType) wasmlib.Sc$mut$FldType { + return wasmlib.NewSc$mut$FldType(m.objID, $fldKeyToKey32.KeyID()) } `, // ******************************* @@ -114,16 +114,16 @@ $#if typedef typedefProxyMapNewOtherTypeTypeDef typedefProxyMapNewOtherTypeStruc "typedefProxyMapNewOtherTypeTypeDef": ` $#emit setVarType -func (m $proxy) Get$OldType(key $oldMapKeyLangType) $mut$OldType { - subID := wasmlib.GetObjectID(m.objID, $oldMapKeyKey.KeyID(), $varType) +func (m $proxy) Get$OldType(key $oldKeyLangType) $mut$OldType { + subID := wasmlib.GetObjectID(m.objID, $oldKeyToKey32.KeyID(), $varType) return $mut$OldType{objID: subID} } `, // ******************************* "typedefProxyMapNewOtherTypeStruct": ` -func (m $proxy) Get$FldType(key $fldMapKeyLangType) $mut$FldType { - return $mut$FldType{objID: m.objID, keyID: $fldMapKeyKey.KeyID()} +func (m $proxy) Get$FldType(key $fldKeyLangType) $mut$FldType { + return $mut$FldType{objID: m.objID, keyID: $fldKeyToKey32.KeyID()} } `, } diff --git a/tools/schema/generator/rstemplates/alltemplates.go b/tools/schema/generator/rstemplates/alltemplates.go index 17e47c1ade..9873da8644 100644 --- a/tools/schema/generator/rstemplates/alltemplates.go +++ b/tools/schema/generator/rstemplates/alltemplates.go @@ -1,7 +1,9 @@ package rstemplates -var RsTemplates = []map[string]string{ - rsCommon, +import "github.com/iotaledger/wasp/tools/schema/model" + +var Templates = []map[string]string{ + common, cargoToml, constsRs, contractRs, @@ -18,7 +20,96 @@ var RsTemplates = []map[string]string{ typedefsRs, } -var rsCommon = map[string]string{ +var TypeDependent = model.StringMapMap{ + "fldLangType": { + "Address": "ScAddress", + "AgentID": "ScAgentID", + "Bool": "bool", + "ChainID": "ScChainID", + "Color": "ScColor", + "Hash": "ScHash", + "Hname": "ScHname", + "Int8": "i8", + "Int16": "i16", + "Int32": "i32", + "Int64": "i64", + "RequestID": "ScRequestID", + "String": "String", + "Uint8": "u8", + "Uint16": "u16", + "Uint32": "u32", + "Uint64": "u64", + }, + "fldTypeID": { + "Address": "TYPE_ADDRESS", + "AgentID": "TYPE_AGENT_ID", + "Bool": "TYPE_BOOL", + "ChainID": "TYPE_CHAIN_ID", + "Color": "TYPE_COLOR", + "Hash": "TYPE_HASH", + "Hname": "TYPE_HNAME", + "Int8": "TYPE_INT8", + "Int16": "TYPE_INT16", + "Int32": "TYPE_INT32", + "Int64": "TYPE_INT64", + "RequestID": "TYPE_REQUEST_ID", + "String": "TYPE_STRING", + "Uint8": "TYPE_INT8", + "Uint16": "TYPE_INT16", + "Uint32": "TYPE_INT32", + "Uint64": "TYPE_INT64", + "": "TYPE_BYTES", + }, + "fldToKey32": { + "Address": "key", + "AgentID": "key", + "Bool": "Key32(key)", + "ChainID": "key", + "Color": "key", + "Hash": "key", + "Hname": "key", + "Int8": "Key32(key)", + "Int16": "Key32(key)", + "Int32": "Key32(key)", + "Int64": "Key32(key)", + "RequestID": "key", + "String": "key", + "Uint8": "Key32(key)", + "Uint16": "Key32(key)", + "Uint32": "Key32(key)", + "Uint64": "Key32(key)", + }, + "fldParamLangType": { + "Address": "ScAddress", + "AgentID": "ScAgentID", + "Bool": "bool", + "ChainID": "ScChainID", + "Color": "ScColor", + "Hash": "ScHash", + "Hname": "ScHname", + "Int8": "i8", + "Int16": "i16", + "Int32": "i32", + "Int64": "i64", + "RequestID": "ScRequestID", + "String": "str", + "Uint8": "u8", + "Uint16": "u16", + "Uint32": "u32", + "Uint64": "u64", + }, + "fldRef": { + "Address": "&", + "AgentID": "&", + "ChainID": "&", + "Color": "&", + "Hash": "&", + "RequestID": "&", + "String": "&", + }, +} + +var common = map[string]string{ // ******************************* "initGlobals": ` $#set arrayTypeID TYPE_ARRAY diff --git a/tools/schema/generator/rstemplates/events.go b/tools/schema/generator/rstemplates/events.go index 89399136ce..6d203ac398 100644 --- a/tools/schema/generator/rstemplates/events.go +++ b/tools/schema/generator/rstemplates/events.go @@ -26,7 +26,7 @@ $#if event eventParams eventParamNone `, // ******************************* "eventParam": ` -$#set params $params, $fld_name: $ref$fldLangType +$#set params $params, $fld_name: $fldRef$fldParamLangType `, // ******************************* "eventParamNone": ` @@ -40,6 +40,6 @@ $#each event eventEmit `, // ******************************* "eventEmit": ` - encoder.$fld_type($ref$fld_name); + encoder.$fld_type($fldRef$fld_name); `, } diff --git a/tools/schema/generator/rstemplates/structs.go b/tools/schema/generator/rstemplates/structs.go index 10b7aae075..057cd29f86 100644 --- a/tools/schema/generator/rstemplates/structs.go +++ b/tools/schema/generator/rstemplates/structs.go @@ -47,7 +47,7 @@ $#emit structMethods `, // ******************************* "structEncode": ` - encode.$fld_type($ref$+self.$fld_name); + encode.$fld_type($fldRef$+self.$fld_name); `, // ******************************* "structMethods": ` diff --git a/tools/schema/generator/rstemplates/typedefs.go b/tools/schema/generator/rstemplates/typedefs.go index 6f2b75378b..e5fef615c2 100644 --- a/tools/schema/generator/rstemplates/typedefs.go +++ b/tools/schema/generator/rstemplates/typedefs.go @@ -108,7 +108,7 @@ $#set exist $proxy `, // ******************************* "typedefProxyMapNewBaseType": ` - pub fn get_$fld_type(&self, key: $fldMapKeyLangType) -> Sc$mut$FldType { + pub fn get_$fld_type(&self, key: $fldKeyRef$fldKeyParamLangType) -> Sc$mut$FldType { Sc$mut$FldType::new(self.obj_id, key.get_key_id()) } `, @@ -119,14 +119,14 @@ $#if typedef typedefProxyMapNewOtherTypeTypeDef typedefProxyMapNewOtherTypeStruc // ******************************* "typedefProxyMapNewOtherTypeTypeDef": ` $#emit setVarType - pub fn get_$old_type(&self, key: $oldMapKeyLangType) -> $mut$OldType { + pub fn get_$old_type(&self, key: $oldKeyRef$oldKeyParamLangType) -> $mut$OldType { let sub_id = get_object_id(self.obj_id, key.get_key_id(), $varType); $mut$OldType { obj_id: sub_id } } `, // ******************************* "typedefProxyMapNewOtherTypeStruct": ` - pub fn get_$fld_type(&self, key: $fldMapKeyLangType) -> $mut$FldType { + pub fn get_$fld_type(&self, key: $fldKeyRef$fldKeyParamLangType) -> $mut$FldType { $mut$FldType { obj_id: self.obj_id, key_id: key.get_key_id() } } `, diff --git a/tools/schema/generator/templates.go b/tools/schema/generator/templates.go index 9289a6abd1..b4652457dd 100644 --- a/tools/schema/generator/templates.go +++ b/tools/schema/generator/templates.go @@ -1,6 +1,8 @@ package generator -var commonTemplates = map[string]string{ +import "github.com/iotaledger/wasp/tools/schema/model" + +var commonTemplates = model.StringMap{ // ******************************* "else": ` `, diff --git a/tools/schema/generator/tstemplates/alltemplates.go b/tools/schema/generator/tstemplates/alltemplates.go index 5a670a947f..95d909cb9c 100644 --- a/tools/schema/generator/tstemplates/alltemplates.go +++ b/tools/schema/generator/tstemplates/alltemplates.go @@ -1,7 +1,9 @@ package tstemplates -var TsTemplates = []map[string]string{ - tsCommon, +import "github.com/iotaledger/wasp/tools/schema/model" + +var Templates = []map[string]string{ + common, constsTs, contractTs, eventsTs, @@ -17,7 +19,87 @@ var TsTemplates = []map[string]string{ typedefsTs, } -var tsCommon = map[string]string{ +var TypeDependent = model.StringMapMap{ + "fldLangType": { + "Address": "wasmlib.ScAddress", + "AgentID": "wasmlib.ScAgentID", + "Bool": "bool", + "ChainID": "wasmlib.ScChainID", + "Color": "wasmlib.ScColor", + "Hash": "wasmlib.ScHash", + "Hname": "wasmlib.ScHname", + "Int8": "i8", + "Int16": "i16", + "Int32": "i32", + "Int64": "i64", + "RequestID": "wasmlib.ScRequestID", + "String": "string", + "Uint8": "u8", + "Uint16": "u16", + "Uint32": "u32", + "Uint64": "u64", + }, + "fldTypeID": { + "Address": "wasmlib.TYPE_ADDRESS", + "AgentID": "wasmlib.TYPE_AGENT_ID", + "Bool": "wasmlib.TYPE_BOOL", + "ChainID": "wasmlib.TYPE_CHAIN_ID", + "Color": "wasmlib.TYPE_COLOR", + "Hash": "wasmlib.TYPE_HASH", + "Hname": "wasmlib.TYPE_HNAME", + "Int8": "wasmlib.TYPE_INT8", + "Int16": "wasmlib.TYPE_INT16", + "Int32": "wasmlib.TYPE_INT32", + "Int64": "wasmlib.TYPE_INT64", + "RequestID": "wasmlib.TYPE_REQUEST_ID", + "String": "wasmlib.TYPE_STRING", + "Uint8": "wasmlib.TYPE_INT8", + "Uint16": "wasmlib.TYPE_INT16", + "Uint32": "wasmlib.TYPE_INT32", + "Uint64": "wasmlib.TYPE_INT64", + "": "wasmlib.TYPE_BYTES", + }, + "fldToKey32": { + "Address": "key", + "AgentID": "key", + "Bool": "new wasmlib.Key32(key?1:0)", + "ChainID": "key", + "Color": "key", + "Hash": "key", + "Hname": "key", + "Int8": "new wasmlib.Key32(key)", + "Int16": "new wasmlib.Key32(key)", + "Int32": "new wasmlib.Key32(key)", + "Int64": "new wasmlib.Key32(key)", + "RequestID": "key", + "String": "wasmlib.Key32.fromString(key)", + "Uint8": "new wasmlib.Key32(key)", + "Uint16": "new wasmlib.Key32(key)", + "Uint32": "new wasmlib.Key32(key)", + "Uint64": "new wasmlib.Key32(key)", + }, + "fldTypeInit": { + "Address": "new wasmlib.ScAddress()", + "AgentID": "new wasmlib.ScAgentID()", + "Bool": "false", + "ChainID": "new wasmlib.ScChainID()", + "Color": "new wasmlib.ScColor(0)", + "Hash": "new wasmlib.ScHash()", + "Hname": "new wasmlib.ScHname(0)", + "Int8": "0", + "Int16": "0", + "Int32": "0", + "Int64": "0", + "RequestID": "new wasmlib.ScRequestID()", + "String": "\"\"", + "Uint8": "0", + "Uint16": "0", + "Uint32": "0", + "Uint64": "0", + }, +} + +var common = map[string]string{ // ******************************* "initGlobals": ` $#set arrayTypeID wasmlib.TYPE_ARRAY diff --git a/tools/schema/generator/tstemplates/typedefs.go b/tools/schema/generator/tstemplates/typedefs.go index 3e551b3027..e0a6a1875a 100644 --- a/tools/schema/generator/tstemplates/typedefs.go +++ b/tools/schema/generator/tstemplates/typedefs.go @@ -111,8 +111,8 @@ $#set exist $proxy // ******************************* "typedefProxyMapNewBaseType": ` - get$FldType(key: $fldMapKeyLangType): wasmlib.Sc$mut$FldType { - return new wasmlib.Sc$mut$FldType(this.objID, $fldMapKeyKey.getKeyID()); + get$FldType(key: $fldKeyLangType): wasmlib.Sc$mut$FldType { + return new wasmlib.Sc$mut$FldType(this.objID, $fldKeyToKey32.getKeyID()); } `, // ******************************* @@ -123,16 +123,16 @@ $#if typedef typedefProxyMapNewOtherTypeTypeDef typedefProxyMapNewOtherTypeStruc "typedefProxyMapNewOtherTypeTypeDef": ` $#emit setVarType - get$OldType(key: $oldMapKeyLangType): sc.$mut$OldType { - let subID = wasmlib.getObjectID(this.objID, $oldMapKeyKey.getKeyID(), $varType); + get$OldType(key: $oldKeyLangType): sc.$mut$OldType { + let subID = wasmlib.getObjectID(this.objID, $oldKeyToKey32.getKeyID(), $varType); return new sc.$mut$OldType(subID); } `, // ******************************* "typedefProxyMapNewOtherTypeStruct": ` - get$FldType(key: $fldMapKeyLangType): sc.$mut$FldType { - return new sc.$mut$FldType(this.objID, $fldMapKeyKey.getKeyID()); + get$FldType(key: $fldKeyLangType): sc.$mut$FldType { + return new sc.$mut$FldType(this.objID, $fldKeyToKey32.getKeyID()); } `, } diff --git a/tools/schema/generator/utils.go b/tools/schema/generator/utils.go index fea7e4b59b..ae12a5aec8 100644 --- a/tools/schema/generator/utils.go +++ b/tools/schema/generator/utils.go @@ -5,7 +5,6 @@ import ( "fmt" "os" "regexp" - "sort" "strings" ) @@ -91,42 +90,6 @@ func snake(name string) string { return lower(name) } -func sortedFields(dict FieldMap) []string { - keys := make([]string, 0) - for key := range dict { - keys = append(keys, key) - } - sort.Strings(keys) - return keys -} - -func sortedFuncDescs(dict FuncDefMap) []string { - keys := make([]string, 0) - for key := range dict { - keys = append(keys, key) - } - sort.Strings(keys) - return keys -} - -func sortedKeys(dict StringMap) []string { - keys := make([]string, 0) - for key := range dict { - keys = append(keys, key) - } - sort.Strings(keys) - return keys -} - -func sortedMaps(dict StringMapMap) []string { - keys := make([]string, 0) - for key := range dict { - keys = append(keys, key) - } - sort.Strings(keys) - return keys -} - // uncapitalize first letter func uncapitalize(name string) string { return lower(name[:1]) + name[1:] diff --git a/tools/schema/main.go b/tools/schema/main.go index 66be0addab..6c88790815 100644 --- a/tools/schema/main.go +++ b/tools/schema/main.go @@ -17,17 +17,19 @@ import ( "time" "github.com/iotaledger/wasp/tools/schema/generator" + "github.com/iotaledger/wasp/tools/schema/model" "gopkg.in/yaml.v2" ) var ( - flagCore = flag.Bool("core", false, "generate core contract interface") - flagForce = flag.Bool("force", false, "force code generation") - flagGo = flag.Bool("go", false, "generate Go code") - flagInit = flag.String("init", "", "generate new schema file for smart contract named ") - flagRust = flag.Bool("rust", false, "generate Rust code") - flagTs = flag.Bool("ts", false, "generate TypScript code") - flagType = flag.String("type", "yaml", "type of schema file that will be generated. Values(yaml,json)") + flagCore = flag.Bool("core", false, "generate core contract interface") + flagClient = flag.Bool("client", false, "generate client side contract interface") + flagForce = flag.Bool("force", false, "force code generation") + flagGo = flag.Bool("go", false, "generate Go code") + flagInit = flag.String("init", "", "generate new schema file for smart contract named ") + flagRust = flag.Bool("rust", false, "generate Rust code") + flagTs = flag.Bool("ts", false, "generate TypScript code") + flagType = flag.String("type", "yaml", "type of schema file that will be generated. Values(yaml,json)") ) func init() { @@ -113,8 +115,8 @@ func generateSchema(file *os.File) error { s.SchemaTime = time.Now() } - if *flagTs { - g := generator.NewTypeScriptGenerator() + if *flagClient { + g := generator.NewClientGenerator() err = g.Generate(s) if err != nil { return err @@ -136,6 +138,14 @@ func generateSchema(file *os.File) error { return err } } + + if *flagTs { + g := generator.NewTypeScriptGenerator() + err = g.Generate(s) + if err != nil { + return err + } + } return nil } @@ -154,30 +164,30 @@ func generateSchemaNew() error { return err } - schemaDef := &generator.SchemaDef{} + schemaDef := &model.SchemaDef{} schemaDef.Name = name schemaDef.Description = name + " description" - schemaDef.Structs = make(generator.StringMapMap) - schemaDef.Events = make(generator.StringMapMap) - schemaDef.Typedefs = make(generator.StringMap) - schemaDef.State = make(generator.StringMap) + schemaDef.Structs = make(model.StringMapMap) + schemaDef.Events = make(model.StringMapMap) + schemaDef.Typedefs = make(model.StringMap) + schemaDef.State = make(model.StringMap) schemaDef.State["owner"] = "AgentID // current owner of this smart contract" - schemaDef.Funcs = make(generator.FuncDefMap) - schemaDef.Views = make(generator.FuncDefMap) + schemaDef.Funcs = make(model.FuncDefMap) + schemaDef.Views = make(model.FuncDefMap) - funcInit := &generator.FuncDef{} - funcInit.Params = make(generator.StringMap) + funcInit := &model.FuncDef{} + funcInit.Params = make(model.StringMap) funcInit.Params["owner"] = "AgentID? // optional owner of this smart contract" schemaDef.Funcs["init"] = funcInit - funcSetOwner := &generator.FuncDef{} + funcSetOwner := &model.FuncDef{} funcSetOwner.Access = "owner // current owner of this smart contract" - funcSetOwner.Params = make(generator.StringMap) + funcSetOwner.Params = make(model.StringMap) funcSetOwner.Params["owner"] = "AgentID // new owner of this smart contract" schemaDef.Funcs["setOwner"] = funcSetOwner - viewGetOwner := &generator.FuncDef{} - viewGetOwner.Results = make(generator.StringMap) + viewGetOwner := &model.FuncDef{} + viewGetOwner.Results = make(model.StringMap) viewGetOwner.Results["owner"] = "AgentID // current owner of this smart contract" schemaDef.Views["getOwner"] = viewGetOwner switch *flagType { @@ -189,9 +199,9 @@ func generateSchemaNew() error { return errors.New("invalid schema type: " + *flagType) } -func loadSchema(file *os.File) (s *generator.Schema, err error) { +func loadSchema(file *os.File) (s *model.Schema, err error) { fmt.Println("loading " + file.Name()) - schemaDef := &generator.SchemaDef{} + schemaDef := &model.SchemaDef{} switch filepath.Ext(file.Name()) { case ".json": err = json.NewDecoder(file).Decode(schemaDef) @@ -211,7 +221,7 @@ func loadSchema(file *os.File) (s *generator.Schema, err error) { return nil, err } - s = generator.NewSchema() + s = model.NewSchema() err = s.Compile(schemaDef) if err != nil { return nil, err @@ -219,7 +229,7 @@ func loadSchema(file *os.File) (s *generator.Schema, err error) { return s, nil } -func WriteJSONSchema(schemaDef *generator.SchemaDef) error { +func WriteJSONSchema(schemaDef *model.SchemaDef) error { file, err := os.Create("schema.json") if err != nil { return err @@ -241,7 +251,7 @@ func WriteJSONSchema(schemaDef *generator.SchemaDef) error { return err } -func WriteYAMLSchema(schemaDef *generator.SchemaDef) error { +func WriteYAMLSchema(schemaDef *model.SchemaDef) error { file, err := os.Create("schema.yaml") if err != nil { return err diff --git a/tools/schema/generator/field.go b/tools/schema/model/field.go similarity index 92% rename from tools/schema/generator/field.go rename to tools/schema/model/field.go index 2b28ca05af..1befe05885 100644 --- a/tools/schema/generator/field.go +++ b/tools/schema/model/field.go @@ -1,7 +1,7 @@ // Copyright 2020 IOTA Stiftung // SPDX-License-Identifier: Apache-2.0 -package generator +package model import ( "fmt" @@ -20,16 +20,22 @@ var ( var FieldTypes = map[string]int32{ "Address": wasmlib.TYPE_ADDRESS, "AgentID": wasmlib.TYPE_AGENT_ID, + "Bool": wasmlib.TYPE_BOOL, "Bytes": wasmlib.TYPE_BYTES, "ChainID": wasmlib.TYPE_CHAIN_ID, "Color": wasmlib.TYPE_COLOR, "Hash": wasmlib.TYPE_HASH, "Hname": wasmlib.TYPE_HNAME, + "Int8": wasmlib.TYPE_INT8, "Int16": wasmlib.TYPE_INT16, "Int32": wasmlib.TYPE_INT32, "Int64": wasmlib.TYPE_INT64, "RequestID": wasmlib.TYPE_REQUEST_ID, "String": wasmlib.TYPE_STRING, + "Uint8": wasmlib.TYPE_INT8, + "Uint16": wasmlib.TYPE_INT16, + "Uint32": wasmlib.TYPE_INT32, + "Uint64": wasmlib.TYPE_INT64, } type Field struct { diff --git a/tools/schema/generator/schema.go b/tools/schema/model/schema.go similarity index 91% rename from tools/schema/generator/schema.go rename to tools/schema/model/schema.go index f0be649eb5..c5e6eb8cb9 100644 --- a/tools/schema/generator/schema.go +++ b/tools/schema/model/schema.go @@ -1,10 +1,11 @@ // Copyright 2020 IOTA Stiftung // SPDX-License-Identifier: Apache-2.0 -package generator +package model import ( "fmt" + "sort" "strings" "time" @@ -79,7 +80,7 @@ func (s *Schema) Compile(schemaDef *SchemaDef) error { if s.FullName == "" { return fmt.Errorf("missing contract name") } - s.Name = lower(s.FullName) + s.Name = strings.ToLower(s.FullName) s.Description = strings.TrimSpace(schemaDef.Description) err := s.compileEvents(schemaDef) @@ -304,3 +305,39 @@ func (s *Schema) compileTypeDefs(schemaDef *SchemaDef) error { } return nil } + +func sortedFields(dict FieldMap) []string { + keys := make([]string, 0) + for key := range dict { + keys = append(keys, key) + } + sort.Strings(keys) + return keys +} + +func sortedFuncDescs(dict FuncDefMap) []string { + keys := make([]string, 0) + for key := range dict { + keys = append(keys, key) + } + sort.Strings(keys) + return keys +} + +func sortedKeys(dict StringMap) []string { + keys := make([]string, 0) + for key := range dict { + keys = append(keys, key) + } + sort.Strings(keys) + return keys +} + +func sortedMaps(dict StringMapMap) []string { + keys := make([]string, 0) + for key := range dict { + keys = append(keys, key) + } + sort.Strings(keys) + return keys +} From d0251682a72e4a68b821be544fb597d581f2b45c Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Thu, 25 Nov 2021 13:26:56 -0800 Subject: [PATCH 126/198] Additional integer types completed --- .../test/donatewithfeedback_bg.wasm | Bin 36521 -> 36517 bytes .../wasm/fairauction/test/fairauction_bg.wasm | Bin 42696 -> 42692 bytes .../fairroulette/test/fairroulette_bg.wasm | Bin 40136 -> 40132 bytes .../wasm/inccounter/test/inccounter_bg.wasm | Bin 37011 -> 37007 bytes .../wasm/testwasmlib/go/testwasmlib/consts.go | 6 ++ .../wasm/testwasmlib/go/testwasmlib/keys.go | 60 ++++++++------ .../wasm/testwasmlib/go/testwasmlib/params.go | 48 +++++++++++ .../testwasmlib/go/testwasmlib/testwasmlib.go | 24 +++++- contracts/wasm/testwasmlib/schema.yaml | 6 ++ contracts/wasm/testwasmlib/src/consts.rs | 6 ++ contracts/wasm/testwasmlib/src/keys.rs | 60 ++++++++------ contracts/wasm/testwasmlib/src/params.rs | 48 +++++++++++ contracts/wasm/testwasmlib/src/testwasmlib.rs | 24 +++++- .../wasm/testwasmlib/test/testwasmlib_bg.wasm | Bin 39537 -> 41299 bytes .../wasm/testwasmlib/test/testwasmlib_test.go | 20 ++++- .../wasm/testwasmlib/ts/testwasmlib/consts.ts | 6 ++ .../wasm/testwasmlib/ts/testwasmlib/keys.ts | 58 ++++++++------ .../wasm/testwasmlib/ts/testwasmlib/params.ts | 48 +++++++++++ .../testwasmlib/ts/testwasmlib/testwasmlib.ts | 24 +++++- packages/vm/wasmlib/go/wasmlib/bytes.go | 57 +++++++++++++ packages/vm/wasmlib/src/bytes.rs | 75 ++++++++++++++++++ packages/vm/wasmlib/ts/wasmlib/bytes.ts | 70 ++++++++++++++++ packages/vm/wasmproc/bytes.go | 57 +++++++++++++ packages/vm/wasmsolo/solocontext.go | 2 +- tools/cluster/tests/wasm/inccounter_bg.wasm | Bin 37011 -> 37007 bytes 25 files changed, 614 insertions(+), 85 deletions(-) diff --git a/contracts/wasm/donatewithfeedback/test/donatewithfeedback_bg.wasm b/contracts/wasm/donatewithfeedback/test/donatewithfeedback_bg.wasm index aa8d0bca0468989efacf3fd9313a94ffdba16b11..c9e154560c0ddd00455d8dc42bd968aa9e040118 100644 GIT binary patch delta 4896 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 Vd~AEQ9>+Q25f1*3humFT{tN$!c4q(p delta 4895 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 C;)F>6 diff --git a/contracts/wasm/fairauction/test/fairauction_bg.wasm b/contracts/wasm/fairauction/test/fairauction_bg.wasm index c8537ddcaaf0c0b37e3fe8065397e374510c0d7e..628071624af097e296f164db4d2a319f01c732e7 100644 GIT binary patch delta 5828 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 delta 5877 zcmai23sjX?cK*-#FP96Ki$C&y`roS{f})~;sgs1G@=!!DiLaQ1nE1RTBGDMlL$1+Q zogoTth(u8FF~+W8Mx5&;)|iHsxLR7Bgz1{qI&D&It68o}8{4{CSL%xW_W$1tXq`2% z{(a6qd!K#w*=Ik_xfg#e`+qHaeYC**+~-YK=av%%hu{@l&x@$xW)84(SzOxuMs&JHX=iI%Sh; zp&CcJXrX#X1K>Y6%$)9zt?AXCNYm*NDkP1CMUE8ajo6SEV)cnKkHZv7-|Pd}q-^Pt z>Xa?X8-Z0miI`T{&8tE)pHsQ4R+^g4?9(b7r6$l~8DnauES9bq;l?!6`6N_+(V5`0 zgxY)}%qPNp5Dez`odx+}l{CoHSR;T(Xk_jDJ7*U592;3MhBY;v#Zpr|pV!w+-S|v+ z^%y6su{^TCZSg=s@K9T1zA?0t>6q&%RVV1H$fuindAd7SI(*TJ``E4D2Q@Wy7MKOt z0Gf$Cn4&73DLpn{8H{}nU9YA?b>oyUUFCd!xzgp+JeoVk;U2OmEM+?CVQoXXjD3RF zXZ4g}>t_q}vZiNTW8K!CEG16SRhL&>CJ~kJN0-56x}bnt4e;FiV_2DsJQ~Bj3*3w5 z9&2TBsuOJJ4q6xWY5aBWUIAbZZq)!i7X4{_$FInfBGM>={^O+i3 z%Yiw?(xF%YZ0!}`f7LT4-V!KS-~)29`@yFIfdCsQM!Kzeki_P-7GrV`#l#jk*<$K4 zmByxvbM##7ftb+Z@LhF^?#DjmY+*aJ(2`NLp%9anqp8sxVqcCbF?fa<$#Pj8I8CB4 z*04Ow8swA0p;a2DJ0#m1rOwet;}^C)B3OOBe#j)g2-_Zy$5lQvav!G0G>i{zf0_Ur z#F?=OIn@X8Kuh4=v1S~aKXBZA^t-s{AF-3?M;DF@nHR3?sP@>~d6d=i=$p}R%RnbB zkAGIQ(?{_ofd3wU2CzHf3BaofI{{ZF<^k?Y%tt2sByk+zwZw*|fkSK;kzrt;+7VmE!2TqC+@OiE5nmvAFzmcqGJ8!b%9fro4XY^EbA zFN&4FOcg?0A(^%!iy7f}LCc+$$2cv#oIivb(EP@q(e^Y`bOn#4-4GDJJL8_StsPF( zM?cQIC2rE@tOju+_-)o@A?{MptVA}wXD&}=mqTz=AZP?aM(K@8ukb);+TdLpc4Kcv z5?%KuJ{59BQ*e?N;Ut8)R+p2poj0xI38|*Ea~}Lb7|mjo+e&dZU&!sNe5qqYI+$8H z;>YrQOA-$&?zvSz?eZ0g9{SX`EIaIP5qy@MKI{E{pJdkyM+)4XW{#bk5aLuE5YVO? z+v=x|v9-h7iZ6m{5~{(jLzb}jVCDW%ZX8NL)^H60UzVL92dH?QZ@gXH1jjXk9rArr z2~*$X(;L}3$ktZn3O0?)afpH7$=rh?t_3GDS<_}}Fo=?VwLiEpZ^Z+{4tw~Ed{e}R z_EYYWaLrTn9}_>G!KEZzPY?{QdcPg{mwB84>w$WW|46&2*yV<~*TvleA#UlbPRGWXV(n&s>kw)YWNGg-eH2-_XF+83{JW14}hiMqzr|L>KM+QF(eSx%`uU$t}wnDR0;YB*3;tuv(nYV3PjZSX}QS{#2z~z$1Or{ z^|Z-Vza0^mp>bgcDc^1e9!2$qLRfW3zwx#uj(g|m+O(NsC1p%sBRXm4^xf!tin#xJ z(PqHGqQ%f>cJU+inZc>x-Qr5jxm4T$?wKXWAAd+U<{8pWs9e87!F*Unn+YmX`iy`$ z7wnqxp-T(~=cw%hx#KTpEfTjWWA@83aDcYY_ClfKv-46OVW8Vqa=HPQE{dF!g}FI% zCc+n=20TT9Ir)g|o;mYGFa6J)JaLwMWqGKo)n)nO0&PXVk4^wyq^|(`>HD&5-$S;v z77)rZrVb-&s*6$X97l7XD0RZ z*!OAW-ek(Ebf3=G{2qF|dMd2iP@M<1gVkw(zp5^U&HuZ4QpS~^ApjO|MO9}a)Xgxa zt1;?s@W}gpUHBFkxC>9sdSMlU(d9SJ z3$FvcD;lmij8C(hUg1T44KYNZcQec|JdcxwEg^EK=L+?L&pn+a#NW`yXS{&z&nyG{ z?wRp`$%}HZuO}AyGWlY}DO4{*DH?Gb)=<07(L0NNkr_TE&hduHDSqVPRxTbZ2I!T= zs}j3$m-TybZTC84sr`@g{_Wx-(H6{DGFE`CbmZ}M%_Fe{8L`uhHP^B z<#zdD3ze^2E4y2%cV({ptd;(L<#^fBO8Tnv@#mVMOFjxC9PK*yPc_rPsyASv%GJwZ zp%bg~MF$P6{u8>sD}nrLMv0^J=9+3TNd0Rv<_}_hHQK=G3H1W9v{VkhybJZR8l{Ga z_OY4#Dv*ur5qIF>>>dbL+$LZ%EIvq6)+SX2?EKCYls|ztH(xg_Nq6l@AjnPp+Ktn# zLpJ>5;8h&{>dO95Ff!6lt!ux1yqV9O0VXJccZ?SDp)0nBD!zj$MrLito5d*6HTK1? zF`&Mtv+KssZXteQCGh3f>KQ69bWdrTkLwbn*aDInKXWZq?GCZ%jwZG9EM@s8%D~y+ ze1D=4zoVDxH;nGIT)-4@xHWKvRtJOE>-Pz{b059_>VEn4zF^e)wW8?ou=8od{+25Z zWYz^K!VBA*9@f%&k`hsIv-!`OxFSo24&6o9JnPSRWq6EKvNW8A+ZmqzETepr!daP+m zq2Fv>6#wOWSb5~8Z@x#5y}2a*?!)6Pd+GR__yQH ztnouu4jBHh=l)8@x0p1Hdw;AM7WSFRApDR$2|d2b(0-}9CnXbqm(^PZrZpG?X& z_<{!iaG4tWhvr88gq`q@`(mRzp2>aG@{?^*gKf|tP6gU2xp~%@Xq!zM(jCP-rjhrd z+aByOCa2Ms=IP=d{k%Cj?d%7bCygk#i}{{4bh}e$=ybU`i|#c)Exr%dzSr-7*7T0*nvpW0uI`vDx4pp3)k!S@5zy}vK+Qk0=(0J|kLZ4BB=bpQQbskPDe zXsXmS*6q8`KGj~-3JTt*BL_;N+Cb&MOLX->Rn%=@CNP7hbN?zXW)jCk=)r(GRS zik}AmvLjiDkLcU z)O=vPp_i!X;2!7aU45E+8pU;{(}Ye0;~^^R%oYKv@0`4%H`dTH!TBz}RD5B4EBZVh z#@~4e-vpdh4b%M((N~4(^uL`Yab=?n&5e;-w5(Sf&F;!i4FHP;wim4f?S8bphc?>P zHPaiOa}lFC82wkYF0}uN)@gD5OV{K${JvxzUo=MeNX+2aLroFh(}{+b3$zL!w_$t< Z`mDg|;1|a>>CqgbZsE|>T~a4^{2zUWfBOIc diff --git a/contracts/wasm/fairroulette/test/fairroulette_bg.wasm b/contracts/wasm/fairroulette/test/fairroulette_bg.wasm index a091d5d23ee1626b7ec805008452ec20a72afa48..851a0e51b6de7120afe74a8966ac6d5e9154de61 100644 GIT binary patch delta 4547 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 F{{WRDMTP(X diff --git a/contracts/wasm/inccounter/test/inccounter_bg.wasm b/contracts/wasm/inccounter/test/inccounter_bg.wasm index d2b4cc258cc1a65fbdcde0670a576746103b5a79..8bae507b0253fa8e64d0664595c93ea1c34a09ff 100644 GIT binary patch delta 4423 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 diff --git a/contracts/wasm/testwasmlib/go/testwasmlib/consts.go b/contracts/wasm/testwasmlib/go/testwasmlib/consts.go index 05dc5882fa..b28384f1f9 100644 --- a/contracts/wasm/testwasmlib/go/testwasmlib/consts.go +++ b/contracts/wasm/testwasmlib/go/testwasmlib/consts.go @@ -19,6 +19,7 @@ const ( ParamAddress = "address" ParamAgentID = "agentID" ParamBlockIndex = "blockIndex" + ParamBool = "bool" ParamBytes = "bytes" ParamChainID = "chainID" ParamColor = "color" @@ -28,11 +29,16 @@ const ( ParamInt16 = "int16" ParamInt32 = "int32" ParamInt64 = "int64" + ParamInt8 = "int8" ParamName = "name" ParamParam = "this" ParamRecordIndex = "recordIndex" ParamRequestID = "requestID" ParamString = "string" + ParamUint16 = "uint16" + ParamUint32 = "uint32" + ParamUint64 = "uint64" + ParamUint8 = "uint8" ParamValue = "value" ) diff --git a/contracts/wasm/testwasmlib/go/testwasmlib/keys.go b/contracts/wasm/testwasmlib/go/testwasmlib/keys.go index bd0abd63c1..e5d6841858 100644 --- a/contracts/wasm/testwasmlib/go/testwasmlib/keys.go +++ b/contracts/wasm/testwasmlib/go/testwasmlib/keys.go @@ -13,39 +13,46 @@ const ( IdxParamAddress = 0 IdxParamAgentID = 1 IdxParamBlockIndex = 2 - IdxParamBytes = 3 - IdxParamChainID = 4 - IdxParamColor = 5 - IdxParamHash = 6 - IdxParamHname = 7 - IdxParamIndex = 8 - IdxParamInt16 = 9 - IdxParamInt32 = 10 - IdxParamInt64 = 11 - IdxParamName = 12 - IdxParamParam = 13 - IdxParamRecordIndex = 14 - IdxParamRequestID = 15 - IdxParamString = 16 - IdxParamValue = 17 + IdxParamBool = 3 + IdxParamBytes = 4 + IdxParamChainID = 5 + IdxParamColor = 6 + IdxParamHash = 7 + IdxParamHname = 8 + IdxParamIndex = 9 + IdxParamInt16 = 10 + IdxParamInt32 = 11 + IdxParamInt64 = 12 + IdxParamInt8 = 13 + IdxParamName = 14 + IdxParamParam = 15 + IdxParamRecordIndex = 16 + IdxParamRequestID = 17 + IdxParamString = 18 + IdxParamUint16 = 19 + IdxParamUint32 = 20 + IdxParamUint64 = 21 + IdxParamUint8 = 22 + IdxParamValue = 23 - IdxResultCount = 18 - IdxResultIotas = 19 - IdxResultLength = 20 - IdxResultRandom = 21 - IdxResultRecord = 22 - IdxResultValue = 23 + IdxResultCount = 24 + IdxResultIotas = 25 + IdxResultLength = 26 + IdxResultRandom = 27 + IdxResultRecord = 28 + IdxResultValue = 29 - IdxStateArrays = 24 - IdxStateRandom = 25 + IdxStateArrays = 30 + IdxStateRandom = 31 ) -const keyMapLen = 26 +const keyMapLen = 32 var keyMap = [keyMapLen]wasmlib.Key{ ParamAddress, ParamAgentID, ParamBlockIndex, + ParamBool, ParamBytes, ParamChainID, ParamColor, @@ -55,11 +62,16 @@ var keyMap = [keyMapLen]wasmlib.Key{ ParamInt16, ParamInt32, ParamInt64, + ParamInt8, ParamName, ParamParam, ParamRecordIndex, ParamRequestID, ParamString, + ParamUint16, + ParamUint32, + ParamUint64, + ParamUint8, ParamValue, ResultCount, ResultIotas, diff --git a/contracts/wasm/testwasmlib/go/testwasmlib/params.go b/contracts/wasm/testwasmlib/go/testwasmlib/params.go index 668e7b8e07..c31fca95d0 100644 --- a/contracts/wasm/testwasmlib/go/testwasmlib/params.go +++ b/contracts/wasm/testwasmlib/go/testwasmlib/params.go @@ -93,6 +93,10 @@ func (s ImmutableParamTypesParams) AgentID() wasmlib.ScImmutableAgentID { return wasmlib.NewScImmutableAgentID(s.id, idxMap[IdxParamAgentID]) } +func (s ImmutableParamTypesParams) Bool() wasmlib.ScImmutableBool { + return wasmlib.NewScImmutableBool(s.id, idxMap[IdxParamBool]) +} + func (s ImmutableParamTypesParams) Bytes() wasmlib.ScImmutableBytes { return wasmlib.NewScImmutableBytes(s.id, idxMap[IdxParamBytes]) } @@ -125,6 +129,10 @@ func (s ImmutableParamTypesParams) Int64() wasmlib.ScImmutableInt64 { return wasmlib.NewScImmutableInt64(s.id, idxMap[IdxParamInt64]) } +func (s ImmutableParamTypesParams) Int8() wasmlib.ScImmutableInt8 { + return wasmlib.NewScImmutableInt8(s.id, idxMap[IdxParamInt8]) +} + func (s ImmutableParamTypesParams) Param() MapStringToImmutableBytes { return MapStringToImmutableBytes{objID: s.id} } @@ -137,6 +145,22 @@ func (s ImmutableParamTypesParams) String() wasmlib.ScImmutableString { return wasmlib.NewScImmutableString(s.id, idxMap[IdxParamString]) } +func (s ImmutableParamTypesParams) Uint16() wasmlib.ScImmutableUint16 { + return wasmlib.NewScImmutableUint16(s.id, idxMap[IdxParamUint16]) +} + +func (s ImmutableParamTypesParams) Uint32() wasmlib.ScImmutableUint32 { + return wasmlib.NewScImmutableUint32(s.id, idxMap[IdxParamUint32]) +} + +func (s ImmutableParamTypesParams) Uint64() wasmlib.ScImmutableUint64 { + return wasmlib.NewScImmutableUint64(s.id, idxMap[IdxParamUint64]) +} + +func (s ImmutableParamTypesParams) Uint8() wasmlib.ScImmutableUint8 { + return wasmlib.NewScImmutableUint8(s.id, idxMap[IdxParamUint8]) +} + type MapStringToMutableBytes struct { objID int32 } @@ -161,6 +185,10 @@ func (s MutableParamTypesParams) AgentID() wasmlib.ScMutableAgentID { return wasmlib.NewScMutableAgentID(s.id, idxMap[IdxParamAgentID]) } +func (s MutableParamTypesParams) Bool() wasmlib.ScMutableBool { + return wasmlib.NewScMutableBool(s.id, idxMap[IdxParamBool]) +} + func (s MutableParamTypesParams) Bytes() wasmlib.ScMutableBytes { return wasmlib.NewScMutableBytes(s.id, idxMap[IdxParamBytes]) } @@ -193,6 +221,10 @@ func (s MutableParamTypesParams) Int64() wasmlib.ScMutableInt64 { return wasmlib.NewScMutableInt64(s.id, idxMap[IdxParamInt64]) } +func (s MutableParamTypesParams) Int8() wasmlib.ScMutableInt8 { + return wasmlib.NewScMutableInt8(s.id, idxMap[IdxParamInt8]) +} + func (s MutableParamTypesParams) Param() MapStringToMutableBytes { return MapStringToMutableBytes{objID: s.id} } @@ -205,6 +237,22 @@ func (s MutableParamTypesParams) String() wasmlib.ScMutableString { return wasmlib.NewScMutableString(s.id, idxMap[IdxParamString]) } +func (s MutableParamTypesParams) Uint16() wasmlib.ScMutableUint16 { + return wasmlib.NewScMutableUint16(s.id, idxMap[IdxParamUint16]) +} + +func (s MutableParamTypesParams) Uint32() wasmlib.ScMutableUint32 { + return wasmlib.NewScMutableUint32(s.id, idxMap[IdxParamUint32]) +} + +func (s MutableParamTypesParams) Uint64() wasmlib.ScMutableUint64 { + return wasmlib.NewScMutableUint64(s.id, idxMap[IdxParamUint64]) +} + +func (s MutableParamTypesParams) Uint8() wasmlib.ScMutableUint8 { + return wasmlib.NewScMutableUint8(s.id, idxMap[IdxParamUint8]) +} + type ImmutableArrayLengthParams struct { id int32 } diff --git a/contracts/wasm/testwasmlib/go/testwasmlib/testwasmlib.go b/contracts/wasm/testwasmlib/go/testwasmlib/testwasmlib.go index fcf6fab30a..dba9a43d1f 100644 --- a/contracts/wasm/testwasmlib/go/testwasmlib/testwasmlib.go +++ b/contracts/wasm/testwasmlib/go/testwasmlib/testwasmlib.go @@ -17,6 +17,9 @@ func funcParamTypes(ctx wasmlib.ScFuncContext, f *ParamTypesContext) { if f.Params.AgentID().Exists() { ctx.Require(f.Params.AgentID().Value() == ctx.AccountID(), "mismatch: AgentID") } + if f.Params.Bool().Exists() { + ctx.Require(f.Params.Bool().Value(), "mismatch: Bool") + } if f.Params.Bytes().Exists() { byteData := []byte("these are bytes") ctx.Require(bytes.Equal(f.Params.Bytes().Value(), byteData), "mismatch: Bytes") @@ -35,14 +38,17 @@ func funcParamTypes(ctx wasmlib.ScFuncContext, f *ParamTypesContext) { if f.Params.Hname().Exists() { ctx.Require(f.Params.Hname().Value() == ctx.AccountID().Hname(), "mismatch: Hname") } + if f.Params.Int8().Exists() { + ctx.Require(f.Params.Int8().Value() == -123, "mismatch: Int8") + } if f.Params.Int16().Exists() { - ctx.Require(f.Params.Int16().Value() == 12345, "mismatch: Int16") + ctx.Require(f.Params.Int16().Value() == -12345, "mismatch: Int16") } if f.Params.Int32().Exists() { - ctx.Require(f.Params.Int32().Value() == 1234567890, "mismatch: Int32") + ctx.Require(f.Params.Int32().Value() == -1234567890, "mismatch: Int32") } if f.Params.Int64().Exists() { - ctx.Require(f.Params.Int64().Value() == 1234567890123456789, "mismatch: Int64") + ctx.Require(f.Params.Int64().Value() == -1234567890123456789, "mismatch: Int64") } if f.Params.RequestID().Exists() { requestID := wasmlib.NewScRequestIDFromBytes([]byte("abcdefghijklmnopqrstuvwxyz123456\x00\x00")) @@ -51,6 +57,18 @@ func funcParamTypes(ctx wasmlib.ScFuncContext, f *ParamTypesContext) { if f.Params.String().Exists() { ctx.Require(f.Params.String().Value() == "this is a string", "mismatch: String") } + if f.Params.Uint8().Exists() { + ctx.Require(f.Params.Uint8().Value() == 123, "mismatch: Uint8") + } + if f.Params.Uint16().Exists() { + ctx.Require(f.Params.Uint16().Value() == 12345, "mismatch: Uint16") + } + if f.Params.Uint32().Exists() { + ctx.Require(f.Params.Uint32().Value() == 1234567890, "mismatch: Uint32") + } + if f.Params.Uint64().Exists() { + ctx.Require(f.Params.Uint64().Value() == 1234567890123456789, "mismatch: Uint64") + } } func viewBlockRecord(ctx wasmlib.ScViewContext, f *BlockRecordContext) { diff --git a/contracts/wasm/testwasmlib/schema.yaml b/contracts/wasm/testwasmlib/schema.yaml index c1f0aee3e5..05b9d67cb9 100644 --- a/contracts/wasm/testwasmlib/schema.yaml +++ b/contracts/wasm/testwasmlib/schema.yaml @@ -22,17 +22,23 @@ funcs: params: address: Address? agentID: AgentID? + bool: Bool? bytes: Bytes? chainID: ChainID? color: Color? hash: Hash? hname: Hname? + int8: Int8? int16: Int16? int32: Int32? int64: Int64? param=this: map[String]Bytes? // special hook to be able to pass key/values as raw bytes requestID: RequestID? string: String? + uint8: Uint8? + uint16: Uint16? + uint32: Uint32? + uint64: Uint64? random: views: arrayLength: diff --git a/contracts/wasm/testwasmlib/src/consts.rs b/contracts/wasm/testwasmlib/src/consts.rs index 648228f143..8af1763e67 100644 --- a/contracts/wasm/testwasmlib/src/consts.rs +++ b/contracts/wasm/testwasmlib/src/consts.rs @@ -16,6 +16,7 @@ pub const HSC_NAME : ScHname = ScHname(0x89703a45); pub const PARAM_ADDRESS : &str = "address"; pub const PARAM_AGENT_ID : &str = "agentID"; pub const PARAM_BLOCK_INDEX : &str = "blockIndex"; +pub const PARAM_BOOL : &str = "bool"; pub const PARAM_BYTES : &str = "bytes"; pub const PARAM_CHAIN_ID : &str = "chainID"; pub const PARAM_COLOR : &str = "color"; @@ -25,11 +26,16 @@ pub const PARAM_INDEX : &str = "index"; pub const PARAM_INT16 : &str = "int16"; pub const PARAM_INT32 : &str = "int32"; pub const PARAM_INT64 : &str = "int64"; +pub const PARAM_INT8 : &str = "int8"; pub const PARAM_NAME : &str = "name"; pub const PARAM_PARAM : &str = "this"; pub const PARAM_RECORD_INDEX : &str = "recordIndex"; pub const PARAM_REQUEST_ID : &str = "requestID"; pub const PARAM_STRING : &str = "string"; +pub const PARAM_UINT16 : &str = "uint16"; +pub const PARAM_UINT32 : &str = "uint32"; +pub const PARAM_UINT64 : &str = "uint64"; +pub const PARAM_UINT8 : &str = "uint8"; pub const PARAM_VALUE : &str = "value"; pub const RESULT_COUNT : &str = "count"; diff --git a/contracts/wasm/testwasmlib/src/keys.rs b/contracts/wasm/testwasmlib/src/keys.rs index f59ef13b3d..f20b5ce4ed 100644 --- a/contracts/wasm/testwasmlib/src/keys.rs +++ b/contracts/wasm/testwasmlib/src/keys.rs @@ -14,38 +14,45 @@ use crate::*; pub(crate) const IDX_PARAM_ADDRESS : usize = 0; pub(crate) const IDX_PARAM_AGENT_ID : usize = 1; pub(crate) const IDX_PARAM_BLOCK_INDEX : usize = 2; -pub(crate) const IDX_PARAM_BYTES : usize = 3; -pub(crate) const IDX_PARAM_CHAIN_ID : usize = 4; -pub(crate) const IDX_PARAM_COLOR : usize = 5; -pub(crate) const IDX_PARAM_HASH : usize = 6; -pub(crate) const IDX_PARAM_HNAME : usize = 7; -pub(crate) const IDX_PARAM_INDEX : usize = 8; -pub(crate) const IDX_PARAM_INT16 : usize = 9; -pub(crate) const IDX_PARAM_INT32 : usize = 10; -pub(crate) const IDX_PARAM_INT64 : usize = 11; -pub(crate) const IDX_PARAM_NAME : usize = 12; -pub(crate) const IDX_PARAM_PARAM : usize = 13; -pub(crate) const IDX_PARAM_RECORD_INDEX : usize = 14; -pub(crate) const IDX_PARAM_REQUEST_ID : usize = 15; -pub(crate) const IDX_PARAM_STRING : usize = 16; -pub(crate) const IDX_PARAM_VALUE : usize = 17; +pub(crate) const IDX_PARAM_BOOL : usize = 3; +pub(crate) const IDX_PARAM_BYTES : usize = 4; +pub(crate) const IDX_PARAM_CHAIN_ID : usize = 5; +pub(crate) const IDX_PARAM_COLOR : usize = 6; +pub(crate) const IDX_PARAM_HASH : usize = 7; +pub(crate) const IDX_PARAM_HNAME : usize = 8; +pub(crate) const IDX_PARAM_INDEX : usize = 9; +pub(crate) const IDX_PARAM_INT16 : usize = 10; +pub(crate) const IDX_PARAM_INT32 : usize = 11; +pub(crate) const IDX_PARAM_INT64 : usize = 12; +pub(crate) const IDX_PARAM_INT8 : usize = 13; +pub(crate) const IDX_PARAM_NAME : usize = 14; +pub(crate) const IDX_PARAM_PARAM : usize = 15; +pub(crate) const IDX_PARAM_RECORD_INDEX : usize = 16; +pub(crate) const IDX_PARAM_REQUEST_ID : usize = 17; +pub(crate) const IDX_PARAM_STRING : usize = 18; +pub(crate) const IDX_PARAM_UINT16 : usize = 19; +pub(crate) const IDX_PARAM_UINT32 : usize = 20; +pub(crate) const IDX_PARAM_UINT64 : usize = 21; +pub(crate) const IDX_PARAM_UINT8 : usize = 22; +pub(crate) const IDX_PARAM_VALUE : usize = 23; -pub(crate) const IDX_RESULT_COUNT : usize = 18; -pub(crate) const IDX_RESULT_IOTAS : usize = 19; -pub(crate) const IDX_RESULT_LENGTH : usize = 20; -pub(crate) const IDX_RESULT_RANDOM : usize = 21; -pub(crate) const IDX_RESULT_RECORD : usize = 22; -pub(crate) const IDX_RESULT_VALUE : usize = 23; +pub(crate) const IDX_RESULT_COUNT : usize = 24; +pub(crate) const IDX_RESULT_IOTAS : usize = 25; +pub(crate) const IDX_RESULT_LENGTH : usize = 26; +pub(crate) const IDX_RESULT_RANDOM : usize = 27; +pub(crate) const IDX_RESULT_RECORD : usize = 28; +pub(crate) const IDX_RESULT_VALUE : usize = 29; -pub(crate) const IDX_STATE_ARRAYS : usize = 24; -pub(crate) const IDX_STATE_RANDOM : usize = 25; +pub(crate) const IDX_STATE_ARRAYS : usize = 30; +pub(crate) const IDX_STATE_RANDOM : usize = 31; -pub const KEY_MAP_LEN: usize = 26; +pub const KEY_MAP_LEN: usize = 32; pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ PARAM_ADDRESS, PARAM_AGENT_ID, PARAM_BLOCK_INDEX, + PARAM_BOOL, PARAM_BYTES, PARAM_CHAIN_ID, PARAM_COLOR, @@ -55,11 +62,16 @@ pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ PARAM_INT16, PARAM_INT32, PARAM_INT64, + PARAM_INT8, PARAM_NAME, PARAM_PARAM, PARAM_RECORD_INDEX, PARAM_REQUEST_ID, PARAM_STRING, + PARAM_UINT16, + PARAM_UINT32, + PARAM_UINT64, + PARAM_UINT8, PARAM_VALUE, RESULT_COUNT, RESULT_IOTAS, diff --git a/contracts/wasm/testwasmlib/src/params.rs b/contracts/wasm/testwasmlib/src/params.rs index 553bc61a15..aaa1f6b8b4 100644 --- a/contracts/wasm/testwasmlib/src/params.rs +++ b/contracts/wasm/testwasmlib/src/params.rs @@ -121,6 +121,10 @@ impl ImmutableParamTypesParams { ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) } + pub fn bool(&self) -> ScImmutableBool { + ScImmutableBool::new(self.id, idx_map(IDX_PARAM_BOOL)) + } + pub fn bytes(&self) -> ScImmutableBytes { ScImmutableBytes::new(self.id, idx_map(IDX_PARAM_BYTES)) } @@ -153,6 +157,10 @@ impl ImmutableParamTypesParams { ScImmutableInt64::new(self.id, idx_map(IDX_PARAM_INT64)) } + pub fn int8(&self) -> ScImmutableInt8 { + ScImmutableInt8::new(self.id, idx_map(IDX_PARAM_INT8)) + } + pub fn param(&self) -> MapStringToImmutableBytes { MapStringToImmutableBytes { obj_id: self.id } } @@ -164,6 +172,22 @@ impl ImmutableParamTypesParams { pub fn string(&self) -> ScImmutableString { ScImmutableString::new(self.id, idx_map(IDX_PARAM_STRING)) } + + pub fn uint16(&self) -> ScImmutableUint16 { + ScImmutableUint16::new(self.id, idx_map(IDX_PARAM_UINT16)) + } + + pub fn uint32(&self) -> ScImmutableUint32 { + ScImmutableUint32::new(self.id, idx_map(IDX_PARAM_UINT32)) + } + + pub fn uint64(&self) -> ScImmutableUint64 { + ScImmutableUint64::new(self.id, idx_map(IDX_PARAM_UINT64)) + } + + pub fn uint8(&self) -> ScImmutableUint8 { + ScImmutableUint8::new(self.id, idx_map(IDX_PARAM_UINT8)) + } } pub struct MapStringToMutableBytes { @@ -194,6 +218,10 @@ impl MutableParamTypesParams { ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_AGENT_ID)) } + pub fn bool(&self) -> ScMutableBool { + ScMutableBool::new(self.id, idx_map(IDX_PARAM_BOOL)) + } + pub fn bytes(&self) -> ScMutableBytes { ScMutableBytes::new(self.id, idx_map(IDX_PARAM_BYTES)) } @@ -226,6 +254,10 @@ impl MutableParamTypesParams { ScMutableInt64::new(self.id, idx_map(IDX_PARAM_INT64)) } + pub fn int8(&self) -> ScMutableInt8 { + ScMutableInt8::new(self.id, idx_map(IDX_PARAM_INT8)) + } + pub fn param(&self) -> MapStringToMutableBytes { MapStringToMutableBytes { obj_id: self.id } } @@ -237,6 +269,22 @@ impl MutableParamTypesParams { pub fn string(&self) -> ScMutableString { ScMutableString::new(self.id, idx_map(IDX_PARAM_STRING)) } + + pub fn uint16(&self) -> ScMutableUint16 { + ScMutableUint16::new(self.id, idx_map(IDX_PARAM_UINT16)) + } + + pub fn uint32(&self) -> ScMutableUint32 { + ScMutableUint32::new(self.id, idx_map(IDX_PARAM_UINT32)) + } + + pub fn uint64(&self) -> ScMutableUint64 { + ScMutableUint64::new(self.id, idx_map(IDX_PARAM_UINT64)) + } + + pub fn uint8(&self) -> ScMutableUint8 { + ScMutableUint8::new(self.id, idx_map(IDX_PARAM_UINT8)) + } } #[derive(Clone, Copy)] diff --git a/contracts/wasm/testwasmlib/src/testwasmlib.rs b/contracts/wasm/testwasmlib/src/testwasmlib.rs index 6aa8067034..ac32a8a541 100644 --- a/contracts/wasm/testwasmlib/src/testwasmlib.rs +++ b/contracts/wasm/testwasmlib/src/testwasmlib.rs @@ -32,6 +32,9 @@ pub fn func_param_types(ctx: &ScFuncContext, f: &ParamTypesContext) { if f.params.agent_id().exists() { ctx.require(f.params.agent_id().value() == ctx.account_id(), "mismatch: AgentID"); } + if f.params.bool().exists() { + ctx.require(f.params.bool().value(), "mismatch: Bool"); + } if f.params.bytes().exists() { let byte_data = "these are bytes".as_bytes(); ctx.require(f.params.bytes().value() == byte_data, "mismatch: Bytes"); @@ -50,14 +53,17 @@ pub fn func_param_types(ctx: &ScFuncContext, f: &ParamTypesContext) { if f.params.hname().exists() { ctx.require(f.params.hname().value() == ctx.account_id().hname(), "mismatch: Hname"); } + if f.params.int8().exists() { + ctx.require(f.params.int8().value() == -123, "mismatch: Int8"); + } if f.params.int16().exists() { - ctx.require(f.params.int16().value() == 12345, "mismatch: Int16"); + ctx.require(f.params.int16().value() == -12345, "mismatch: Int16"); } if f.params.int32().exists() { - ctx.require(f.params.int32().value() == 1234567890, "mismatch: Int32"); + ctx.require(f.params.int32().value() == -1234567890, "mismatch: Int32"); } if f.params.int64().exists() { - ctx.require(f.params.int64().value() == 1234567890123456789, "mismatch: Int64"); + ctx.require(f.params.int64().value() == -1234567890123456789, "mismatch: Int64"); } if f.params.request_id().exists() { let request_id = ScRequestID::from_bytes("abcdefghijklmnopqrstuvwxyz123456\x00\x00".as_bytes()); @@ -66,6 +72,18 @@ pub fn func_param_types(ctx: &ScFuncContext, f: &ParamTypesContext) { if f.params.string().exists() { ctx.require(f.params.string().value() == "this is a string", "mismatch: String"); } + if f.params.uint8().exists() { + ctx.require(f.params.uint8().value() == 123, "mismatch: Uint8"); + } + if f.params.uint16().exists() { + ctx.require(f.params.uint16().value() == 12345, "mismatch: Uint16"); + } + if f.params.uint32().exists() { + ctx.require(f.params.uint32().value() == 1234567890, "mismatch: Uint32"); + } + if f.params.uint64().exists() { + ctx.require(f.params.uint64().value() == 1234567890123456789, "mismatch: Uint64"); + } } pub fn view_array_length(_ctx: &ScViewContext, f: &ArrayLengthContext) { diff --git a/contracts/wasm/testwasmlib/test/testwasmlib_bg.wasm b/contracts/wasm/testwasmlib/test/testwasmlib_bg.wasm index 6a12ee28334458bbc65054e23a72d06a4e927b93..8a09327b5c81f77601d6834c627bda9828be7b23 100644 GIT binary patch delta 15386 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 delta 14194 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 PI0-U38y)h4=8gXcj2N1$ diff --git a/contracts/wasm/testwasmlib/test/testwasmlib_test.go b/contracts/wasm/testwasmlib/test/testwasmlib_test.go index fc8692eb82..3cc625fccc 100644 --- a/contracts/wasm/testwasmlib/test/testwasmlib_test.go +++ b/contracts/wasm/testwasmlib/test/testwasmlib_test.go @@ -18,16 +18,22 @@ var ( allParams = []string{ testwasmlib.ParamAddress, testwasmlib.ParamAgentID, + testwasmlib.ParamBool, testwasmlib.ParamChainID, testwasmlib.ParamColor, testwasmlib.ParamHash, testwasmlib.ParamHname, + testwasmlib.ParamInt8, testwasmlib.ParamInt16, testwasmlib.ParamInt32, testwasmlib.ParamInt64, testwasmlib.ParamRequestID, + testwasmlib.ParamUint8, + testwasmlib.ParamUint16, + testwasmlib.ParamUint32, + testwasmlib.ParamUint64, } - allLengths = []int{33, 37, 33, 32, 32, 4, 2, 4, 8, 34} + allLengths = []int{33, 37, 1, 33, 32, 32, 4, 1, 2, 4, 8, 34, 1, 2, 4, 8} invalidValues = map[wasmlib.Key][][]byte{ testwasmlib.ParamAddress: { append([]byte{3}, zeroHash...), @@ -79,16 +85,22 @@ func testValidParams(t *testing.T) *wasmsolo.SoloContext { pt := testwasmlib.ScFuncs.ParamTypes(ctx) pt.Params.Address().SetValue(ctx.ChainID().Address()) pt.Params.AgentID().SetValue(ctx.AccountID()) + pt.Params.Bool().SetValue(true) pt.Params.Bytes().SetValue([]byte("these are bytes")) pt.Params.ChainID().SetValue(ctx.ChainID()) pt.Params.Color().SetValue(wasmlib.NewScColorFromBytes([]byte("RedGreenBlueYellowCyanBlackWhite"))) pt.Params.Hash().SetValue(wasmlib.NewScHashFromBytes([]byte("0123456789abcdeffedcba9876543210"))) pt.Params.Hname().SetValue(testwasmlib.HScName) - pt.Params.Int16().SetValue(12345) - pt.Params.Int32().SetValue(1234567890) - pt.Params.Int64().SetValue(1234567890123456789) + pt.Params.Int8().SetValue(-123) + pt.Params.Int16().SetValue(-12345) + pt.Params.Int32().SetValue(-1234567890) + pt.Params.Int64().SetValue(-1234567890123456789) pt.Params.RequestID().SetValue(wasmlib.NewScRequestIDFromBytes([]byte("abcdefghijklmnopqrstuvwxyz123456\x00\x00"))) pt.Params.String().SetValue("this is a string") + pt.Params.Uint8().SetValue(123) + pt.Params.Uint16().SetValue(12345) + pt.Params.Uint32().SetValue(1234567890) + pt.Params.Uint64().SetValue(1234567890123456789) pt.Func.TransferIotas(1).Post() require.NoError(t, ctx.Err) return ctx diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/consts.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/consts.ts index 452ab61090..a6a3b0d49c 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/consts.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/consts.ts @@ -14,6 +14,7 @@ export const HScName = new wasmlib.ScHname(0x89703a45); export const ParamAddress = "address"; export const ParamAgentID = "agentID"; export const ParamBlockIndex = "blockIndex"; +export const ParamBool = "bool"; export const ParamBytes = "bytes"; export const ParamChainID = "chainID"; export const ParamColor = "color"; @@ -23,11 +24,16 @@ export const ParamIndex = "index"; export const ParamInt16 = "int16"; export const ParamInt32 = "int32"; export const ParamInt64 = "int64"; +export const ParamInt8 = "int8"; export const ParamName = "name"; export const ParamParam = "this"; export const ParamRecordIndex = "recordIndex"; export const ParamRequestID = "requestID"; export const ParamString = "string"; +export const ParamUint16 = "uint16"; +export const ParamUint32 = "uint32"; +export const ParamUint64 = "uint64"; +export const ParamUint8 = "uint8"; export const ParamValue = "value"; export const ResultCount = "count"; diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/keys.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/keys.ts index 415ad2feea..a67473b453 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/keys.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/keys.ts @@ -11,36 +11,43 @@ import * as sc from "./index"; export const IdxParamAddress = 0; export const IdxParamAgentID = 1; export const IdxParamBlockIndex = 2; -export const IdxParamBytes = 3; -export const IdxParamChainID = 4; -export const IdxParamColor = 5; -export const IdxParamHash = 6; -export const IdxParamHname = 7; -export const IdxParamIndex = 8; -export const IdxParamInt16 = 9; -export const IdxParamInt32 = 10; -export const IdxParamInt64 = 11; -export const IdxParamName = 12; -export const IdxParamParam = 13; -export const IdxParamRecordIndex = 14; -export const IdxParamRequestID = 15; -export const IdxParamString = 16; -export const IdxParamValue = 17; +export const IdxParamBool = 3; +export const IdxParamBytes = 4; +export const IdxParamChainID = 5; +export const IdxParamColor = 6; +export const IdxParamHash = 7; +export const IdxParamHname = 8; +export const IdxParamIndex = 9; +export const IdxParamInt16 = 10; +export const IdxParamInt32 = 11; +export const IdxParamInt64 = 12; +export const IdxParamInt8 = 13; +export const IdxParamName = 14; +export const IdxParamParam = 15; +export const IdxParamRecordIndex = 16; +export const IdxParamRequestID = 17; +export const IdxParamString = 18; +export const IdxParamUint16 = 19; +export const IdxParamUint32 = 20; +export const IdxParamUint64 = 21; +export const IdxParamUint8 = 22; +export const IdxParamValue = 23; -export const IdxResultCount = 18; -export const IdxResultIotas = 19; -export const IdxResultLength = 20; -export const IdxResultRandom = 21; -export const IdxResultRecord = 22; -export const IdxResultValue = 23; +export const IdxResultCount = 24; +export const IdxResultIotas = 25; +export const IdxResultLength = 26; +export const IdxResultRandom = 27; +export const IdxResultRecord = 28; +export const IdxResultValue = 29; -export const IdxStateArrays = 24; -export const IdxStateRandom = 25; +export const IdxStateArrays = 30; +export const IdxStateRandom = 31; export let keyMap: string[] = [ sc.ParamAddress, sc.ParamAgentID, sc.ParamBlockIndex, + sc.ParamBool, sc.ParamBytes, sc.ParamChainID, sc.ParamColor, @@ -50,11 +57,16 @@ export let keyMap: string[] = [ sc.ParamInt16, sc.ParamInt32, sc.ParamInt64, + sc.ParamInt8, sc.ParamName, sc.ParamParam, sc.ParamRecordIndex, sc.ParamRequestID, sc.ParamString, + sc.ParamUint16, + sc.ParamUint32, + sc.ParamUint64, + sc.ParamUint8, sc.ParamValue, sc.ResultCount, sc.ResultIotas, diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/params.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/params.ts index 1802402c5d..d70bdc0180 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/params.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/params.ts @@ -81,6 +81,10 @@ export class ImmutableParamTypesParams extends wasmlib.ScMapID { return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); } + bool(): wasmlib.ScImmutableBool { + return new wasmlib.ScImmutableBool(this.mapID, sc.idxMap[sc.IdxParamBool]); + } + bytes(): wasmlib.ScImmutableBytes { return new wasmlib.ScImmutableBytes(this.mapID, sc.idxMap[sc.IdxParamBytes]); } @@ -113,6 +117,10 @@ export class ImmutableParamTypesParams extends wasmlib.ScMapID { return new wasmlib.ScImmutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64]); } + int8(): wasmlib.ScImmutableInt8 { + return new wasmlib.ScImmutableInt8(this.mapID, sc.idxMap[sc.IdxParamInt8]); + } + param(): sc.MapStringToImmutableBytes { return new sc.MapStringToImmutableBytes(this.mapID); } @@ -124,6 +132,22 @@ export class ImmutableParamTypesParams extends wasmlib.ScMapID { string(): wasmlib.ScImmutableString { return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamString]); } + + uint16(): wasmlib.ScImmutableUint16 { + return new wasmlib.ScImmutableUint16(this.mapID, sc.idxMap[sc.IdxParamUint16]); + } + + uint32(): wasmlib.ScImmutableUint32 { + return new wasmlib.ScImmutableUint32(this.mapID, sc.idxMap[sc.IdxParamUint32]); + } + + uint64(): wasmlib.ScImmutableUint64 { + return new wasmlib.ScImmutableUint64(this.mapID, sc.idxMap[sc.IdxParamUint64]); + } + + uint8(): wasmlib.ScImmutableUint8 { + return new wasmlib.ScImmutableUint8(this.mapID, sc.idxMap[sc.IdxParamUint8]); + } } export class MapStringToMutableBytes { @@ -151,6 +175,10 @@ export class MutableParamTypesParams extends wasmlib.ScMapID { return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamAgentID]); } + bool(): wasmlib.ScMutableBool { + return new wasmlib.ScMutableBool(this.mapID, sc.idxMap[sc.IdxParamBool]); + } + bytes(): wasmlib.ScMutableBytes { return new wasmlib.ScMutableBytes(this.mapID, sc.idxMap[sc.IdxParamBytes]); } @@ -183,6 +211,10 @@ export class MutableParamTypesParams extends wasmlib.ScMapID { return new wasmlib.ScMutableInt64(this.mapID, sc.idxMap[sc.IdxParamInt64]); } + int8(): wasmlib.ScMutableInt8 { + return new wasmlib.ScMutableInt8(this.mapID, sc.idxMap[sc.IdxParamInt8]); + } + param(): sc.MapStringToMutableBytes { return new sc.MapStringToMutableBytes(this.mapID); } @@ -194,6 +226,22 @@ export class MutableParamTypesParams extends wasmlib.ScMapID { string(): wasmlib.ScMutableString { return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamString]); } + + uint16(): wasmlib.ScMutableUint16 { + return new wasmlib.ScMutableUint16(this.mapID, sc.idxMap[sc.IdxParamUint16]); + } + + uint32(): wasmlib.ScMutableUint32 { + return new wasmlib.ScMutableUint32(this.mapID, sc.idxMap[sc.IdxParamUint32]); + } + + uint64(): wasmlib.ScMutableUint64 { + return new wasmlib.ScMutableUint64(this.mapID, sc.idxMap[sc.IdxParamUint64]); + } + + uint8(): wasmlib.ScMutableUint8 { + return new wasmlib.ScMutableUint8(this.mapID, sc.idxMap[sc.IdxParamUint8]); + } } export class ImmutableArrayLengthParams extends wasmlib.ScMapID { diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/testwasmlib.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/testwasmlib.ts index f6a42c4294..1bfc31f7bd 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/testwasmlib.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/testwasmlib.ts @@ -32,6 +32,9 @@ export function funcParamTypes(ctx: wasmlib.ScFuncContext, f: sc.ParamTypesConte if (f.params.agentID().exists()) { ctx.require(f.params.agentID().value().equals(ctx.accountID()), "mismatch: AgentID"); } + if (f.params.bool().exists()) { + ctx.require(f.params.bool().value(), "mismatch: Bool"); + } if (f.params.bytes().exists()) { let byteData = wasmlib.Convert.fromString("these are bytes"); ctx.require(wasmlib.Convert.equals(f.params.bytes().value(), byteData), "mismatch: Bytes"); @@ -50,14 +53,17 @@ export function funcParamTypes(ctx: wasmlib.ScFuncContext, f: sc.ParamTypesConte if (f.params.hname().exists()) { ctx.require(f.params.hname().value().equals(ctx.accountID().hname()), "mismatch: Hname"); } + if (f.params.int8().exists()) { + ctx.require(f.params.int8().value() == -123, "mismatch: Int8"); + } if (f.params.int16().exists()) { - ctx.require(f.params.int16().value() == 12345, "mismatch: Int16"); + ctx.require(f.params.int16().value() == -12345, "mismatch: Int16"); } if (f.params.int32().exists()) { - ctx.require(f.params.int32().value() == 1234567890, "mismatch: Int32"); + ctx.require(f.params.int32().value() == -1234567890, "mismatch: Int32"); } if (f.params.int64().exists()) { - ctx.require(f.params.int64().value() == 1234567890123456789, "mismatch: Int64"); + ctx.require(f.params.int64().value() == -1234567890123456789, "mismatch: Int64"); } if (f.params.requestID().exists()) { let requestId = wasmlib.ScRequestID.fromBytes(wasmlib.Convert.fromString("abcdefghijklmnopqrstuvwxyz123456\x00\x00")); @@ -66,6 +72,18 @@ export function funcParamTypes(ctx: wasmlib.ScFuncContext, f: sc.ParamTypesConte if (f.params.string().exists()) { ctx.require(f.params.string().value() == "this is a string", "mismatch: String"); } + if (f.params.uint8().exists()) { + ctx.require(f.params.uint8().value() == 123, "mismatch: Uint8"); + } + if (f.params.uint16().exists()) { + ctx.require(f.params.uint16().value() == 12345, "mismatch: Uint16"); + } + if (f.params.uint32().exists()) { + ctx.require(f.params.uint32().value() == 1234567890, "mismatch: Uint32"); + } + if (f.params.uint64().exists()) { + ctx.require(f.params.uint64().value() == 1234567890123456789, "mismatch: Uint64"); + } } export function viewArrayLength(ctx: wasmlib.ScViewContext, f: sc.ArrayLengthContext): void { diff --git a/packages/vm/wasmlib/go/wasmlib/bytes.go b/packages/vm/wasmlib/go/wasmlib/bytes.go index 6c17e5ebe8..3800daceb4 100644 --- a/packages/vm/wasmlib/go/wasmlib/bytes.go +++ b/packages/vm/wasmlib/go/wasmlib/bytes.go @@ -22,6 +22,10 @@ func (d *BytesDecoder) AgentID() ScAgentID { return NewScAgentIDFromBytes(d.Bytes()) } +func (d *BytesDecoder) Bool() bool { + return d.Int8() != 0 +} + func (d *BytesDecoder) Bytes() []byte { size := int(d.Int32()) if len(d.data) < size { @@ -54,6 +58,15 @@ func (d *BytesDecoder) Hname() ScHname { return NewScHnameFromBytes(d.Bytes()) } +func (d *BytesDecoder) Int8() int8 { + if len(d.data) == 0 { + panic("insufficient bytes") + } + value := d.data[0] + d.data = d.data[1:] + return int8(value) +} + func (d *BytesDecoder) Int16() int16 { return int16(d.leb128Decode(16)) } @@ -103,6 +116,22 @@ func (d *BytesDecoder) String() string { return string(d.Bytes()) } +func (d *BytesDecoder) Uint8() uint8 { + return uint8(d.Int8()) +} + +func (d *BytesDecoder) Uint16() uint16 { + return uint16(d.Int16()) +} + +func (d *BytesDecoder) Uint32() uint32 { + return uint32(d.Int32()) +} + +func (d *BytesDecoder) Uint64() uint64 { + return uint64(d.Int64()) +} + // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ type BytesEncoder struct { @@ -121,6 +150,13 @@ func (e *BytesEncoder) AgentID(value ScAgentID) *BytesEncoder { return e.Bytes(value.Bytes()) } +func (e *BytesEncoder) Bool(value bool) *BytesEncoder { + if value { + return e.Int8(1) + } + return e.Int8(0) +} + func (e *BytesEncoder) Bytes(value []byte) *BytesEncoder { e.Int32(int32(len(value))) e.data = append(e.data, value...) @@ -147,6 +183,11 @@ func (e *BytesEncoder) Hname(value ScHname) *BytesEncoder { return e.Bytes(value.Bytes()) } +func (e *BytesEncoder) Int8(value int8) *BytesEncoder { + e.data = append(e.data, byte(value)) + return e +} + func (e *BytesEncoder) Int16(value int16) *BytesEncoder { return e.leb128Encode(int64(value)) } @@ -180,3 +221,19 @@ func (e *BytesEncoder) RequestID(value ScRequestID) *BytesEncoder { func (e *BytesEncoder) String(value string) *BytesEncoder { return e.Bytes([]byte(value)) } + +func (e *BytesEncoder) Uint8(value uint8) *BytesEncoder { + return e.Int8(int8(value)) +} + +func (e *BytesEncoder) Uint16(value uint16) *BytesEncoder { + return e.Int16(int16(value)) +} + +func (e *BytesEncoder) Uint32(value uint32) *BytesEncoder { + return e.Int32(int32(value)) +} + +func (e *BytesEncoder) Uint64(value uint64) *BytesEncoder { + return e.Int64(int64(value)) +} diff --git a/packages/vm/wasmlib/src/bytes.rs b/packages/vm/wasmlib/src/bytes.rs index 50d582bb6d..1d89dd780d 100644 --- a/packages/vm/wasmlib/src/bytes.rs +++ b/packages/vm/wasmlib/src/bytes.rs @@ -28,6 +28,11 @@ impl BytesDecoder<'_> { ScAgentID::from_bytes(self.bytes()) } + // decodes a bool from the byte buffer + pub fn bool(&mut self) -> bool { + self.int8() != 0 + } + // decodes the next substring of bytes from the byte buffer pub fn bytes(&mut self) -> &[u8] { let size = self.int32() as usize; @@ -59,6 +64,16 @@ impl BytesDecoder<'_> { ScHname::from_bytes(self.bytes()) } + // decodes an int8 from the byte buffer + pub fn int8(&mut self) -> i8 { + if self.buf.len() == 0 { + panic("insufficient bytes"); + } + let val = self.buf[0] as i8; + self.buf = &self.buf[1..]; + val + } + // decodes an int16 from the byte buffer // note that these are encoded using leb128 encoding to conserve space pub fn int16(&mut self) -> i16 { @@ -117,6 +132,29 @@ impl BytesDecoder<'_> { pub fn string(&mut self) -> String { String::from_utf8_lossy(self.bytes()).to_string() } + + // decodes an uint8 from the byte buffer + pub fn uint8(&mut self) -> u8 { + self.int8() as u8 + } + + // decodes an uint16 from the byte buffer + // note that these are encoded using leb128 encoding to conserve space + pub fn uint16(&mut self) -> u16 { + self.int16() as u16 + } + + // decodes an uint32 from the byte buffer + // note that these are encoded using leb128 encoding to conserve space + pub fn uint32(&mut self) -> u32 { + self.int32() as u32 + } + + // decodes an uint64 from the byte buffer + // note that these are encoded using leb128 encoding to conserve space + pub fn uint64(&mut self) -> u64 { + self.int64() as u64 + } } impl Drop for BytesDecoder<'_> { @@ -150,6 +188,14 @@ impl BytesEncoder { self.bytes(value.to_bytes()) } + // encodes a bool into the byte buffer + pub fn bool(&mut self, val: bool) -> &BytesEncoder { + if val { + return self.int8(1); + } + self.int8(0) + } + // encodes a substring of bytes into the byte buffer pub fn bytes(&mut self, value: &[u8]) -> &BytesEncoder { self.int32(value.len() as i32); @@ -182,6 +228,12 @@ impl BytesEncoder { self.bytes(&value.to_bytes()) } + // encodes an int8 into the byte buffer + pub fn int8(&mut self, val: i8) -> &BytesEncoder { + self.buf.push(val as u8); + self + } + // encodes an int16 into the byte buffer // note that these are encoded using leb128 encoding to conserve space pub fn int16(&mut self, val: i16) -> &BytesEncoder { @@ -223,4 +275,27 @@ impl BytesEncoder { pub fn string(&mut self, value: &str) -> &BytesEncoder { self.bytes(value.as_bytes()) } + + // encodes an uint8 into the byte buffer + pub fn uint8(&mut self, val: u8) -> &BytesEncoder { + self.int8(val as i8) + } + + // encodes an uint16 into the byte buffer + // note that these are encoded using leb128 encoding to conserve space + pub fn uint16(&mut self, val: u16) -> &BytesEncoder { + self.int16(val as i16) + } + + // encodes an uint32 into the byte buffer + // note that these are encoded using leb128 encoding to conserve space + pub fn uint32(&mut self, val: u32) -> &BytesEncoder { + self.int32(val as i32) + } + + // encodes an uint64 into the byte buffer + // note that these are encoded using leb128 encoding to conserve space + pub fn uint64(&mut self, val: u64) -> &BytesEncoder { + self.int64(val as i64) + } } diff --git a/packages/vm/wasmlib/ts/wasmlib/bytes.ts b/packages/vm/wasmlib/ts/wasmlib/bytes.ts index 557b16b3c5..d62a624d2a 100644 --- a/packages/vm/wasmlib/ts/wasmlib/bytes.ts +++ b/packages/vm/wasmlib/ts/wasmlib/bytes.ts @@ -27,6 +27,11 @@ export class BytesDecoder { return ScAgentID.fromBytes(this.bytes()); } + // decodes a bool from the byte buffer + bool(): boolean { + return this.int8() != 0; + } + // decodes the next substring of bytes from the byte buffer bytes(): u8[] { let size = this.int32(); @@ -58,6 +63,11 @@ export class BytesDecoder { return ScHname.fromBytes(this.bytes()); } + // decodes an int8 from the byte buffer + int8(): i8 { + return this.buf.shift() as i8; + } + // decodes an int16 from the byte buffer // note that these are encoded using leb128 encoding to conserve space int16(): i16 { @@ -118,6 +128,29 @@ export class BytesDecoder { return Convert.toString(this.bytes()); } + // decodes an uint8 from the byte buffer + uint8(): u8 { + return this.int8() as u8; + } + + // decodes an uint16 from the byte buffer + // note that these are encoded using leb128 encoding to conserve space + uint16(): u16 { + return this.int16() as u16; + } + + // decodes an uint32 from the byte buffer + // note that these are encoded using leb128 encoding to conserve space + uint32(): u32 { + return this.int32() as u32; + } + + // decodes an uint64 from the byte buffer + // note that these are encoded using leb128 encoding to conserve space + uint64(): u64 { + return this.int64() as u64; + } + close(): void { if (this.buf.length != 0) { panic("extra bytes"); @@ -146,6 +179,14 @@ export class BytesEncoder { return this.bytes(value.toBytes()); } + // encodes a bool into the byte buffer + bool(val: boolean): BytesEncoder { + if (val) { + return this.int8(1); + } + return this.int8(0); + } + // encodes a substring of bytes into the byte buffer bytes(value: u8[]): BytesEncoder { this.int32(value.length); @@ -180,6 +221,12 @@ export class BytesEncoder { return this.bytes(value.toBytes()); } + // encodes an int8 into the byte buffer + int8(val: i8): BytesEncoder { + this.buf.push(val as u8); + return this; + } + // encodes an int16 into the byte buffer // note that these are encoded using leb128 encoding to conserve space int16(val: i16): BytesEncoder { @@ -222,4 +269,27 @@ export class BytesEncoder { string(value: string): BytesEncoder { return this.bytes(Convert.fromString(value)); } + + // encodes an uint8 into the byte buffer + uint8(val: u8): BytesEncoder { + return this.int8(val as i8); + } + + // encodes an uint16 into the byte buffer + // note that these are encoded using leb128 encoding to conserve space + uint16(val: u16): BytesEncoder { + return this.int16(val as i16); + } + + // encodes an uint32 into the byte buffer + // note that these are encoded using leb128 encoding to conserve space + uint32(val: u32): BytesEncoder { + return this.int32(val as i32); + } + + // encodes an uint64 into the byte buffer + // note that these are encoded using leb128 encoding to conserve space + uint64(val: u64): BytesEncoder { + return this.int64(val as i64); + } } diff --git a/packages/vm/wasmproc/bytes.go b/packages/vm/wasmproc/bytes.go index cbc334b2bf..e05b2a6488 100644 --- a/packages/vm/wasmproc/bytes.go +++ b/packages/vm/wasmproc/bytes.go @@ -11,6 +11,10 @@ func NewBytesDecoder(data []byte) *BytesDecoder { return &BytesDecoder{data: data} } +func (d *BytesDecoder) Bool() bool { + return d.Int8() != 0 +} + func (d *BytesDecoder) Bytes() []byte { size := int(d.Int32()) if len(d.data) < size { @@ -21,6 +25,15 @@ func (d *BytesDecoder) Bytes() []byte { return value } +func (d *BytesDecoder) Int8() int8 { + if len(d.data) == 0 { + panic("insufficient bytes") + } + value := d.data[0] + d.data = d.data[1:] + return int8(value) +} + func (d *BytesDecoder) Int16() int16 { return int16(d.leb128Decode(16)) } @@ -62,6 +75,22 @@ func (d *BytesDecoder) leb128Decode(bits int) int64 { } } +func (d *BytesDecoder) Uint8() uint8 { + return uint8(d.Int8()) +} + +func (d *BytesDecoder) Uint16() uint16 { + return uint16(d.Int16()) +} + +func (d *BytesDecoder) Uint32() uint32 { + return uint32(d.Int32()) +} + +func (d *BytesDecoder) Uint64() uint64 { + return uint64(d.Int64()) +} + // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ type BytesEncoder struct { @@ -72,6 +101,13 @@ func NewBytesEncoder() *BytesEncoder { return &BytesEncoder{data: make([]byte, 0, 128)} } +func (e *BytesEncoder) Bool(value bool) *BytesEncoder { + if value { + return e.Int8(1) + } + return e.Int8(0) +} + func (e *BytesEncoder) Bytes(value []byte) *BytesEncoder { e.Int32(int32(len(value))) e.data = append(e.data, value...) @@ -82,6 +118,11 @@ func (e *BytesEncoder) Data() []byte { return e.data } +func (e *BytesEncoder) Int8(value int8) *BytesEncoder { + e.data = append(e.data, byte(value)) + return e +} + func (e *BytesEncoder) Int16(value int16) *BytesEncoder { return e.leb128Encode(int64(value)) } @@ -107,3 +148,19 @@ func (e *BytesEncoder) leb128Encode(value int64) *BytesEncoder { e.data = append(e.data, b|0x80) } } + +func (e *BytesEncoder) Uint8(value uint8) *BytesEncoder { + return e.Int8(int8(value)) +} + +func (e *BytesEncoder) Uint16(value uint16) *BytesEncoder { + return e.Int16(int16(value)) +} + +func (e *BytesEncoder) Uint32(value uint32) *BytesEncoder { + return e.Int32(int32(value)) +} + +func (e *BytesEncoder) Uint64(value uint64) *BytesEncoder { + return e.Int64(int64(value)) +} diff --git a/packages/vm/wasmsolo/solocontext.go b/packages/vm/wasmsolo/solocontext.go index 1bd87259dd..0ede0c064b 100644 --- a/packages/vm/wasmsolo/solocontext.go +++ b/packages/vm/wasmsolo/solocontext.go @@ -24,7 +24,7 @@ import ( ) const ( - SoloDebug = false + SoloDebug = true SoloHostTracing = false SoloStackTracing = false ) diff --git a/tools/cluster/tests/wasm/inccounter_bg.wasm b/tools/cluster/tests/wasm/inccounter_bg.wasm index d2b4cc258cc1a65fbdcde0670a576746103b5a79..8bae507b0253fa8e64d0664595c93ea1c34a09ff 100644 GIT binary patch delta 4423 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 From e694d648df96e9fe7549ba2239bd5341da243e80 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Thu, 25 Nov 2021 13:37:14 -0800 Subject: [PATCH 127/198] Disable debug flag --- packages/vm/wasmsolo/solocontext.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vm/wasmsolo/solocontext.go b/packages/vm/wasmsolo/solocontext.go index 0ede0c064b..1bd87259dd 100644 --- a/packages/vm/wasmsolo/solocontext.go +++ b/packages/vm/wasmsolo/solocontext.go @@ -24,7 +24,7 @@ import ( ) const ( - SoloDebug = true + SoloDebug = false SoloHostTracing = false SoloStackTracing = false ) From 3289a076b4c13cdb7819d982143a2a20ac41c430 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Thu, 25 Nov 2021 13:58:46 -0800 Subject: [PATCH 128/198] Fixed failing tests --- packages/vm/wasmsolo/solocontext.go | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/packages/vm/wasmsolo/solocontext.go b/packages/vm/wasmsolo/solocontext.go index 1bd87259dd..479ce39b22 100644 --- a/packages/vm/wasmsolo/solocontext.go +++ b/packages/vm/wasmsolo/solocontext.go @@ -344,27 +344,31 @@ func (ctx *SoloContext) upload(keyPair *ed25519.KeyPair) { return } + // start with file in test folder wasmFile := ctx.scName + "_bg.wasm" - // try Rust first - exists, _ := util.ExistsFilePath("../pkg/" + wasmFile) + // try (newer?) Rust Wasm file first + rsFile := "../pkg/" + wasmFile + exists, _ := util.ExistsFilePath(rsFile) if exists { - wasmFile = "../pkg/" + wasmFile + wasmFile = rsFile } + // try Go Wasm file? if !exists || *GoWasm { - wasmFile = ctx.scName + "_go.wasm" - exists, _ = util.ExistsFilePath("../go/pkg/" + wasmFile) + goFile := "../go/pkg/" + ctx.scName + "_go.wasm" + exists, _ = util.ExistsFilePath(goFile) if exists { - wasmFile = "../go/pkg/" + wasmFile + wasmFile = goFile } } + // try TypeScript Wasm file? if !exists || *TsWasm { - wasmFile = ctx.scName + "_ts.wasm" - exists, _ = util.ExistsFilePath("../ts/pkg/" + wasmFile) + tsFile := "../ts/pkg/" + ctx.scName + "_ts.wasm" + exists, _ = util.ExistsFilePath(tsFile) if exists { - wasmFile = "../ts/pkg/" + wasmFile + wasmFile = tsFile } } From b1059a142a1b42d5e82070984660ed98d9cf88d6 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Thu, 25 Nov 2021 17:27:28 -0800 Subject: [PATCH 129/198] Remove potential typing problem --- contracts/wasm/dividend/test/dividend_bg.wasm | Bin 32303 -> 32303 bytes .../test/donatewithfeedback_bg.wasm | Bin 36517 -> 36517 bytes contracts/wasm/erc20/test/erc20_bg.wasm | Bin 35451 -> 35451 bytes .../wasm/fairauction/test/fairauction_bg.wasm | Bin 42692 -> 42692 bytes contracts/wasm/fairroulette/client/events.ts | 114 ++++++++++++++++++ .../fairroulette/test/fairroulette_bg.wasm | Bin 40132 -> 40132 bytes .../wasm/inccounter/test/inccounter_bg.wasm | Bin 37007 -> 37007 bytes contracts/wasm/testcore/test/testcore_bg.wasm | Bin 53154 -> 53154 bytes .../wasm/testwasmlib/test/testwasmlib_bg.wasm | Bin 41299 -> 41300 bytes .../wasm/timestamp/test/timestamp_bg.wasm | Bin 28155 -> 28155 bytes .../tokenregistry/test/tokenregistry_bg.wasm | Bin 32026 -> 32026 bytes .../sbtests/sbtestsc/testcore_bg.wasm | Bin 53154 -> 53154 bytes packages/vm/wasmhost/kvstorehost.go | 6 +- packages/vm/wasmlib/go/wasmlib/host.go | 5 +- packages/vm/wasmlib/src/host.rs | 5 +- packages/vm/wasmlib/ts/wasmlib/host.ts | 5 +- tools/cluster/tests/wasm/inccounter_bg.wasm | Bin 37007 -> 37007 bytes .../generator/clienttemplates/events.go | 7 ++ 18 files changed, 133 insertions(+), 9 deletions(-) create mode 100644 contracts/wasm/fairroulette/client/events.ts diff --git a/contracts/wasm/dividend/test/dividend_bg.wasm b/contracts/wasm/dividend/test/dividend_bg.wasm index 6399772b022e6e55917ec9ae09e3cbf3d67bb839..70255dafe355e264bb3912a01784af54354873b5 100644 GIT binary patch delta 32 lcmZ4ghjINM#tprBg82*#3=%-Rf>nUQ6-dwAJTGq|KLE4A36=l= delta 32 lcmZ4ghjINM#tprBf_V%K3=%-Rf>nUQ6-dw6JTGq|KLE3(36uZ; diff --git a/contracts/wasm/donatewithfeedback/test/donatewithfeedback_bg.wasm b/contracts/wasm/donatewithfeedback/test/donatewithfeedback_bg.wasm index c9e154560c0ddd00455d8dc42bd968aa9e040118..9781c00db1bc0bd19caf60a7761503ad25e629f5 100644 GIT binary patch delta 32 lcmZ2Fmucx-rVXoW1@jpg7$kt$f=z(I6-dwAyr=f1005gz2?_uJ delta 32 lcmZ2Fmucx-rVXoW1@jmf7$kt$f=z(I6-dw6yr=f1005gX2?ziH diff --git a/contracts/wasm/erc20/test/erc20_bg.wasm b/contracts/wasm/erc20/test/erc20_bg.wasm index e0226a51d8284b83f04babefcb9b56b2e932e5ef..b237bd7325603533c507889f9b59c773753dc35a 100644 GIT binary patch delta 31 ncmex8h3WScrVXAkObv{ay<_y48W}fN#{|hS=5Ib%wU!?M$Pf$& delta 31 ncmex8h3WScrVXAkOa~Yyd&lT89c0*C9TOzSn78>{)mnZ4(5VcC diff --git a/contracts/wasm/fairauction/test/fairauction_bg.wasm b/contracts/wasm/fairauction/test/fairauction_bg.wasm index 628071624af097e296f164db4d2a319f01c732e7..058793c0986c5db274d32f2bd178f1d9b865615a 100644 GIT binary patch delta 47 zcmX?dmg&e@rVR^YGmAez4)`DU_Ju_g9H#4a0oEC0_mBXZ%=(G0066M B5BC57 delta 47 zcmX?dmg&e@rVR^>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + + +type Address = string; +type AgentID = string; +type ChainID = string; +type Color = string; +type Hash = string; +type Hname = string; +type Int16 = number; +type Int32 = number; +type Int64 = bigint; +type RequestID = string; +type String = string; + +export class FairRouletteEvents { + public static readonly EVENT_BET: string = 'fairroulette.bet'; + public static readonly EVENT_PAYOUT: string = 'fairroulette.payout'; + public static readonly EVENT_ROUND: string = 'fairroulette.round'; + public static readonly EVENT_START: string = 'fairroulette.start'; + public static readonly EVENT_STOP: string = 'fairroulette.stop'; + public static readonly EVENT_WINNER: string = 'fairroulette.winner'; +} + +export interface EventBet { + timestamp: Int32; + address: Address; + amount: Int64; + number: Int64; +} + +export interface EventPayout { + timestamp: Int32; + address: Address; + amount: Int64; +} + +export interface EventRound { + timestamp: Int32; + number: Int64; +} + +export interface EventStart { + timestamp: Int32; +} + +export interface EventStop { + timestamp: Int32; +} + +export interface EventWinner { + timestamp: Int32; + number: Int64; +} + + private handleVmMessage(message: string[]): void { + const messageHandlers: MessageHandlers = { + EVENT_BET: (index) => { + const evt: EventBet = { + timestamp: message[index + 1], + address: message[index + 2], + amount: message[index + 2], + number: message[index + 2], + }; + this.emitter.emit(EVENT_BET, evt); + }, + EVENT_PAYOUT: (index) => { + const evt: EventPayout = { + timestamp: message[index + 1], + address: message[index + 2], + amount: message[index + 2], + }; + this.emitter.emit(EVENT_PAYOUT, evt); + }, + EVENT_ROUND: (index) => { + const evt: EventRound = { + timestamp: message[index + 1], + number: message[index + 2], + }; + this.emitter.emit(EVENT_ROUND, evt); + }, + EVENT_START: (index) => { + const evt: EventStart = { + timestamp: message[index + 1], + }; + this.emitter.emit(EVENT_START, evt); + }, + EVENT_STOP: (index) => { + const evt: EventStop = { + timestamp: message[index + 1], + }; + this.emitter.emit(EVENT_STOP, evt); + }, + EVENT_WINNER: (index) => { + const evt: EventWinner = { + timestamp: message[index + 1], + number: message[index + 2], + }; + this.emitter.emit(EVENT_WINNER, evt); + }, + }; + + const topicIndex = 3; + const topic = message[topicIndex]; + + if (typeof messageHandlers[topic] != 'undefined') { + messageHandlers[topic](topicIndex); + } + } diff --git a/contracts/wasm/fairroulette/test/fairroulette_bg.wasm b/contracts/wasm/fairroulette/test/fairroulette_bg.wasm index 851a0e51b6de7120afe74a8966ac6d5e9154de61..594b9ad28a7f9b87d0c62ecdc9e78650d152399f 100644 GIT binary patch delta 47 zcmX@Ilj+D#rVUpUnHm@;Ur#h~;ua0xKD0_mBX#e3KC0|1yc B4srkh delta 47 zcmX@Ilj+D#rVUpUnGP^azMg2zbdX^)Ptq?f!8`^A1_>Zuz$L)o3Z!Rj7Vlll4*;l` B4(a};1pnR1=2G&KWbRZ4*;F#2`&Ht delta 32 lcmeBQ$ke}(X~V?^!8`^A1_>a};1pnR1=2G%KWbRZ4*;FZ2`m5r diff --git a/contracts/wasm/testcore/test/testcore_bg.wasm b/contracts/wasm/testcore/test/testcore_bg.wasm index 614212c5fff4f869285456479ee4696c739c529d..8ff1ea7b16e2117f1daeb142ca4d452ae5eb38f7 100644 GIT binary patch delta 47 zcmZ29pLx-I<_%BlnHm@;Kd(1tYGm9j(@Y#0RWF& B4sQSe delta 47 zcmZ29pLx-I<_%BlnGP^aeqL|PbdX`QOhbvSU>*Ylg9H#i5EWo>1=2G%FWk#01OT7E B4(k8_ diff --git a/contracts/wasm/testwasmlib/test/testwasmlib_bg.wasm b/contracts/wasm/testwasmlib/test/testwasmlib_bg.wasm index 8a09327b5c81f77601d6834c627bda9828be7b23..9a441d9ba38d17bcc36db5e78c79840ac41e9739 100644 GIT binary patch delta 79 zcmcb7i0R59rVaW`jJG!%FwIF}YG9mvF3p&!k#RF~`V1LiQ3eGD4JHQ1Ei(=JgBQR6 delta 78 zcmca|i0SenrVaW`jJGx$FwIF}I>0dbT$(Y{L59uD=`&=6L>LqpG?*A1x6C-e;K(Sz h>}axiUGoQC!8`^A1_>ZO!!5wz3Z!RjUO#auKL7%17mEM@ diff --git a/contracts/wasm/timestamp/test/timestamp_bg.wasm b/contracts/wasm/timestamp/test/timestamp_bg.wasm index cb253ab2b2288c137bbea2dbf5dce142c7740ed5..5d5d866b5d160faf96b95ddc0fe4ea6d9f3c6329 100644 GIT binary patch delta 16 Xcmex;oALK;#tn^ejQN|J;wt$8Oic&L delta 16 Xcmex;oALK;#tn^ejCq@z;wt$8Oh*UE diff --git a/contracts/wasm/tokenregistry/test/tokenregistry_bg.wasm b/contracts/wasm/tokenregistry/test/tokenregistry_bg.wasm index 78cfa8a72d18d7dcd7ba57347035745ae9cd3eb9..979977d52a85d37b779f5ad2058f194ed06d736e 100644 GIT binary patch delta 32 lcmbRBi*eR3#tjv@g82*#3=%+mhed$F6-dwA+?hL(9{{eI32y)Z delta 32 lcmbRBi*eR3#tjv@f_V%K3=%+mhed$F6-dw6+?hL(9{{d>32guX diff --git a/packages/vm/core/testcore/sbtests/sbtestsc/testcore_bg.wasm b/packages/vm/core/testcore/sbtests/sbtestsc/testcore_bg.wasm index 614212c5fff4f869285456479ee4696c739c529d..8ff1ea7b16e2117f1daeb142ca4d452ae5eb38f7 100644 GIT binary patch delta 47 zcmZ29pLx-I<_%BlnHm@;Kd(1tYGm9j(@Y#0RWF& B4sQSe delta 47 zcmZ29pLx-I<_%BlnGP^aeqL|PbdX`QOhbvSU>*Ylg9H#i5EWo>1=2G%FWk#01OT7E B4(k8_ diff --git a/packages/vm/wasmhost/kvstorehost.go b/packages/vm/wasmhost/kvstorehost.go index f257f230d1..bf6103409c 100644 --- a/packages/vm/wasmhost/kvstorehost.go +++ b/packages/vm/wasmhost/kvstorehost.go @@ -17,9 +17,9 @@ import ( //nolint:revive const ( OBJTYPE_ARRAY int32 = 0x20 - OBJTYPE_ARRAY16 int32 = 0x30 - OBJTYPE_CALL int32 = 0x40 - OBJTYPE_TYPEMASK int32 = 0x0f + OBJTYPE_ARRAY16 int32 = 0x60 + OBJTYPE_CALL int32 = 0x80 + OBJTYPE_TYPEMASK int32 = 0x1f OBJTYPE_ADDRESS int32 = 1 OBJTYPE_AGENT_ID int32 = 2 diff --git a/packages/vm/wasmlib/go/wasmlib/host.go b/packages/vm/wasmlib/go/wasmlib/host.go index 2f84973267..70e7105b06 100644 --- a/packages/vm/wasmlib/go/wasmlib/host.go +++ b/packages/vm/wasmlib/go/wasmlib/host.go @@ -9,8 +9,9 @@ import "encoding/binary" const ( // all TYPE_* values should exactly match the counterpart OBJTYPE_* values on the host! TYPE_ARRAY int32 = 0x20 - TYPE_ARRAY16 int32 = 0x30 - TYPE_CALL int32 = 0x40 + TYPE_ARRAY16 int32 = 0x60 + TYPE_CALL int32 = 0x80 + TYPE_MASK int32 = 0x1f TYPE_ADDRESS int32 = 1 TYPE_AGENT_ID int32 = 2 diff --git a/packages/vm/wasmlib/src/host.rs b/packages/vm/wasmlib/src/host.rs index 6952a06cd8..e5c5494499 100644 --- a/packages/vm/wasmlib/src/host.rs +++ b/packages/vm/wasmlib/src/host.rs @@ -9,8 +9,9 @@ use crate::keys::*; // all type id values should exactly match their counterpart values on the host! pub const TYPE_ARRAY: i32 = 0x20; -pub const TYPE_ARRAY16: i32 = 0x30; -pub const TYPE_CALL: i32 = 0x40; +pub const TYPE_ARRAY16: i32 = 0x60; +pub const TYPE_CALL: i32 = 0x80; +pub const TYPE_MASK: i32 = 0x1f; pub const TYPE_ADDRESS: i32 = 1; pub const TYPE_AGENT_ID: i32 = 2; diff --git a/packages/vm/wasmlib/ts/wasmlib/host.ts b/packages/vm/wasmlib/ts/wasmlib/host.ts index ee6d6f0d74..35c960b296 100644 --- a/packages/vm/wasmlib/ts/wasmlib/host.ts +++ b/packages/vm/wasmlib/ts/wasmlib/host.ts @@ -10,8 +10,9 @@ import * as keys from "./keys"; import {Convert} from "./convert"; export const TYPE_ARRAY: i32 = 0x20; -export const TYPE_ARRAY16: i32 = 0x30; -export const TYPE_CALL: i32 = 0x40; +export const TYPE_ARRAY16: i32 = 0x60; +export const TYPE_CALL: i32 = 0x80; +export const TYPE_MASK: i32 = 0x1f; export const TYPE_ADDRESS: i32 = 1; export const TYPE_AGENT_ID: i32 = 2; diff --git a/tools/cluster/tests/wasm/inccounter_bg.wasm b/tools/cluster/tests/wasm/inccounter_bg.wasm index 8bae507b0253fa8e64d0664595c93ea1c34a09ff..9623493c7242095b06cce2d08a355636688825b2 100644 GIT binary patch delta 32 lcmeBQ$ke}(X~V?^!F&b=1_>a};1pnR1=2G&KWbRZ4*;F#2`&Ht delta 32 lcmeBQ$ke}(X~V?^!8`^A1_>a};1pnR1=2G%KWbRZ4*;FZ2`m5r diff --git a/tools/schema/generator/clienttemplates/events.go b/tools/schema/generator/clienttemplates/events.go index 2888b2fdc5..ee7f5992b9 100644 --- a/tools/schema/generator/clienttemplates/events.go +++ b/tools/schema/generator/clienttemplates/events.go @@ -6,15 +6,22 @@ var eventsTs = map[string]string{ type Address = string; type AgentID = string; +type Bool = boolean; +type Bytes = Uint8Array; type ChainID = string; type Color = string; type Hash = string; type Hname = string; +type Int8 = number; type Int16 = number; type Int32 = number; type Int64 = bigint; type RequestID = string; type String = string; +type Uint8 = number; +type Uint16 = number; +type Uint32 = number; +type Uint64 = bigint; export class $Package$+Events { $#each events eventConst From 315b3ac51bfe7082e8a63decadff78d1877229be Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Thu, 25 Nov 2021 18:34:07 -0800 Subject: [PATCH 130/198] Update documentation with new data types --- documentation/docs/guide/wasm_vm/types.mdx | 89 ++++++++++++-------- tools/schema/generator/emitter.go | 2 +- tools/schema/generator/gotemplates/consts.go | 2 +- tools/schema/generator/rstemplates/consts.go | 2 +- tools/schema/generator/tstemplates/consts.go | 2 +- 5 files changed, 57 insertions(+), 40 deletions(-) diff --git a/documentation/docs/guide/wasm_vm/types.mdx b/documentation/docs/guide/wasm_vm/types.mdx index 194654fc9d..1e0e30d08e 100644 --- a/documentation/docs/guide/wasm_vm/types.mdx +++ b/documentation/docs/guide/wasm_vm/types.mdx @@ -16,11 +16,17 @@ direct support for the following value data types: ## Basic Value Data Types -- `Int16` - 16-bit signed integer value.allocation +- `Bool` - boolean value (0 or 1). +- `Int8` - 8-bit signed integer value. +- `Int16` - 16-bit signed integer value. - `Int32` - 32-bit signed integer value. - `Int64` - 64-bit signed integer value. - `Bytes` - An arbitrary-length byte array. - `String` - An UTF-8 encoded string value. +- `Uint8` - 8-bit unsigned integer value. +- `Uint16` - 16-bit unsigned integer value. +- `Uint32` - 32-bit unsigned integer value. +- `Uint64` - 64-bit unsigned integer value. ## ISCP-specific Value Data Types @@ -28,7 +34,6 @@ direct support for the following value data types: - `AgentID` - A 37-byte ISCP Agent ID. - `ChainID` - A 33-byte ISCP Chain ID. - `Color` - A 32-byte token color ID. -- `ContractID` - A 37-byte ISCP smart contract ID. - `Hash` - A 32-byte hash value. - `Hname` - A 4-byte unsigned integer hash value derived from a name string. - `RequestID` - A 34-byte transaction request ID. @@ -36,65 +41,77 @@ direct support for the following value data types: The first group consists of the basic value data types that are found in all programming languages, whereas the second group consists of WasmLib versions of ISCP-specific value data types. More detailed explanations about their specific uses can be found in the -[ISCP documentation](https://github.com/iotaledger/wasp/blob/develop/documentation/docs/misc/coretypes.md) -. WasmLib provides its own implementations for each of the ISCP value data types. They can +[ISCP documentation](https://github.com/iotaledger/wasp/blob/develop/documentation/docs/misc/coretypes.md). +WasmLib provides its own implementations for each of the ISCP value data types. They can all be serialized into and deserialized from a byte array. Each value data type can also be used as a key in key/value maps. -WasmLib implements [value proxies](proxies.mdx#value-proxies) for each value type, as well as a set of -[container proxies](proxies.mdx#container-proxies), [map proxies](proxies.mdx#map-proxies) that allow the value types to -be used as key and/or stored value and [array proxies](#array-proxies) for arrays of each of -these value types, and for arrays of maps. +WasmLib implements [value proxies](proxies.mdx#value-proxies) for each value type, as well +as a set of [container proxies](proxies.mdx#container-proxies), +[map proxies](proxies.mdx#map-proxies) that allow the value types to be used as key and/or +stored value and [array proxies](#array-proxies) for arrays of each of these value types, +and for arrays of maps. -Another thing to consider is that some data provided by the host is mutable, -whereas other data may be immutable. To facilitate this distinction, each proxy type comes -in two flavors that reflect this, and makes sure the data can only be used as intended. The -rule is that from an immutable container proxy you can only derive immutable container and -value proxies. The referenced data can never be changed through immutable proxies. +Another thing to consider is that some data provided by the host is mutable, whereas other +data may be immutable. To facilitate this distinction, each proxy type comes in two +flavors that reflect this, and makes sure that the data can only be used as intended. +The rule is that from an immutable container proxy you can only derive immutable container +and value proxies. The referenced data can never be changed through immutable proxies. Separating these constraints for types into separate proxy types allows the use of -compile-time type-checking to enforce these constraints. To guard against client code that tries to bypass -them, the ISCP sandbox will also check these constraints at runtime on the host. +compile-time type-checking to enforce these constraints. To guard against client code that +tries to bypass them, the ISCP sandbox will also check these constraints at runtime on the +host. ## Full Matrix of WasmLib Types (excluding array proxies) -| ISCP type | WasmLib type | Mutable proxy | Immutable proxy | -| ---------- | ---------------- | ----------------------- | ------------------------- | -| Bytes | *byte array* | ScMutable**Bytes** | ScImmutable**Bytes** | -| Int16 | *16-bit integer* | ScMutable**Int16** | ScImmutable**Int16** | -| Int32 | *32-bit integer* | ScMutable**Int32** | ScImmutable**Int32** | -| Int64 | *64-bit integer* | ScMutable**Int64** | ScImmutable**Int64** | -| String | *UTF-8 string* | ScMutable**String** | ScImmutable**String** | -| | | | | -| Address | Sc**Address** | ScMutable**Address** | ScImmutable**Address** | -| AgentId | Sc**AgentId** | ScMutable**AgentId** | ScImmutable**AgentId** | -| ChainId | Sc**ChainId** | ScMutable**ChainId** | ScImmutable**ChainId** | -| Color | Sc**Color** | ScMutable**Color** | ScImmutable**Color** | -| ContractId | Sc**ContractId** | ScMutable**ContractId** | ScImmutable**ContractId** | -| HName | Sc**HName** | ScMutable**HName** | ScImmutable**HName** | -| Hash | Sc**Hash** | ScMutable**Hash** | ScImmutable**Hash** | -| Map | Sc**Map** | ScMutable**Map** | ScImmutable**Map** | -| RequestId | Sc**RequestId** | ScMutable**RequestId** | ScImmutable**RequestId** | +| ISCP type | WasmLib type | Mutable proxy | Immutable proxy | +| ---------- | ----------------- | ----------------------- | ------------------------- | +| Bool | *boolean* | ScMutable**Bool** | ScImmutable**Bool** | +| Bytes | *byte array* | ScMutable**Bytes** | ScImmutable**Bytes** | +| Int8 | *8-bit signed* | ScMutable**Int8** | ScImmutable**Int8** | +| Int16 | *16-bit signed* | ScMutable**Int16** | ScImmutable**Int16** | +| Int32 | *32-bit signed* | ScMutable**Int32** | ScImmutable**Int32** | +| Int64 | *64-bit signed* | ScMutable**Int64** | ScImmutable**Int64** | +| String | *UTF-8 string* | ScMutable**String** | ScImmutable**String** | +| Uint8 | *8-bit unsigned* | ScMutable**Uint8** | ScImmutable**Uint8** | +| Uint16 | *16-bit unsigned* | ScMutable**Uint16** | ScImmutable**Uint16** | +| Uint32 | *32-bit unsigned* | ScMutable**Uint32** | ScImmutable**Uint32** | +| Uint64 | *64-bit unsigned* | ScMutable**Uint64** | ScImmutable**Uint64** | +| | | | | +| Address | Sc**Address** | ScMutable**Address** | ScImmutable**Address** | +| AgentId | Sc**AgentId** | ScMutable**AgentId** | ScImmutable**AgentId** | +| ChainId | Sc**ChainId** | ScMutable**ChainId** | ScImmutable**ChainId** | +| Color | Sc**Color** | ScMutable**Color** | ScImmutable**Color** | +| Hname | Sc**Hname** | ScMutable**Hname** | ScImmutable**Hname** | +| Hash | Sc**Hash** | ScMutable**Hash** | ScImmutable**Hash** | +| Map | Sc**Map** | ScMutable**Map** | ScImmutable**Map** | +| RequestId | Sc**RequestId** | ScMutable**RequestId** | ScImmutable**RequestId** | -The consistent naming makes it easy to remember the type names and how Bytes, Int16, -Int32, Int64, and String are the odd ones out. They are implemented in WasmLib by the +The consistent naming makes it easy to remember the type names. Bool, Bytes, String, +and the integer types are the odd ones out. They are implemented in WasmLib by the closest equivalents in the chosen implementation programming language. ## Full Matrix of WasmLib Types for Array Proxies | ISCP type | Mutable array proxy | Immutable array proxy | | ---------- | ---------------------------- | ------------------------------ | +| Bool | ScMutable**Bool**Array | ScImmutable**Bool**Array | | Bytes | ScMutable**Bytes**Array | ScImmutable**Bytes**Array | +| Int8 | ScMutable**Int8**Array | ScImmutable**Int8**Array | | Int16 | ScMutable**Int16**Array | ScImmutable**Int16**Array | | Int32 | ScMutable**Int32**Array | ScImmutable**Int32**Array | | Int64 | ScMutable**Int64**Array | ScImmutable**Int64**Array | | String | ScMutable**String**Array | ScImmutable**String**Array | +| Uint8 | ScMutable**Uint8**Array | ScImmutable**Uint8**Array | +| Uint16 | ScMutable**Uint16**Array | ScImmutable**Uint16**Array | +| Uint32 | ScMutable**Uint32**Array | ScImmutable**Uint32**Array | +| Uint64 | ScMutable**Uint64**Array | ScImmutable**Uint64**Array | | | | | | Address | ScMutable**Address**Array | ScImmutable**Address**Array | | AgentId | ScMutable**AgentId**Array | ScImmutable**AgentId**Array | | ChainId | ScMutable**ChainId**Array | ScImmutable**ChainId**Array | | Color | ScMutable**Color**Array | ScImmutable**Color**Array | -| ContractId | ScMutable**ContractId**Array | ScImmutable**ContractId**Array | -| HName | ScMutable**HName**Array | ScImmutable**HName**Array | +| Hname | ScMutable**Hname**Array | ScImmutable**Hname**Array | | Hash | ScMutable**Hash**Array | ScImmutable**Hash**Array | | Map | ScMutable**Map**Array | ScImmutable**Map**Array | | RequestId | ScMutable**RequestId**Array | ScImmutable**RequestId**Array | diff --git a/tools/schema/generator/emitter.go b/tools/schema/generator/emitter.go index e103295461..9805fbcc73 100644 --- a/tools/schema/generator/emitter.go +++ b/tools/schema/generator/emitter.go @@ -434,7 +434,7 @@ func (g *GenBase) setFieldKeys(pad bool) { func (g *GenBase) setFuncKeys() { g.setMultiKeyValues("funcName", g.currentFunc.Name) g.setMultiKeyValues("kind", g.currentFunc.Kind) - g.keys["funcHName"] = iscp.Hn(g.keys["funcName"]).String() + g.keys["funcHname"] = iscp.Hn(g.keys["funcName"]).String() grant := g.currentFunc.Access comment := "" index := strings.Index(grant, "//") diff --git a/tools/schema/generator/gotemplates/consts.go b/tools/schema/generator/gotemplates/consts.go index 3ba03bca64..ac7d6e350c 100644 --- a/tools/schema/generator/gotemplates/consts.go +++ b/tools/schema/generator/gotemplates/consts.go @@ -56,6 +56,6 @@ $#each state constField `, // ******************************* "constHFunc": ` - H$Kind$FuncName$funcPad = wasmlib.ScHname(0x$funcHName) + H$Kind$FuncName$funcPad = wasmlib.ScHname(0x$funcHname) `, } diff --git a/tools/schema/generator/rstemplates/consts.go b/tools/schema/generator/rstemplates/consts.go index cc8dca8759..4c3a5bcc4b 100644 --- a/tools/schema/generator/rstemplates/consts.go +++ b/tools/schema/generator/rstemplates/consts.go @@ -46,6 +46,6 @@ pub$crate const $KIND$+_$FUNC_NAME$func_pad : &str = "$funcName"; `, // ******************************* "constHFunc": ` -pub$crate const H$KIND$+_$FUNC_NAME$func_pad : ScHname = ScHname(0x$funcHName); +pub$crate const H$KIND$+_$FUNC_NAME$func_pad : ScHname = ScHname(0x$funcHname); `, } diff --git a/tools/schema/generator/tstemplates/consts.go b/tools/schema/generator/tstemplates/consts.go index b50939ef77..002eade14c 100644 --- a/tools/schema/generator/tstemplates/consts.go +++ b/tools/schema/generator/tstemplates/consts.go @@ -44,6 +44,6 @@ export const $Kind$FuncName$funcPad = "$funcName"; `, // ******************************* "constHFunc": ` -export const H$Kind$FuncName$funcPad = new wasmlib.ScHname(0x$funcHName); +export const H$Kind$FuncName$funcPad = new wasmlib.ScHname(0x$funcHname); `, } From aa81ee2848eef8c01a0b1da2d1ba408937972d16 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Fri, 26 Nov 2021 09:32:49 +0200 Subject: [PATCH 131/198] BugFix: too large earlier comment --- tools/cluster/templates/waspconfig.go | 2 +- tools/cluster/tests/spam_test.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/cluster/templates/waspconfig.go b/tools/cluster/templates/waspconfig.go index 250b71b439..c5875d905b 100644 --- a/tools/cluster/templates/waspconfig.go +++ b/tools/cluster/templates/waspconfig.go @@ -16,7 +16,7 @@ type WaspConfigParams struct { const WaspConfig = ` { "database": { - "inMemory": false, + "inMemory": true, "directory": "waspdb" }, "logger": { diff --git a/tools/cluster/tests/spam_test.go b/tools/cluster/tests/spam_test.go index f06046a975..3c5baa2dce 100644 --- a/tools/cluster/tests/spam_test.go +++ b/tools/cluster/tests/spam_test.go @@ -10,6 +10,7 @@ import ( "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/colored" "github.com/iotaledger/wasp/packages/kv/dict" + "github.com/iotaledger/wasp/packages/testutil" "github.com/iotaledger/wasp/packages/util" "github.com/iotaledger/wasp/packages/vm/core/accounts" "github.com/iotaledger/wasp/packages/vm/core/blocklog" @@ -20,7 +21,7 @@ import ( const numRequests = 100000 func TestSpamOnledger(t *testing.T) { - // testutil.RunHeavy(t) + testutil.RunHeavy(t) env := setupAdvancedInccounterTest(t, 1, []int{0}) keyPair, _ := env.getOrCreateAddress() @@ -46,7 +47,7 @@ const maxParallelRequests = 700 // !! WARNING !! - this test should only be run with `database.inMemory` set to `false`. Otherwise it is WAY slower, and will probably time out or take a LONG time func TestSpamOffledger(t *testing.T) { - // testutil.RunHeavy(t) + testutil.RunHeavy(t) // single wasp node committee, to test if publishing can break state transitions env := setupAdvancedInccounterTest(t, 1, []int{0}) From f27b7a9d9ae5e5ac4480952078ed498d647d412c Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Fri, 26 Nov 2021 10:02:12 +0200 Subject: [PATCH 132/198] Git hash of exact wasp version logged on client --- plugins/banner/plugin.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/banner/plugin.go b/plugins/banner/plugin.go index 7a29e572ef..5c9aa22038 100644 --- a/plugins/banner/plugin.go +++ b/plugins/banner/plugin.go @@ -24,8 +24,8 @@ func configure(ctx *node.Plugin) { \/ \/ \__,_|___/ |__/ | | |_| - %s -`, wasp.Version) + %s (commit: %s) +`, wasp.Version, wasp.VersionHash) fmt.Println() // TODO embed build time see https://stackoverflow.com/questions/53031035/generate-build-timestamp-in-go/53045029 From 4f33550faf58eaf1f08da01c7f8891f89bce7043 Mon Sep 17 00:00:00 2001 From: Phyloiota <77154511+Phyloiota@users.noreply.github.com> Date: Fri, 26 Nov 2021 17:58:19 +0800 Subject: [PATCH 133/198] added link to the Whitepaper on iota.org --- documentation/docs/guide/core_concepts/iscp-architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/docs/guide/core_concepts/iscp-architecture.md b/documentation/docs/guide/core_concepts/iscp-architecture.md index 94203e4b6b..2a53e889a9 100644 --- a/documentation/docs/guide/core_concepts/iscp-architecture.md +++ b/documentation/docs/guide/core_concepts/iscp-architecture.md @@ -19,4 +19,4 @@ The multi-chain nature of ISCP makes it a more complex implementation of smart c ![ISCP multichain architecture](../../../static/img/multichain.png) The comprehensive overview of architectural design decisions of IOTA Smart Contracts can be found in the -[whitepaper](https://github.com/iotaledger/wasp/raw/master/documentation/ISC_WP_Nov_10_2021.pdf). +[whitepaper](https://files.iota.org/papers/ISC_WP_Nov_10_2021.pdf). From 6f6b1ac7caa9768c1c82927e3b8bc96260b51afb Mon Sep 17 00:00:00 2001 From: Phyloiota <77154511+Phyloiota@users.noreply.github.com> Date: Fri, 26 Nov 2021 18:14:14 +0800 Subject: [PATCH 134/198] changed ISCP to IOTA Smart Contracts --- .../docs/guide/core_concepts/iscp-architecture.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/documentation/docs/guide/core_concepts/iscp-architecture.md b/documentation/docs/guide/core_concepts/iscp-architecture.md index 2a53e889a9..558c85ae10 100644 --- a/documentation/docs/guide/core_concepts/iscp-architecture.md +++ b/documentation/docs/guide/core_concepts/iscp-architecture.md @@ -5,16 +5,16 @@ keywords: - Architecture - Ethereum - Implementation -description: ISCP allows anyone to start their own chain and validators. Link to full technical description of the ISCP architecture +description: IOTA Smart Contracts allow anyone to start their own chain and validators. Link to full technical description of the IOTA Smart Contarcts architecture and whitepaper image: /img/multichain.png --- -# ISCP Architecture +# IOTA Smart Contracts Architecture -With ISCP, anyone can start their own chain and define the validators. +With IOTA Smart Contracts, anyone can start their own chain and define the validators. Each chain has its own state where a state update (going from one block to the next) is hashed and published to the Tangle, which moves the state anchor on Layer 1. -The multi-chain nature of ISCP makes it a more complex implementation of smart contracts, over say Ethereum, as illustrated here: +The multi-chain nature of IOTA Smart COntracts makes it a more complex implementation of smart contracts, over say Ethereum, as illustrated here: ![ISCP multichain architecture](../../../static/img/multichain.png) From b7997eabd3cd931c0f09d0823d4c2f6ebf57b760 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Fri, 26 Nov 2021 13:51:34 -0800 Subject: [PATCH 135/198] Support all Wasm VM types in wasp-cli --- packages/iscp/agentid.go | 5 +-- packages/iscp/chainid.go | 8 +++- packages/iscp/request.go | 25 ++++++++++++ tools/wasp-cli/util/types.go | 75 ++++++++++++++++++++++++++++++++---- 4 files changed, 100 insertions(+), 13 deletions(-) diff --git a/packages/iscp/agentid.go b/packages/iscp/agentid.go index 4821af2239..e273ad7341 100644 --- a/packages/iscp/agentid.go +++ b/packages/iscp/agentid.go @@ -71,10 +71,7 @@ func NewAgentIDFromBase58EncodedString(s string) (*AgentID, error) { // NewAgentIDFromString parses the human-readable string representation func NewAgentIDFromString(s string) (*AgentID, error) { - if len(s) < 2 { - return nil, xerrors.New("NewAgentIDFromString: invalid length") - } - if s[:2] != "A/" { + if !strings.HasPrefix(s, "A/") { return nil, xerrors.New("NewAgentIDFromString: wrong prefix") } parts := strings.Split(s[2:], "::") diff --git a/packages/iscp/chainid.go b/packages/iscp/chainid.go index 2b823e5c53..72cdc1a2d2 100644 --- a/packages/iscp/chainid.go +++ b/packages/iscp/chainid.go @@ -5,6 +5,7 @@ package iscp import ( "io" + "strings" "github.com/iotaledger/hive.go/marshalutil" @@ -24,7 +25,7 @@ func NewChainID(addr *ledgerstate.AliasAddress) *ChainID { return &ChainID{addr} } -// ChainIDFromAddress creates a chainIDD from alias address. Returns and error if not an alias address type +// ChainIDFromAddress creates a chain ID from alias address. Returns and error if not an alias address type func ChainIDFromAddress(addr ledgerstate.Address) (*ChainID, error) { alias, ok := addr.(*ledgerstate.AliasAddress) if !ok { @@ -59,6 +60,11 @@ func ChainIDFromBytes(data []byte) (*ChainID, error) { return &ChainID{alias}, nil } +// ChainIDFromString reconstructs a ChainID from its string representation. +func ChainIDFromString(s string) (*ChainID, error) { + return ChainIDFromBase58(strings.TrimPrefix(s, "$/")) +} + // RandomChainID creates a random chain ID. func RandomChainID(seed ...[]byte) *ChainID { var h hashing.HashValue diff --git a/packages/iscp/request.go b/packages/iscp/request.go index ca8deab995..73faf508a4 100644 --- a/packages/iscp/request.go +++ b/packages/iscp/request.go @@ -2,12 +2,15 @@ package iscp import ( "fmt" + "strconv" + "strings" "time" "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/hive.go/marshalutil" "github.com/iotaledger/wasp/packages/kv/dict" "github.com/iotaledger/wasp/packages/util" + "golang.org/x/xerrors" ) // region Request ////////////////////////////////////////////////////// @@ -94,6 +97,28 @@ func RequestIDFromBase58(b58 string) (ret RequestID, err error) { return } +func RequestIDFromString(s string) (ret RequestID, err error) { + if !strings.HasPrefix(s, "[") { + return RequestIDFromBase58(s) + } + parts := strings.Split(s[1:], "]") + if len(parts) != 2 { + err = xerrors.New("RequestIDFromString: wrong format") + return + } + index, err2 := strconv.ParseUint(parts[0], 10, 16) + if err2 != nil { + err = xerrors.Errorf("RequestIDFromString: %v", err2) + return + } + txid, err3 := ledgerstate.TransactionIDFromBase58(parts[1]) + if err3 != nil { + err = xerrors.Errorf("RequestIDFromString: %v", err3) + return + } + return NewRequestID(txid, uint16(index)), nil +} + func (rid RequestID) OutputID() ledgerstate.OutputID { return ledgerstate.OutputID(rid) } diff --git a/tools/wasp-cli/util/types.go b/tools/wasp-cli/util/types.go index c1ec3b99fa..6a45287056 100644 --- a/tools/wasp-cli/util/types.go +++ b/tools/wasp-cli/util/types.go @@ -7,6 +7,7 @@ import ( "strconv" "github.com/iotaledger/goshimmer/packages/ledgerstate" + "github.com/iotaledger/wasp/packages/hashing" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/kv" "github.com/iotaledger/wasp/packages/kv/codec" @@ -15,8 +16,13 @@ import ( "github.com/mr-tron/base58" ) +//nolint:funlen func ValueFromString(vtype, s string) []byte { switch vtype { + case "address": + addr, err := ledgerstate.AddressFromBase58EncodedString(s) + log.Check(err) + return addr.Bytes() case "agentid": agentid, err := iscp.NewAgentIDFromString(s) log.Check(err) @@ -29,45 +35,74 @@ func ValueFromString(vtype, s string) []byte { b, err := base58.Decode(s) log.Check(err) return b + case "chainid": + chainid, err := iscp.ChainIDFromString(s) + log.Check(err) + return chainid.Bytes() case "color": col, err := ledgerstate.ColorFromBase58EncodedString(s) log.Check(err) return col.Bytes() case "file": return ReadFile(s) + case "hash": + hash, err := hashing.HashValueFromBase58(s) + log.Check(err) + return hash.Bytes() + case "hname": + hn, err := iscp.HnameFromString(s) + log.Check(err) + return hn.Bytes() + case "int8": + n, err := strconv.ParseInt(s, 10, 8) + log.Check(err) + return codec.EncodeInt8(int8(n)) case "int16": - n, err := strconv.Atoi(s) //nolint:gosec // potential int32 overflow + n, err := strconv.ParseInt(s, 10, 16) log.Check(err) return codec.EncodeInt16(int16(n)) case "int32": - n, err := strconv.Atoi(s) //nolint:gosec // potential int32 overflow + n, err := strconv.ParseInt(s, 10, 32) log.Check(err) return codec.EncodeInt32(int32(n)) case "int64", "int": - n, err := strconv.Atoi(s) + n, err := strconv.ParseInt(s, 10, 64) + log.Check(err) + return codec.EncodeInt64(n) + case "requestid": + rid, err := iscp.RequestIDFromString(s) log.Check(err) - return codec.EncodeInt64(int64(n)) + return rid.Bytes() case "string": return []byte(s) + case "uint8": + n, err := strconv.ParseUint(s, 10, 8) + log.Check(err) + return codec.EncodeUint8(uint8(n)) case "uint16": - n, err := strconv.Atoi(s) + n, err := strconv.ParseUint(s, 10, 16) log.Check(err) return codec.EncodeUint16(uint16(n)) case "uint32": - n, err := strconv.Atoi(s) + n, err := strconv.ParseUint(s, 10, 32) log.Check(err) return codec.EncodeUint32(uint32(n)) case "uint64": - n, err := strconv.Atoi(s) + n, err := strconv.ParseUint(s, 10, 64) log.Check(err) - return codec.EncodeUint64(uint64(n)) + return codec.EncodeUint64(n) } log.Fatalf("ValueFromString: No handler for type %s", vtype) return nil } +//nolint:funlen func ValueToString(vtype string, v []byte) string { switch vtype { + case "address": + addr, err := codec.DecodeAddress(v) + log.Check(err) + return addr.Base58() case "agentid": aid, err := codec.DecodeAgentID(v) log.Check(err) @@ -81,10 +116,26 @@ func ValueToString(vtype string, v []byte) string { return "false" case "bytes", "base58": return base58.Encode(v) + case "chainid": + cid, err := codec.DecodeChainID(v) + log.Check(err) + return cid.String() case "color": col, err := codec.DecodeColor(v) log.Check(err) return col.String() + case "hash": + hash, err := codec.DecodeHashValue(v) + log.Check(err) + return hash.String() + case "hname": + hn, err := codec.DecodeHname(v) + log.Check(err) + return hn.String() + case "int8": + n, err := codec.DecodeInt8(v) + log.Check(err) + return fmt.Sprintf("%d", n) case "int16": n, err := codec.DecodeInt16(v) log.Check(err) @@ -97,8 +148,16 @@ func ValueToString(vtype string, v []byte) string { n, err := codec.DecodeInt64(v) log.Check(err) return fmt.Sprintf("%d", n) + case "requestid": + rid, err := codec.DecodeRequestID(v) + log.Check(err) + return rid.String() case "string": return fmt.Sprintf("%q", string(v)) + case "uint8": + n, err := codec.DecodeUint8(v) + log.Check(err) + return fmt.Sprintf("%d", n) case "uint16": n, err := codec.DecodeUint16(v) log.Check(err) From b1767a8e23056e1f8c32fbe680e566ce9dc3e330 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Fri, 26 Nov 2021 18:03:14 -0800 Subject: [PATCH 136/198] Documentation for new data types and events --- contracts/wasm/fairroulette/client/events.ts | 114 ------- documentation/docs/guide/schema/events.mdx | 301 +++++++++++++++++++ documentation/docs/guide/schema/funcdesc.mdx | 2 +- documentation/docs/guide/schema/init.mdx | 2 +- documentation/docs/guide/schema/state.mdx | 4 +- documentation/docs/guide/schema/structs.mdx | 4 +- documentation/docs/guide/schema/typedefs.mdx | 4 +- documentation/docs/guide/schema/usage.mdx | 6 +- documentation/sidebars.js | 5 + 9 files changed, 318 insertions(+), 124 deletions(-) delete mode 100644 contracts/wasm/fairroulette/client/events.ts create mode 100644 documentation/docs/guide/schema/events.mdx diff --git a/contracts/wasm/fairroulette/client/events.ts b/contracts/wasm/fairroulette/client/events.ts deleted file mode 100644 index 66628d578c..0000000000 --- a/contracts/wasm/fairroulette/client/events.ts +++ /dev/null @@ -1,114 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - - -type Address = string; -type AgentID = string; -type ChainID = string; -type Color = string; -type Hash = string; -type Hname = string; -type Int16 = number; -type Int32 = number; -type Int64 = bigint; -type RequestID = string; -type String = string; - -export class FairRouletteEvents { - public static readonly EVENT_BET: string = 'fairroulette.bet'; - public static readonly EVENT_PAYOUT: string = 'fairroulette.payout'; - public static readonly EVENT_ROUND: string = 'fairroulette.round'; - public static readonly EVENT_START: string = 'fairroulette.start'; - public static readonly EVENT_STOP: string = 'fairroulette.stop'; - public static readonly EVENT_WINNER: string = 'fairroulette.winner'; -} - -export interface EventBet { - timestamp: Int32; - address: Address; - amount: Int64; - number: Int64; -} - -export interface EventPayout { - timestamp: Int32; - address: Address; - amount: Int64; -} - -export interface EventRound { - timestamp: Int32; - number: Int64; -} - -export interface EventStart { - timestamp: Int32; -} - -export interface EventStop { - timestamp: Int32; -} - -export interface EventWinner { - timestamp: Int32; - number: Int64; -} - - private handleVmMessage(message: string[]): void { - const messageHandlers: MessageHandlers = { - EVENT_BET: (index) => { - const evt: EventBet = { - timestamp: message[index + 1], - address: message[index + 2], - amount: message[index + 2], - number: message[index + 2], - }; - this.emitter.emit(EVENT_BET, evt); - }, - EVENT_PAYOUT: (index) => { - const evt: EventPayout = { - timestamp: message[index + 1], - address: message[index + 2], - amount: message[index + 2], - }; - this.emitter.emit(EVENT_PAYOUT, evt); - }, - EVENT_ROUND: (index) => { - const evt: EventRound = { - timestamp: message[index + 1], - number: message[index + 2], - }; - this.emitter.emit(EVENT_ROUND, evt); - }, - EVENT_START: (index) => { - const evt: EventStart = { - timestamp: message[index + 1], - }; - this.emitter.emit(EVENT_START, evt); - }, - EVENT_STOP: (index) => { - const evt: EventStop = { - timestamp: message[index + 1], - }; - this.emitter.emit(EVENT_STOP, evt); - }, - EVENT_WINNER: (index) => { - const evt: EventWinner = { - timestamp: message[index + 1], - number: message[index + 2], - }; - this.emitter.emit(EVENT_WINNER, evt); - }, - }; - - const topicIndex = 3; - const topic = message[topicIndex]; - - if (typeof messageHandlers[topic] != 'undefined') { - messageHandlers[topic](topicIndex); - } - } diff --git a/documentation/docs/guide/schema/events.mdx b/documentation/docs/guide/schema/events.mdx new file mode 100644 index 0000000000..8ea06c9848 --- /dev/null +++ b/documentation/docs/guide/schema/events.mdx @@ -0,0 +1,301 @@ +--- +keywords: +- functions +- state +- structures +- storage +- named fields +description: The smart contracts can trigger events that the user can subscribe to and that convey changes to its state. +image: /img/logo/WASP_logo_dark.png +--- + +import Tabs from "@theme/Tabs" +import TabItem from "@theme/TabItem" + +# Triggering Events + +Smart contracts do not live in a vacuum. Even though they run in a very limited +sandbox, from a larger perspective there will have to be a way for users to interact +with them. Since smart contracts are essentially event-driven, and requests run +asynchronously from the user's perspective, there is a need for triggering events by +the smart contracts themselves. Of course, it would be possible for users to +periodically call a view function to retrieve the latest state of the smart contract, +but this burdens the nodes unnecessarily. A better way is to have the smart contracts +trigger events that the user can subscribe to and that convey changes to its state. + +To support events the ISCP sandbox provides a very rudimentary interface. The function +call context exposes this interface through its `event()` function, which is passed a +completely arbitrary text string. It is up to the smart contract creator to format +this text string and it's up to the user to interpret this text string correctly. This +is error-prone, inconsistent, and means that a lot of code needs to be written both on +the smart contract side that generates these events, and on the client side that handles +these events. And with any change to the formatting of these events both ends need to be +modified to stay in sync. + +This is why the [schema tool](usage.mdx) allows you to define your own structured events. +The schema tool will generate a structure that will become part of all func call contexts. +Events can only be triggered from within a func. They will become part of the state of the +smart contract because every event is logged in the core `eventlog` contract. +Therefore, they cannot be triggered from a view. + +For each event defined in the `events` section of the schema definition file, this +events structure will contain a member function that takes the defined types of parameters +and will automatically encode the event as a consistently formatted string and pass it +to the ISCP context's `event()` function. The string consists of the name of the event, +a timestamp, and string representations of each field, all separated by vertical bars. + +Here is the `events` section that can be found in the demo `fairroulette` smart contract: + + + + + +```json +"events": { + "bet": { + "address": "Address // address of better", + "amount": "Int64 // amount of iotas to bet", + "number": "Int64 // number to bet on", + }, + "payout": { + "address": "Address // address of winner", + "amount": "Int64 // amount of iotas won", + }, + "round": { + "number": "Int64 // current betting round number" + }, + "start": { + }, + "stop": { + }, + "winner": { + "number": "Int64 // the winning number" + } +} +``` + + + + + +```yaml +events: + bet: + address: Address // address of better + amount: Int64 // amount of iotas to bet + number: Int64 // number to bet on + payout: + address: Address // address of winner + amount: Int64 // amount of iotas won + round: + number: Int64 // current betting round number + start: + stop: + winner: + number: Int64 // the winning number +``` + + + + +The schema tool will generate `events.xx` which contains the following code for the +FairRouletteEvents struct: + + + + + +```go +package fairroulette + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +type FairRouletteEvents struct{} + +func (e FairRouletteEvents) Bet(address wasmlib.ScAddress, amount int64, number int64) { + wasmlib.NewEventEncoder("fairroulette.bet"). + Address(address). + Int64(amount). + Int64(number). + Emit() +} + +func (e FairRouletteEvents) Payout(address wasmlib.ScAddress, amount int64) { + wasmlib.NewEventEncoder("fairroulette.payout"). + Address(address). + Int64(amount). + Emit() +} + +func (e FairRouletteEvents) Round(number int64) { + wasmlib.NewEventEncoder("fairroulette.round"). + Int64(number). + Emit() +} + +func (e FairRouletteEvents) Start() { + wasmlib.NewEventEncoder("fairroulette.start"). + Emit() +} + +func (e FairRouletteEvents) Stop() { + wasmlib.NewEventEncoder("fairroulette.stop"). + Emit() +} + +func (e FairRouletteEvents) Winner(number int64) { + wasmlib.NewEventEncoder("fairroulette.winner"). + Int64(number). + Emit() +} +``` + + + + +```rust +use wasmlib::*; + +pub struct FairRouletteEvents { +} + +impl FairRouletteEvents { + pub fn bet(&self, address: &ScAddress, amount: i64, number: i64) { + let mut encoder = EventEncoder::new("fairroulette.bet"); + encoder.address(&address); + encoder.int64(amount); + encoder.int64(number); + encoder.emit(); + } + + pub fn payout(&self, address: &ScAddress, amount: i64) { + let mut encoder = EventEncoder::new("fairroulette.payout"); + encoder.address(&address); + encoder.int64(amount); + encoder.emit(); + } + + pub fn round(&self, number: i64) { + let mut encoder = EventEncoder::new("fairroulette.round"); + encoder.int64(number); + encoder.emit(); + } + + pub fn start(&self) { + EventEncoder::new("fairroulette.start").emit(); + } + + pub fn stop(&self) { + EventEncoder::new("fairroulette.stop").emit(); + } + + pub fn winner(&self, number: i64) { + let mut encoder = EventEncoder::new("fairroulette.winner"); + encoder.int64(number); + encoder.emit(); + } +} +``` + + + + +```ts +import * as wasmlib from "wasmlib"; + +export class FairRouletteEvents { + bet(address: wasmlib.ScAddress, amount: i64, number: i64): void { + new wasmlib.EventEncoder("fairroulette.bet"). + address(address). + int64(amount). + int64(number). + emit(); + } + + payout(address: wasmlib.ScAddress, amount: i64): void { + new wasmlib.EventEncoder("fairroulette.payout"). + address(address). + int64(amount). + emit(); + } + + round(number: i64): void { + new wasmlib.EventEncoder("fairroulette.round"). + int64(number). + emit(); + } + + start(): void { + new wasmlib.EventEncoder("fairroulette.start"). + emit(); + } + + stop(): void { + new wasmlib.EventEncoder("fairroulette.stop"). + emit(); + } + + winner(number: i64): void { + new wasmlib.EventEncoder("fairroulette.winner"). + int64(number). + emit(); + } +} +``` + + + + +Notice how the generated functions use the WasmLib EventEncoder to encode the +parameters into a single string before emitting it. Here is the way in which +`fairroulette` emits the `bet` event in its smart contract code: + + + + + + +```go + f.Events.Bet(bet.Better.Address(), bet.Amount, bet.Number) +``` + + + + +```rust + f.events.bet(&bet.better.address(), bet.amount, bet.number); +``` + + + + +```ts + f.events.bet(bet.better.address(), bet.amount, bet.number); +``` + + + + +The smart contract client code can listen in to the event stream and respond to the +events it deems noteworthy. The schema tool will shortly also be generating the client +side code that properly parses these events and passes a type-safe structure to the +client code. + +In the next section we will explore how the schema tool helps to simplify +[function definitions](funcs.mdx). diff --git a/documentation/docs/guide/schema/funcdesc.mdx b/documentation/docs/guide/schema/funcdesc.mdx index 572bc2a9b5..71f56c0a7d 100644 --- a/documentation/docs/guide/schema/funcdesc.mdx +++ b/documentation/docs/guide/schema/funcdesc.mdx @@ -195,7 +195,7 @@ impl ScFuncs { ```ts -import * as wasmlib from "../wasmlib" +import * as wasmlib from "wasmlib" import * as sc from "./index"; export class DivideCall { diff --git a/documentation/docs/guide/schema/init.mdx b/documentation/docs/guide/schema/init.mdx index ba7e46e1b0..4337bc92b3 100644 --- a/documentation/docs/guide/schema/init.mdx +++ b/documentation/docs/guide/schema/init.mdx @@ -151,7 +151,7 @@ pub fn func_init(ctx: &ScFuncContext, f: &InitContext) { // step by step what is happening in the code. We also unnecessarily annotate // all 'let' statements with their assignment type to improve understanding. -import * as wasmlib from "../wasmlib" +import * as wasmlib from "wasmlib" import * as sc from "./index"; // 'init' is used as a way to initialize a smart contract. It is an optional diff --git a/documentation/docs/guide/schema/state.mdx b/documentation/docs/guide/schema/state.mdx index 67d17d90eb..f032e1072b 100644 --- a/documentation/docs/guide/schema/state.mdx +++ b/documentation/docs/guide/schema/state.mdx @@ -182,5 +182,5 @@ homogenous types. In the above example both `ArrayOfMutableAddress` and `MapAddressToMutableInt64` are examples of such automatically generated proxy types. See the full `state.xx` for more details. -In the next section we will explore how the schema tool helps to simplify [function -definitions](funcs.mdx). \ No newline at end of file +In the next section we will explore how the schema tool helps to simplify [triggering +events](events.mdx). \ No newline at end of file diff --git a/documentation/docs/guide/schema/structs.mdx b/documentation/docs/guide/schema/structs.mdx index d80d6568cd..e1b44f52ca 100644 --- a/documentation/docs/guide/schema/structs.mdx +++ b/documentation/docs/guide/schema/structs.mdx @@ -220,7 +220,7 @@ impl MutableBet { ```ts -import * as wasmlib from "../wasmlib" +import * as wasmlib from "wasmlib" export class Bet { amount: i64 = 0; // bet amount @@ -448,7 +448,7 @@ impl MutableBettingState { ```ts -import * as wasmlib from "../wasmlib" +import * as wasmlib from "wasmlib" import * as sc from "./index"; export class ArrayOfImmutableBet { diff --git a/documentation/docs/guide/schema/typedefs.mdx b/documentation/docs/guide/schema/typedefs.mdx index 274f078c89..c757ea7058 100644 --- a/documentation/docs/guide/schema/typedefs.mdx +++ b/documentation/docs/guide/schema/typedefs.mdx @@ -161,7 +161,7 @@ impl ArrayOfMutableBet { ```ts -import * as wasmlib from "../wasmlib" +import * as wasmlib from "wasmlib" import * as sc from "./index"; export class ImmutableBettingRound extends ArrayOfImmutableBet { @@ -389,7 +389,7 @@ impl MutableBettingState { ```ts -import * as wasmlib from "../wasmlib" +import * as wasmlib from "wasmlib" import * as sc from "./index"; export class ArrayOfImmutableBettingRound { diff --git a/documentation/docs/guide/schema/usage.mdx b/documentation/docs/guide/schema/usage.mdx index 0fbb5e03f3..076bf53a9a 100644 --- a/documentation/docs/guide/schema/usage.mdx +++ b/documentation/docs/guide/schema/usage.mdx @@ -59,6 +59,7 @@ this: { "name": "MySmartContract", "description": "MySmartContract description", + "events": {} "structs": {}, "typedefs": {}, "state": { @@ -93,6 +94,7 @@ this: ```yaml name: MySmartContract description: MySmartContract description +events: {} structs: {} typedefs: {} state: @@ -220,7 +222,7 @@ regenerated and overwritten whenever the schema tool is run again. ```bash -asc lib.ts --binaryFile output_ts.wasm +asc lib.ts --binaryFile output_ts.wasm --lib path/to/node_modules ``` This will use the TypeScript source files in the current folder. The only file in this @@ -299,7 +301,7 @@ pub fn view_get_owner(_ctx: &ScViewContext, f: &GetOwnerContext) { ```ts -import * as wasmlib from "../wasmlib" +import * as wasmlib from "wasmlib" import * as sc from "./index"; export function funcInit(ctx: wasmlib.ScFuncContext, f: sc.InitContext): void { diff --git a/documentation/sidebars.js b/documentation/sidebars.js index e7f397147b..c551861a34 100644 --- a/documentation/sidebars.js +++ b/documentation/sidebars.js @@ -300,6 +300,11 @@ module.exports = { label: 'Smart Contract State', id: 'guide/schema/state', }, + { + type: 'doc', + label: 'Triggering Events', + id: 'guide/schema/events', + }, { type: 'doc', label: 'Function Definitions', From f00faa7ba6fc4bd333363a03b830909a7adb3949 Mon Sep 17 00:00:00 2001 From: Ivange Larry Date: Sat, 27 Nov 2021 23:22:47 +0100 Subject: [PATCH 137/198] Fix: wasp-cli chain activate/deactivate (#621) * Fix: wasp-cli chain activate/deactivate --- client/committee_record.go | 2 +- packages/chains/chains.go | 12 +++--- packages/webapi/admapi/committeerecord.go | 4 +- tools/cluster/tests/wasp-cli_test.go | 45 +++++++++++++++++++++++ 4 files changed, 56 insertions(+), 7 deletions(-) diff --git a/client/committee_record.go b/client/committee_record.go index acbd99cea4..064f5091da 100644 --- a/client/committee_record.go +++ b/client/committee_record.go @@ -27,7 +27,7 @@ func (c *WaspClient) GetCommitteeRecord(addr ledgerstate.Address) (*registry.Com // GetCommitteeForChain fetches the CommitteeRecord that manages the given chain func (c *WaspClient) GetCommitteeForChain(chainID *iscp.ChainID) (*registry.CommitteeRecord, error) { res := &model.CommitteeRecord{} - if err := c.do(http.MethodGet, routes.GetCommitteeForChain(chainID.Base58()), nil, res); err != nil { + if err := c.do(http.MethodGet, routes.GetCommitteeForChain(chainID.Base58())+"?includeDeactivated=true", nil, res); err != nil { return nil, err } return res.Record(), nil diff --git a/packages/chains/chains.go b/packages/chains/chains.go index d0f2233548..c6dc0958bf 100644 --- a/packages/chains/chains.go +++ b/packages/chains/chains.go @@ -120,8 +120,8 @@ func (c *Chains) Activate(chr *registry.ChainRecord, registryProvider registry.P return xerrors.Errorf("cannot activate chain for deactivated chain record") } chainArr := chr.ChainID.Array() - _, ok := c.allChains[chainArr] - if ok { + ret, ok := c.allChains[chainArr] + if ok && !ret.IsDismissed() { c.log.Debugf("chain is already active: %s", chr.ChainID.String()) return nil } @@ -181,15 +181,17 @@ func (c *Chains) Deactivate(chr *registry.ChainRecord) error { // Get returns active chain object or nil if it doesn't exist // lazy unsubscribing -func (c *Chains) Get(chainID *iscp.ChainID) chain.Chain { +func (c *Chains) Get(chainID *iscp.ChainID, includeDeactivated ...bool) chain.Chain { c.mutex.RLock() defer c.mutex.RUnlock() addrArr := chainID.Array() ret, ok := c.allChains[addrArr] + + if len(includeDeactivated) > 0 && includeDeactivated[0] { + return ret + } if ok && ret.IsDismissed() { - delete(c.allChains, addrArr) - c.nodeConn.Unsubscribe(chainID.AliasAddress) return nil } return ret diff --git a/packages/webapi/admapi/committeerecord.go b/packages/webapi/admapi/committeerecord.go index b144987424..998f6bb2a7 100644 --- a/packages/webapi/admapi/committeerecord.go +++ b/packages/webapi/admapi/committeerecord.go @@ -3,6 +3,7 @@ package admapi import ( "fmt" "net/http" + "strconv" "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/wasp/packages/chains" @@ -91,7 +92,8 @@ func (s *committeeRecordService) handleGetCommitteeForChain(c echo.Context) erro if err != nil { return httperrors.BadRequest(err.Error()) } - chain := s.chains().Get(chainID) + includeDeactivated, _ := strconv.ParseBool(c.QueryParam("includeDeactivated")) + chain := s.chains().Get(chainID, includeDeactivated) if chain == nil { return httperrors.NotFound(fmt.Sprintf("Active chain %s not found", chainID)) } diff --git a/tools/cluster/tests/wasp-cli_test.go b/tools/cluster/tests/wasp-cli_test.go index 1bbea3234a..612c7662eb 100644 --- a/tools/cluster/tests/wasp-cli_test.go +++ b/tools/cluster/tests/wasp-cli_test.go @@ -309,3 +309,48 @@ func TestWaspCLIBalance(t *testing.T) { require.EqualValues(t, utxodb.RequestFundsAmount-1000, bals["IOTA"]) require.EqualValues(t, 1000, bals[mintedColor]) } + +func TestWaspCLIRejoinChain(t *testing.T) { + w := newWaspCLITest(t) + + w.Run("init") + w.Run("request-funds") + + alias := "chain1" + + committee, quorum := w.CommitteeConfig() + + // test chain deploy command + w.Run("chain", "deploy", "--chain="+alias, committee, quorum) + + // test chain info command + out := w.Run("chain", "info") + chainID := regexp.MustCompile(`(?m)Chain ID:\s+([[:alnum:]]+)$`).FindStringSubmatch(out[0])[1] + require.NotEmpty(t, chainID) + t.Logf("Chain ID: %s", chainID) + + // test chain list command + out = w.Run("chain", "list") + require.Contains(t, out[0], "Total 1 chain(s)") + require.Contains(t, out[4], chainID) + + // deactivate chain and check that the chain was deactivated + w.Run("chain", "deactivate") + out = w.Run("chain", "list") + require.Contains(t, out[0], "Total 1 chain(s)") + require.Contains(t, out[4], chainID) + + chOut := strings.Fields(out[4]) + active, _ := strconv.ParseBool(chOut[1]) + require.False(t, active) + + // activate chain and check that it was activated + w.Run("chain", "activate") + out = w.Run("chain", "list") + require.Contains(t, out[0], "Total 1 chain(s)") + require.Contains(t, out[4], chainID) + + chOut = strings.Fields(out[4]) + active, _ = strconv.ParseBool(chOut[1]) + require.True(t, active) +} From cde06af75d65c60a4e07d7cccdee86203eaa5e99 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Sat, 27 Nov 2021 17:33:25 -0800 Subject: [PATCH 138/198] Fixed integer map key code generation --- contracts/wasm/dividend/test/dividend_bg.wasm | Bin 32303 -> 32303 bytes contracts/wasm/dividend/test/dividend_test.go | 4 +-- .../test/donatewithfeedback_bg.wasm | Bin 36517 -> 36521 bytes contracts/wasm/erc20/test/erc20_bg.wasm | Bin 35451 -> 35401 bytes .../wasm/fairauction/test/fairauction_bg.wasm | Bin 42692 -> 42696 bytes .../fairroulette/test/fairroulette_bg.wasm | Bin 40132 -> 40086 bytes .../wasm/inccounter/test/inccounter_bg.wasm | Bin 37007 -> 37011 bytes contracts/wasm/testcore/test/testcore_bg.wasm | Bin 53154 -> 53154 bytes .../wasm/testcore/ts/testcore/results.ts | 8 ++--- .../wasm/testwasmlib/test/testwasmlib_bg.wasm | Bin 41300 -> 41300 bytes .../wasm/testwasmlib/ts/testwasmlib/params.ts | 4 +-- .../wasm/testwasmlib/ts/testwasmlib/state.ts | 4 +-- .../wasm/timestamp/test/timestamp_bg.wasm | Bin 28155 -> 28155 bytes .../tokenregistry/test/tokenregistry_bg.wasm | Bin 32026 -> 32026 bytes .../test/example_tutorial_bg.wasm | Bin 16802 -> 16810 bytes .../sbtests/sbtestsc/testcore_bg.wasm | Bin 53154 -> 53154 bytes packages/vm/wasmlib/go/wasmlib/host.go | 6 ++++ packages/vm/wasmlib/src/host.rs | 6 ++++ .../vm/wasmlib/ts/wasmlib/coreblob/params.ts | 4 +-- .../vm/wasmlib/ts/wasmlib/coreblob/results.ts | 4 +-- packages/vm/wasmlib/ts/wasmlib/host.ts | 6 ++++ tools/cluster/tests/wasm/inccounter_bg.wasm | Bin 37007 -> 37011 bytes .../generator/gotemplates/alltemplates.go | 34 +++++++++--------- .../schema/generator/gotemplates/typedefs.go | 6 ++-- .../generator/rstemplates/alltemplates.go | 34 +++++++++--------- .../schema/generator/rstemplates/typedefs.go | 6 ++-- .../generator/tstemplates/alltemplates.go | 32 ++++++++--------- .../schema/generator/tstemplates/typedefs.go | 6 ++-- tools/schema/model/field.go | 2 +- 29 files changed, 92 insertions(+), 74 deletions(-) diff --git a/contracts/wasm/dividend/test/dividend_bg.wasm b/contracts/wasm/dividend/test/dividend_bg.wasm index 70255dafe355e264bb3912a01784af54354873b5..37a852b8f4c989cc7c85877743e834a09863cbe6 100644 GIT binary patch delta 248 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 diff --git a/contracts/wasm/erc20/test/erc20_bg.wasm b/contracts/wasm/erc20/test/erc20_bg.wasm index b237bd7325603533c507889f9b59c773753dc35a..1f883542824bd97b37abe9a38a77ce4c2b149920 100644 GIT binary patch delta 1072 zcmXX_U2IfE6rMA)m)%mcI}nmqTlKcxVxeWlNcXO>*v__F+g(IM`U8cQNDM8P77g(M z>O!{x5o58?+0-gLK(|4CvEca77)|!YL=%%5VnRcBAjF4846ii72fx`m$vOA@-S3?9 z&Am_a{I@*6wUMeA<4!Q>aC<^bIF4`xa~KZS^>nqnW%nDeG{1FthTff_0yP!rr2?Ku z3Y4vWa{<=bNcTLARc#%(K%>{`23@94sZCB(4!L=HCc5Ve)uq3pjRjN2_trLduyR+Z zd9GHj6`5>j<*Jx3GS#S7t$zSn?h3hHwMhS0nW<=RklOXb#wV1}_nJmX>GmCq)tNw> zn#TqnH;^uZN7OGAH)={?|we~eq))VSQb@3bP=%?}50qS{i zfS&L&^F(1TJH zwDimuiKzgkOmz2BAd<3csvM~Yvlt;|9;p^VU8W(`;b4@pbQV!%v5jj zT(RC~tpo}U(6&r3QPRxrS>zQfmn@HNK!tpD{&U#BA|PAMp|^kFVY@TKcz<58JDV5w zHF2P4dTfu$o?1$ng&vRK-0!WU#7y4;pPSY<`x>h(#n-2S=3!#jS1Xq-G87p8r>~M; z(@y^mzWSNo)jzYLI8{Rby`OV^bYO&1dU@bdNpCgh4*o*as=EiLx3ppy+Qv3vo}GS_ zm48A+`pyBbi{iWiSL1?6m&=a{cBSu%2Hp_o%oVQKCR|TQYboi=Ggt}9k_xPsBl@8$ z^uxh@*rj=>9dw=^S~TYHU0(6nl2U;+Dt(o=_C@Rkf^Ho7Iq=>vrwKY+$CNx?OHoTz zSTR|TIR&fXE>kSdL+Hmn^kZnMa`wXu%c19x4BI3nCv&;nt&com3kmliy<{%`=)Rbc zG5Ass4A)RxXNR8!ZL`D6)Txh-d27z^XM8DfupU6?!L-$woeQnwn2 delta 1117 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 delta 5377 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 d?@xV>Y85huarBbWTrOFsD2{{c#!|Aqhn diff --git a/contracts/wasm/inccounter/test/inccounter_bg.wasm b/contracts/wasm/inccounter/test/inccounter_bg.wasm index 9623493c7242095b06cce2d08a355636688825b2..e4a7d92ca038a07a1e86a249ad1f6ed343b5dad5 100644 GIT binary patch delta 4415 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 delta 4433 zcma)9e{j^r760yj?=F|zUHBdeatR6ST>=RSgr6Z8&}4&wL{yT9KR_h>MlL`EBiKJM z5dvbHBJwDrMi2!-5CyJ^or-0wt#nE|SaCon(}^~1vCuZ9%#=|E`gz~)T?oodo6L82 z-`lru-@f;GZ}(`Ie0G;S^l#xkDux{uL-q>#R_qsN>2+Bvy6Cdp89IC9xREc76%nH{ zU@F7fDIU?XNq5oP<`jth$E^2tKqMOW$Yy<-=DG%m)3nCbi1zO;HKgkud->ggB;^SR z9oNRnl6or}<9@UtE*cS)0hbcmTopmnq#f-^`hue=?8Yv?bC1E^!jqnD&qj5MtjOiy4X6LAYy8--3w(nN}XjOon<1i3=6P!pQorWVUhv$23v&Y zCKlNz7fAzgW|dSlh%Hr~anjJdp3O0oX&n(^)9+!cmL(PWY#D3}8G1db(CXPqxvE{| z`W$_kbZ_$|Uhd16u1JdJF-{SUz)VA524y#VFhk)CN=zNVGu@6{C7gW)!?0n(bn8{2 zypuV8`O+IP0*24;^7VKWj#I7%c-zumYm?yp**tAI_Bjf}Z0Rq(IX?SLwh8%**YlGOfjm-7)sD(! zCb-ufG&lKJ+U^*J?P!>Ph>6`aD&-h`n-cJJG1(ClzQ=^W|sa>7hV|kA>mgu+ZJq92k^lFBZJ`hBbrR z_T35n~0X0K)4azq3z?#d=f{8^JaKQ+Za7WdqM< zav%}YnU+fI7*1vrHdqH8Pr3Q9Wf5g9)&IcdL#8qpnvv#!_)pej{6?%NINe& z>4)i!qCNIa`bmLke|$@o*hg0XhcehX@adF*Py%VE%@x|55|HpxYySrmVfd}>edWK^Zcy`nipILzI!zm49^s2SnF$bpT1Qkf`dt5>jA zSS4YVGOizlkx`hL;jy!KE8UqHiAP5Cf}RBQ%%+IR(1X7m=*1}WX;*68L6ZYgxq#yQ zK}T=p3YI8i%B{Q&Q3p^rqy?@C{3kiJEMDa(q^fb)d1^$6&*qd?8{95f?>Bw0^$j)0 zsj18YogN+=k5}xTaIuh`JLy19S@w}vjw8AfIf6PMt8vko`c*kK;8s!}p)Vuj(;W%n zgH!aiYvziuiOd_GQzV|DSvkcS&+K6ZsGrb)w7&|3cvpoz`Wf1vQ!YNE^Em_1CgqOr z_n9qugQC{GRFpGZ?4`B2#c1El%`Q2<^SEK%fxzx#coynYOwU3{B(97~^rn7W=(%a4hW$^m_Qe zk7IgrROox4je}cU2e%e0$4M7l)00Zb9uB+%WI8jdCXq+OM`!zcq&Q~xj~;vzkeL9P zY>LPmLH6qCA{P$+$+*aE`wlo4y!JIIIdwn;xvM$dxNFikn`L|Bvox|K9eOHDMu|6R zbxA>1kNmZ3*Nhcm;gjXc1$3|~I#yCHcGK08;aR8lBTkbLAGbd2)}0B;)Pr<)Y|8jw z2+zwe;M6;i)uxmmzEZH9)_MID-b}|a-DVb+B7_+L(yKkSSDYN)Gtxhgvp{K_UwdI zAzETPCY}(mYVqy$;tTrt_AuJ7Z=Zp7Qdu6_hO&IoPFu?&1G$F7s))&#das+@Kn259 zak}hab|Qpa1FTHGeR{`xM|qCeN*|Ul?AL|MI2y(iBVszTdsv(v9TH(+EYJmRg6=GZ~{ZcJpR9TK-fW$7TQtqO_#^j393 zSqCK|bzNEPt~)<=rFCqEZG|X!h|0$2Fh04NhD=)xLw8JjNW4$qOe+-N)NBCa4%S4( z8+59s8t%!g9hSY_smszb{I$?tDYcV+aU-1J( zuHYDT0~{PMp}6qFeK6&m!-JG;V(0}?G!dpNhpDA5-DB&zL@(BbQ%`PQL~0Li@G1gIx@NR|hZS2n(=7q+CuWU65cbU)EVjmeKPxEG z+P7eXLY!Mg^$8vyC%X9XNYO$$vj?NCo}EkcYSXA?_VZXCsvqWQhs9b@c72Fi>ix95 zJ__)DUcaO-zcj|lkdhUm1V2cmeubvbS%A{~vpM(JIyxHylsC5_?IL5OKLn7o+j-o! zh4#!H54`+w?vGKAmd;x$KWe9C^D^nuyjoQF$@7am_FeD;8aZ!*+?|*U(bw}c0i-1h z@@d$DiT0>lT%ef?--EKWMKe&fmMtm(fBT}rfZzvLIFG0V6@lg6(OJndNB&tB=;tSxr zNYSVE2G68eMi!{^*m)58GZb0-biY|Xhnpb{!wv47q9WsE`e1EIayw@D?^C+Ec53ov zPzqFt>efvPPV_s}XmG;#CerKc%EZCgU)J>(;sd(cI%#Nkz%u$`N~T))y=oXM=PqBo zP%T`(KrLCmVBr&LEcm>Er0Dv>-8nUW8nF~I}x92r_>FF8J9t& zg6rvH87}lG=vhxY)oqv%POO;-?htV2q4%PXqW9QRZ*3S6+zx6ms1$tclI^j7Y-o0e l^ZHpvKFF!~xKGdzV9dtl#WuA)VWu#2eZqy8Em@n_{THFH7J&c& diff --git a/contracts/wasm/testcore/test/testcore_bg.wasm b/contracts/wasm/testcore/test/testcore_bg.wasm index 8ff1ea7b16e2117f1daeb142ca4d452ae5eb38f7..d7a9b173c8d054a8d853cc03a0b08e4cea65c76e 100644 GIT binary patch delta 506 zcmZ29pLx-I<_*P6e02vIKQXp5*|sy8ePS%y+{iRJoN30I$zo9-gjcLNz~IQMz~pF= z<#=HwkiBEgX36LUg2F8zj-zOB79;Q zP?NR-qoYEW;};P7&GOBa%^@tpS5~2!_GZ=O2kjBUf6&FJte))M5h45l`ajpd~Pub*!1J*ck*9XGRj=+}0T?#SFfeccF$)mu z0kQt%k9+hP4JIq@O_!Y_EWqFj6w3!<2_S~?=L6ZAlPB(~X8bdmcek~!A&?IOj6iGz z#Ks^F5P%mkAY_b3BJw(imA{3#;9 O;04t2Z}Y;vj6wjx8Lx-{ delta 508 zcmZ29pLx-I<_*P6e75aObq5*Snan;h7JXve+{iRJoaxD`$zo9-gukphz~IQMz~pF= zrklnI+vt;xFLE$~ifgEiG7DtXO#}^>>n&q3%By(RPeJ1 z&j1-922>}J<=6uRiq!z4OZP2N}A4by-S-vAO1-Mq1GD~s@y z)j&>X=1S2l;R2roc4ZO6*V585MyPoRrGSUK6dBSLr$$SIOYwod?w zD^I@JVJdt8BsWTcjs@HnjEvcg3)C1)!o*P zx(pD&2&D9YSRaTvfS3h{4S?7Xh>d_41VCzxf!G9yMSvKj#&ojno^(dn$xHXB1Ie>s z@++8>-3t5~^E zg-#AnGK1+s$X%Jfc|j5%r|^kMKuy{TjE)Lfj$c6RHv^&!#<%J8s zK^JbBJ~<00egWhVNhHg+OaqGBPZrLX5bl_PCbwk9WV`%u;U^#mivaD0dF03R%`5V6 z2rzA#w7IFlgila_fq{Voh*^MG5Qv2)|DT}GC_GtzV!G@UP5}m2pjbW-O8_y9KOe}} zoV>ZOn(@zM{eEj%5g;D~7=c(6h{Zr0AOP{jC(rIrXM8!Cd4f8S)CQBmV6qxaE}oza b6hA&eoA)J`0D~7$hX_!c&gRV%7xDuD{D+pz delta 459 zcmca|i0R59rVZ~Hxphx6rcGfy$*8e|aq~~chEU->lMgUBYAdifa%4Ha0I}Ch-rN)Z zj*V&0^vN}GlbEK=*enq5$Ryk`4JaoDR40+;*fRylUNCKPN@BP0gQ-BaxB?Sg{KwSE z3z9-7hbNiA^dRIGOxwI5iH}pbVLDKgwgRK0LYCti5PQjt%?Gn}n1m;wo3>)=q`Yw9 z9q7UrrcTZRiq8Q#L=wsJ29UV@WZ`@X;VU2qBg=i5HrXyeTzCUWTm)!0%p*spZC;Uo zLxAbWWSLCrd$FHUO*ipKy5mckN4>_ickLDmo9sT aTY$k8D4q|*5&&jhkHH*cP}kRJf6sgJP$ diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/params.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/params.ts index d70bdc0180..b4865a4e4e 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/params.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/params.ts @@ -68,7 +68,7 @@ export class MapStringToImmutableBytes { } getBytes(key: string): wasmlib.ScImmutableBytes { - return new wasmlib.ScImmutableBytes(this.objID, wasmlib.Key32.fromString(key).getKeyID()); + return new wasmlib.ScImmutableBytes(this.objID, wasmlib.Key32.fromString(key)); } } @@ -162,7 +162,7 @@ export class MapStringToMutableBytes { } getBytes(key: string): wasmlib.ScMutableBytes { - return new wasmlib.ScMutableBytes(this.objID, wasmlib.Key32.fromString(key).getKeyID()); + return new wasmlib.ScMutableBytes(this.objID, wasmlib.Key32.fromString(key)); } } diff --git a/contracts/wasm/testwasmlib/ts/testwasmlib/state.ts b/contracts/wasm/testwasmlib/ts/testwasmlib/state.ts index ddce3923cd..a823238696 100644 --- a/contracts/wasm/testwasmlib/ts/testwasmlib/state.ts +++ b/contracts/wasm/testwasmlib/ts/testwasmlib/state.ts @@ -16,7 +16,7 @@ export class MapStringToImmutableStringArray { } getStringArray(key: string): sc.ImmutableStringArray { - let subID = wasmlib.getObjectID(this.objID, wasmlib.Key32.fromString(key).getKeyID(), wasmlib.TYPE_ARRAY|wasmlib.TYPE_STRING); + let subID = wasmlib.getObjectID(this.objID, wasmlib.Key32.fromString(key), wasmlib.TYPE_ARRAY|wasmlib.TYPE_STRING); return new sc.ImmutableStringArray(subID); } } @@ -44,7 +44,7 @@ export class MapStringToMutableStringArray { } getStringArray(key: string): sc.MutableStringArray { - let subID = wasmlib.getObjectID(this.objID, wasmlib.Key32.fromString(key).getKeyID(), wasmlib.TYPE_ARRAY|wasmlib.TYPE_STRING); + let subID = wasmlib.getObjectID(this.objID, wasmlib.Key32.fromString(key), wasmlib.TYPE_ARRAY|wasmlib.TYPE_STRING); return new sc.MutableStringArray(subID); } } diff --git a/contracts/wasm/timestamp/test/timestamp_bg.wasm b/contracts/wasm/timestamp/test/timestamp_bg.wasm index 5d5d866b5d160faf96b95ddc0fe4ea6d9f3c6329..508e5d3fc3619954d5aaae76aa71da6ec7946f14 100644 GIT binary patch delta 76 zcmex;oALK;#tqD_!ZTVAFgR)}usCvLIUWJAJ6bo3xvpSg+S0uFfahG{$%=6iygL{L d7+e_`81jKwVscb$HIo3-*u*_yId68R7r{ delta 76 zcmex;oALK;#tqD_!W&u+FgR)}usCvLIo<)W7qn~^b6vs0^rL0-0nfR@laIz$Fs)#m eY#-+}IW{(ew}wf8!Igo5As>h(Hn+u<@&f>hZ5q@7 diff --git a/contracts/wasm/tokenregistry/test/tokenregistry_bg.wasm b/contracts/wasm/tokenregistry/test/tokenregistry_bg.wasm index 979977d52a85d37b779f5ad2058f194ed06d736e..6ff8e7658c92f855d2473102a2eccbc45ddeb07c 100644 GIT binary patch delta 246 zcmbRBi*eR3#toYoIocSfF=|a?RNcIbaigd3osI(xj@k+=jvQHz9i2e-nU2kM-rj6X zciJYO4xGfarG0aJPz9s#oGzf8xB`=-M3&h(fEdP~4`gdj&djc6 zyfXP|wzVuLkPiZkK+FZi+#n7RfcQLrWoUD*j!Kg5KW{$Ni2Ll8!0x3=)=0f6gPyU#b&h&+Oa#XGw y?-ynP1}~uGA|Te7oSCi9$TN9ncDn2x76ArVpjbW-O8_y9KNHB-+}xYn%MSnvhe+7~ diff --git a/documentation/tutorial-examples/test/example_tutorial_bg.wasm b/documentation/tutorial-examples/test/example_tutorial_bg.wasm index 1b1051f5422a09c40684da0f211c16144065f4ee..e0347a0265cdd4979b2f68137a23531c592c7e78 100644 GIT binary patch delta 2914 zcma)8U1%KF6~5=r%$@;NYdo9V1B+HSiC>zPLRcK;2 zv!%r#NQhmeBv7{{(6~1bhSJzA4S_&I+AX0k0hQ91QbY0<+K`gcK>ASHzLXR{wBNn6 zGI5%eB35_i%-nO&`M&R*Ge3TTUVnjJ8uw`X%Z%Ney3u!W!{Pf}VnkVUkr{>^`Mx^+Y;eSl6;K`&8L^X4VBFT8kie`DY5$c2sbinxi6*#*ZvRU7O{o${|m3sd>yDWm)TGI|TNV1#A31~uhJAJYo zc(4dKbCeC_5!bxtih1ctM@;H(IM3$C(|BhsbbOwnv=VVp_HA`7l5C;fMwoTa=Rb2U ziDl_l0!NaV2$@?lAt2`G+>Son`z)Q76mpza4iK6UdqK?k9zZZbFdM{g-PhX3WkRe4 zP9~Y=B?XMO#A%tpa#cL6U-VX+=A~mCg|I1S3&(~W;s4Y79kIKwhbD=&)2;f?b>dTp)>}P!bAk+JQ_&lV^@20Z8v%k@s zw`djph2)Blti+@GCBM7(eq5jhO13dFB*A5(5`~_{C5ae8o&LZd%$%KdOT1)A4-j1%08u zXL~``E%+R|Ebx?75{d#|>)>-COvb2%qN1LPLi!ZIlA;jV#AwR8Xs$ily~a4f8Iz!%^-m*BWp8m4Jd|Eb|3g0*4`sFq%>?Dr(8FCCabk9zQ(nq2jp2Tr#wNcueB znOM=8#!*_ea^I^?yODtEf-@eJxT?Usc}(IjTm6ex<47c+vC|C+;Uf!a{&< z2?zjV;2H=%{f8%W`maqr$uoWm>RHz9&3Oc%nu{peo#tG9StUof3!x>|RsZIe5;(N$FrIs2SRZSVb@y%h@s=~kigQ4a;CUG0^6+!f{^Gr%*;5W619*x(OzOKW zU*9eoEq{)Cdq`cpKP86YCUBv0AG|xl4c%GPFbV=a4C$(8)OC|wJMe)s03rqehF5P| zk9}v)+GfnK;)yHf+N9&6KHhFU+tK4w#*~N3*a3iwT(ojX$fW4e!NHT%Q(ZfFnXv4( z9d#Zm2mF613^7Cj)fCp+X%sfoxu-Bfrx??}=rjuZq;nYz%y&To)z`Z?r&ayapr6j^ zKLoQ=MM%dj?X|wNtu+TN|G$Re0}65OD`Ybab5i4!{a`}Xw+AaVmD7wh`fFjv36 zr)bb@X3l$Ihp^RR2}LR#oO|6plXIvjBQaiU3Qn|WETF{>C9K2dZRu3P_|g$|piitB zhN@3>Um;r3@8(+QG5wd^@pCh2@rZ#+{bpwu=!?fjcq8^>N|?DRF)lG=gv26nUEmTF zV=0J|S#m}_U=*>CnATVFQzZ3k`8*BiyZITQ*>HHHv|^YH%q&KyMMI4HFglXyb<5`a z0Jb{Y#P-#y+&DA?Ci)tto|z5_{X}JyD^{zw9?DR| zDocxV=&P7`5im)J0sU6*JF{9rZXatTQ4fOeWJbsTwAgEt->dwIuP3z6Uw(NAA zFjuA}Oz9hgKdhe$9dK@hZit`OL&rbP48}?10pP0c8LDI-q(k2sYFd)&m(T5*Hmcr? zSFscr&hD6K(uT7`F=wqXwpyN2F;61qDO2MKk0qM6e)dE=4(0|u*B<<%6Dtoy^8Ml4 zG^pw(Xw4Jh;O;Q zLx4A_E6Tv>3WiotV339B2nG)23$AaEwjvC>C1vCK_2@bc>CUl(dt|2!*?M{`oS48_ z-8dJ6Eyu)>fU9o<9JMJN^8qK>Nyp52M?pj8J1Hf=Lp-v$eq!upIwxAHj R34MP2D|D>-^YOnY{sSE#1Iqva delta 3116 zcma)8TWnlM8J^2Idv<;H>`olp@g=e69Ix$7?f4eQu^l_!vEw+l>)3Ie#f}{k3EGrn zKv=TWiljJgA5svgM1v5OK%oc~1QHi5sECKkAn}4w1aBZBmAfh)fHy!?f^X)mtu`uE zWvyp+F8}5GzW<;7)(iA&FVN4Ax#R|+yZ0vVE^cmcR^w1YX^v$GBQ7C?dCc_~VS)Kh znMbITPGN&NoSAJ#UBWq`HLk-c!4zM3n$nD}qvQ0rzC`OAK6tHE)4n-;sIKSSsjC}{ zk6+uY`NlIF`ZjHwU5lusDlI0qR9!NNWcb&AZ^i2AZS`y%F-4SJRcvPq=b5B)Es`t- zOcLe9=Dhv`ee&=b)waD8dWwXUmsm*>v8*@P(<@5-^6nlfGO`_!nSf(`_9>WB4?n#} zVl3NLpW}k0<`P^uOPD%aQA+Z;?TEF6RAMSIG1td*f%nLA=wdG5h$rDKImUz|=AC|0&o>Qm}DKI?Rar z6C#!bGn2CzuV#Y_mDcn<-UE=0w=k8s3t8eXq%tkjpuol=$yP)}S^w4_YFmp^_5!P3 zpw$b+(pT2K*|2dXFp9V=v$JNR-b_Ffr}fQjSMCv;U(R;F51U6d3)*Q}zjCO~owI07 z1`FOwfULx2eJ^P5K8OoEp*(Di1W7QN+KMCB;^HAjaH-!22D0a8oDwS;bwnv$s%_AN zxtR{I?@LcQSRRp%y2Fe(@m=JlYaw=h>FE5SY5hj-DA;=|H-P`W`Qz@mIiNT5UAyx# zvk)){xX990TBs~o&A{e-2ck#!R)kYk99vINIVh79zDkXu+U0AGO5;}HD@oP0p@+HN|c`)Z%? z%@)BXg}eK;({x<_vGy8*wPFitHN9$o*q5Zfe)!ChN6%E{s=t4Ds(D`0cLSb?6&=)# z&}DtT?mAq(TK9_+@27v#{r;)%*B=|4P-r|nX*^-dLVy+w2moW~7zp0}hn)-hZ}nZ? zOpu0pmi5tw4g@gOa26%|TtgvWR^BjkAT&?y#314a4IgftFwF)X(-^el5cXX$r2CJ^ z%)y#oKXSfrVh#wR)rujA%f-h*pG@vX=1w_;3}7j-Fs>gQ`S|XH(ek^Pw@xz2{j?Z@ znb3jC1Mtp;6FD=eVH5;<7}8bGsM{vF7Kj(d0Ep-V7;fIQ9(!hgwb?9V6+4c&&@8!w z`gpx@_E<5XSyLV=YhMvm?))_sLhbczxE!&alPf45!&0}E}CK;_$Qcz{>+cfu2NK|c&3$FH=?Lu6;gegB7V@fZ^r$MJc687_{h;F<@IBnQSz0mNhUOVZ??sDDIx~8d>3+-RX9w0Ywyo7v z>)seNPf`}v&sV|<5zZk|^`+xXC01BBFW6=e>zc+~F z#IzA=F)pIQO6u=stw~JlU-j3~CHICr z)h`ZwC4V;JP=S%Yk;0T78hkU`pCr)%09SSKkl$Z9x_3C94b zZYqBlC^>>OOIjpA!7y$RRsrr%^&&!2*9ABHNOGE|O>!!0O2_=dgjSQMgZkT#cwM(% z9qW}DCilHM#w(0ir>v+ahtxZ9`s~ns+OK;~^+RIUPJNUPR(^hJicNPQziccDc2Hli zidI~hW%GLZry1L&pEANF2Vo<`e*BJw_q3(prID+hgTy~a8PYB?2WerzlZJgqR3&Go kt2#d#>5q+SI-u#;yuU7Nv7(+&>hjo!Xm91mWB*9~4+H%f3;+NC diff --git a/packages/vm/core/testcore/sbtests/sbtestsc/testcore_bg.wasm b/packages/vm/core/testcore/sbtests/sbtestsc/testcore_bg.wasm index 8ff1ea7b16e2117f1daeb142ca4d452ae5eb38f7..d7a9b173c8d054a8d853cc03a0b08e4cea65c76e 100644 GIT binary patch delta 506 zcmZ29pLx-I<_*P6e02vIKQXp5*|sy8ePS%y+{iRJoN30I$zo9-gjcLNz~IQMz~pF= z<#=HwkiBEgX36LUg2F8zj-zOB79;Q zP?NR-qoYEW;};P7&GOBa%^@tpS5~2!_GZ=O2kjBUf6&FJte))M5h45l`ajpd~Pub*!1J*ck*9XGRj=+}0T?#SFfeccF$)mu z0kQt%k9+hP4JIq@O_!Y_EWqFj6w3!<2_S~?=L6ZAlPB(~X8bdmcek~!A&?IOj6iGz z#Ks^F5P%mkAY_b3BJw(imA{3#;9 O;04t2Z}Y;vj6wjx8Lx-{ delta 508 zcmZ29pLx-I<_*P6e75aObq5*Snan;h7JXve+{iRJoaxD`$zo9-gukphz~IQMz~pF= zrklnI+vt;xFLE$~ifgEiG7DtXO#}^>>n&q3%By(RPeJ1 z&j1-922>}J<=6uRiq!z4OZP2N}A4by-S-vAO1-Mq1GD~s@y z)j&>X=1S2l;R2roc4ZO6*V585MyPoRrGSUK6dBSLr$$SIOYwod?w zD^I@JVJdt8BsWTcjs@HnjEvcg3)C1)!o*P zx(pD&2&D9YSRaTvfS3h{4S?7Xh>d_41VCzxf!G9yMSvKj#&ojno^(dn$xHXB1Ie>s z@++8>-3t Key32 { } } +// Retrieve the key id that the host has associated with the specified integer key +pub fn get_key_id_from_uint64(key: u64, nr_of_bytes: usize) -> Key32 { + let bytes = key.to_le_bytes(); + get_key_id_from_bytes(&bytes[..nr_of_bytes]) +} + // Retrieve the length of an array container object on the host pub fn get_length(obj_id: i32) -> i32 { // special integer key "length" is used diff --git a/packages/vm/wasmlib/ts/wasmlib/coreblob/params.ts b/packages/vm/wasmlib/ts/wasmlib/coreblob/params.ts index d4eef4d06e..b334596688 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreblob/params.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreblob/params.ts @@ -16,7 +16,7 @@ export class MapStringToImmutableBytes { } getBytes(key: string): wasmlib.ScImmutableBytes { - return new wasmlib.ScImmutableBytes(this.objID, wasmlib.Key32.fromString(key).getKeyID()); + return new wasmlib.ScImmutableBytes(this.objID, wasmlib.Key32.fromString(key)); } } @@ -38,7 +38,7 @@ export class MapStringToMutableBytes { } getBytes(key: string): wasmlib.ScMutableBytes { - return new wasmlib.ScMutableBytes(this.objID, wasmlib.Key32.fromString(key).getKeyID()); + return new wasmlib.ScMutableBytes(this.objID, wasmlib.Key32.fromString(key)); } } diff --git a/packages/vm/wasmlib/ts/wasmlib/coreblob/results.ts b/packages/vm/wasmlib/ts/wasmlib/coreblob/results.ts index 5069e76d45..f10b4bf968 100644 --- a/packages/vm/wasmlib/ts/wasmlib/coreblob/results.ts +++ b/packages/vm/wasmlib/ts/wasmlib/coreblob/results.ts @@ -40,7 +40,7 @@ export class MapStringToImmutableInt32 { } getInt32(key: string): wasmlib.ScImmutableInt32 { - return new wasmlib.ScImmutableInt32(this.objID, wasmlib.Key32.fromString(key).getKeyID()); + return new wasmlib.ScImmutableInt32(this.objID, wasmlib.Key32.fromString(key)); } } @@ -62,7 +62,7 @@ export class MapStringToMutableInt32 { } getInt32(key: string): wasmlib.ScMutableInt32 { - return new wasmlib.ScMutableInt32(this.objID, wasmlib.Key32.fromString(key).getKeyID()); + return new wasmlib.ScMutableInt32(this.objID, wasmlib.Key32.fromString(key)); } } diff --git a/packages/vm/wasmlib/ts/wasmlib/host.ts b/packages/vm/wasmlib/ts/wasmlib/host.ts index 35c960b296..3d8b8f6806 100644 --- a/packages/vm/wasmlib/ts/wasmlib/host.ts +++ b/packages/vm/wasmlib/ts/wasmlib/host.ts @@ -141,6 +141,12 @@ export function getKeyIDFromString(key: string): Key32 { return getKeyID(bytes, bytes.length); } +// Retrieve the key id that the host has associated with the specified integer key +export function getKeyIDFromUint64(key: u64, nrOfBytes: usize): Key32 { + // negative size indicates this is a bytes key + return getKeyID(Convert.fromI64(key as i64), -nrOfBytes - 1); +} + // Retrieve the length of an array container object on the host export function getLength(objID: i32): i32 { // special integer key "length" is used diff --git a/tools/cluster/tests/wasm/inccounter_bg.wasm b/tools/cluster/tests/wasm/inccounter_bg.wasm index 9623493c7242095b06cce2d08a355636688825b2..e4a7d92ca038a07a1e86a249ad1f6ed343b5dad5 100644 GIT binary patch delta 4415 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 delta 4433 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 diff --git a/tools/schema/generator/gotemplates/alltemplates.go b/tools/schema/generator/gotemplates/alltemplates.go index f4c097223b..4cbd5d2b4e 100644 --- a/tools/schema/generator/gotemplates/alltemplates.go +++ b/tools/schema/generator/gotemplates/alltemplates.go @@ -60,23 +60,23 @@ var TypeDependent = model.StringMapMap{ "": "wasmlib.TYPE_BYTES", }, "fldToKey32": { - "Address": "key", - "AgentID": "key", - "Bool": "wasmlib.Key32(key)", - "ChainID": "key", - "Color": "key", - "Hash": "key", - "Hname": "key", - "Int8": "wasmlib.Key32(key)", - "Int16": "wasmlib.Key32(key)", - "Int32": "wasmlib.Key32(key)", - "Int64": "wasmlib.Key32(key)", - "RequestID": "key", - "String": "wasmlib.Key(key)", - "Uint8": "wasmlib.Key32(key)", - "Uint16": "wasmlib.Key32(key)", - "Uint32": "wasmlib.Key32(key)", - "Uint64": "wasmlib.Key32(key)", + "Address": "key.KeyID()", + "AgentID": "key.KeyID()", + "Bool": "???cannot use Bool as map key", + "ChainID": "key.KeyID()", + "Color": "key.KeyID()", + "Hash": "key.KeyID()", + "Hname": "key.KeyID()", + "Int8": "wasmlib.GetKeyIDFromUint64(uint64(key), 1)", + "Int16": "wasmlib.GetKeyIDFromUint64(uint64(key), 2)", + "Int32": "wasmlib.GetKeyIDFromUint64(uint64(key), 4)", + "Int64": "wasmlib.GetKeyIDFromUint64(uint64(key), 8)", + "RequestID": "key.KeyID()", + "String": "wasmlib.Key(key).KeyID()", + "Uint8": "wasmlib.GetKeyIDFromUint64(uint64(key), 1)", + "Uint16": "wasmlib.GetKeyIDFromUint64(uint64(key), 2)", + "Uint32": "wasmlib.GetKeyIDFromUint64(uint64(key), 4)", + "Uint64": "wasmlib.GetKeyIDFromUint64(key, 8)", }, } diff --git a/tools/schema/generator/gotemplates/typedefs.go b/tools/schema/generator/gotemplates/typedefs.go index f4448dfda9..ed5fcb42e9 100644 --- a/tools/schema/generator/gotemplates/typedefs.go +++ b/tools/schema/generator/gotemplates/typedefs.go @@ -103,7 +103,7 @@ func (m $proxy) Clear() { "typedefProxyMapNewBaseType": ` func (m $proxy) Get$FldType(key $fldKeyLangType) wasmlib.Sc$mut$FldType { - return wasmlib.NewSc$mut$FldType(m.objID, $fldKeyToKey32.KeyID()) + return wasmlib.NewSc$mut$FldType(m.objID, $fldKeyToKey32) } `, // ******************************* @@ -115,7 +115,7 @@ $#if typedef typedefProxyMapNewOtherTypeTypeDef typedefProxyMapNewOtherTypeStruc $#emit setVarType func (m $proxy) Get$OldType(key $oldKeyLangType) $mut$OldType { - subID := wasmlib.GetObjectID(m.objID, $oldKeyToKey32.KeyID(), $varType) + subID := wasmlib.GetObjectID(m.objID, $oldKeyToKey32, $varType) return $mut$OldType{objID: subID} } `, @@ -123,7 +123,7 @@ func (m $proxy) Get$OldType(key $oldKeyLangType) $mut$OldType { "typedefProxyMapNewOtherTypeStruct": ` func (m $proxy) Get$FldType(key $fldKeyLangType) $mut$FldType { - return $mut$FldType{objID: m.objID, keyID: $fldKeyToKey32.KeyID()} + return $mut$FldType{objID: m.objID, keyID: $fldKeyToKey32} } `, } diff --git a/tools/schema/generator/rstemplates/alltemplates.go b/tools/schema/generator/rstemplates/alltemplates.go index 9873da8644..5039a1807d 100644 --- a/tools/schema/generator/rstemplates/alltemplates.go +++ b/tools/schema/generator/rstemplates/alltemplates.go @@ -61,23 +61,23 @@ var TypeDependent = model.StringMapMap{ "": "TYPE_BYTES", }, "fldToKey32": { - "Address": "key", - "AgentID": "key", - "Bool": "Key32(key)", - "ChainID": "key", - "Color": "key", - "Hash": "key", - "Hname": "key", - "Int8": "Key32(key)", - "Int16": "Key32(key)", - "Int32": "Key32(key)", - "Int64": "Key32(key)", - "RequestID": "key", - "String": "key", - "Uint8": "Key32(key)", - "Uint16": "Key32(key)", - "Uint32": "Key32(key)", - "Uint64": "Key32(key)", + "Address": "key.get_key_id()", + "AgentID": "key.get_key_id()", + "Bool": "???cannot use Bool as map key", + "ChainID": "key.get_key_id()", + "Color": "key.get_key_id()", + "Hash": "key.get_key_id()", + "Hname": "key.get_key_id()", + "Int8": "get_key_id_from_uint64(key as u64, 1)", + "Int16": "get_key_id_from_uint64(key as u64, 2)", + "Int32": "get_key_id_from_uint64(key as u64, 4)", + "Int64": "get_key_id_from_uint64(key as u64, 8)", + "RequestID": "key.get_key_id()", + "String": "key.get_key_id()", + "Uint8": "get_key_id_from_uint64(key as u64, 1)", + "Uint16": "get_key_id_from_uint64(key as u64, 2)", + "Uint32": "get_key_id_from_uint64(key as u64, 4)", + "Uint64": "get_key_id_from_uint64(key, 8)", }, "fldParamLangType": { "Address": "ScAddress", diff --git a/tools/schema/generator/rstemplates/typedefs.go b/tools/schema/generator/rstemplates/typedefs.go index e5fef615c2..3b6a2fd676 100644 --- a/tools/schema/generator/rstemplates/typedefs.go +++ b/tools/schema/generator/rstemplates/typedefs.go @@ -109,7 +109,7 @@ $#set exist $proxy // ******************************* "typedefProxyMapNewBaseType": ` pub fn get_$fld_type(&self, key: $fldKeyRef$fldKeyParamLangType) -> Sc$mut$FldType { - Sc$mut$FldType::new(self.obj_id, key.get_key_id()) + Sc$mut$FldType::new(self.obj_id, $fldKeyToKey32) } `, // ******************************* @@ -120,14 +120,14 @@ $#if typedef typedefProxyMapNewOtherTypeTypeDef typedefProxyMapNewOtherTypeStruc "typedefProxyMapNewOtherTypeTypeDef": ` $#emit setVarType pub fn get_$old_type(&self, key: $oldKeyRef$oldKeyParamLangType) -> $mut$OldType { - let sub_id = get_object_id(self.obj_id, key.get_key_id(), $varType); + let sub_id = get_object_id(self.obj_id, $oldKeyToKey32, $varType); $mut$OldType { obj_id: sub_id } } `, // ******************************* "typedefProxyMapNewOtherTypeStruct": ` pub fn get_$fld_type(&self, key: $fldKeyRef$fldKeyParamLangType) -> $mut$FldType { - $mut$FldType { obj_id: self.obj_id, key_id: key.get_key_id() } + $mut$FldType { obj_id: self.obj_id, key_id: $fldKeyToKey32 } } `, } diff --git a/tools/schema/generator/tstemplates/alltemplates.go b/tools/schema/generator/tstemplates/alltemplates.go index 95d909cb9c..0c1f1388be 100644 --- a/tools/schema/generator/tstemplates/alltemplates.go +++ b/tools/schema/generator/tstemplates/alltemplates.go @@ -60,23 +60,23 @@ var TypeDependent = model.StringMapMap{ "": "wasmlib.TYPE_BYTES", }, "fldToKey32": { - "Address": "key", - "AgentID": "key", - "Bool": "new wasmlib.Key32(key?1:0)", - "ChainID": "key", - "Color": "key", - "Hash": "key", - "Hname": "key", - "Int8": "new wasmlib.Key32(key)", - "Int16": "new wasmlib.Key32(key)", - "Int32": "new wasmlib.Key32(key)", - "Int64": "new wasmlib.Key32(key)", - "RequestID": "key", + "Address": "key.getKeyID()", + "AgentID": "key.getKeyID()", + "Bool": "???cannot use Bool as map key", + "ChainID": "key.getKeyID()", + "Color": "key.getKeyID()", + "Hash": "key.getKeyID()", + "Hname": "key.getKeyID()", + "Int8": "wasmlib.getKeyIDFromUint64(key as u64, 1)", + "Int16": "wasmlib.getKeyIDFromUint64(key as u64, 2)", + "Int32": "wasmlib.getKeyIDFromUint64(key as u64, 4)", + "Int64": "wasmlib.getKeyIDFromUint64(key as u64, 8)", + "RequestID": "key.getKeyID()", "String": "wasmlib.Key32.fromString(key)", - "Uint8": "new wasmlib.Key32(key)", - "Uint16": "new wasmlib.Key32(key)", - "Uint32": "new wasmlib.Key32(key)", - "Uint64": "new wasmlib.Key32(key)", + "Uint8": "wasmlib.getKeyIDFromUint64(key as u64, 1)", + "Uint16": "wasmlib.getKeyIDFromUint64(key as u64, 2)", + "Uint32": "wasmlib.getKeyIDFromUint64(key as u64, 4)", + "Uint64": "wasmlib.getKeyIDFromUint64(key, 8)", }, "fldTypeInit": { "Address": "new wasmlib.ScAddress()", diff --git a/tools/schema/generator/tstemplates/typedefs.go b/tools/schema/generator/tstemplates/typedefs.go index e0a6a1875a..21ae67839b 100644 --- a/tools/schema/generator/tstemplates/typedefs.go +++ b/tools/schema/generator/tstemplates/typedefs.go @@ -112,7 +112,7 @@ $#set exist $proxy "typedefProxyMapNewBaseType": ` get$FldType(key: $fldKeyLangType): wasmlib.Sc$mut$FldType { - return new wasmlib.Sc$mut$FldType(this.objID, $fldKeyToKey32.getKeyID()); + return new wasmlib.Sc$mut$FldType(this.objID, $fldKeyToKey32); } `, // ******************************* @@ -124,7 +124,7 @@ $#if typedef typedefProxyMapNewOtherTypeTypeDef typedefProxyMapNewOtherTypeStruc $#emit setVarType get$OldType(key: $oldKeyLangType): sc.$mut$OldType { - let subID = wasmlib.getObjectID(this.objID, $oldKeyToKey32.getKeyID(), $varType); + let subID = wasmlib.getObjectID(this.objID, $oldKeyToKey32, $varType); return new sc.$mut$OldType(subID); } `, @@ -132,7 +132,7 @@ $#emit setVarType "typedefProxyMapNewOtherTypeStruct": ` get$FldType(key: $fldKeyLangType): sc.$mut$FldType { - return new sc.$mut$FldType(this.objID, $fldKeyToKey32.getKeyID()); + return new sc.$mut$FldType(this.objID, $fldKeyToKey32); } `, } diff --git a/tools/schema/model/field.go b/tools/schema/model/field.go index 1befe05885..38232a01df 100644 --- a/tools/schema/model/field.go +++ b/tools/schema/model/field.go @@ -92,7 +92,7 @@ func (f *Field) Compile(s *Schema, fldName, fldType string) error { index = strings.Index(fldType, "]") if index > 5 { f.MapKey = strings.TrimSpace(fldType[4:index]) - if !fldTypeRegexp.MatchString(f.MapKey) { + if !fldTypeRegexp.MatchString(f.MapKey) || f.MapKey == "Bool" { return fmt.Errorf("invalid key field type: %s", f.MapKey) } fldType = strings.TrimSpace(fldType[index+1:]) From 258e9542e9f2e7f293e8d58fde7fc1039c7bcddf Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Sun, 28 Nov 2021 10:57:42 -0800 Subject: [PATCH 139/198] Cleanup/simplify --- .../generator/clienttemplates/alltemplates.go | 8 ++ tools/schema/generator/emitter.go | 44 ++++----- tools/schema/generator/generator.go | 90 +++++++++---------- tools/schema/generator/generator_client.go | 17 +--- tools/schema/generator/generator_go.go | 21 ++--- tools/schema/generator/generator_rust.go | 23 ++--- tools/schema/generator/generator_ts.go | 23 +++-- .../generator/gotemplates/alltemplates.go | 8 ++ .../generator/rstemplates/alltemplates.go | 8 ++ .../generator/tstemplates/alltemplates.go | 8 ++ tools/schema/main.go | 16 ++-- 11 files changed, 134 insertions(+), 132 deletions(-) diff --git a/tools/schema/generator/clienttemplates/alltemplates.go b/tools/schema/generator/clienttemplates/alltemplates.go index 85f01722c5..8bc8ee4ea5 100644 --- a/tools/schema/generator/clienttemplates/alltemplates.go +++ b/tools/schema/generator/clienttemplates/alltemplates.go @@ -2,7 +2,15 @@ package clienttemplates import "github.com/iotaledger/wasp/tools/schema/model" +var config = map[string]string{ + "language": "Client", + "extension": ".ts", + "rootFolder": "client", + "funcRegexp": `N/A`, +} + var Templates = []map[string]string{ + config, common, eventsTs, } diff --git a/tools/schema/generator/emitter.go b/tools/schema/generator/emitter.go index 9805fbcc73..862957115e 100644 --- a/tools/schema/generator/emitter.go +++ b/tools/schema/generator/emitter.go @@ -164,43 +164,43 @@ func (g *GenBase) emitEachEvent(events []*model.Struct, template string) { } func (g *GenBase) emitEachField(fields []*model.Field, template string) { - g.maxCamelFldLen = 0 - g.maxSnakeFldLen = 0 + maxCamelLength := 0 + maxSnakeLength := 0 for _, g.currentField = range fields { camelLen := len(g.currentField.Name) - if g.maxCamelFldLen < camelLen { - g.maxCamelFldLen = camelLen + if maxCamelLength < camelLen { + maxCamelLength = camelLen } snakeLen := len(snake(g.currentField.Name)) - if g.maxSnakeFldLen < snakeLen { - g.maxSnakeFldLen = snakeLen + if maxSnakeLength < snakeLen { + maxSnakeLength = snakeLen } } for _, g.currentField = range fields { g.log("currentField: " + g.currentField.Name) - g.gen.setFieldKeys(true) + g.setFieldKeys(true, maxCamelLength, maxSnakeLength) g.emit(template) } } func (g *GenBase) emitEachFunc(funcs []*model.Func, template string) { - g.maxCamelFuncLen = 0 - g.maxSnakeFuncLen = 0 + maxCamelLength := 0 + maxSnakeLength := 0 for _, g.currentFunc = range funcs { camelLen := len(g.currentFunc.Name) - if g.maxCamelFuncLen < camelLen { - g.maxCamelFuncLen = camelLen + if maxCamelLength < camelLen { + maxCamelLength = camelLen } snakeLen := len(snake(g.currentFunc.Name)) - if g.maxSnakeFuncLen < snakeLen { - g.maxSnakeFuncLen = snakeLen + if maxSnakeLength < snakeLen { + maxSnakeLength = snakeLen } } for _, g.currentFunc = range funcs { g.log("currentFunc: " + g.currentFunc.Name) - g.gen.setFuncKeys() + g.setFuncKeys(true, maxCamelLength, maxSnakeLength) g.emit(template) } } @@ -352,7 +352,7 @@ func (g *GenBase) fieldIsTypeDef() bool { for _, typeDef := range g.s.Typedefs { if typeDef.Name == g.currentField.Type { g.currentField = typeDef - g.gen.setFieldKeys(false) + g.setFieldKeys(false, 0, 0) return true } } @@ -378,7 +378,7 @@ func (g *GenBase) setCommonKeys() { g.keys["maxIndex"] = strconv.Itoa(g.s.KeyID) } -func (g *GenBase) setFieldKeys(pad bool) { +func (g *GenBase) setFieldKeys(pad bool, maxCamelLength, maxSnakeLength int) { tmp := make(model.StringMap) for k, v := range g.keys { if len(k) < 3 { @@ -405,8 +405,8 @@ func (g *GenBase) setFieldKeys(pad bool) { g.keys["fldIndex"] = strconv.Itoa(g.currentField.KeyID) if pad { - g.keys["fldPad"] = spaces[:g.maxCamelFldLen-len(g.keys["fldName"])] - g.keys["fld_pad"] = spaces[:g.maxSnakeFldLen-len(g.keys["fld_name"])] + g.keys["fldPad"] = spaces[:maxCamelLength-len(g.keys["fldName"])] + g.keys["fld_pad"] = spaces[:maxSnakeLength-len(g.keys["fld_name"])] } for fieldName, typeValues := range g.typeDependent { @@ -431,7 +431,7 @@ func (g *GenBase) setFieldKeys(pad bool) { } } -func (g *GenBase) setFuncKeys() { +func (g *GenBase) setFuncKeys(pad bool, maxCamelLength, maxSnakeLength int) { g.setMultiKeyValues("funcName", g.currentFunc.Name) g.setMultiKeyValues("kind", g.currentFunc.Kind) g.keys["funcHname"] = iscp.Hn(g.keys["funcName"]).String() @@ -445,8 +445,10 @@ func (g *GenBase) setFuncKeys() { g.keys["funcAccess"] = grant g.keys["funcAccessComment"] = comment - g.keys["funcPad"] = spaces[:g.maxCamelFuncLen-len(g.keys["funcName"])] - g.keys["func_pad"] = spaces[:g.maxSnakeFuncLen-len(g.keys["func_name"])] + if pad { + g.keys["funcPad"] = spaces[:maxCamelLength-len(g.keys["funcName"])] + g.keys["func_pad"] = spaces[:maxSnakeLength-len(g.keys["func_name"])] + } } func (g *GenBase) setMultiKeyValues(key, value string) { diff --git a/tools/schema/generator/generator.go b/tools/schema/generator/generator.go index 0515a5dc85..539ad61ae2 100644 --- a/tools/schema/generator/generator.go +++ b/tools/schema/generator/generator.go @@ -16,53 +16,49 @@ import ( // TODO nested structs // TODO handle case where owner is type AgentID[] -type Generator interface { - init(s *model.Schema) - funcName(f *model.Func) string - generateLanguageSpecificFiles() error - setFieldKeys(pad bool) - setFuncKeys() -} - type GenBase struct { - currentEvent *model.Struct - currentField *model.Field - currentFunc *model.Func - currentStruct *model.Struct - emitters map[string]func(g *GenBase) - extension string - file *os.File - folder string - funcRegexp *regexp.Regexp - gen Generator - keys model.StringMap - language string - maxCamelFuncLen int - maxSnakeFuncLen int - maxCamelFldLen int - maxSnakeFldLen int - newTypes map[string]bool - rootFolder string - s *model.Schema - tab int - templates model.StringMap - typeDependent model.StringMapMap + currentEvent *model.Struct + currentField *model.Field + currentFunc *model.Func + currentStruct *model.Struct + emitters map[string]func(g *GenBase) + extension string + file *os.File + folder string + funcRegexp *regexp.Regexp + keys model.StringMap + language string + newTypes map[string]bool + rootFolder string + s *model.Schema + tab int + templates model.StringMap + typeDependent model.StringMapMap } const spaces = " " func (g *GenBase) init(s *model.Schema, typeDependent model.StringMapMap, templates []map[string]string) { g.s = s + g.typeDependent = typeDependent + g.emitters = map[string]func(g *GenBase){} - g.newTypes = map[string]bool{} g.keys = model.StringMap{} - g.setCommonKeys() - g.typeDependent = typeDependent + g.newTypes = map[string]bool{} g.templates = model.StringMap{} + + config := templates[0] + g.language = config["language"] + g.extension = config["extension"] + g.rootFolder = config["rootFolder"] + g.funcRegexp = regexp.MustCompile(config["funcRegexp"]) + g.addTemplates(commonTemplates) for _, template := range templates { g.addTemplates(template) } + + g.setCommonKeys() } func (g *GenBase) addTemplates(t model.StringMap) { @@ -110,12 +106,14 @@ func (g *GenBase) exists(path string) (err error) { } func (g *GenBase) funcName(f *model.Func) string { - return f.Kind + capitalize(f.Name) + name := f.Kind + capitalize(f.Name) + if g.language == "Rust" { + name = snake(name) + } + return name } -func (g *GenBase) Generate(s *model.Schema) error { - g.gen.init(s) - +func (g *GenBase) generateCommonFiles() error { g.folder = g.rootFolder + "/" if g.rootFolder != "src" { module := strings.ReplaceAll(moduleCwd, "\\", "/") @@ -131,7 +129,7 @@ func (g *GenBase) Generate(s *model.Schema) error { return err } info, err := os.Stat(g.folder + "consts" + g.extension) - if err == nil && info.ModTime().After(s.SchemaTime) { + if err == nil && info.ModTime().After(g.s.SchemaTime) { fmt.Printf("skipping %s code generation\n", g.language) return nil } @@ -192,13 +190,9 @@ func (g *GenBase) generateCode() error { return err } if !g.s.CoreContracts { - err = g.generateFuncs() - if err != nil { - return err - } + return g.generateFuncs() } - - return g.gen.generateLanguageSpecificFiles() + return nil } func (g *GenBase) generateFuncs() error { @@ -236,8 +230,8 @@ func (g *GenBase) generateFuncs() error { // append any new funcs for _, g.currentFunc = range g.s.Funcs { - if existing[g.gen.funcName(g.currentFunc)] == "" { - g.setFuncKeys() + if existing[g.funcName(g.currentFunc)] == "" { + g.setFuncKeys(false, 0, 0) g.emit("funcSignature") } } @@ -248,10 +242,6 @@ func (g *GenBase) generateFuncs() error { return os.Remove(scOriginal) } -func (g *GenBase) generateLanguageSpecificFiles() error { - return nil -} - func (g *GenBase) generateTests() error { err := os.MkdirAll("test", 0o755) if err != nil { diff --git a/tools/schema/generator/generator_client.go b/tools/schema/generator/generator_client.go index c010e5df8a..c9d6572868 100644 --- a/tools/schema/generator/generator_client.go +++ b/tools/schema/generator/generator_client.go @@ -15,29 +15,20 @@ type ClientGenerator struct { GenBase } -func NewClientGenerator() *ClientGenerator { +func NewClientGenerator(s *model.Schema) *ClientGenerator { g := &ClientGenerator{} - g.extension = ".ts" - g.language = "Client" - g.rootFolder = "client" - g.gen = g + g.init(s, clienttemplates.TypeDependent, clienttemplates.Templates) return g } -func (g *ClientGenerator) init(s *model.Schema) { - g.GenBase.init(s, clienttemplates.TypeDependent, clienttemplates.Templates) -} - -func (g *ClientGenerator) Generate(s *model.Schema) error { - g.gen.init(s) - +func (g *ClientGenerator) Generate() error { g.folder = g.rootFolder + "/" err := os.MkdirAll(g.folder, 0o755) if err != nil { return err } info, err := os.Stat(g.folder + "events" + g.extension) - if err == nil && info.ModTime().After(s.SchemaTime) { + if err == nil && info.ModTime().After(g.s.SchemaTime) { fmt.Printf("skipping %s code generation\n", g.language) return nil } diff --git a/tools/schema/generator/generator_go.go b/tools/schema/generator/generator_go.go index 16a1dfe25d..a7b93dd141 100644 --- a/tools/schema/generator/generator_go.go +++ b/tools/schema/generator/generator_go.go @@ -4,8 +4,6 @@ package generator import ( - "regexp" - "github.com/iotaledger/wasp/tools/schema/generator/gotemplates" "github.com/iotaledger/wasp/tools/schema/model" ) @@ -14,20 +12,19 @@ type GoGenerator struct { GenBase } -func NewGoGenerator() *GoGenerator { +func NewGoGenerator(s *model.Schema) *GoGenerator { g := &GoGenerator{} - g.extension = ".go" - g.funcRegexp = regexp.MustCompile(`^func (\w+).+$`) - g.language = "Go" - g.rootFolder = "go" - g.gen = g + g.init(s, gotemplates.TypeDependent, gotemplates.Templates) return g } -func (g *GoGenerator) init(s *model.Schema) { - g.GenBase.init(s, gotemplates.TypeDependent, gotemplates.Templates) -} +func (g *GoGenerator) Generate() error { + err := g.generateCommonFiles() + if err != nil { + return err + } + + // now generate language-specific files -func (g *GoGenerator) generateLanguageSpecificFiles() error { return g.createSourceFile("../main", !g.s.CoreContracts) } diff --git a/tools/schema/generator/generator_rust.go b/tools/schema/generator/generator_rust.go index 363aa11fc5..6268d436b3 100644 --- a/tools/schema/generator/generator_rust.go +++ b/tools/schema/generator/generator_rust.go @@ -4,8 +4,6 @@ package generator import ( - "regexp" - "github.com/iotaledger/wasp/tools/schema/generator/rstemplates" "github.com/iotaledger/wasp/tools/schema/model" ) @@ -14,25 +12,20 @@ type RustGenerator struct { GenBase } -func NewRustGenerator() *RustGenerator { +func NewRustGenerator(s *model.Schema) *RustGenerator { g := &RustGenerator{} - g.extension = ".rs" - g.funcRegexp = regexp.MustCompile(`^pub fn (\w+).+$`) - g.language = "Rust" - g.rootFolder = "src" - g.gen = g + g.init(s, rstemplates.TypeDependent, rstemplates.Templates) return g } -func (g *RustGenerator) init(s *model.Schema) { - g.GenBase.init(s, rstemplates.TypeDependent, rstemplates.Templates) -} +func (g *RustGenerator) Generate() error { + err := g.generateCommonFiles() + if err != nil { + return err + } -func (g *RustGenerator) funcName(f *model.Func) string { - return snake(g.GenBase.funcName(f)) -} + // now generate language-specific files -func (g *RustGenerator) generateLanguageSpecificFiles() error { if g.s.CoreContracts { return g.createSourceFile("mod", true) } diff --git a/tools/schema/generator/generator_ts.go b/tools/schema/generator/generator_ts.go index bf4e3b384f..954ccb82f3 100644 --- a/tools/schema/generator/generator_ts.go +++ b/tools/schema/generator/generator_ts.go @@ -4,8 +4,6 @@ package generator import ( - "regexp" - "github.com/iotaledger/wasp/tools/schema/generator/tstemplates" "github.com/iotaledger/wasp/tools/schema/model" ) @@ -14,22 +12,21 @@ type TypeScriptGenerator struct { GenBase } -func NewTypeScriptGenerator() *TypeScriptGenerator { +func NewTypeScriptGenerator(s *model.Schema) *TypeScriptGenerator { g := &TypeScriptGenerator{} - g.extension = ".ts" - g.funcRegexp = regexp.MustCompile(`^export function (\w+).+$`) - g.language = "TypeScript" - g.rootFolder = "ts" - g.gen = g + g.init(s, tstemplates.TypeDependent, tstemplates.Templates) return g } -func (g *TypeScriptGenerator) init(s *model.Schema) { - g.GenBase.init(s, tstemplates.TypeDependent, tstemplates.Templates) -} +func (g *TypeScriptGenerator) Generate() error { + err := g.generateCommonFiles() + if err != nil { + return err + } + + // now generate language-specific files -func (g *TypeScriptGenerator) generateLanguageSpecificFiles() error { - err := g.createSourceFile("index", true) + err = g.createSourceFile("index", true) if err != nil { return err } diff --git a/tools/schema/generator/gotemplates/alltemplates.go b/tools/schema/generator/gotemplates/alltemplates.go index 4cbd5d2b4e..f4d0fd736b 100644 --- a/tools/schema/generator/gotemplates/alltemplates.go +++ b/tools/schema/generator/gotemplates/alltemplates.go @@ -2,7 +2,15 @@ package gotemplates import "github.com/iotaledger/wasp/tools/schema/model" +var config = map[string]string{ + "language": "Go", + "extension": ".go", + "rootFolder": "go", + "funcRegexp": `^func (\w+).+$`, +} + var Templates = []map[string]string{ + config, common, constsGo, contractGo, diff --git a/tools/schema/generator/rstemplates/alltemplates.go b/tools/schema/generator/rstemplates/alltemplates.go index 5039a1807d..394bf05480 100644 --- a/tools/schema/generator/rstemplates/alltemplates.go +++ b/tools/schema/generator/rstemplates/alltemplates.go @@ -2,7 +2,15 @@ package rstemplates import "github.com/iotaledger/wasp/tools/schema/model" +var config = map[string]string{ + "language": "Rust", + "extension": ".rs", + "rootFolder": "src", + "funcRegexp": `^pub fn (\w+).+$`, +} + var Templates = []map[string]string{ + config, common, cargoToml, constsRs, diff --git a/tools/schema/generator/tstemplates/alltemplates.go b/tools/schema/generator/tstemplates/alltemplates.go index 0c1f1388be..8fc4865ace 100644 --- a/tools/schema/generator/tstemplates/alltemplates.go +++ b/tools/schema/generator/tstemplates/alltemplates.go @@ -2,7 +2,15 @@ package tstemplates import "github.com/iotaledger/wasp/tools/schema/model" +var config = map[string]string{ + "language": "TypeScript", + "extension": ".ts", + "rootFolder": "ts", + "funcRegexp": `^export function (\w+).+$`, +} + var Templates = []map[string]string{ + config, common, constsTs, contractTs, diff --git a/tools/schema/main.go b/tools/schema/main.go index 6c88790815..bcdb2543b6 100644 --- a/tools/schema/main.go +++ b/tools/schema/main.go @@ -116,32 +116,32 @@ func generateSchema(file *os.File) error { } if *flagClient { - g := generator.NewClientGenerator() - err = g.Generate(s) + g := generator.NewClientGenerator(s) + err = g.Generate() if err != nil { return err } } if *flagGo { - g := generator.NewGoGenerator() - err = g.Generate(s) + g := generator.NewGoGenerator(s) + err = g.Generate() if err != nil { return err } } if *flagRust { - g := generator.NewRustGenerator() - err = g.Generate(s) + g := generator.NewRustGenerator(s) + err = g.Generate() if err != nil { return err } } if *flagTs { - g := generator.NewTypeScriptGenerator() - err = g.Generate(s) + g := generator.NewTypeScriptGenerator(s) + err = g.Generate() if err != nil { return err } From 4486c0a5e12cdf1109a193ebd80dee19c147349d Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Mon, 29 Nov 2021 15:43:04 -0800 Subject: [PATCH 140/198] Added missing encodings to event encoder --- contracts/wasm/dividend/test/dividend_bg.wasm | Bin 32303 -> 32303 bytes .../test/donatewithfeedback_bg.wasm | Bin 36521 -> 36517 bytes contracts/wasm/erc20/test/erc20_bg.wasm | Bin 35401 -> 35401 bytes .../wasm/fairauction/test/fairauction_bg.wasm | Bin 42696 -> 42692 bytes .../fairroulette/frontend/package-lock.json | 6903 +---------------- .../fairroulette/test/fairroulette_bg.wasm | Bin 40086 -> 40086 bytes .../wasm/inccounter/test/inccounter_bg.wasm | Bin 37011 -> 37007 bytes contracts/wasm/testcore/test/testcore_bg.wasm | Bin 53154 -> 53154 bytes .../wasm/testwasmlib/test/testwasmlib_bg.wasm | Bin 41300 -> 41300 bytes .../wasm/timestamp/test/timestamp_bg.wasm | Bin 28155 -> 28155 bytes .../tokenregistry/test/tokenregistry_bg.wasm | Bin 32026 -> 32026 bytes .../test/example_tutorial_bg.wasm | Bin 16810 -> 16802 bytes .../sbtests/sbtestsc/testcore_bg.wasm | Bin 53154 -> 53154 bytes packages/vm/wasmlib/go/wasmlib/bytes.go | 32 +- packages/vm/wasmlib/go/wasmlib/events.go | 27 + packages/vm/wasmlib/src/bytes.rs | 31 +- packages/vm/wasmlib/src/events.rs | 39 +- packages/vm/wasmlib/ts/wasmlib/bytes.ts | 23 +- packages/vm/wasmlib/ts/wasmlib/events.ts | 39 +- tools/cluster/tests/wasm/inccounter_bg.wasm | Bin 37011 -> 37007 bytes .../generator/clienttemplates/alltemplates.go | 65 +- tools/schema/generator/clienttemplates/app.go | 22 + .../generator/clienttemplates/events.go | 54 +- .../generator/clienttemplates/service.go | 82 + tools/schema/generator/emitter.go | 7 +- tools/schema/generator/generator.go | 10 +- tools/schema/generator/generator_client.go | 8 + tools/schema/model/schema.go | 15 +- 28 files changed, 545 insertions(+), 6812 deletions(-) create mode 100644 tools/schema/generator/clienttemplates/app.go create mode 100644 tools/schema/generator/clienttemplates/service.go diff --git a/contracts/wasm/dividend/test/dividend_bg.wasm b/contracts/wasm/dividend/test/dividend_bg.wasm index 37a852b8f4c989cc7c85877743e834a09863cbe6..6a7f37621677b6538e9c078212542fed513445b0 100644 GIT binary patch delta 248 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 QjuXTsZ2TVv`P(=D7rHTGDgXcg delta 4884 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 diff --git a/contracts/wasm/erc20/test/erc20_bg.wasm b/contracts/wasm/erc20/test/erc20_bg.wasm index 1f883542824bd97b37abe9a38a77ce4c2b149920..f70613a735478f4d20d8ad373a1c847573a51627 100644 GIT binary patch delta 289 zcmX>(h3VuJrVXbUxfU}{VqDCqvzSqR^A*NIU*Q9N2N)c+6<8cOvK-%l*cj!egf%+w~9RGmK|FD@UX{jhv4(nv!qIHU^Sp^sh7#JAl za4<0N0clbSHOIR5R|F%u;DB%MTO- y0gw&>AQl91fB?i7njBM^&fCKd(dh;h(VDDK5zQ;WA;91YSQ delta 295 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 delta 5034 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 diff --git a/contracts/wasm/fairroulette/frontend/package-lock.json b/contracts/wasm/fairroulette/frontend/package-lock.json index a67c277c27..20257cd895 100644 --- a/contracts/wasm/fairroulette/frontend/package-lock.json +++ b/contracts/wasm/fairroulette/frontend/package-lock.json @@ -1,6502 +1,46 @@ { "name": "svelte-app", "version": "1.0.0", - "lockfileVersion": 2, + "lockfileVersion": 1, "requires": true, - "packages": { - "": { - "name": "svelte-app", - "version": "1.0.0", - "dependencies": { - "@babel/eslint-parser": "^7.15.8", - "lottie-web": "^5.7.13", - "svelte-router-spa": "^6.0.2" - }, - "devDependencies": { - "@rollup/plugin-commonjs": "^17.0.0", - "@rollup/plugin-node-resolve": "^11.0.0", - "@rollup/plugin-replace": "^3.0.0", - "@rollup/plugin-typescript": "^8.2.5", - "@tsconfig/svelte": "^2.0.0", - "@types/gtag.js": "^0.0.7", - "@typescript-eslint/eslint-plugin": "^4.29.2", - "@typescript-eslint/parser": "^4.29.2", - "base64-js": "^1.5.1", - "blakejs": "^1.1.1", - "eslint": "^7.32.0", - "eslint-plugin-security": "^1.4.0", - "eslint-plugin-svelte3": "^3.2.0", - "ieee754": "^1.2.1", - "nanoevents": "^6.0.0", - "node-sass": "^6.0.1", - "prettier": "^2.3.2", - "random-number-csprng": "^1.0.2", - "rollup": "^2.3.4", - "rollup-plugin-css-only": "^3.1.0", - "rollup-plugin-livereload": "^2.0.0", - "rollup-plugin-node-builtins": "^2.1.2", - "rollup-plugin-node-globals": "^1.4.0", - "rollup-plugin-svelte": "^7.0.0", - "rollup-plugin-terser": "^7.0.0", - "rollup-plugin-typescript2": "^0.30.0", - "rollup-plugin-web-worker-loader": "^1.6.1", - "sirv-cli": "^1.0.0", - "svelte": "^3.0.0", - "svelte-check": "^2.0.0", - "svelte-preprocess": "^4.0.0", - "threads": "^1.6.5", - "tslib": "^2.0.0", - "tweetnacl": "^1.0.3", - "typescript": "^4.0.0", - "uuid": "^8.3.2" - } - }, - "node_modules/@babel/code-frame": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", - "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", - "dependencies": { - "@babel/highlight": "^7.10.4" - } - }, - "node_modules/@babel/compat-data": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz", - "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==", - "peer": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/core": { - "version": "7.15.8", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.8.tgz", - "integrity": "sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==", - "peer": true, - "dependencies": { - "@babel/code-frame": "^7.15.8", - "@babel/generator": "^7.15.8", - "@babel/helper-compilation-targets": "^7.15.4", - "@babel/helper-module-transforms": "^7.15.8", - "@babel/helpers": "^7.15.4", - "@babel/parser": "^7.15.8", - "@babel/template": "^7.15.4", - "@babel/traverse": "^7.15.4", - "@babel/types": "^7.15.6", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.1.2", - "semver": "^6.3.0", - "source-map": "^0.5.0" - }, - "engines": { - "node": ">=6.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" - } - }, - "node_modules/@babel/core/node_modules/@babel/code-frame": { - "version": "7.15.8", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz", - "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==", - "peer": true, - "dependencies": { - "@babel/highlight": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "peer": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/@babel/core/node_modules/source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "peer": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/@babel/eslint-parser": { - "version": "7.15.8", - "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.15.8.tgz", - "integrity": "sha512-fYP7QFngCvgxjUuw8O057SVH5jCXsbFFOoE77CFDcvzwBVgTOkMD/L4mIC5Ud1xf8chK/no2fRbSSn1wvNmKuQ==", - "dependencies": { - "eslint-scope": "^5.1.1", - "eslint-visitor-keys": "^2.1.0", - "semver": "^6.3.0" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || >=14.0.0" - }, - "peerDependencies": { - "@babel/core": ">=7.11.0", - "eslint": ">=7.5.0" - } - }, - "node_modules/@babel/eslint-parser/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/@babel/generator": { - "version": "7.15.8", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz", - "integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==", - "peer": true, - "dependencies": { - "@babel/types": "^7.15.6", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/generator/node_modules/source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "peer": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/@babel/helper-compilation-targets": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz", - "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==", - "peer": true, - "dependencies": { - "@babel/compat-data": "^7.15.0", - "@babel/helper-validator-option": "^7.14.5", - "browserslist": "^4.16.6", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "peer": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/@babel/helper-function-name": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz", - "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==", - "peer": true, - "dependencies": { - "@babel/helper-get-function-arity": "^7.15.4", - "@babel/template": "^7.15.4", - "@babel/types": "^7.15.4" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-get-function-arity": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz", - "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==", - "peer": true, - "dependencies": { - "@babel/types": "^7.15.4" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-hoist-variables": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz", - "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==", - "peer": true, - "dependencies": { - "@babel/types": "^7.15.4" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz", - "integrity": "sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==", - "peer": true, - "dependencies": { - "@babel/types": "^7.15.4" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-imports": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz", - "integrity": "sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==", - "peer": true, - "dependencies": { - "@babel/types": "^7.15.4" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-transforms": { - "version": "7.15.8", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz", - "integrity": "sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg==", - "peer": true, - "dependencies": { - "@babel/helper-module-imports": "^7.15.4", - "@babel/helper-replace-supers": "^7.15.4", - "@babel/helper-simple-access": "^7.15.4", - "@babel/helper-split-export-declaration": "^7.15.4", - "@babel/helper-validator-identifier": "^7.15.7", - "@babel/template": "^7.15.4", - "@babel/traverse": "^7.15.4", - "@babel/types": "^7.15.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-optimise-call-expression": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz", - "integrity": "sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==", - "peer": true, - "dependencies": { - "@babel/types": "^7.15.4" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-replace-supers": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz", - "integrity": "sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==", - "peer": true, - "dependencies": { - "@babel/helper-member-expression-to-functions": "^7.15.4", - "@babel/helper-optimise-call-expression": "^7.15.4", - "@babel/traverse": "^7.15.4", - "@babel/types": "^7.15.4" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-simple-access": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz", - "integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==", - "peer": true, - "dependencies": { - "@babel/types": "^7.15.4" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-split-export-declaration": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz", - "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==", - "peer": true, - "dependencies": { - "@babel/types": "^7.15.4" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.15.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz", - "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-option": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz", - "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==", - "peer": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helpers": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz", - "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==", - "peer": true, - "dependencies": { - "@babel/template": "^7.15.4", - "@babel/traverse": "^7.15.4", - "@babel/types": "^7.15.4" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", - "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", - "dependencies": { - "@babel/helper-validator-identifier": "^7.14.5", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/highlight/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" - }, - "node_modules/@babel/highlight/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/@babel/highlight/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/parser": { - "version": "7.15.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz", - "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==", - "peer": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/template": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz", - "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==", - "peer": true, - "dependencies": { - "@babel/code-frame": "^7.14.5", - "@babel/parser": "^7.15.4", - "@babel/types": "^7.15.4" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/template/node_modules/@babel/code-frame": { - "version": "7.15.8", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz", - "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==", - "peer": true, - "dependencies": { - "@babel/highlight": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/traverse": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz", - "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==", - "peer": true, - "dependencies": { - "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.15.4", - "@babel/helper-function-name": "^7.15.4", - "@babel/helper-hoist-variables": "^7.15.4", - "@babel/helper-split-export-declaration": "^7.15.4", - "@babel/parser": "^7.15.4", - "@babel/types": "^7.15.4", - "debug": "^4.1.0", - "globals": "^11.1.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/traverse/node_modules/@babel/code-frame": { - "version": "7.15.8", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz", - "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==", - "peer": true, - "dependencies": { - "@babel/highlight": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/traverse/node_modules/globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "peer": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/types": { - "version": "7.15.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz", - "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==", - "peer": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.14.9", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@eslint/eslintrc": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", - "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.1.1", - "espree": "^7.3.0", - "globals": "^13.9.0", - "ignore": "^4.0.6", - "import-fresh": "^3.2.1", - "js-yaml": "^3.13.1", - "minimatch": "^3.0.4", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/@eslint/eslintrc/node_modules/ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", - "engines": { - "node": ">= 4" - } - }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", - "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", - "dependencies": { - "@humanwhocodes/object-schema": "^1.2.0", - "debug": "^4.1.1", - "minimatch": "^3.0.4" - }, - "engines": { - "node": ">=10.10.0" - } - }, - "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz", - "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==" - }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@polka/url": { - "version": "1.0.0-next.21", - "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz", - "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==", - "dev": true - }, - "node_modules/@rollup/plugin-commonjs": { - "version": "17.1.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-17.1.0.tgz", - "integrity": "sha512-PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew==", - "dev": true, - "dependencies": { - "@rollup/pluginutils": "^3.1.0", - "commondir": "^1.0.1", - "estree-walker": "^2.0.1", - "glob": "^7.1.6", - "is-reference": "^1.2.1", - "magic-string": "^0.25.7", - "resolve": "^1.17.0" - }, - "engines": { - "node": ">= 8.0.0" - }, - "peerDependencies": { - "rollup": "^2.30.0" - } - }, - "node_modules/@rollup/plugin-node-resolve": { - "version": "11.2.1", - "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz", - "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==", - "dev": true, - "dependencies": { - "@rollup/pluginutils": "^3.1.0", - "@types/resolve": "1.17.1", - "builtin-modules": "^3.1.0", - "deepmerge": "^4.2.2", - "is-module": "^1.0.0", - "resolve": "^1.19.0" - }, - "engines": { - "node": ">= 10.0.0" - }, - "peerDependencies": { - "rollup": "^1.20.0||^2.0.0" - } - }, - "node_modules/@rollup/plugin-replace": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-3.0.0.tgz", - "integrity": "sha512-3c7JCbMuYXM4PbPWT4+m/4Y6U60SgsnDT/cCyAyUKwFHg7pTSfsSQzIpETha3a3ig6OdOKzZz87D9ZXIK3qsDg==", - "dev": true, - "dependencies": { - "@rollup/pluginutils": "^3.1.0", - "magic-string": "^0.25.7" - }, - "peerDependencies": { - "rollup": "^1.20.0 || ^2.0.0" - } - }, - "node_modules/@rollup/plugin-typescript": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-8.3.0.tgz", - "integrity": "sha512-I5FpSvLbtAdwJ+naznv+B4sjXZUcIvLLceYpITAn7wAP8W0wqc5noLdGIp9HGVntNhRWXctwPYrSSFQxtl0FPA==", - "dev": true, - "dependencies": { - "@rollup/pluginutils": "^3.1.0", - "resolve": "^1.17.0" - }, - "engines": { - "node": ">=8.0.0" - }, - "peerDependencies": { - "rollup": "^2.14.0", - "tslib": "*", - "typescript": ">=3.7.0" - } - }, - "node_modules/@rollup/pluginutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", - "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", - "dev": true, - "dependencies": { - "@types/estree": "0.0.39", - "estree-walker": "^1.0.1", - "picomatch": "^2.2.2" - }, - "engines": { - "node": ">= 8.0.0" - }, - "peerDependencies": { - "rollup": "^1.20.0||^2.0.0" - } - }, - "node_modules/@rollup/pluginutils/node_modules/estree-walker": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", - "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", - "dev": true - }, - "node_modules/@tsconfig/svelte": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@tsconfig/svelte/-/svelte-2.0.1.tgz", - "integrity": "sha512-aqkICXbM1oX5FfgZd2qSSAGdyo/NRxjWCamxoyi3T8iVQnzGge19HhDYzZ6NrVOW7bhcWNSq9XexWFtMzbB24A==", - "dev": true - }, - "node_modules/@types/estree": { - "version": "0.0.39", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", - "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", - "dev": true - }, - "node_modules/@types/gtag.js": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/@types/gtag.js/-/gtag.js-0.0.7.tgz", - "integrity": "sha512-Kl5beBoB0OXw7WeFgHHpLEchvC7HyIu3v1AksNNTemAF6jmEmQGqhZQSHcG6BOU/Lq0xsByQNqLzicLPjVkxYQ==", - "dev": true - }, - "node_modules/@types/json-schema": { - "version": "7.0.9", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", - "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", - "dev": true - }, - "node_modules/@types/minimist": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz", - "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==", - "dev": true - }, - "node_modules/@types/node": { - "version": "16.11.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz", - "integrity": "sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==", - "dev": true - }, - "node_modules/@types/normalize-package-data": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz", - "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==", - "dev": true - }, - "node_modules/@types/pug": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@types/pug/-/pug-2.0.5.tgz", - "integrity": "sha512-LOnASQoeNZMkzexRuyqcBBDZ6rS+rQxUMkmj5A0PkhhiSZivLIuz6Hxyr1mkGoEZEkk66faROmpMi4fFkrKsBA==", - "dev": true - }, - "node_modules/@types/resolve": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz", - "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/sass": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/@types/sass/-/sass-1.16.1.tgz", - "integrity": "sha512-iZUcRrGuz/Tbg3loODpW7vrQJkUtpY2fFSf4ELqqkApcS2TkZ1msk7ie8iZPB86lDOP8QOTTmuvWjc5S0R9OjQ==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@typescript-eslint/eslint-plugin": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz", - "integrity": "sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==", - "dev": true, - "dependencies": { - "@typescript-eslint/experimental-utils": "4.33.0", - "@typescript-eslint/scope-manager": "4.33.0", - "debug": "^4.3.1", - "functional-red-black-tree": "^1.0.1", - "ignore": "^5.1.8", - "regexpp": "^3.1.0", - "semver": "^7.3.5", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "@typescript-eslint/parser": "^4.0.0", - "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/experimental-utils": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz", - "integrity": "sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==", - "dev": true, - "dependencies": { - "@types/json-schema": "^7.0.7", - "@typescript-eslint/scope-manager": "4.33.0", - "@typescript-eslint/types": "4.33.0", - "@typescript-eslint/typescript-estree": "4.33.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "*" - } - }, - "node_modules/@typescript-eslint/parser": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz", - "integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==", - "dev": true, - "dependencies": { - "@typescript-eslint/scope-manager": "4.33.0", - "@typescript-eslint/types": "4.33.0", - "@typescript-eslint/typescript-estree": "4.33.0", - "debug": "^4.3.1" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/scope-manager": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz", - "integrity": "sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "4.33.0", - "@typescript-eslint/visitor-keys": "4.33.0" - }, - "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/types": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz", - "integrity": "sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==", - "dev": true, - "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/typescript-estree": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz", - "integrity": "sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "4.33.0", - "@typescript-eslint/visitor-keys": "4.33.0", - "debug": "^4.3.1", - "globby": "^11.0.3", - "is-glob": "^4.0.1", - "semver": "^7.3.5", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/visitor-keys": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz", - "integrity": "sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "4.33.0", - "eslint-visitor-keys": "^2.0.0" - }, - "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true - }, - "node_modules/abstract-leveldown": { - "version": "0.12.4", - "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz", - "integrity": "sha1-KeGOYy5g5OIh1YECR4UqY9ey5BA=", - "dev": true, - "dependencies": { - "xtend": "~3.0.0" - } - }, - "node_modules/abstract-leveldown/node_modules/xtend": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", - "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=", - "dev": true, - "engines": { - "node": ">=0.4" - } - }, - "node_modules/acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "peerDependencies": { - "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true, - "engines": { - "node": ">=0.4.2" - } - }, - "node_modules/ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", - "engines": { - "node": ">=6" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", - "dev": true, - "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", - "dev": true - }, - "node_modules/are-we-there-yet": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz", - "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==", - "dev": true, - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "dev": true, - "dependencies": { - "safer-buffer": "~2.1.0" - } - }, - "node_modules/asn1.js": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", - "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", - "dev": true, - "dependencies": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "safer-buffer": "^2.1.0" - } - }, - "node_modules/asn1.js/node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true - }, - "node_modules/assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/astral-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/async-foreach": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", - "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true - }, - "node_modules/aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/aws4": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", - "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", - "dev": true - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "dev": true, - "dependencies": { - "tweetnacl": "^0.14.3" - } - }, - "node_modules/bcrypt-pbkdf/node_modules/tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true - }, - "node_modules/binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/bl": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz", - "integrity": "sha1-yba8oI0bwuoA/Ir7Txpf0eHGbk4=", - "dev": true, - "dependencies": { - "readable-stream": "~1.0.26" - } - }, - "node_modules/bl/node_modules/isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "node_modules/bl/node_modules/readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "dev": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "node_modules/bl/node_modules/string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - }, - "node_modules/blakejs": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.1.1.tgz", - "integrity": "sha512-bLG6PHOCZJKNshTjGRBvET0vTciwQE6zFKOKKXPDJfwFBd4Ac0yBfPZqcGvGJap50l7ktvlpFqc2jGVaUgbJgg==", - "dev": true - }, - "node_modules/bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", - "dev": true - }, - "node_modules/bn.js": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz", - "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==", - "dev": true - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "dependencies": { - "fill-range": "^7.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", - "dev": true - }, - "node_modules/browserify-aes": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", - "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", - "dev": true, - "dependencies": { - "buffer-xor": "^1.0.3", - "cipher-base": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.3", - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/browserify-cipher": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", - "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", - "dev": true, - "dependencies": { - "browserify-aes": "^1.0.4", - "browserify-des": "^1.0.0", - "evp_bytestokey": "^1.0.0" - } - }, - "node_modules/browserify-des": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", - "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", - "dev": true, - "dependencies": { - "cipher-base": "^1.0.1", - "des.js": "^1.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, - "node_modules/browserify-fs": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browserify-fs/-/browserify-fs-1.0.0.tgz", - "integrity": "sha1-8HWqinKdTRcW0GZiDjhvzBMRqW8=", - "dev": true, - "dependencies": { - "level-filesystem": "^1.0.1", - "level-js": "^2.1.3", - "levelup": "^0.18.2" - } - }, - "node_modules/browserify-rsa": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz", - "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==", - "dev": true, - "dependencies": { - "bn.js": "^5.0.0", - "randombytes": "^2.0.1" - } - }, - "node_modules/browserify-sign": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", - "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", - "dev": true, - "dependencies": { - "bn.js": "^5.1.1", - "browserify-rsa": "^4.0.1", - "create-hash": "^1.2.0", - "create-hmac": "^1.1.7", - "elliptic": "^6.5.3", - "inherits": "^2.0.4", - "parse-asn1": "^5.1.5", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" - } - }, - "node_modules/browserify-sign/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/browserify-sign/node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/browserslist": { - "version": "4.17.5", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.5.tgz", - "integrity": "sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==", - "peer": true, - "dependencies": { - "caniuse-lite": "^1.0.30001271", - "electron-to-chromium": "^1.3.878", - "escalade": "^3.1.1", - "node-releases": "^2.0.1", - "picocolors": "^1.0.0" - }, - "bin": { - "browserslist": "cli.js" - }, - "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - } - }, - "node_modules/buffer-crc32": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/buffer-es6": { - "version": "4.9.3", - "resolved": "https://registry.npmjs.org/buffer-es6/-/buffer-es6-4.9.3.tgz", - "integrity": "sha1-8mNHuC33b9N+GLy1KIxJcM/VxAQ=", - "dev": true - }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true - }, - "node_modules/buffer-xor": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", - "dev": true - }, - "node_modules/builtin-modules": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz", - "integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==", - "dev": true, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "engines": { - "node": ">=6" - } - }, - "node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/camelcase-keys": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", - "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", - "dev": true, - "dependencies": { - "camelcase": "^5.3.1", - "map-obj": "^4.0.0", - "quick-lru": "^4.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/caniuse-lite": { - "version": "1.0.30001271", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz", - "integrity": "sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA==", - "peer": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - } - }, - "node_modules/caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true - }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/chokidar": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", - "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", - "dev": true, - "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/cipher-base": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", - "dev": true, - "dependencies": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dev": true, - "dependencies": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - } - }, - "node_modules/cliui/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/cliui/node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/cliui/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/cliui/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/clone": { - "version": "0.1.19", - "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz", - "integrity": "sha1-YT+2hjmyaklKxTJT4Vsaa9iK2oU=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true - }, - "node_modules/commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", - "dev": true - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" - }, - "node_modules/concat-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", - "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "dev": true, - "engines": [ - "node >= 0.8" - ], - "dependencies": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" - } - }, - "node_modules/console-clear": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/console-clear/-/console-clear-1.1.1.tgz", - "integrity": "sha512-pMD+MVR538ipqkG5JXeOEbKWS5um1H4LUUccUQG68qpeqBYbzYy79Gh55jkd2TtPdRfUaLWdv6LPP//5Zt0aPQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true - }, - "node_modules/convert-source-map": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", - "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", - "peer": true, - "dependencies": { - "safe-buffer": "~5.1.1" - } - }, - "node_modules/core-util-is": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", - "dev": true - }, - "node_modules/create-ecdh": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", - "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", - "dev": true, - "dependencies": { - "bn.js": "^4.1.0", - "elliptic": "^6.5.3" - } - }, - "node_modules/create-ecdh/node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true - }, - "node_modules/create-error": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/create-error/-/create-error-0.3.1.tgz", - "integrity": "sha1-aYECRaYp5lRDK/BDdzYAA6U1GiM=", - "dev": true - }, - "node_modules/create-hash": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", - "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", - "dev": true, - "dependencies": { - "cipher-base": "^1.0.1", - "inherits": "^2.0.1", - "md5.js": "^1.3.4", - "ripemd160": "^2.0.1", - "sha.js": "^2.4.0" - } - }, - "node_modules/create-hmac": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", - "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", - "dev": true, - "dependencies": { - "cipher-base": "^1.0.3", - "create-hash": "^1.1.0", - "inherits": "^2.0.1", - "ripemd160": "^2.0.0", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - } - }, - "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/crypto-browserify": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", - "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", - "dev": true, - "dependencies": { - "browserify-cipher": "^1.0.0", - "browserify-sign": "^4.0.0", - "create-ecdh": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.0", - "diffie-hellman": "^5.0.0", - "inherits": "^2.0.1", - "pbkdf2": "^3.0.3", - "public-encrypt": "^4.0.0", - "randombytes": "^2.0.0", - "randomfill": "^1.0.3" - }, - "engines": { - "node": "*" - } - }, - "node_modules/dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/decamelize-keys": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz", - "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=", - "dev": true, - "dependencies": { - "decamelize": "^1.1.0", - "map-obj": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/decamelize-keys/node_modules/map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" - }, - "node_modules/deepmerge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/deferred-leveldown": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz", - "integrity": "sha1-LO8fER4cV4cNi7uK8mUOWHzS9bQ=", - "dev": true, - "dependencies": { - "abstract-leveldown": "~0.12.1" - } - }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "dev": true - }, - "node_modules/des.js": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", - "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } - }, - "node_modules/detect-indent": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz", - "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/diffie-hellman": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", - "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", - "dev": true, - "dependencies": { - "bn.js": "^4.1.0", - "miller-rabin": "^4.0.0", - "randombytes": "^2.0.0" - } - }, - "node_modules/diffie-hellman/node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true - }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "dev": true, - "dependencies": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, - "node_modules/electron-to-chromium": { - "version": "1.3.880", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.880.tgz", - "integrity": "sha512-iwIP/6WoeSimzUKJIQtjtpVDsK8Ir8qQCMXsUBwg+rxJR2Uh3wTNSbxoYRfs+3UWx/9MAnPIxVZCyWkm8MT0uw==", - "peer": true - }, - "node_modules/elliptic": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", - "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", - "dev": true, - "dependencies": { - "bn.js": "^4.11.9", - "brorand": "^1.1.0", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.1", - "inherits": "^2.0.4", - "minimalistic-assert": "^1.0.1", - "minimalistic-crypto-utils": "^1.0.1" - } - }, - "node_modules/elliptic/node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true - }, - "node_modules/emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, - "node_modules/enquirer": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", - "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", - "dependencies": { - "ansi-colors": "^4.1.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/env-paths": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/errno": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz", - "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==", - "dev": true, - "dependencies": { - "prr": "~1.0.1" - }, - "bin": { - "errno": "cli.js" - } - }, - "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "dependencies": { - "is-arrayish": "^0.2.1" - } - }, - "node_modules/es6-promise": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", - "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=", - "dev": true - }, - "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "peer": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint": { - "version": "7.32.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", - "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", - "dependencies": { - "@babel/code-frame": "7.12.11", - "@eslint/eslintrc": "^0.4.3", - "@humanwhocodes/config-array": "^0.5.0", - "ajv": "^6.10.0", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.0.1", - "doctrine": "^3.0.0", - "enquirer": "^2.3.5", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^2.0.0", - "espree": "^7.3.1", - "esquery": "^1.4.0", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.1.2", - "globals": "^13.6.0", - "ignore": "^4.0.6", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "js-yaml": "^3.13.1", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.0.4", - "natural-compare": "^1.4.0", - "optionator": "^0.9.1", - "progress": "^2.0.0", - "regexpp": "^3.1.0", - "semver": "^7.2.1", - "strip-ansi": "^6.0.0", - "strip-json-comments": "^3.1.0", - "table": "^6.0.9", - "text-table": "^0.2.0", - "v8-compile-cache": "^2.0.3" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-plugin-security": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-security/-/eslint-plugin-security-1.4.0.tgz", - "integrity": "sha512-xlS7P2PLMXeqfhyf3NpqbvbnW04kN8M9NtmhpR3XGyOvt/vNKS7XPXT5EDbwKW9vCjWH4PpfQvgD/+JgN0VJKA==", - "dev": true, - "dependencies": { - "safe-regex": "^1.1.0" - } - }, - "node_modules/eslint-plugin-svelte3": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-svelte3/-/eslint-plugin-svelte3-3.2.1.tgz", - "integrity": "sha512-YoBR9mLoKCjGghJ/gvpnFZKaMEu/VRcuxpSRS8KuozuEo7CdBH7bmBHa6FmMm0i4kJnOyx+PVsaptz96K6H/4Q==", - "dev": true, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "eslint": ">=6.0.0", - "svelte": "^3.2.0" - } - }, - "node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^2.0.0" - }, - "engines": { - "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=5" - } - }, - "node_modules/eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "engines": { - "node": ">=10" - } - }, - "node_modules/eslint/node_modules/eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dependencies": { - "eslint-visitor-keys": "^1.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/eslint/node_modules/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "engines": { - "node": ">=4" - } - }, - "node_modules/eslint/node_modules/ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", - "engines": { - "node": ">= 4" - } - }, - "node_modules/esm": { - "version": "3.2.25", - "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz", - "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==", - "dev": true, - "optional": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/espree": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", - "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", - "dependencies": { - "acorn": "^7.4.0", - "acorn-jsx": "^5.3.1", - "eslint-visitor-keys": "^1.3.0" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/espree/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "engines": { - "node": ">=4" - } - }, - "node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/esquery": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", - "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", - "dependencies": { - "estraverse": "^5.1.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/esquery/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dependencies": { - "estraverse": "^5.2.0" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esrecurse/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estree-walker": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", - "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", - "dev": true - }, - "node_modules/esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/evp_bytestokey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", - "dev": true, - "dependencies": { - "md5.js": "^1.3.4", - "safe-buffer": "^5.1.1" - } - }, - "node_modules/extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, - "node_modules/extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true, - "engines": [ - "node >=0.6.0" - ] - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" - }, - "node_modules/fast-glob": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", - "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" - }, - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" - }, - "node_modules/fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", - "dev": true, - "dependencies": { - "reusify": "^1.0.4" - } - }, - "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dependencies": { - "flat-cache": "^3.0.4" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/find-cache-dir": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", - "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", - "dev": true, - "dependencies": { - "commondir": "^1.0.1", - "make-dir": "^3.0.2", - "pkg-dir": "^4.1.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/avajs/find-cache-dir?sponsor=1" - } - }, - "node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", - "dependencies": { - "flatted": "^3.1.0", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/flatted": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz", - "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==" - }, - "node_modules/foreach": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", - "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", - "dev": true - }, - "node_modules/forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dev": true, - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 0.12" - } - }, - "node_modules/fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, - "node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" - }, - "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "node_modules/functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=" - }, - "node_modules/fwd-stream": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/fwd-stream/-/fwd-stream-1.0.4.tgz", - "integrity": "sha1-7Sgcq+1G/uz5Ie4y3ExQs3KsfPo=", - "dev": true, - "dependencies": { - "readable-stream": "~1.0.26-4" - } - }, - "node_modules/fwd-stream/node_modules/isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "node_modules/fwd-stream/node_modules/readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "dev": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "node_modules/fwd-stream/node_modules/string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - }, - "node_modules/gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", - "dev": true, - "dependencies": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "node_modules/gauge/node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gauge/node_modules/strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gaze": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", - "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", - "dev": true, - "dependencies": { - "globule": "^1.0.0" - }, - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "peer": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/get-port": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz", - "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/get-stdin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0" - } - }, - "node_modules/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/globals": { - "version": "13.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", - "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/globby": { - "version": "11.0.4", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", - "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", - "dev": true, - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.1.1", - "ignore": "^5.1.4", - "merge2": "^1.3.0", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/globule": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.3.tgz", - "integrity": "sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==", - "dev": true, - "dependencies": { - "glob": "~7.1.1", - "lodash": "~4.17.10", - "minimatch": "~3.0.2" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/globule/node_modules/glob": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", - "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==", - "dev": true - }, - "node_modules/har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/har-validator": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", - "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", - "deprecated": "this library is no longer supported", - "dev": true, - "dependencies": { - "ajv": "^6.12.3", - "har-schema": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/hard-rejection": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", - "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/has-ansi/node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", - "dev": true - }, - "node_modules/hash-base": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", - "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.4", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/hash-base/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/hash-base/node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/hash.js": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", - "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" - } - }, - "node_modules/hmac-drbg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", - "dev": true, - "dependencies": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" - } - }, - "node_modules/hosted-git-info": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz", - "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - }, - "engines": { - "node": ">=0.8", - "npm": ">=1.3.7" - } - }, - "node_modules/idb-wrapper": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/idb-wrapper/-/idb-wrapper-1.7.2.tgz", - "integrity": "sha512-zfNREywMuf0NzDo9mVsL0yegjsirJxHpKHvWcyRozIqQy89g0a3U+oBPOCN4cc0oCiOuYgZHimzaW/R46G1Mpg==", - "dev": true - }, - "node_modules/ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/indexof": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", - "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", - "dev": true - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "node_modules/is": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/is/-/is-0.2.7.tgz", - "integrity": "sha1-OzSixI81mXLzUEKEkZOucmS2NWI=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true - }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-core-module": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz", - "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==", - "dev": true, - "dependencies": { - "has": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "dependencies": { - "number-is-nan": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", - "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=", - "dev": true - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/is-object": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/is-object/-/is-object-0.1.2.tgz", - "integrity": "sha1-AO+8CIFsM8/ErIJR0TLhDcZQmNc=", - "dev": true - }, - "node_modules/is-observable": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-2.1.0.tgz", - "integrity": "sha512-DailKdLb0WU+xX8K5w7VsJhapwHLZ9jjmazqCJq4X12CTgqq73TKnbRcnSLuXYPOoLQgV5IrD7ePiX/h1vnkBw==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-reference": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz", - "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==", - "dev": true, - "dependencies": { - "@types/estree": "*" - } - }, - "node_modules/is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true - }, - "node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "node_modules/isbuffer": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/isbuffer/-/isbuffer-0.0.0.tgz", - "integrity": "sha1-OMFG2d9Si4v5sHAcPUPPEt8/w5s=", - "dev": true - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" - }, - "node_modules/isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true - }, - "node_modules/jest-worker": { - "version": "26.6.2", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz", - "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==", - "dev": true, - "dependencies": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^7.0.0" - }, - "engines": { - "node": ">= 10.13.0" - } - }, - "node_modules/js-base64": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", - "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==", - "dev": true - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" - }, - "node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true - }, - "node_modules/jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "peer": true, - "bin": { - "jsesc": "bin/jsesc" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true - }, - "node_modules/json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true - }, - "node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" - }, - "node_modules/json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=" - }, - "node_modules/json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true - }, - "node_modules/json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "peer": true, - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "dev": true, - "engines": [ - "node >=0.6.0" - ], - "dependencies": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - } - }, - "node_modules/kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/kleur": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", - "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/level-blobs": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/level-blobs/-/level-blobs-0.1.7.tgz", - "integrity": "sha1-mrm5e7mfHtv594o0M+Ie1WOGva8=", - "dev": true, - "dependencies": { - "level-peek": "1.0.6", - "once": "^1.3.0", - "readable-stream": "^1.0.26-4" - } - }, - "node_modules/level-blobs/node_modules/isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "node_modules/level-blobs/node_modules/readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "dev": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "node_modules/level-blobs/node_modules/string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - }, - "node_modules/level-filesystem": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/level-filesystem/-/level-filesystem-1.2.0.tgz", - "integrity": "sha1-oArKmRnEpN+v3KaoEI0iWq3/Y7M=", - "dev": true, - "dependencies": { - "concat-stream": "^1.4.4", - "errno": "^0.1.1", - "fwd-stream": "^1.0.4", - "level-blobs": "^0.1.7", - "level-peek": "^1.0.6", - "level-sublevel": "^5.2.0", - "octal": "^1.0.0", - "once": "^1.3.0", - "xtend": "^2.2.0" - } - }, - "node_modules/level-fix-range": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/level-fix-range/-/level-fix-range-1.0.2.tgz", - "integrity": "sha1-vxW5Fa422EcMgh6IPd95zRZCCCg=", - "dev": true - }, - "node_modules/level-hooks": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/level-hooks/-/level-hooks-4.5.0.tgz", - "integrity": "sha1-G5rmGSKTDzMF0aYfxNg8gQLA3ZM=", - "dev": true, - "dependencies": { - "string-range": "~1.2" - } - }, - "node_modules/level-js": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/level-js/-/level-js-2.2.4.tgz", - "integrity": "sha1-vAVfQYBjXUSJtWHJSG+jcOjBFpc=", - "dev": true, - "dependencies": { - "abstract-leveldown": "~0.12.0", - "idb-wrapper": "^1.5.0", - "isbuffer": "~0.0.0", - "ltgt": "^2.1.2", - "typedarray-to-buffer": "~1.0.0", - "xtend": "~2.1.2" - } - }, - "node_modules/level-js/node_modules/xtend": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", - "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", - "dev": true, - "dependencies": { - "object-keys": "~0.4.0" - }, - "engines": { - "node": ">=0.4" - } - }, - "node_modules/level-peek": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/level-peek/-/level-peek-1.0.6.tgz", - "integrity": "sha1-vsUccqgu5GTTNkNMfIdsP8vM538=", - "dev": true, - "dependencies": { - "level-fix-range": "~1.0.2" - } - }, - "node_modules/level-sublevel": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/level-sublevel/-/level-sublevel-5.2.3.tgz", - "integrity": "sha1-dEwSxy0ucr543eO5tc2E1iGRQTo=", - "dev": true, - "dependencies": { - "level-fix-range": "2.0", - "level-hooks": ">=4.4.0 <5", - "string-range": "~1.2.1", - "xtend": "~2.0.4" - } - }, - "node_modules/level-sublevel/node_modules/level-fix-range": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/level-fix-range/-/level-fix-range-2.0.0.tgz", - "integrity": "sha1-xBfWIVlEIVGhnZojZ4aPFyTC1Ug=", - "dev": true, - "dependencies": { - "clone": "~0.1.9" - } - }, - "node_modules/level-sublevel/node_modules/object-keys": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.2.0.tgz", - "integrity": "sha1-zd7AKZiwkb5CvxA1rjLknxy26mc=", - "deprecated": "Please update to the latest object-keys", - "dev": true, - "dependencies": { - "foreach": "~2.0.1", - "indexof": "~0.0.1", - "is": "~0.2.6" - } - }, - "node_modules/level-sublevel/node_modules/xtend": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.0.6.tgz", - "integrity": "sha1-XqZXptukRwacLlnFihE4ywxebO4=", - "dev": true, - "dependencies": { - "is-object": "~0.1.2", - "object-keys": "~0.2.0" - }, - "engines": { - "node": ">=0.4" - } - }, - "node_modules/levelup": { - "version": "0.18.6", - "resolved": "https://registry.npmjs.org/levelup/-/levelup-0.18.6.tgz", - "integrity": "sha1-5qAcsIlhbI7MApHCqb0/DETj5es=", - "dev": true, - "dependencies": { - "bl": "~0.8.1", - "deferred-leveldown": "~0.2.0", - "errno": "~0.1.1", - "prr": "~0.0.0", - "readable-stream": "~1.0.26", - "semver": "~2.3.1", - "xtend": "~3.0.0" - } - }, - "node_modules/levelup/node_modules/isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "node_modules/levelup/node_modules/prr": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz", - "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=", - "dev": true - }, - "node_modules/levelup/node_modules/readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "dev": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "node_modules/levelup/node_modules/semver": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-2.3.2.tgz", - "integrity": "sha1-uYSPJdbPNjMwc+ye+IVtQvEjPlI=", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/levelup/node_modules/string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - }, - "node_modules/levelup/node_modules/xtend": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", - "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=", - "dev": true, - "engines": { - "node": ">=0.4" - } - }, - "node_modules/levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dependencies": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/lines-and-columns": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", - "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", - "dev": true - }, - "node_modules/livereload": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/livereload/-/livereload-0.9.3.tgz", - "integrity": "sha512-q7Z71n3i4X0R9xthAryBdNGVGAO2R5X+/xXpmKeuPMrteg+W2U8VusTKV3YiJbXZwKsOlFlHe+go6uSNjfxrZw==", - "dev": true, - "dependencies": { - "chokidar": "^3.5.0", - "livereload-js": "^3.3.1", - "opts": ">= 1.2.0", - "ws": "^7.4.3" - }, - "bin": { - "livereload": "bin/livereload.js" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/livereload-js": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-3.3.2.tgz", - "integrity": "sha512-w677WnINxFkuixAoUEXOStewzLYGI76XVag+0JWMMEyjJQKs0ibWZMxkTlB96Lm3EjZ7IeOxVziBEbtxVQqQZA==", - "dev": true - }, - "node_modules/local-access": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/local-access/-/local-access-1.1.0.tgz", - "integrity": "sha512-XfegD5pyTAfb+GY6chk283Ox5z8WexG56OvM06RWLpAc/UHozO8X6xAxEkIitZOtsSMM1Yr3DkHgW5W+onLhCw==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, - "node_modules/lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=" - }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" - }, - "node_modules/lodash.truncate": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=" - }, - "node_modules/lottie-web": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.7.14.tgz", - "integrity": "sha512-J+QEPse7Rws0XvTqRJNtcE8cszb5FWYFHubEK6bgDJtw64/AQJ40aazbWXsWGBM4sm/PgLBLgmmhDU4QpLiieg==" - }, - "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/ltgt": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz", - "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU=", - "dev": true - }, - "node_modules/magic-string": { - "version": "0.25.7", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz", - "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==", - "dev": true, - "dependencies": { - "sourcemap-codec": "^1.4.4" - } - }, - "node_modules/make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, - "dependencies": { - "semver": "^6.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/make-dir/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/map-obj": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", - "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/md5.js": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", - "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", - "dev": true, - "dependencies": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, - "node_modules/meow": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz", - "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==", - "dev": true, - "dependencies": { - "@types/minimist": "^1.2.0", - "camelcase-keys": "^6.2.2", - "decamelize": "^1.2.0", - "decamelize-keys": "^1.1.0", - "hard-rejection": "^2.1.0", - "minimist-options": "4.1.0", - "normalize-package-data": "^3.0.0", - "read-pkg-up": "^7.0.1", - "redent": "^3.0.0", - "trim-newlines": "^3.0.0", - "type-fest": "^0.18.0", - "yargs-parser": "^20.2.3" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/meow/node_modules/type-fest": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", - "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", - "dev": true, - "dependencies": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/miller-rabin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", - "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", - "dev": true, - "dependencies": { - "bn.js": "^4.0.0", - "brorand": "^1.0.1" - }, - "bin": { - "miller-rabin": "bin/miller-rabin" - } - }, - "node_modules/miller-rabin/node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true - }, - "node_modules/mime": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz", - "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==", - "dev": true, - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/mime-db": { - "version": "1.50.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz", - "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.33", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz", - "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==", - "dev": true, - "dependencies": { - "mime-db": "1.50.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/min-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", - "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/minimalistic-assert": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", - "dev": true - }, - "node_modules/minimalistic-crypto-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=", - "dev": true - }, - "node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" - }, - "node_modules/minimist-options": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", - "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", - "dev": true, - "dependencies": { - "arrify": "^1.0.1", - "is-plain-obj": "^1.1.0", - "kind-of": "^6.0.3" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/minipass": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz", - "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/mri": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", - "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "node_modules/nan": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", - "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==", - "dev": true - }, - "node_modules/nanoevents": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/nanoevents/-/nanoevents-6.0.2.tgz", - "integrity": "sha512-FRS2otuFcPPYDPYViNWQ42+1iZqbXydinkRHTHFxrF4a1CpBfmydR9zkI44WSXAXCyPrkcGtPk5CnpW6Y3lFKQ==", - "dev": true, - "engines": { - "node": "^12.0.0 || ^14.0.0 || >=16.0.0" - } - }, - "node_modules/natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=" - }, - "node_modules/node-gyp": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz", - "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==", - "dev": true, - "dependencies": { - "env-paths": "^2.2.0", - "glob": "^7.1.4", - "graceful-fs": "^4.2.3", - "nopt": "^5.0.0", - "npmlog": "^4.1.2", - "request": "^2.88.2", - "rimraf": "^3.0.2", - "semver": "^7.3.2", - "tar": "^6.0.2", - "which": "^2.0.2" - }, - "bin": { - "node-gyp": "bin/node-gyp.js" - }, - "engines": { - "node": ">= 10.12.0" - } - }, - "node_modules/node-releases": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz", - "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==", - "peer": true - }, - "node_modules/node-sass": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-6.0.1.tgz", - "integrity": "sha512-f+Rbqt92Ful9gX0cGtdYwjTrWAaGURgaK5rZCWOgCNyGWusFYHhbqCCBoFBeat+HKETOU02AyTxNhJV0YZf2jQ==", - "dev": true, - "hasInstallScript": true, - "dependencies": { - "async-foreach": "^0.1.3", - "chalk": "^1.1.1", - "cross-spawn": "^7.0.3", - "gaze": "^1.0.0", - "get-stdin": "^4.0.1", - "glob": "^7.0.3", - "lodash": "^4.17.15", - "meow": "^9.0.0", - "nan": "^2.13.2", - "node-gyp": "^7.1.0", - "npmlog": "^4.0.0", - "request": "^2.88.0", - "sass-graph": "2.2.5", - "stdout-stream": "^1.4.0", - "true-case-path": "^1.0.2" - }, - "bin": { - "node-sass": "bin/node-sass" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/node-sass/node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/node-sass/node_modules/ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/node-sass/node_modules/chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "dependencies": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/node-sass/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/node-sass/node_modules/strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/node-sass/node_modules/supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/nopt": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", - "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", - "dev": true, - "dependencies": { - "abbrev": "1" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/normalize-package-data": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", - "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", - "dev": true, - "dependencies": { - "hosted-git-info": "^4.0.1", - "is-core-module": "^2.5.0", - "semver": "^7.3.4", - "validate-npm-package-license": "^3.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "dev": true, - "dependencies": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "node_modules/number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-keys": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz", - "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=", - "dev": true - }, - "node_modules/observable-fns": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/observable-fns/-/observable-fns-0.6.1.tgz", - "integrity": "sha512-9gRK4+sRWzeN6AOewNBTLXir7Zl/i3GB6Yl26gK4flxz8BXVpD3kt8amREmWNb0mxYOGDotvE5a4N+PtGGKdkg==", - "dev": true - }, - "node_modules/octal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/octal/-/octal-1.0.0.tgz", - "integrity": "sha1-Y+cWKmjvvrniE1iNWOmJ0eXEUws=", - "dev": true - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", - "dependencies": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/opts": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/opts/-/opts-2.0.2.tgz", - "integrity": "sha512-k41FwbcLnlgnFh69f4qdUfvDQ+5vaSDnVPFI/y5XuhKRq97EnVVneO9F1ESVCdiVu4fCS2L8usX3mU331hB7pg==", - "dev": true - }, - "node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dependencies": { - "callsites": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/parse-asn1": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", - "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", - "dev": true, - "dependencies": { - "asn1.js": "^5.2.0", - "browserify-aes": "^1.0.0", - "evp_bytestokey": "^1.0.0", - "pbkdf2": "^3.0.3", - "safe-buffer": "^5.1.1" - } - }, - "node_modules/parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "engines": { - "node": ">=8" - } - }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/pbkdf2": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", - "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==", - "dev": true, - "dependencies": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - }, - "engines": { - "node": ">=0.12" - } - }, - "node_modules/performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true - }, - "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "peer": true - }, - "node_modules/picomatch": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", - "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", - "dev": true, - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "dependencies": { - "find-up": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/prettier": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz", - "integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==", - "dev": true, - "bin": { - "prettier": "bin-prettier.js" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/process-es6": { - "version": "0.11.6", - "resolved": "https://registry.npmjs.org/process-es6/-/process-es6-0.11.6.tgz", - "integrity": "sha1-xrs4n5qVH4K9TrFpYAEFvS/5x3g=", - "dev": true - }, - "node_modules/process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true - }, - "node_modules/progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/prr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", - "dev": true - }, - "node_modules/psl": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", - "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", - "dev": true - }, - "node_modules/public-encrypt": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", - "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", - "dev": true, - "dependencies": { - "bn.js": "^4.1.0", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "parse-asn1": "^5.0.0", - "randombytes": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, - "node_modules/public-encrypt/node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true - }, - "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "engines": { - "node": ">=6" - } - }, - "node_modules/qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "dev": true, - "engines": { - "node": ">=0.6" - } - }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/quick-lru": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", - "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/random-number-csprng": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/random-number-csprng/-/random-number-csprng-1.0.2.tgz", - "integrity": "sha1-/NEg5i3/wsB2dMfD/gHhayX3OiY=", - "dev": true, - "dependencies": { - "bluebird": "^3.3.3", - "create-error": "^0.3.1" - } - }, - "node_modules/randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true, - "dependencies": { - "safe-buffer": "^5.1.0" - } - }, - "node_modules/randomfill": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", - "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", - "dev": true, - "dependencies": { - "randombytes": "^2.0.5", - "safe-buffer": "^5.1.0" - } - }, - "node_modules/read-pkg": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", - "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", - "dev": true, - "dependencies": { - "@types/normalize-package-data": "^2.4.0", - "normalize-package-data": "^2.5.0", - "parse-json": "^5.0.0", - "type-fest": "^0.6.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/read-pkg-up": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", - "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", - "dev": true, - "dependencies": { - "find-up": "^4.1.0", - "read-pkg": "^5.2.0", - "type-fest": "^0.8.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-pkg-up/node_modules/type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/read-pkg/node_modules/hosted-git-info": { - "version": "2.8.9", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", - "dev": true - }, - "node_modules/read-pkg/node_modules/normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "dev": true, - "dependencies": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "node_modules/read-pkg/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/read-pkg/node_modules/type-fest": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", - "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/redent": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", - "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", - "dev": true, - "dependencies": { - "indent-string": "^4.0.0", - "strip-indent": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/regexpp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", - "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/request": { - "version": "2.88.2", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", - "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", - "dev": true, - "dependencies": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/request/node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", - "dev": true, - "bin": { - "uuid": "bin/uuid" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, - "node_modules/require-relative": { - "version": "0.8.7", - "resolved": "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz", - "integrity": "sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4=", - "dev": true - }, - "node_modules/resolve": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", - "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", - "dev": true, - "dependencies": { - "is-core-module": "^2.2.0", - "path-parse": "^1.0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "engines": { - "node": ">=4" - } - }, - "node_modules/ret": { - "version": "0.1.15", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", - "dev": true, - "engines": { - "node": ">=0.12" - } - }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/ripemd160": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", - "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", - "dev": true, - "dependencies": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1" - } - }, - "node_modules/rollup": { - "version": "2.58.3", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.58.3.tgz", - "integrity": "sha512-ei27MSw1KhRur4p87Q0/Va2NAYqMXOX++FNEumMBcdreIRLURKy+cE2wcDJKBn0nfmhP2ZGrJkP1XPO+G8FJQw==", - "dev": true, - "bin": { - "rollup": "dist/bin/rollup" - }, - "engines": { - "node": ">=10.0.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/rollup-plugin-css-only": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/rollup-plugin-css-only/-/rollup-plugin-css-only-3.1.0.tgz", - "integrity": "sha512-TYMOE5uoD76vpj+RTkQLzC9cQtbnJNktHPB507FzRWBVaofg7KhIqq1kGbcVOadARSozWF883Ho9KpSPKH8gqA==", - "dev": true, - "dependencies": { - "@rollup/pluginutils": "4" - }, - "engines": { - "node": ">=10.12.0" - }, - "peerDependencies": { - "rollup": "1 || 2" - } - }, - "node_modules/rollup-plugin-css-only/node_modules/@rollup/pluginutils": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.1.1.tgz", - "integrity": "sha512-clDjivHqWGXi7u+0d2r2sBi4Ie6VLEAzWMIkvJLnDmxoOhBYOTfzGbOQBA32THHm11/LiJbd01tJUpJsbshSWQ==", - "dev": true, - "dependencies": { - "estree-walker": "^2.0.1", - "picomatch": "^2.2.2" - }, - "engines": { - "node": ">= 8.0.0" - } - }, - "node_modules/rollup-plugin-livereload": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/rollup-plugin-livereload/-/rollup-plugin-livereload-2.0.5.tgz", - "integrity": "sha512-vqQZ/UQowTW7VoiKEM5ouNW90wE5/GZLfdWuR0ELxyKOJUIaj+uismPZZaICU4DnWPVjnpCDDxEqwU7pcKY/PA==", - "dev": true, - "dependencies": { - "livereload": "^0.9.1" - }, - "engines": { - "node": ">=8.3" - } - }, - "node_modules/rollup-plugin-node-builtins": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/rollup-plugin-node-builtins/-/rollup-plugin-node-builtins-2.1.2.tgz", - "integrity": "sha1-JKH+1KQyV7a2Q3HYq8bOGrFFl+k=", - "dev": true, - "dependencies": { - "browserify-fs": "^1.0.0", - "buffer-es6": "^4.9.2", - "crypto-browserify": "^3.11.0", - "process-es6": "^0.11.2" - } - }, - "node_modules/rollup-plugin-node-globals": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/rollup-plugin-node-globals/-/rollup-plugin-node-globals-1.4.0.tgz", - "integrity": "sha512-xRkB+W/m1KLIzPUmG0ofvR+CPNcvuCuNdjVBVS7ALKSxr3EDhnzNceGkGi1m8MToSli13AzKFYH4ie9w3I5L3g==", - "dev": true, - "dependencies": { - "acorn": "^5.7.3", - "buffer-es6": "^4.9.3", - "estree-walker": "^0.5.2", - "magic-string": "^0.22.5", - "process-es6": "^0.11.6", - "rollup-pluginutils": "^2.3.1" - } - }, - "node_modules/rollup-plugin-node-globals/node_modules/acorn": { - "version": "5.7.4", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz", - "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/rollup-plugin-node-globals/node_modules/estree-walker": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.5.2.tgz", - "integrity": "sha512-XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig==", - "dev": true - }, - "node_modules/rollup-plugin-node-globals/node_modules/magic-string": { - "version": "0.22.5", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz", - "integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==", - "dev": true, - "dependencies": { - "vlq": "^0.2.2" - } - }, - "node_modules/rollup-plugin-svelte": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/rollup-plugin-svelte/-/rollup-plugin-svelte-7.1.0.tgz", - "integrity": "sha512-vopCUq3G+25sKjwF5VilIbiY6KCuMNHP1PFvx2Vr3REBNMDllKHFZN2B9jwwC+MqNc3UPKkjXnceLPEjTjXGXg==", - "dev": true, - "dependencies": { - "require-relative": "^0.8.7", - "rollup-pluginutils": "^2.8.2" - }, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "rollup": ">=2.0.0", - "svelte": ">=3.5.0" - } - }, - "node_modules/rollup-plugin-terser": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz", - "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.10.4", - "jest-worker": "^26.2.1", - "serialize-javascript": "^4.0.0", - "terser": "^5.0.0" - }, - "peerDependencies": { - "rollup": "^2.0.0" - } - }, - "node_modules/rollup-plugin-typescript2": { - "version": "0.30.0", - "resolved": "https://registry.npmjs.org/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.30.0.tgz", - "integrity": "sha512-NUFszIQyhgDdhRS9ya/VEmsnpTe+GERDMmFo0Y+kf8ds51Xy57nPNGglJY+W6x1vcouA7Au7nsTgsLFj2I0PxQ==", - "dev": true, - "dependencies": { - "@rollup/pluginutils": "^4.1.0", - "find-cache-dir": "^3.3.1", - "fs-extra": "8.1.0", - "resolve": "1.20.0", - "tslib": "2.1.0" - }, - "peerDependencies": { - "rollup": ">=1.26.3", - "typescript": ">=2.4.0" - } - }, - "node_modules/rollup-plugin-typescript2/node_modules/@rollup/pluginutils": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.1.1.tgz", - "integrity": "sha512-clDjivHqWGXi7u+0d2r2sBi4Ie6VLEAzWMIkvJLnDmxoOhBYOTfzGbOQBA32THHm11/LiJbd01tJUpJsbshSWQ==", - "dev": true, - "dependencies": { - "estree-walker": "^2.0.1", - "picomatch": "^2.2.2" - }, - "engines": { - "node": ">= 8.0.0" - } - }, - "node_modules/rollup-plugin-typescript2/node_modules/tslib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", - "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", - "dev": true - }, - "node_modules/rollup-plugin-web-worker-loader": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/rollup-plugin-web-worker-loader/-/rollup-plugin-web-worker-loader-1.6.1.tgz", - "integrity": "sha512-4QywQSz1NXFHKdyiou16mH3ijpcfLtLGOrAqvAqu1Gx+P8+zj+3gwC2BSL/VW1d+LW4nIHC8F7d7OXhs9UdR2A==", - "dev": true, - "peerDependencies": { - "rollup": "^1.9.2 || ^2.0.0" - } - }, - "node_modules/rollup-pluginutils": { - "version": "2.8.2", - "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz", - "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==", - "dev": true, - "dependencies": { - "estree-walker": "^0.6.1" - } - }, - "node_modules/rollup-pluginutils/node_modules/estree-walker": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz", - "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==", - "dev": true - }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, - "node_modules/sade": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/sade/-/sade-1.7.4.tgz", - "integrity": "sha512-y5yauMD93rX840MwUJr7C1ysLFBgMspsdTo4UVrDg3fXDvtwOyIqykhVAAm6fk/3au77773itJStObgK+LKaiA==", - "dev": true, - "dependencies": { - "mri": "^1.1.0" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "node_modules/safe-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", - "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", - "dev": true, - "dependencies": { - "ret": "~0.1.10" - } - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "node_modules/sander": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/sander/-/sander-0.5.1.tgz", - "integrity": "sha1-dB4kXiMfB8r7b98PEzrfohalAq0=", - "dev": true, - "dependencies": { - "es6-promise": "^3.1.2", - "graceful-fs": "^4.1.3", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.2" - } - }, - "node_modules/sander/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/sass-graph": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz", - "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==", - "dev": true, - "dependencies": { - "glob": "^7.0.0", - "lodash": "^4.0.0", - "scss-tokenizer": "^0.2.3", - "yargs": "^13.3.2" - }, - "bin": { - "sassgraph": "bin/sassgraph" - } - }, - "node_modules/scss-tokenizer": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", - "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", - "dev": true, - "dependencies": { - "js-base64": "^2.1.8", - "source-map": "^0.4.2" - } - }, - "node_modules/semiver": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/semiver/-/semiver-1.1.0.tgz", - "integrity": "sha512-QNI2ChmuioGC1/xjyYwyZYADILWyW6AmS1UH6gDj/SFUUUS4MBAWs/7mxnkRPc/F4iHezDP+O8t0dO8WHiEOdg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/serialize-javascript": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", - "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", - "dev": true, - "dependencies": { - "randombytes": "^2.1.0" - } - }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "node_modules/sha.js": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", - "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", - "dev": true, - "dependencies": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - }, - "bin": { - "sha.js": "bin.js" - } - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "engines": { - "node": ">=8" - } - }, - "node_modules/signal-exit": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz", - "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==", - "dev": true - }, - "node_modules/sirv": { - "version": "1.0.18", - "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.18.tgz", - "integrity": "sha512-f2AOPogZmXgJ9Ma2M22ZEhc1dNtRIzcEkiflMFeVTRq+OViOZMvH1IPMVOwrKaxpSaHioBJiDR0SluRqGa7atA==", - "dev": true, - "dependencies": { - "@polka/url": "^1.0.0-next.20", - "mime": "^2.3.1", - "totalist": "^1.0.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/sirv-cli": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/sirv-cli/-/sirv-cli-1.0.14.tgz", - "integrity": "sha512-yyUTNr984ANKDloqepkYbBSqvx3buwYg2sQKPWjSU+IBia5loaoka2If8N9CMwt8AfP179cdEl7kYJ//iWJHjQ==", - "dev": true, - "dependencies": { - "console-clear": "^1.1.0", - "get-port": "^3.2.0", - "kleur": "^3.0.0", - "local-access": "^1.0.1", - "sade": "^1.6.0", - "semiver": "^1.0.0", - "sirv": "^1.0.13", - "tinydate": "^1.0.0" - }, - "bin": { - "sirv": "bin.js" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, - "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "engines": { - "node": ">=8" - } - }, - "node_modules/sorcery": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/sorcery/-/sorcery-0.10.0.tgz", - "integrity": "sha1-iukK19fLBfxZ8asMY3hF1cFaUrc=", - "dev": true, - "dependencies": { - "buffer-crc32": "^0.2.5", - "minimist": "^1.2.0", - "sander": "^0.5.0", - "sourcemap-codec": "^1.3.0" - }, - "bin": { - "sorcery": "bin/index.js" - } - }, - "node_modules/source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, - "dependencies": { - "amdefine": ">=0.0.4" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.20", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", - "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", - "dev": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/source-map-support/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/sourcemap-codec": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", - "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", - "dev": true - }, - "node_modules/spdx-correct": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", - "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", - "dev": true, - "dependencies": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", - "dev": true - }, - "node_modules/spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dev": true, - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-license-ids": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz", - "integrity": "sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==", - "dev": true - }, - "node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" - }, - "node_modules/sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "dev": true, - "dependencies": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - }, - "bin": { - "sshpk-conv": "bin/sshpk-conv", - "sshpk-sign": "bin/sshpk-sign", - "sshpk-verify": "bin/sshpk-verify" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/sshpk/node_modules/tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true - }, - "node_modules/stdout-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz", - "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", - "dev": true, - "dependencies": { - "readable-stream": "^2.0.1" - } - }, - "node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/string-range": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/string-range/-/string-range-1.2.2.tgz", - "integrity": "sha1-qJPtNH5yKZvIO++78qaSqNI51d0=", - "dev": true - }, - "node_modules/string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "dependencies": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/string-width/node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/string-width/node_modules/strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-indent": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", - "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", - "dev": true, - "dependencies": { - "min-indent": "^1.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/svelte": { - "version": "3.44.0", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.44.0.tgz", - "integrity": "sha512-zWACSJBSncGiDvFfYOMFGNV5zDLOlyhftmO5yOZ0lEtQMptpElaRtl39MWz1+lYCpwUq4F3Q2lTzI9TrTL+eMA==", - "engines": { - "node": ">= 8" - } - }, - "node_modules/svelte-check": { - "version": "2.2.7", - "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.7.tgz", - "integrity": "sha512-lH8ArmwVC+D314cToZkXBBfj7NlpvgQGP7nXCAMnNHo6hTEcbKcf/cAZgzbnAOTftjIJrmLHp+EDW887VJFSOQ==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "chokidar": "^3.4.1", - "fast-glob": "^3.2.7", - "import-fresh": "^3.2.1", - "minimist": "^1.2.5", - "sade": "^1.7.4", - "source-map": "^0.7.3", - "svelte-preprocess": "^4.0.0", - "typescript": "*" - }, - "bin": { - "svelte-check": "bin/svelte-check" - }, - "peerDependencies": { - "svelte": "^3.24.0" - } - }, - "node_modules/svelte-check/node_modules/source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/svelte-preprocess": { - "version": "4.9.8", - "resolved": "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.9.8.tgz", - "integrity": "sha512-EQS/oRZzMtYdAprppZxY3HcysKh11w54MgA63ybtL+TAZ4hVqYOnhw41JVJjWN9dhPnNjjLzvbZ2tMhTsla1Og==", - "dev": true, - "hasInstallScript": true, - "dependencies": { - "@types/pug": "^2.0.4", - "@types/sass": "^1.16.0", - "detect-indent": "^6.0.0", - "magic-string": "^0.25.7", - "sorcery": "^0.10.0", - "strip-indent": "^3.0.0" - }, - "engines": { - "node": ">= 9.11.2" - }, - "peerDependencies": { - "@babel/core": "^7.10.2", - "coffeescript": "^2.5.1", - "less": "^3.11.3", - "postcss": "^7 || ^8", - "postcss-load-config": "^2.1.0 || ^3.0.0", - "pug": "^3.0.0", - "sass": "^1.26.8", - "stylus": "^0.54.7", - "sugarss": "^2.0.0", - "svelte": "^3.23.0", - "typescript": "^3.9.5 || ^4.0.0" - }, - "peerDependenciesMeta": { - "@babel/core": { - "optional": true - }, - "coffeescript": { - "optional": true - }, - "less": { - "optional": true - }, - "node-sass": { - "optional": true - }, - "postcss": { - "optional": true - }, - "postcss-load-config": { - "optional": true - }, - "pug": { - "optional": true - }, - "sass": { - "optional": true - }, - "stylus": { - "optional": true - }, - "sugarss": { - "optional": true - }, - "typescript": { - "optional": true - } - } - }, - "node_modules/svelte-router-spa": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/svelte-router-spa/-/svelte-router-spa-6.0.3.tgz", - "integrity": "sha512-aHgyUVVI/WjipQNmKcXpX0hFZtkW5Y6hwH5aXLr2P/aRQ/qlX8ZbKQJUwKjOD59p7tt/c+wqokiIt68N7aNuKQ==", - "dependencies": { - "url-params-parser": "^1.0.3" - }, - "peerDependencies": { - "svelte": "^3.36.0" - } - }, - "node_modules/table": { - "version": "6.7.2", - "resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz", - "integrity": "sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==", - "dependencies": { - "ajv": "^8.0.1", - "lodash.clonedeep": "^4.5.0", - "lodash.truncate": "^4.4.2", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/table/node_modules/ajv": { - "version": "8.6.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz", - "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/table/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "node_modules/table/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "engines": { - "node": ">=8" - } - }, - "node_modules/table/node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" - }, - "node_modules/table/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/tar": { - "version": "6.1.11", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", - "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", - "dev": true, - "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^3.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/tar/node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true, - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/terser": { - "version": "5.9.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz", - "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==", - "dev": true, - "dependencies": { - "commander": "^2.20.0", - "source-map": "~0.7.2", - "source-map-support": "~0.5.20" - }, - "bin": { - "terser": "bin/terser" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/terser/node_modules/source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=" - }, - "node_modules/threads": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/threads/-/threads-1.7.0.tgz", - "integrity": "sha512-Mx5NBSHX3sQYR6iI9VYbgHKBLisyB+xROCBGjjWm1O9wb9vfLxdaGtmT/KCjUqMsSNW6nERzCW3T6H43LqjDZQ==", - "dev": true, - "dependencies": { - "callsites": "^3.1.0", - "debug": "^4.2.0", - "is-observable": "^2.1.0", - "observable-fns": "^0.6.1" - }, - "funding": { - "url": "https://github.com/andywer/threads.js?sponsor=1" - }, - "optionalDependencies": { - "tiny-worker": ">= 2" - } - }, - "node_modules/tiny-worker": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/tiny-worker/-/tiny-worker-2.3.0.tgz", - "integrity": "sha512-pJ70wq5EAqTAEl9IkGzA+fN0836rycEuz2Cn6yeZ6FRzlVS5IDOkFHpIoEsksPRQV34GDqXm65+OlnZqUSyK2g==", - "dev": true, - "optional": true, - "dependencies": { - "esm": "^3.2.25" - } - }, - "node_modules/tinydate": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/tinydate/-/tinydate-1.3.0.tgz", - "integrity": "sha512-7cR8rLy2QhYHpsBDBVYnnWXm8uRTr38RoZakFSW7Bs7PzfMPNZthuMLkwqZv7MTu8lhQ91cOFYS5a7iFj2oR3w==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", - "peer": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/totalist": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz", - "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, - "dependencies": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/trim-newlines": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", - "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/true-case-path": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", - "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", - "dev": true, - "dependencies": { - "glob": "^7.1.2" - } - }, - "node_modules/tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", - "dev": true - }, - "node_modules/tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", - "dev": true, - "dependencies": { - "tslib": "^1.8.1" - }, - "engines": { - "node": ">= 6" - }, - "peerDependencies": { - "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" - } - }, - "node_modules/tsutils/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "node_modules/tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, - "dependencies": { - "safe-buffer": "^5.0.1" - }, - "engines": { - "node": "*" - } - }, - "node_modules/tweetnacl": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", - "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==", - "dev": true - }, - "node_modules/type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dependencies": { - "prelude-ls": "^1.2.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", - "dev": true - }, - "node_modules/typedarray-to-buffer": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-1.0.4.tgz", - "integrity": "sha1-m7i6DoQfs/TPH+fCRenz+opf6Zw=", - "dev": true - }, - "node_modules/typescript": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz", - "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } - }, - "node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true, - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/url-params-parser": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/url-params-parser/-/url-params-parser-1.0.4.tgz", - "integrity": "sha512-0m6BqGpY2OetTZ3UPTLKkbTfUHigsX2YhrzORT9iYiyUJ/SP2WJ3cggg2YWtvMs36GPwK9Q44ffddyarniu2Tg==" - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "dev": true, - "bin": { - "uuid": "dist/bin/uuid" - } - }, - "node_modules/v8-compile-cache": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", - "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==" - }, - "node_modules/validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "dependencies": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "node_modules/verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, - "engines": [ - "node >=0.6.0" - ], - "dependencies": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, - "node_modules/verror/node_modules/core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "node_modules/vlq": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz", - "integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==", - "dev": true - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, - "node_modules/wide-align": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", - "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", - "dev": true, - "dependencies": { - "string-width": "^1.0.2 || 2 || 3 || 4" - } - }, - "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/wrap-ansi/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/wrap-ansi/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/wrap-ansi/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" - }, - "node_modules/ws": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz", - "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==", - "dev": true, - "engines": { - "node": ">=8.3.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, - "node_modules/xtend": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.2.0.tgz", - "integrity": "sha1-7vax8ZjByN6vrYsXZaBNrUoBxak=", - "dev": true, - "engines": { - "node": ">=0.4" - } - }, - "node_modules/y18n": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", - "dev": true - }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "node_modules/yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", - "dev": true, - "dependencies": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" - } - }, - "node_modules/yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/yargs/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs/node_modules/find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "dependencies": { - "locate-path": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs/node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/yargs/node_modules/locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "dependencies": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs/node_modules/p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "dependencies": { - "p-limit": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs/node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/yargs/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs/node_modules/yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", - "dev": true, - "dependencies": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - } - }, "dependencies": { "@babel/code-frame": { "version": "7.12.11", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", - "requires": { - "@babel/highlight": "^7.10.4" - } - }, - "@babel/compat-data": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz", - "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==", - "peer": true - }, - "@babel/core": { - "version": "7.15.8", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.8.tgz", - "integrity": "sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==", - "peer": true, - "requires": { - "@babel/code-frame": "^7.15.8", - "@babel/generator": "^7.15.8", - "@babel/helper-compilation-targets": "^7.15.4", - "@babel/helper-module-transforms": "^7.15.8", - "@babel/helpers": "^7.15.4", - "@babel/parser": "^7.15.8", - "@babel/template": "^7.15.4", - "@babel/traverse": "^7.15.4", - "@babel/types": "^7.15.6", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.1.2", - "semver": "^6.3.0", - "source-map": "^0.5.0" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.15.8", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz", - "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==", - "peer": true, - "requires": { - "@babel/highlight": "^7.14.5" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "peer": true - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "peer": true - } - } - }, - "@babel/eslint-parser": { - "version": "7.15.8", - "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.15.8.tgz", - "integrity": "sha512-fYP7QFngCvgxjUuw8O057SVH5jCXsbFFOoE77CFDcvzwBVgTOkMD/L4mIC5Ud1xf8chK/no2fRbSSn1wvNmKuQ==", - "requires": { - "eslint-scope": "^5.1.1", - "eslint-visitor-keys": "^2.1.0", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } - } - }, - "@babel/generator": { - "version": "7.15.8", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz", - "integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==", - "peer": true, - "requires": { - "@babel/types": "^7.15.6", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "peer": true - } + "dev": true, + "requires": { + "@babel/highlight": "^7.10.4" } }, - "@babel/helper-compilation-targets": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz", - "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==", - "peer": true, + "@babel/eslint-parser": { + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.15.8.tgz", + "integrity": "sha512-fYP7QFngCvgxjUuw8O057SVH5jCXsbFFOoE77CFDcvzwBVgTOkMD/L4mIC5Ud1xf8chK/no2fRbSSn1wvNmKuQ==", "requires": { - "@babel/compat-data": "^7.15.0", - "@babel/helper-validator-option": "^7.14.5", - "browserslist": "^4.16.6", + "eslint-scope": "^5.1.1", + "eslint-visitor-keys": "^2.1.0", "semver": "^6.3.0" }, "dependencies": { "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "peer": true + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" } } }, - "@babel/helper-function-name": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz", - "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==", - "peer": true, - "requires": { - "@babel/helper-get-function-arity": "^7.15.4", - "@babel/template": "^7.15.4", - "@babel/types": "^7.15.4" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz", - "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==", - "peer": true, - "requires": { - "@babel/types": "^7.15.4" - } - }, - "@babel/helper-hoist-variables": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz", - "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==", - "peer": true, - "requires": { - "@babel/types": "^7.15.4" - } - }, - "@babel/helper-member-expression-to-functions": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz", - "integrity": "sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==", - "peer": true, - "requires": { - "@babel/types": "^7.15.4" - } - }, - "@babel/helper-module-imports": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz", - "integrity": "sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==", - "peer": true, - "requires": { - "@babel/types": "^7.15.4" - } - }, - "@babel/helper-module-transforms": { - "version": "7.15.8", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz", - "integrity": "sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg==", - "peer": true, - "requires": { - "@babel/helper-module-imports": "^7.15.4", - "@babel/helper-replace-supers": "^7.15.4", - "@babel/helper-simple-access": "^7.15.4", - "@babel/helper-split-export-declaration": "^7.15.4", - "@babel/helper-validator-identifier": "^7.15.7", - "@babel/template": "^7.15.4", - "@babel/traverse": "^7.15.4", - "@babel/types": "^7.15.6" - } - }, - "@babel/helper-optimise-call-expression": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz", - "integrity": "sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==", - "peer": true, - "requires": { - "@babel/types": "^7.15.4" - } - }, - "@babel/helper-replace-supers": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz", - "integrity": "sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==", - "peer": true, - "requires": { - "@babel/helper-member-expression-to-functions": "^7.15.4", - "@babel/helper-optimise-call-expression": "^7.15.4", - "@babel/traverse": "^7.15.4", - "@babel/types": "^7.15.4" - } - }, - "@babel/helper-simple-access": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz", - "integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==", - "peer": true, - "requires": { - "@babel/types": "^7.15.4" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz", - "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==", - "peer": true, - "requires": { - "@babel/types": "^7.15.4" - } - }, "@babel/helper-validator-identifier": { "version": "7.15.7", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz", - "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==" - }, - "@babel/helper-validator-option": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz", - "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==", - "peer": true - }, - "@babel/helpers": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz", - "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==", - "peer": true, - "requires": { - "@babel/template": "^7.15.4", - "@babel/traverse": "^7.15.4", - "@babel/types": "^7.15.4" - } + "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==", + "dev": true }, "@babel/highlight": { "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", + "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.5", "chalk": "^2.0.0", @@ -6507,6 +51,7 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, "requires": { "color-convert": "^1.9.0" } @@ -6515,6 +60,7 @@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, "requires": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -6525,6 +71,7 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, "requires": { "color-name": "1.1.3" } @@ -6532,104 +79,37 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, "requires": { "has-flag": "^3.0.0" } } } }, - "@babel/parser": { - "version": "7.15.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz", - "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==", - "peer": true - }, - "@babel/template": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz", - "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==", - "peer": true, - "requires": { - "@babel/code-frame": "^7.14.5", - "@babel/parser": "^7.15.4", - "@babel/types": "^7.15.4" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.15.8", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz", - "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==", - "peer": true, - "requires": { - "@babel/highlight": "^7.14.5" - } - } - } - }, - "@babel/traverse": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz", - "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==", - "peer": true, - "requires": { - "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.15.4", - "@babel/helper-function-name": "^7.15.4", - "@babel/helper-hoist-variables": "^7.15.4", - "@babel/helper-split-export-declaration": "^7.15.4", - "@babel/parser": "^7.15.4", - "@babel/types": "^7.15.4", - "debug": "^4.1.0", - "globals": "^11.1.0" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.15.8", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz", - "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==", - "peer": true, - "requires": { - "@babel/highlight": "^7.14.5" - } - }, - "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "peer": true - } - } - }, - "@babel/types": { - "version": "7.15.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz", - "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==", - "peer": true, - "requires": { - "@babel/helper-validator-identifier": "^7.14.9", - "to-fast-properties": "^2.0.0" - } - }, "@eslint/eslintrc": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", + "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.1.1", @@ -6645,7 +125,8 @@ "ignore": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==" + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true } } }, @@ -6653,6 +134,7 @@ "version": "0.5.0", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", + "dev": true, "requires": { "@humanwhocodes/object-schema": "^1.2.0", "debug": "^4.1.1", @@ -6662,7 +144,8 @@ "@humanwhocodes/object-schema": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz", - "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==" + "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==", + "dev": true }, "@nodelib/fs.scandir": { "version": "2.1.5", @@ -6939,18 +422,20 @@ "acorn": { "version": "7.4.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==" + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true }, "acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "requires": {} + "dev": true }, "ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -6967,17 +452,20 @@ "ansi-colors": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==" + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true }, "ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true }, "ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -7012,6 +500,7 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, "requires": { "sprintf-js": "~1.0.2" } @@ -7066,7 +555,8 @@ "astral-regex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==" + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "dev": true }, "async-foreach": { "version": "0.1.3", @@ -7095,7 +585,8 @@ "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true }, "base64-js": { "version": "1.5.1", @@ -7183,6 +674,7 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7297,19 +789,6 @@ } } }, - "browserslist": { - "version": "4.17.5", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.5.tgz", - "integrity": "sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==", - "peer": true, - "requires": { - "caniuse-lite": "^1.0.30001271", - "electron-to-chromium": "^1.3.878", - "escalade": "^3.1.1", - "node-releases": "^2.0.1", - "picocolors": "^1.0.0" - } - }, "buffer-crc32": { "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", @@ -7343,7 +822,8 @@ "callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true }, "camelcase": { "version": "5.3.1", @@ -7362,12 +842,6 @@ "quick-lru": "^4.0.1" } }, - "caniuse-lite": { - "version": "1.0.30001271", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz", - "integrity": "sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA==", - "peer": true - }, "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", @@ -7378,6 +852,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -7476,6 +951,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, "requires": { "color-name": "~1.1.4" } @@ -7483,7 +959,8 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, "combined-stream": { "version": "1.0.8", @@ -7509,7 +986,8 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true }, "concat-stream": { "version": "1.6.2", @@ -7535,15 +1013,6 @@ "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true }, - "convert-source-map": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", - "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", - "peer": true, - "requires": { - "safe-buffer": "~5.1.1" - } - }, "core-util-is": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", @@ -7605,6 +1074,7 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -7643,6 +1113,7 @@ "version": "4.3.2", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "dev": true, "requires": { "ms": "2.1.2" } @@ -7674,7 +1145,8 @@ "deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true }, "deepmerge": { "version": "4.2.2", @@ -7751,6 +1223,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, "requires": { "esutils": "^2.0.2" } @@ -7765,12 +1238,6 @@ "safer-buffer": "^2.1.0" } }, - "electron-to-chromium": { - "version": "1.3.880", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.880.tgz", - "integrity": "sha512-iwIP/6WoeSimzUKJIQtjtpVDsK8Ir8qQCMXsUBwg+rxJR2Uh3wTNSbxoYRfs+3UWx/9MAnPIxVZCyWkm8MT0uw==", - "peer": true - }, "elliptic": { "version": "6.5.4", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", @@ -7804,6 +1271,7 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "dev": true, "requires": { "ansi-colors": "^4.1.1" } @@ -7838,21 +1306,17 @@ "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=", "dev": true }, - "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "peer": true - }, "escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true }, "eslint": { "version": "7.32.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", + "dev": true, "requires": { "@babel/code-frame": "7.12.11", "@eslint/eslintrc": "^0.4.3", @@ -7900,6 +1364,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, "requires": { "eslint-visitor-keys": "^1.1.0" }, @@ -7907,14 +1372,16 @@ "eslint-visitor-keys": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==" + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true } } }, "ignore": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==" + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true } } }, @@ -7931,8 +1398,7 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/eslint-plugin-svelte3/-/eslint-plugin-svelte3-3.2.1.tgz", "integrity": "sha512-YoBR9mLoKCjGghJ/gvpnFZKaMEu/VRcuxpSRS8KuozuEo7CdBH7bmBHa6FmMm0i4kJnOyx+PVsaptz96K6H/4Q==", - "dev": true, - "requires": {} + "dev": true }, "eslint-scope": { "version": "5.1.1", @@ -7968,6 +1434,7 @@ "version": "7.3.1", "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", + "dev": true, "requires": { "acorn": "^7.4.0", "acorn-jsx": "^5.3.1", @@ -7977,19 +1444,22 @@ "eslint-visitor-keys": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==" + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true } } }, "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true }, "esquery": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", + "dev": true, "requires": { "estraverse": "^5.1.0" }, @@ -7997,7 +1467,8 @@ "estraverse": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true } } }, @@ -8030,7 +1501,8 @@ "esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true }, "evp_bytestokey": { "version": "1.0.3", @@ -8057,7 +1529,8 @@ "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true }, "fast-glob": { "version": "3.2.7", @@ -8075,12 +1548,14 @@ "fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true }, "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true }, "fastq": { "version": "1.13.0", @@ -8095,6 +1570,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, "requires": { "flat-cache": "^3.0.4" } @@ -8133,6 +1609,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "dev": true, "requires": { "flatted": "^3.1.0", "rimraf": "^3.0.2" @@ -8141,7 +1618,8 @@ "flatted": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz", - "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==" + "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==", + "dev": true }, "foreach": { "version": "2.0.5", @@ -8189,7 +1667,8 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true }, "fsevents": { "version": "2.3.2", @@ -8207,7 +1686,8 @@ "functional-red-black-tree": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=" + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true }, "fwd-stream": { "version": "1.0.4", @@ -8286,12 +1766,6 @@ "globule": "^1.0.0" } }, - "gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "peer": true - }, "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -8323,6 +1797,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "dev": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -8336,6 +1811,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, "requires": { "is-glob": "^4.0.1" } @@ -8344,6 +1820,7 @@ "version": "13.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", + "dev": true, "requires": { "type-fest": "^0.20.2" } @@ -8446,7 +1923,8 @@ "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true }, "has-unicode": { "version": "2.0.1", @@ -8547,6 +2025,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, "requires": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -8555,7 +2034,8 @@ "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true }, "indent-string": { "version": "4.0.0", @@ -8573,6 +2053,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -8581,7 +2062,8 @@ "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true }, "is": { "version": "0.2.7", @@ -8616,7 +2098,8 @@ "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true }, "is-fullwidth-code-point": { "version": "1.0.0", @@ -8631,6 +2114,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, "requires": { "is-extglob": "^2.1.1" } @@ -8695,7 +2179,8 @@ "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true }, "isstream": { "version": "0.1.2", @@ -8723,12 +2208,14 @@ "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true }, "js-yaml": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, "requires": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -8740,12 +2227,6 @@ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", "dev": true }, - "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "peer": true - }, "json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -8761,12 +2242,14 @@ "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true }, "json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=" + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true }, "json-stringify-safe": { "version": "5.0.1", @@ -8774,15 +2257,6 @@ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", "dev": true }, - "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "peer": true, - "requires": { - "minimist": "^1.2.5" - } - }, "jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", @@ -9026,6 +2500,7 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, "requires": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -9079,17 +2554,20 @@ "lodash.clonedeep": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=" + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", + "dev": true }, "lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true }, "lodash.truncate": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=" + "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=", + "dev": true }, "lottie-web": { "version": "5.7.14", @@ -9100,6 +2578,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, "requires": { "yallist": "^4.0.0" } @@ -9264,6 +2743,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, "requires": { "brace-expansion": "^1.1.7" } @@ -9271,7 +2751,8 @@ "minimist": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true }, "minimist-options": { "version": "4.1.0", @@ -9321,7 +2802,8 @@ "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true }, "nan": { "version": "2.15.0", @@ -9338,7 +2820,8 @@ "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=" + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "dev": true }, "node-gyp": { "version": "7.1.2", @@ -9358,12 +2841,6 @@ "which": "^2.0.2" } }, - "node-releases": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz", - "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==", - "peer": true - }, "node-sass": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-6.0.1.tgz", @@ -9514,6 +2991,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, "requires": { "wrappy": "1" } @@ -9522,6 +3000,7 @@ "version": "0.9.1", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "dev": true, "requires": { "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", @@ -9565,6 +3044,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, "requires": { "callsites": "^3.0.0" } @@ -9603,12 +3083,14 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true }, "path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true }, "path-parse": { "version": "1.0.7", @@ -9641,12 +3123,6 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", "dev": true }, - "picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "peer": true - }, "picomatch": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", @@ -9665,7 +3141,8 @@ "prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==" + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true }, "prettier": { "version": "2.4.1", @@ -9688,7 +3165,8 @@ "progress": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==" + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true }, "prr": { "version": "1.0.1", @@ -9727,7 +3205,8 @@ "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true }, "qs": { "version": "6.5.2", @@ -9876,7 +3355,8 @@ "regexpp": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", - "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==" + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "dev": true }, "request": { "version": "2.88.2", @@ -9923,7 +3403,8 @@ "require-from-string": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true }, "require-main-filename": { "version": "2.0.0", @@ -9950,7 +3431,8 @@ "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true }, "ret": { "version": "0.1.15", @@ -9968,6 +3450,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, "requires": { "glob": "^7.1.3" } @@ -10127,8 +3610,7 @@ "version": "1.6.1", "resolved": "https://registry.npmjs.org/rollup-plugin-web-worker-loader/-/rollup-plugin-web-worker-loader-1.6.1.tgz", "integrity": "sha512-4QywQSz1NXFHKdyiou16mH3ijpcfLtLGOrAqvAqu1Gx+P8+zj+3gwC2BSL/VW1d+LW4nIHC8F7d7OXhs9UdR2A==", - "dev": true, - "requires": {} + "dev": true }, "rollup-pluginutils": { "version": "2.8.2", @@ -10168,7 +3650,8 @@ "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true }, "safe-regex": { "version": "1.1.0", @@ -10240,6 +3723,7 @@ "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dev": true, "requires": { "lru-cache": "^6.0.0" } @@ -10273,6 +3757,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, "requires": { "shebang-regex": "^3.0.0" } @@ -10280,7 +3765,8 @@ "shebang-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true }, "signal-exit": { "version": "3.0.5", @@ -10325,6 +3811,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", + "dev": true, "requires": { "ansi-styles": "^4.0.0", "astral-regex": "^2.0.0", @@ -10334,7 +3821,8 @@ "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true } } }, @@ -10418,7 +3906,8 @@ "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true }, "sshpk": { "version": "1.16.1", @@ -10454,15 +3943,6 @@ "readable-stream": "^2.0.1" } }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, "string-range": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/string-range/-/string-range-1.2.2.tgz", @@ -10497,10 +3977,20 @@ } } }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + }, "strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, "requires": { "ansi-regex": "^5.0.1" } @@ -10517,12 +4007,14 @@ "strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==" + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -10530,7 +4022,8 @@ "svelte": { "version": "3.44.0", "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.44.0.tgz", - "integrity": "sha512-zWACSJBSncGiDvFfYOMFGNV5zDLOlyhftmO5yOZ0lEtQMptpElaRtl39MWz1+lYCpwUq4F3Q2lTzI9TrTL+eMA==" + "integrity": "sha512-zWACSJBSncGiDvFfYOMFGNV5zDLOlyhftmO5yOZ0lEtQMptpElaRtl39MWz1+lYCpwUq4F3Q2lTzI9TrTL+eMA==", + "dev": true }, "svelte-check": { "version": "2.2.7", @@ -10583,6 +4076,7 @@ "version": "6.7.2", "resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz", "integrity": "sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==", + "dev": true, "requires": { "ajv": "^8.0.1", "lodash.clonedeep": "^4.5.0", @@ -10596,6 +4090,7 @@ "version": "8.6.3", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz", "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==", + "dev": true, "requires": { "fast-deep-equal": "^3.1.1", "json-schema-traverse": "^1.0.0", @@ -10606,22 +4101,26 @@ "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true }, "json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true }, "string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -10674,7 +4173,8 @@ "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=" + "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "dev": true }, "threads": { "version": "1.7.0", @@ -10705,12 +4205,6 @@ "integrity": "sha512-7cR8rLy2QhYHpsBDBVYnnWXm8uRTr38RoZakFSW7Bs7PzfMPNZthuMLkwqZv7MTu8lhQ91cOFYS5a7iFj2oR3w==", "dev": true }, - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", - "peer": true - }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -10793,6 +4287,7 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, "requires": { "prelude-ls": "^1.2.1" } @@ -10800,7 +4295,8 @@ "type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true }, "typedarray": { "version": "0.0.6", @@ -10830,6 +4326,7 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, "requires": { "punycode": "^2.1.0" } @@ -10854,7 +4351,8 @@ "v8-compile-cache": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", - "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==" + "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", + "dev": true }, "validate-npm-package-license": { "version": "3.0.4", @@ -10895,6 +4393,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, "requires": { "isexe": "^2.0.0" } @@ -10917,7 +4416,8 @@ "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==" + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true }, "wrap-ansi": { "version": "5.1.0", @@ -10991,14 +4491,14 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true }, "ws": { "version": "7.5.5", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz", "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==", - "dev": true, - "requires": {} + "dev": true }, "xtend": { "version": "2.2.0", @@ -11015,7 +4515,8 @@ "yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true }, "yargs": { "version": "13.3.2", diff --git a/contracts/wasm/fairroulette/test/fairroulette_bg.wasm b/contracts/wasm/fairroulette/test/fairroulette_bg.wasm index 8d9158bf5e809e0b741830bbb57563f61fb7c0fe..0456ec46ee632cab3aa8208e91067fae59a32fd5 100644 GIT binary patch delta 775 zcmZ8eO-NKx6u##=|NhMLji@EYO`_4HMoE$g)F){WNTd`rB{DN=`5gQKF+>O#E@qt3 zneoiH5H$lKTtpLZ<4=Vefq~JcMQ&`9VPLx!5-vJ7k)#9PJ>PeJ@4IhmnNKbAv;da_ zz+xt3SQxWgttPX{gqLC4xe8k_2P<@5+Jdqbqlm|E@mL&R+vrf>!7BSG$Eh% z7V6q465ljlwb?RUYcb-g0J&v;g81hcZuy^KxIKbj{Y4lGG`W7u_{o}R4EF-VV&?ze zGzFAKmMNf=VU7Or*}ZKcLaSy!Y2a0V30YnGStm0tT-1ck#6J2 zeGg5ZI%`u{Beh*1T$y?pPtbLx@}x3gxBARk;LJ3Noo(1gs3#;B@3X yBym0Brt?R{ot?BR>?S2Y5Zss@@jxEJ*u&xlhr${t)=MZP9P6jV%Z#7VMdu&AqUUG; delta 776 zcmZ8dUr19?7(eHD_s3c8dhbxnw1Y&`lw1_~kd#-lAQ;i22bUt#P4j9xOH2{UK*Y7p zO~2_w%p@3rU}W5=rY|N02CE)=NwA)J@WCj0?xF7}BiIMO`~803ch2`a_nS|%`7~SM zRHZg*Hc@KMGZT_;u}G3+g41-%zDieVhMvsO>NU(yj4~F#%GRdg`L$c@RSZfzRqRU) zG>?;|VxW80l;zoVqSbIov+CMc!IMV)^)qIu@Ge4cOOq|JPR=sUnWn&-7N>$zt4GCk z?e84&-8uN(Qm$xNl6Cnp#oX9?j1(l{sJ8;Py$ftP4r4cG*~E-tZ~aKwkC^ej?HyGT zVp1{smg?G$@Le`uwp;Vm-6(Q}Q{j+_ARnKGOvh80^p}C^cdO5G`){Lg*FUCi=GM2P zKm#h=?hG4_fSIblVmPd3e{eF6JTbF(ps{OMNed%YrUjgGTE!f4ow3=KV#)?!y#)U$ z`^asOhl?T6)1>U?wkBYw=dxJ!Dg7`@#K5h0&_-iL|7@ZcU_9uD2f;%46MRTrFf@3P zYDRjnS^DpQ>)%_0a5!&q@jT9C7u*YDp;!-?u05un%_^Wq1i)ji%c#NLQWux5n0_0fk#bH z8?I&KAoN7Kd4p9Z&3Iq{QHsdwMdZ~8XrF2WDO@TcPeFP3TzMff5fouZ$U5+Y`*2oYkA!}u9lvi}1Y Cp6J8? diff --git a/contracts/wasm/inccounter/test/inccounter_bg.wasm b/contracts/wasm/inccounter/test/inccounter_bg.wasm index e4a7d92ca038a07a1e86a249ad1f6ed343b5dad5..9e243c6fb4540d609f4655129f8e5cf17b33933e 100644 GIT binary patch delta 4439 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 diff --git a/contracts/wasm/testcore/test/testcore_bg.wasm b/contracts/wasm/testcore/test/testcore_bg.wasm index d7a9b173c8d054a8d853cc03a0b08e4cea65c76e..e45a896d91f30962c3a3ec7e9de90c0393038c25 100644 GIT binary patch delta 495 zcmZ29pLx-I<_%>`-0e)Z?M!B$7>hnJZf<0n9M1G))nu`#55iwo9bjg z4Q))qQ&s~tYb!81Dr7kx0I_$h*<9Hi!Xmr?-P9c`CqHP95I%t}{$S-~?~VxJH6SNR zBDrD$NL+dH%??xH10bi104;&J@XD&mik(3)ab_g(&260r^_du+Z}!|7&&ZfEIc9e` zqvzzSyRCH%7$ATVNErgL5fa}R$Tk6D5g=v(V$;dCd(s(QCokQj4kXWl$**8ib}vZ8 zb+0mz%-pNb>nb9^;04t24~R7`+@BcRnQYsc%sw#|ZEj?m9L_Xj&1A8t55gYl9Lyr_ngQFsYRLL6u^Ok&UK$@^-%VHyzPPe9_Kn>W_!GBG`0y!k;x z8^I9dS2l;R2wz!+X6l<&lOME42>(GBpR#(gcSnTq1CWy> zkz8?P6;NDx^34uY;V&Q;iU2Kvxv*o+WW~-Pm^d?%_~y3GgZfM5n-PXE>Kt2dC01KScx>yns6X KZC<#SQ3wDb1hDo1 diff --git a/contracts/wasm/testwasmlib/test/testwasmlib_bg.wasm b/contracts/wasm/testwasmlib/test/testwasmlib_bg.wasm index 588f1bf7b6a0a6953db7d54366bf9e3b1b5a5236..0182c443f6fa240ebfde5f5263040bd48f184399 100644 GIT binary patch delta 428 zcmca|i0R59rVSq%IZiU_o@CV6!MOP+V?(I$g~z&F8*Wc_q?ezI`Bgzy!RgOTMvOq*<%A1=HBBrXE98|INC(>AZjSCXGx z*I&WtG5LGHwX84$1TX?A5g-;t;)_l8pODUII(hp9bs%{kOtMb|vGu`Z_(WwOyLzHF yuPK)RgBQpIpfNg=kN4>_ickLDmo9sTTY$k8D4q|*5&&j+$KH*cP}kRJd_K#Gn4 delta 426 zcmca|i0R59rVSq%Id(9fWYj&$sImDcV?(HL%hUr5j@k+=jvQHz8$j$YQ#SX6zhh%+ znLN2BZW7a-$(se@9hrppOb5z|0o6%lIUWG1yE1)pN@BP06p*;M0ux+(&Gg9&l0qkk zCz-+YAmpx0-@G7+k5l->B%mg31x81OEXOY(_M6F@4`%By2_Kn;X4;);lk&oa-=GV( zOrM+u6u$s+h$NEbTc!cU?I#Q8O9*$&K$BZCW3pX-xbPE@gGGRL!#wh1`sNk+O7fF~ z`VA%h(Hn+u<@&f>hZ5q@7 delta 76 zcmex;oALK;#tqD_!ZTVAFgR)}usCvLIUWJAJ6bo3xvpSg+S0uFfahG{$%=6iygL{L d7+e_`81jKwVscb$HIo3-*u*_yId68R7r{ diff --git a/contracts/wasm/tokenregistry/test/tokenregistry_bg.wasm b/contracts/wasm/tokenregistry/test/tokenregistry_bg.wasm index 6ff8e7658c92f855d2473102a2eccbc45ddeb07c..b3377ff1b131ba6a95fc10d9a1b1ec0fcd862145 100644 GIT binary patch delta 248 zcmbRBi*eR3#toYoIi@jcO=DDTW8A!paigd3iuMBxj@k+=jvQHzS3v9;?VIboz1f(~ zbWT1UIEiUV*XH=33P#}<9Y8s81tv#{EXOAxbq$@HUj-jz5uVTqHh|GlArWoUD*j!Kg5KW{$Ni2Ll8!0x3=)=0f6gPyU#b&h&+Oa#XGw y?-ynP1}~uGA|Te7oSCi9$TN9ncDn2x76ArVpjbW-O8_y9KOe}}+}xYn%MSnv!${u% delta 246 zcmbRBi*eR3#toYoIocSfF=|a?RNcIbaigd3osI(xj@k+=jvQHz9i2e-nU2kM-rj6X zciJYO4xGfarG0aJPz9s#oGzf8xB`=-M3&h(fEdP~4`gdj&djc6 zyfXP|wzVuLkPiZkK+FZi+#n7RfcQL`olp@g=e69Ix$7?f4eQu^l_!vEw+l>)3Ie#f}{k3EGrn zKv=TWiljJgA5svgM1v5OK%oc~1QHi5sECKkAn}4w1aBZBmAfh)fHy!?f^X)mtu`uE zWvyp+F8}5GzW<;7)(iA&FVN4Ax#R|+yZ0vVE^cmcR^w1YX^v$GBQ7C?dCc_~VS)Kh znMbITPGN&NoSAJ#UBWq`HLk-c!4zM3n$nD}qvQ0rzC`OAK6tHE)4n-;sIKSSsjC}{ zk6+uY`NlIF`ZjHwU5lusDlI0qR9!NNWcb&AZ^i2AZS`y%F-4SJRcvPq=b5B)Es`t- zOcLe9=Dhv`ee&=b)waD8dWwXUmsm*>v8*@P(<@5-^6nlfGO`_!nSf(`_9>WB4?n#} zVl3NLpW}k0<`P^uOPD%aQA+Z;?TEF6RAMSIG1td*f%nLA=wdG5h$rDKImUz|=AC|0&o>Qm}DKI?Rar z6C#!bGn2CzuV#Y_mDcn<-UE=0w=k8s3t8eXq%tkjpuol=$yP)}S^w4_YFmp^_5!P3 zpw$b+(pT2K*|2dXFp9V=v$JNR-b_Ffr}fQjSMCv;U(R;F51U6d3)*Q}zjCO~owI07 z1`FOwfULx2eJ^P5K8OoEp*(Di1W7QN+KMCB;^HAjaH-!22D0a8oDwS;bwnv$s%_AN zxtR{I?@LcQSRRp%y2Fe(@m=JlYaw=h>FE5SY5hj-DA;=|H-P`W`Qz@mIiNT5UAyx# zvk)){xX990TBs~o&A{e-2ck#!R)kYk99vINIVh79zDkXu+U0AGO5;}HD@oP0p@+HN|c`)Z%? z%@)BXg}eK;({x<_vGy8*wPFitHN9$o*q5Zfe)!ChN6%E{s=t4Ds(D`0cLSb?6&=)# z&}DtT?mAq(TK9_+@27v#{r;)%*B=|4P-r|nX*^-dLVy+w2moW~7zp0}hn)-hZ}nZ? zOpu0pmi5tw4g@gOa26%|TtgvWR^BjkAT&?y#314a4IgftFwF)X(-^el5cXX$r2CJ^ z%)y#oKXSfrVh#wR)rujA%f-h*pG@vX=1w_;3}7j-Fs>gQ`S|XH(ek^Pw@xz2{j?Z@ znb3jC1Mtp;6FD=eVH5;<7}8bGsM{vF7Kj(d0Ep-V7;fIQ9(!hgwb?9V6+4c&&@8!w z`gpx@_E<5XSyLV=YhMvm?))_sLhbczxE!&alPf45!&0}E}CK;_$Qcz{>+cfu2NK|c&3$FH=?Lu6;gegB7V@fZ^r$MJc687_{h;F<@IBnQSz0mNhUOVZ??sDDIx~8d>3+-RX9w0Ywyo7v z>)seNPf`}v&sV|<5zZk|^`+xXC01BBFW6=e>zc+~F z#IzA=F)pIQO6u=stw~JlU-j3~CHICr z)h`ZwC4V;JP=S%Yk;0T78hkU`pCr)%09SSKkl$Z9x_3C94b zZYqBlC^>>OOIjpA!7y$RRsrr%^&&!2*9ABHNOGE|O>!!0O2_=dgjSQMgZkT#cwM(% z9qW}DCilHM#w(0ir>v+ahtxZ9`s~ns+OK;~^+RIUPJNUPR(^hJicNPQziccDc2Hli zidI~hW%GLZry1L&pEANF2Vo<`e*BJw_q3(prID+hgTy~a8PYB?2WerzlZJgqR3&Go kt2#d#>5q+SI-u#;yuU7Nv7(+&>hjo!Xm91mWB*9~4+H%f3;+NC delta 2914 zcma)8U1%KF6~5=r%$@;NYdo9V1B+HSiC>zPLRcK;2 zv!%r#NQhmeBv7{{(6~1bhSJzA4S_&I+AX0k0hQ91QbY0<+K`gcK>ASHzLXR{wBNn6 zGI5%eB35_i%-nO&`M&R*Ge3TTUVnjJ8uw`X%Z%Ney3u!W!{Pf}VnkVUkr{>^`Mx^+Y;eSl6;K`&8L^X4VBFT8kie`DY5$c2sbinxi6*#*ZvRU7O{o${|m3sd>yDWm)TGI|TNV1#A31~uhJAJYo zc(4dKbCeC_5!bxtih1ctM@;H(IM3$C(|BhsbbOwnv=VVp_HA`7l5C;fMwoTa=Rb2U ziDl_l0!NaV2$@?lAt2`G+>Son`z)Q76mpza4iK6UdqK?k9zZZbFdM{g-PhX3WkRe4 zP9~Y=B?XMO#A%tpa#cL6U-VX+=A~mCg|I1S3&(~W;s4Y79kIKwhbD=&)2;f?b>dTp)>}P!bAk+JQ_&lV^@20Z8v%k@s zw`djph2)Blti+@GCBM7(eq5jhO13dFB*A5(5`~_{C5ae8o&LZd%$%KdOT1)A4-j1%08u zXL~``E%+R|Ebx?75{d#|>)>-COvb2%qN1LPLi!ZIlA;jV#AwR8Xs$ily~a4f8Iz!%^-m*BWp8m4Jd|Eb|3g0*4`sFq%>?Dr(8FCCabk9zQ(nq2jp2Tr#wNcueB znOM=8#!*_ea^I^?yODtEf-@eJxT?Usc}(IjTm6ex<47c+vC|C+;Uf!a{&< z2?zjV;2H=%{f8%W`maqr$uoWm>RHz9&3Oc%nu{peo#tG9StUof3!x>|RsZIe5;(N$FrIs2SRZSVb@y%h@s=~kigQ4a;CUG0^6+!f{^Gr%*;5W619*x(OzOKW zU*9eoEq{)Cdq`cpKP86YCUBv0AG|xl4c%GPFbV=a4C$(8)OC|wJMe)s03rqehF5P| zk9}v)+GfnK;)yHf+N9&6KHhFU+tK4w#*~N3*a3iwT(ojX$fW4e!NHT%Q(ZfFnXv4( z9d#Zm2mF613^7Cj)fCp+X%sfoxu-Bfrx??}=rjuZq;nYz%y&To)z`Z?r&ayapr6j^ zKLoQ=MM%dj?X|wNtu+TN|G$Re0}65OD`Ybab5i4!{a`}Xw+AaVmD7wh`fFjv36 zr)bb@X3l$Ihp^RR2}LR#oO|6plXIvjBQaiU3Qn|WETF{>C9K2dZRu3P_|g$|piitB zhN@3>Um;r3@8(+QG5wd^@pCh2@rZ#+{bpwu=!?fjcq8^>N|?DRF)lG=gv26nUEmTF zV=0J|S#m}_U=*>CnATVFQzZ3k`8*BiyZITQ*>HHHv|^YH%q&KyMMI4HFglXyb<5`a z0Jb{Y#P-#y+&DA?Ci)tto|z5_{X}JyD^{zw9?DR| zDocxV=&P7`5im)J0sU6*JF{9rZXatTQ4fOeWJbsTwAgEt->dwIuP3z6Uw(NAA zFjuA}Oz9hgKdhe$9dK@hZit`OL&rbP48}?10pP0c8LDI-q(k2sYFd)&m(T5*Hmcr? zSFscr&hD6K(uT7`F=wqXwpyN2F;61qDO2MKk0qM6e)dE=4(0|u*B<<%6Dtoy^8Ml4 zG^pw(Xw4Jh;O;Q zLx4A_E6Tv>3WiotV339B2nG)23$AaEwjvC>C1vCK_2@bc>CUl(dt|2!*?M{`oS48_ z-8dJ6Eyu)>fU9o<9JMJN^8qK>Nyp52M?pj8J1Hf=Lp-v$eq!upIwxAHj R34MP2D|D>-^YOnY{sSE#1Iqva diff --git a/packages/vm/core/testcore/sbtests/sbtestsc/testcore_bg.wasm b/packages/vm/core/testcore/sbtests/sbtestsc/testcore_bg.wasm index d7a9b173c8d054a8d853cc03a0b08e4cea65c76e..e45a896d91f30962c3a3ec7e9de90c0393038c25 100644 GIT binary patch delta 495 zcmZ29pLx-I<_%>`-0e)Z?M!B$7>hnJZf<0n9M1G))nu`#55iwo9bjg z4Q))qQ&s~tYb!81Dr7kx0I_$h*<9Hi!Xmr?-P9c`CqHP95I%t}{$S-~?~VxJH6SNR zBDrD$NL+dH%??xH10bi104;&J@XD&mik(3)ab_g(&260r^_du+Z}!|7&&ZfEIc9e` zqvzzSyRCH%7$ATVNErgL5fa}R$Tk6D5g=v(V$;dCd(s(QCokQj4kXWl$**8ib}vZ8 zb+0mz%-pNb>nb9^;04t24~R7`+@BcRnQYsc%sw#|ZEj?m9L_Xj&1A8t55gYl9Lyr_ngQFsYRLL6u^Ok&UK$@^-%VHyzPPe9_Kn>W_!GBG`0y!k;x z8^I9dS2l;R2wz!+X6l<&lOME42>(GBpR#(gcSnTq1CWy> zkz8?P6;NDx^34uY;V&Q;iU2Kvxv*o+WW~-Pm^d?%_~y3GgZfM5n-PXE>Kt2dC01KScx>yns6X KZC<#SQ3wDb1hDo1 diff --git a/packages/vm/wasmlib/go/wasmlib/bytes.go b/packages/vm/wasmlib/go/wasmlib/bytes.go index 3800daceb4..cb7fd62f4e 100644 --- a/packages/vm/wasmlib/go/wasmlib/bytes.go +++ b/packages/vm/wasmlib/go/wasmlib/bytes.go @@ -23,12 +23,12 @@ func (d *BytesDecoder) AgentID() ScAgentID { } func (d *BytesDecoder) Bool() bool { - return d.Int8() != 0 + return d.Uint8() != 0 } func (d *BytesDecoder) Bytes() []byte { - size := int(d.Int32()) - if len(d.data) < size { + size := d.Uint32() + if uint32(len(d.data)) < size { panic("insufficient bytes") } value := d.data[:size] @@ -59,12 +59,7 @@ func (d *BytesDecoder) Hname() ScHname { } func (d *BytesDecoder) Int8() int8 { - if len(d.data) == 0 { - panic("insufficient bytes") - } - value := d.data[0] - d.data = d.data[1:] - return int8(value) + return int8(d.Uint8()) } func (d *BytesDecoder) Int16() int16 { @@ -117,7 +112,12 @@ func (d *BytesDecoder) String() string { } func (d *BytesDecoder) Uint8() uint8 { - return uint8(d.Int8()) + if len(d.data) == 0 { + panic("insufficient bytes") + } + value := d.data[0] + d.data = d.data[1:] + return value } func (d *BytesDecoder) Uint16() uint16 { @@ -152,13 +152,13 @@ func (e *BytesEncoder) AgentID(value ScAgentID) *BytesEncoder { func (e *BytesEncoder) Bool(value bool) *BytesEncoder { if value { - return e.Int8(1) + return e.Uint8(1) } - return e.Int8(0) + return e.Uint8(0) } func (e *BytesEncoder) Bytes(value []byte) *BytesEncoder { - e.Int32(int32(len(value))) + e.Uint32(uint32(len(value))) e.data = append(e.data, value...) return e } @@ -184,8 +184,7 @@ func (e *BytesEncoder) Hname(value ScHname) *BytesEncoder { } func (e *BytesEncoder) Int8(value int8) *BytesEncoder { - e.data = append(e.data, byte(value)) - return e + return e.Uint8(uint8(value)) } func (e *BytesEncoder) Int16(value int16) *BytesEncoder { @@ -223,7 +222,8 @@ func (e *BytesEncoder) String(value string) *BytesEncoder { } func (e *BytesEncoder) Uint8(value uint8) *BytesEncoder { - return e.Int8(int8(value)) + e.data = append(e.data, value) + return e } func (e *BytesEncoder) Uint16(value uint16) *BytesEncoder { diff --git a/packages/vm/wasmlib/go/wasmlib/events.go b/packages/vm/wasmlib/go/wasmlib/events.go index b2046d83a2..feabb505c5 100644 --- a/packages/vm/wasmlib/go/wasmlib/events.go +++ b/packages/vm/wasmlib/go/wasmlib/events.go @@ -27,6 +27,13 @@ func (e *EventEncoder) AgentID(value ScAgentID) *EventEncoder { return e.String(value.String()) } +func (e *EventEncoder) Bool(value bool) *EventEncoder { + if value { + return e.Uint8(1) + } + return e.Uint8(0) +} + func (e *EventEncoder) Bytes(value []byte) *EventEncoder { return e.String(base58Encode(value)) } @@ -51,6 +58,10 @@ func (e *EventEncoder) Hname(value ScHname) *EventEncoder { return e.String(value.String()) } +func (e *EventEncoder) Int8(value int8) *EventEncoder { + return e.Int64(int64(value)) +} + func (e *EventEncoder) Int16(value int16) *EventEncoder { return e.Int64(int64(value)) } @@ -72,3 +83,19 @@ func (e *EventEncoder) String(value string) *EventEncoder { e.event += "|" + value return e } + +func (e *EventEncoder) Uint8(value uint8) *EventEncoder { + return e.Uint64(uint64(value)) +} + +func (e *EventEncoder) Uint16(value uint16) *EventEncoder { + return e.Uint64(uint64(value)) +} + +func (e *EventEncoder) Uint32(value uint32) *EventEncoder { + return e.Uint64(uint64(value)) +} + +func (e *EventEncoder) Uint64(value uint64) *EventEncoder { + return e.String(strconv.FormatUint(value, 10)) +} diff --git a/packages/vm/wasmlib/src/bytes.rs b/packages/vm/wasmlib/src/bytes.rs index 1d89dd780d..e93f11ee54 100644 --- a/packages/vm/wasmlib/src/bytes.rs +++ b/packages/vm/wasmlib/src/bytes.rs @@ -30,12 +30,12 @@ impl BytesDecoder<'_> { // decodes a bool from the byte buffer pub fn bool(&mut self) -> bool { - self.int8() != 0 + self.uint8() != 0 } // decodes the next substring of bytes from the byte buffer pub fn bytes(&mut self) -> &[u8] { - let size = self.int32() as usize; + let size = self.uint32() as usize; if self.buf.len() < size { panic("insufficient bytes"); } @@ -66,12 +66,7 @@ impl BytesDecoder<'_> { // decodes an int8 from the byte buffer pub fn int8(&mut self) -> i8 { - if self.buf.len() == 0 { - panic("insufficient bytes"); - } - let val = self.buf[0] as i8; - self.buf = &self.buf[1..]; - val + self.uint8() as i8 } // decodes an int16 from the byte buffer @@ -135,7 +130,12 @@ impl BytesDecoder<'_> { // decodes an uint8 from the byte buffer pub fn uint8(&mut self) -> u8 { - self.int8() as u8 + if self.buf.len() == 0 { + panic("insufficient bytes"); + } + let val = self.buf[0]; + self.buf = &self.buf[1..]; + val } // decodes an uint16 from the byte buffer @@ -190,15 +190,12 @@ impl BytesEncoder { // encodes a bool into the byte buffer pub fn bool(&mut self, val: bool) -> &BytesEncoder { - if val { - return self.int8(1); - } - self.int8(0) + self.uint8(val as u8) } // encodes a substring of bytes into the byte buffer pub fn bytes(&mut self, value: &[u8]) -> &BytesEncoder { - self.int32(value.len() as i32); + self.uint32(value.len() as u32); self.buf.extend_from_slice(value); self } @@ -230,8 +227,7 @@ impl BytesEncoder { // encodes an int8 into the byte buffer pub fn int8(&mut self, val: i8) -> &BytesEncoder { - self.buf.push(val as u8); - self + self.uint8(val as u8) } // encodes an int16 into the byte buffer @@ -278,7 +274,8 @@ impl BytesEncoder { // encodes an uint8 into the byte buffer pub fn uint8(&mut self, val: u8) -> &BytesEncoder { - self.int8(val as i8) + self.buf.push(val); + self } // encodes an uint16 into the byte buffer diff --git a/packages/vm/wasmlib/src/events.rs b/packages/vm/wasmlib/src/events.rs index fc7193d1bb..19d74cb1df 100644 --- a/packages/vm/wasmlib/src/events.rs +++ b/packages/vm/wasmlib/src/events.rs @@ -29,6 +29,11 @@ impl EventEncoder { self.string(&value.to_string()) } + // encodes a Bool as 0/1 into the byte buffer + pub fn bool(&mut self, value: bool) -> &EventEncoder { + self.uint8(value as u8) + } + // encodes a substring of bytes into the byte buffer pub fn bytes(&mut self, value: &[u8]) -> &EventEncoder { self.string(&base58_encode(value)) @@ -59,20 +64,22 @@ impl EventEncoder { self.string(&value.to_string()) } - // encodes an int16 into the byte buffer - // note that these are encoded using leb128 encoding to conserve space + // encodes an Int8 into the byte buffer + pub fn int8(&mut self, value: i8) -> &EventEncoder { + self.string(&value.to_string()) + } + + // encodes an Int16 into the byte buffer pub fn int16(&mut self, value: i16) -> &EventEncoder { self.string(&value.to_string()) } - // encodes an int32 into the byte buffer - // note that these are encoded using leb128 encoding to conserve space + // encodes an Int32 into the byte buffer pub fn int32(&mut self, value: i32) -> &EventEncoder { self.string(&value.to_string()) } - // encodes an int64 into the byte buffer - // note that these are encoded using leb128 encoding to conserve space + // encodes an Int64 into the byte buffer pub fn int64(&mut self, value: i64) -> &EventEncoder { self.string(&value.to_string()) } @@ -87,4 +94,24 @@ impl EventEncoder { self.event += &("|".to_owned() + value); self } + + // encodes an Uint8 into the byte buffer + pub fn uint8(&mut self, value: u8) -> &EventEncoder { + self.string(&value.to_string()) + } + + // encodes an Uint16 into the byte buffer + pub fn uint16(&mut self, value: u16) -> &EventEncoder { + self.string(&value.to_string()) + } + + // encodes an Uint32 into the byte buffer + pub fn uint32(&mut self, value: u32) -> &EventEncoder { + self.string(&value.to_string()) + } + + // encodes an Uint64 into the byte buffer + pub fn uint64(&mut self, value: u64) -> &EventEncoder { + self.string(&value.to_string()) + } } diff --git a/packages/vm/wasmlib/ts/wasmlib/bytes.ts b/packages/vm/wasmlib/ts/wasmlib/bytes.ts index d62a624d2a..0cf37a1eb5 100644 --- a/packages/vm/wasmlib/ts/wasmlib/bytes.ts +++ b/packages/vm/wasmlib/ts/wasmlib/bytes.ts @@ -29,13 +29,13 @@ export class BytesDecoder { // decodes a bool from the byte buffer bool(): boolean { - return this.int8() != 0; + return this.uint8() != 0; } // decodes the next substring of bytes from the byte buffer bytes(): u8[] { - let size = this.int32(); - if (this.buf.length < size) { + let size = this.uint32(); + if (u32(this.buf.length) < size) { panic("insufficient bytes"); } let value = this.buf.slice(0, size); @@ -65,7 +65,7 @@ export class BytesDecoder { // decodes an int8 from the byte buffer int8(): i8 { - return this.buf.shift() as i8; + return this.uint8() as i8; } // decodes an int16 from the byte buffer @@ -130,7 +130,7 @@ export class BytesDecoder { // decodes an uint8 from the byte buffer uint8(): u8 { - return this.int8() as u8; + return this.buf.shift(); } // decodes an uint16 from the byte buffer @@ -181,15 +181,12 @@ export class BytesEncoder { // encodes a bool into the byte buffer bool(val: boolean): BytesEncoder { - if (val) { - return this.int8(1); - } - return this.int8(0); + return this.int8(val ? 1 : 0); } // encodes a substring of bytes into the byte buffer bytes(value: u8[]): BytesEncoder { - this.int32(value.length); + this.uint32(value.length); for (let i = 0; i < value.length; i++) { this.buf.push(value[i]); } @@ -223,8 +220,7 @@ export class BytesEncoder { // encodes an int8 into the byte buffer int8(val: i8): BytesEncoder { - this.buf.push(val as u8); - return this; + return this.uint8(val as u8); } // encodes an int16 into the byte buffer @@ -272,7 +268,8 @@ export class BytesEncoder { // encodes an uint8 into the byte buffer uint8(val: u8): BytesEncoder { - return this.int8(val as i8); + this.buf.push(val); + return this; } // encodes an uint16 into the byte buffer diff --git a/packages/vm/wasmlib/ts/wasmlib/events.ts b/packages/vm/wasmlib/ts/wasmlib/events.ts index def1d6bb5d..0779992c77 100644 --- a/packages/vm/wasmlib/ts/wasmlib/events.ts +++ b/packages/vm/wasmlib/ts/wasmlib/events.ts @@ -26,6 +26,11 @@ export class EventEncoder { return this.string(value.toString()); } + // encodes a Bool into the byte buffer + bool(value: bool): EventEncoder { + return this.uint8(value ? 1 : 0); + } + // encodes a substring of bytes into the byte buffer bytes(value: u8[]): EventEncoder { return this.string(base58Encode(value)); @@ -56,20 +61,22 @@ export class EventEncoder { return this.string(value.toString()); } - // encodes an int16 into the byte buffer - // note that these are encoded using leb128 encoding to conserve space + // encodes an Int8 into the byte buffer + int8(value: i8): EventEncoder { + return this.string(value.toString()); + } + + // encodes an Int16 into the byte buffer int16(value: i16): EventEncoder { return this.string(value.toString()); } - // encodes an int32 into the byte buffer - // note that these are encoded using leb128 encoding to conserve space + // encodes an Int32 into the byte buffer int32(value: i32): EventEncoder { return this.string(value.toString()); } - // encodes an int64 into the byte buffer - // note that these are encoded using leb128 encoding to conserve space + // encodes an Int64 into the byte buffer int64(value: i64): EventEncoder { return this.string(value.toString()); } @@ -85,4 +92,24 @@ export class EventEncoder { this.event += "|" + value; return this; } + + // encodes an Uint8 into the byte buffer + uint8(value: u8): EventEncoder { + return this.string(value.toString()); + } + + // encodes an Uint16 into the byte buffer + uint16(value: u16): EventEncoder { + return this.string(value.toString()); + } + + // encodes an Uint32 into the byte buffer + uint32(value: u32): EventEncoder { + return this.string(value.toString()); + } + + // encodes an Uint64 into the byte buffer + uint64(value: u64): EventEncoder { + return this.string(value.toString()); + } } diff --git a/tools/cluster/tests/wasm/inccounter_bg.wasm b/tools/cluster/tests/wasm/inccounter_bg.wasm index e4a7d92ca038a07a1e86a249ad1f6ed343b5dad5..9e243c6fb4540d609f4655129f8e5cf17b33933e 100644 GIT binary patch delta 4439 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 diff --git a/tools/schema/generator/clienttemplates/alltemplates.go b/tools/schema/generator/clienttemplates/alltemplates.go index 8bc8ee4ea5..2fca82b07b 100644 --- a/tools/schema/generator/clienttemplates/alltemplates.go +++ b/tools/schema/generator/clienttemplates/alltemplates.go @@ -12,10 +12,73 @@ var config = map[string]string{ var Templates = []map[string]string{ config, common, + appTs, eventsTs, + serviceTs, } -var TypeDependent = model.StringMapMap{} +var TypeDependent = model.StringMapMap{ + "msgConvert": { + "Address": "message[++index]", + "AgentID": "message[++index]", + "Bool": "message[++index][0]!='0'", + "ChainID": "message[++index]", + "Color": "message[++index]", + "Hash": "message[++index]", + "Hname": "message[++index]", + "Int8": "Number(message[++index])", + "Int16": "Number(message[++index])", + "Int32": "Number(message[++index])", + "Int64": "BigInt(message[++index])", + "RequestID": "message[++index]", + "String": "message[++index]", + "Uint8": "Number(message[++index])", + "Uint16": "Number(message[++index])", + "Uint32": "Number(message[++index])", + "Uint64": "BigInt(message[++index])", + }, + "fldDefault": { + "Address": "''", + "AgentID": "''", + "Bool": "false", + "ChainID": "''", + "Color": "''", + "Hash": "''", + "Hname": "''", + "Int8": "0", + "Int16": "0", + "Int32": "0", + "Int64": "BigInt(0)", + "RequestID": "''", + "String": "''", + "Uint8": "0", + "Uint16": "0", + "Uint32": "0", + "Uint64": "BigInt(0)", + }, + "resConvert": { + "Address": "toString", + "AgentID": "toString", + "Bool": "readUInt8", + "ChainID": "toString", + "Color": "toString", + "Hash": "toString", + "Hname": "toString", + "Int8": "readInt8", + "Int16": "readInt16LE", + "Int32": "readInt32LE", + "Int64": "readBigInt64LE", + "RequestID": "toString", + "String": "toString", + "Uint8": "readUInt8", + "Uint16": "readUInt16LE", + "Uint32": "readUInt32LE", + "Uint64": "readBigUInt64LE", + }, + "resConvert2": { + "Bool": "!=0", + }, +} var common = map[string]string{ // ******************************* diff --git a/tools/schema/generator/clienttemplates/app.go b/tools/schema/generator/clienttemplates/app.go new file mode 100644 index 0000000000..cee2726e7a --- /dev/null +++ b/tools/schema/generator/clienttemplates/app.go @@ -0,0 +1,22 @@ +package clienttemplates + +var appTs = map[string]string{ + // ******************************* + "app.ts": ` +import * as wasmlib from "./wasmlib" +import * as events from "./events" +import * as service from "./service" + +let $pkgName$+Service: service.$PkgName$+Service; + +export function subscribeTo$Package$+Events(): void { +$#each events appOnEvent +} +`, + // ******************************* + "appOnEvent": ` + + $pkgName$+Service.on('$package$+_$evtName', (event: events.Event$EvtName) => { + }); +`, +} diff --git a/tools/schema/generator/clienttemplates/events.go b/tools/schema/generator/clienttemplates/events.go index ee7f5992b9..ca14b503d1 100644 --- a/tools/schema/generator/clienttemplates/events.go +++ b/tools/schema/generator/clienttemplates/events.go @@ -3,33 +3,17 @@ package clienttemplates var eventsTs = map[string]string{ // ******************************* "events.ts": ` +import * as wasmlib from "./wasmlib" +import * as service from "./service" -type Address = string; -type AgentID = string; -type Bool = boolean; -type Bytes = Uint8Array; -type ChainID = string; -type Color = string; -type Hash = string; -type Hname = string; -type Int8 = number; -type Int16 = number; -type Int32 = number; -type Int64 = bigint; -type RequestID = string; -type String = string; -type Uint8 = number; -type Uint16 = number; -type Uint32 = number; -type Uint64 = bigint; +$#each events eventInterface -export class $Package$+Events { -$#each events eventConst +export interface $Package$+Events { +$#each events eventSignature } -$#each events eventInterface - private handleVmMessage(message: string[]): void { - const messageHandlers: MessageHandlers = { +export function handleVmMessage(message: string[]): void { + const messageHandlers: wasmlib.MessageHandlers = { $#each events eventHandler }; @@ -39,36 +23,36 @@ $#each events eventHandler if (typeof messageHandlers[topic] != 'undefined') { messageHandlers[topic](topicIndex); } - } +} `, // ******************************* - "eventConst": ` - public static readonly EVENT_$EVT_NAME: string = '$package.$evtName'; + "eventSignature": ` + $package$+_$evtName: (event: Event$EvtName) => void; `, // ******************************* "eventInterface": ` export interface Event$EvtName { - timestamp: Int32; + timestamp: wasmlib.Int32; $#each event eventInterfaceField } `, // ******************************* "eventInterfaceField": ` - $fldName: $FldType; + $fldName: wasmlib.$FldType; `, // ******************************* "eventHandler": ` - EVENT_$EVT_NAME: (index) => { - const evt: Event$EvtName = { - timestamp: message[index + 1], + '$package.$evtName': (index) => { + const evt: Event$EvtName = { + timestamp: Number(message[++index]), $#each event eventHandlerField - }; - this.emitter.emit(EVENT_$EVT_NAME, evt); - }, + }; + this.emitter.emit('$package$+_$evtName', evt); + }, `, // ******************************* "eventHandlerField": ` - $fldName: message[index + 2], + $fldName: $msgConvert, `, } diff --git a/tools/schema/generator/clienttemplates/service.go b/tools/schema/generator/clienttemplates/service.go new file mode 100644 index 0000000000..f67dc8de6d --- /dev/null +++ b/tools/schema/generator/clienttemplates/service.go @@ -0,0 +1,82 @@ +package clienttemplates + +var serviceTs = map[string]string{ + // ******************************* + "service.ts": ` +import * as wasmlib from "./wasmlib" +import * as events from "./events" +$#each func serviceResults + +export class $PkgName$+Service extends wasmlib.Service { + + constructor(client: BasicClient, chainId: string) { + super(client, chainId, 0x$hscName); + } +$#each func serviceFunction +} +`, + // ******************************* + "serviceResults": ` +$#if result serviceHasResults +`, + // ******************************* + "serviceHasResults": ` + +export interface $FuncName$+Result { +$#each result serviceResult +} +`, + // ******************************* + "serviceResult": ` + $fldName: wasmlib.$FldType; +`, + // ******************************* + "serviceFunction": ` +$#set sep $empty +$#set params $empty +$#each param serviceParam +$#emit service$Kind +`, + // ******************************* + "serviceParam": ` +$#set params $params$sep$fldName: wasmlib.$FldType +$#set sep , +`, + // ******************************* + "serviceFunc": ` + + public async $funcName($params): Promise { + const args: wasmlib.Argument[] = [ +$#each param serviceFuncParam + ]; + await this.postRequest(0x$funcHname, args); + } +`, + // ******************************* + "serviceFuncParam": ` + { key: '$fldName', value: $fldName, }, +`, + // ******************************* + "serviceView": ` + + public async $funcName($params): Promise<$FuncName$+Result> { + const args: wasmlib.Argument[] = [ +$#each param serviceFuncParam + ]; + const response = await this.callView(0x$funcHname, args); + let result: $FuncName$+Result = {}; + +$#each result serviceViewResult + + return result; + } +`, + // ******************************* + "serviceViewResult": ` + let $fldName = response['$fldName']; + result.$fldName = $fldDefault; + if ($fldName) { + result.$fldName = $fldName.$resConvert($fldName)$resConvert2; + } +`, +} diff --git a/tools/schema/generator/emitter.go b/tools/schema/generator/emitter.go index 862957115e..7f965c837c 100644 --- a/tools/schema/generator/emitter.go +++ b/tools/schema/generator/emitter.go @@ -364,10 +364,11 @@ func (g *GenBase) setCommonKeys() { g.keys["true"] = "true" g.keys["empty"] = "" g.keys["space"] = " " - g.keys["package"] = g.s.Name - g.keys["Package"] = g.s.FullName + g.keys["package"] = g.s.PackageName + g.keys["Package"] = g.s.ContractName + g.setMultiKeyValues("pkgName", g.s.ContractName) g.keys["module"] = moduleName + strings.Replace(moduleCwd[len(modulePath):], "\\", "/", -1) - scName := g.s.Name + scName := g.s.PackageName if g.s.CoreContracts { // strip off "core" prefix scName = scName[4:] diff --git a/tools/schema/generator/generator.go b/tools/schema/generator/generator.go index 539ad61ae2..221813c841 100644 --- a/tools/schema/generator/generator.go +++ b/tools/schema/generator/generator.go @@ -15,6 +15,7 @@ import ( // TODO nested structs // TODO handle case where owner is type AgentID[] +// TODO take copyright from schema? type GenBase struct { currentEvent *model.Struct @@ -84,7 +85,6 @@ func (g *GenBase) createFile(path string, overwrite bool, generator func()) (err return nil } -// TODO take copyright from schema? func (g *GenBase) createSourceFile(name string, condition bool) error { if !condition { return nil @@ -121,7 +121,7 @@ func (g *GenBase) generateCommonFiles() error { g.folder += module + "/" } if g.s.CoreContracts { - g.folder += g.s.Name + "/" + g.folder += g.s.PackageName + "/" } err := os.MkdirAll(g.folder, 0o755) @@ -196,7 +196,7 @@ func (g *GenBase) generateCode() error { } func (g *GenBase) generateFuncs() error { - scFileName := g.folder + g.s.Name + g.extension + scFileName := g.folder + g.s.PackageName + g.extension if g.exists(scFileName) != nil { // generate initial SC function file return g.createFile(scFileName, false, func() { @@ -216,7 +216,7 @@ func (g *GenBase) generateFuncs() error { } // save old one from overwrite - scOriginal := g.folder + g.s.Name + ".bak" + scOriginal := g.folder + g.s.PackageName + ".bak" err = os.Rename(scFileName, scOriginal) if err != nil { return err @@ -249,7 +249,7 @@ func (g *GenBase) generateTests() error { } // do not overwrite existing file - name := strings.ToLower(g.s.Name) + name := strings.ToLower(g.s.PackageName) filename := "test/" + name + "_test.go" return g.createFile(filename, false, func() { g.emit("test.go") diff --git a/tools/schema/generator/generator_client.go b/tools/schema/generator/generator_client.go index c9d6572868..bc48b6369f 100644 --- a/tools/schema/generator/generator_client.go +++ b/tools/schema/generator/generator_client.go @@ -42,5 +42,13 @@ func (g *ClientGenerator) generateCode() error { if err != nil { return err } + err = g.createSourceFile("app", len(g.s.Events) != 0) + if err != nil { + return err + } + err = g.createSourceFile("service", len(g.s.Events) != 0) + if err != nil { + return err + } return nil } diff --git a/tools/schema/model/schema.go b/tools/schema/model/schema.go index c5e6eb8cb9..99d3da9d6c 100644 --- a/tools/schema/model/schema.go +++ b/tools/schema/model/schema.go @@ -53,13 +53,10 @@ type Struct struct { } type Schema struct { - Name string - FullName string + ContractName string + PackageName string Description string KeyID int - ConstLen int - ConstNames []string - ConstValues []string CoreContracts bool SchemaTime time.Time Events []*Struct @@ -76,11 +73,11 @@ func NewSchema() *Schema { } func (s *Schema) Compile(schemaDef *SchemaDef) error { - s.FullName = strings.TrimSpace(schemaDef.Name) - if s.FullName == "" { + s.ContractName = strings.TrimSpace(schemaDef.Name) + if s.ContractName == "" { return fmt.Errorf("missing contract name") } - s.Name = strings.ToLower(s.FullName) + s.PackageName = strings.ToLower(s.ContractName) s.Description = strings.TrimSpace(schemaDef.Description) err := s.compileEvents(schemaDef) @@ -210,7 +207,7 @@ func (s *Schema) compileFuncFields(fieldMap StringMap, allFieldMap *FieldMap, wh return nil, fmt.Errorf("redefined %s alias: '%s' != '%s", what, existing.Alias, field.Alias) } if existing.Type != field.Type { - return nil, fmt.Errorf("redefined %s type", what) + return nil, fmt.Errorf("redefined %s type: %s", what, field.Name) } fields = append(fields, field) } From bec40dc3e80f0d8fd861036a92003f0e116d92ea Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 30 Nov 2021 13:53:12 +0200 Subject: [PATCH 141/198] Node connection stats merged to metrics. No tests yet. --- packages/chain/chain.go | 35 ++------ packages/chain/chainimpl/chainimpl.go | 2 +- packages/chain/chainimpl/metrics.go | 13 +++ packages/chain/chainimpl/stats.go | 13 --- packages/chain/nodeconnimpl/nodeconnimpl.go | 37 ++++----- .../chain/nodeconnimpl/nodeconnimpl_chain.go | 25 +++--- .../chain/nodeconnimpl/nodeconnimpl_test.go | 3 +- packages/chain/util.go | 7 -- packages/chains/chains.go | 5 +- packages/metrics/metrics.go | 15 +++- .../metrics/nodeconnmetrics/empty_message.go | 18 +++++ .../metrics/nodeconnmetrics/empty_messages.go | 43 ++++++++++ .../metrics/nodeconnmetrics/empty_metrics.go | 28 +++++++ packages/metrics/nodeconnmetrics/interface.go | 39 +++++++++ packages/metrics/nodeconnmetrics/message.go | 59 ++++++++++++++ packages/metrics/nodeconnmetrics/messages.go | 65 +++++++++++++++ packages/metrics/nodeconnmetrics/metrics.go | 81 +++++++++++++++++++ packages/testutil/testchain/mock_nodeconn.go | 5 +- ...{chainstats.go => chainnodeconnmetrics.go} | 32 ++++---- .../webapi/model/node_connection_stats.go | 71 ++++++++-------- packages/webapi/request/request_test.go | 3 +- plugins/chains/plugin.go | 2 +- 22 files changed, 460 insertions(+), 141 deletions(-) create mode 100644 packages/chain/chainimpl/metrics.go delete mode 100644 packages/chain/chainimpl/stats.go create mode 100644 packages/metrics/nodeconnmetrics/empty_message.go create mode 100644 packages/metrics/nodeconnmetrics/empty_messages.go create mode 100644 packages/metrics/nodeconnmetrics/empty_metrics.go create mode 100644 packages/metrics/nodeconnmetrics/interface.go create mode 100644 packages/metrics/nodeconnmetrics/message.go create mode 100644 packages/metrics/nodeconnmetrics/messages.go create mode 100644 packages/metrics/nodeconnmetrics/metrics.go rename packages/webapi/admapi/{chainstats.go => chainnodeconnmetrics.go} (76%) diff --git a/packages/chain/chain.go b/packages/chain/chain.go index 6185c13e3c..97052030c0 100644 --- a/packages/chain/chain.go +++ b/packages/chain/chain.go @@ -16,12 +16,12 @@ import ( "github.com/iotaledger/wasp/packages/hashing" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/coreutil" + "github.com/iotaledger/wasp/packages/metrics/nodeconnmetrics" "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/state" "github.com/iotaledger/wasp/packages/tcrypto" "github.com/iotaledger/wasp/packages/util/ready" "github.com/iotaledger/wasp/packages/vm/processors" - "go.uber.org/atomic" ) type ChainCore interface { @@ -51,8 +51,8 @@ type ChainRequests interface { EventRequestProcessed() *events.Event } -type ChainStats interface { - GetNodeConnectionStats() NodeConnectionMessagesStats +type ChainMetrics interface { + GetNodeConnectionMetrics() nodeconnmetrics.NodeConnectionMessagesMetrics } type ChainEvents interface { @@ -64,7 +64,7 @@ type Chain interface { ChainCore ChainRequests ChainEntry - ChainStats + ChainMetrics } // Committee is ordered (indexed 0..size-1) list of peers which run the consensus @@ -108,7 +108,7 @@ type NodeConnection interface { PullConfirmedOutput(addr ledgerstate.Address, outputID ledgerstate.OutputID) PostTransaction(tx *ledgerstate.Transaction) - GetStats() NodeConnectionStats + GetMetrics() nodeconnmetrics.NodeConnectionMetrics } type ChainNodeConnection interface { @@ -122,30 +122,7 @@ type ChainNodeConnection interface { PullConfirmedOutput(outputID ledgerstate.OutputID) PostTransaction(tx *ledgerstate.Transaction) - GetStats() NodeConnectionMessagesStats -} - -type NodeConnectionMessageStats struct { - Total atomic.Uint32 - LastEvent time.Time - LastMessage interface{} -} - -type NodeConnectionMessagesStats struct { - OutPullState NodeConnectionMessageStats - OutPullTransactionInclusionState NodeConnectionMessageStats - OutPullConfirmedOutput NodeConnectionMessageStats - OutPostTransaction NodeConnectionMessageStats - - InTransaction NodeConnectionMessageStats - InInclusionState NodeConnectionMessageStats - InOutput NodeConnectionMessageStats - InUnspentAliasOutput NodeConnectionMessageStats -} - -type NodeConnectionStats struct { - NodeConnectionMessagesStats - Subscribed []ledgerstate.Address + GetMetrics() nodeconnmetrics.NodeConnectionMessagesMetrics } type StateManager interface { diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index 93b1d7e0c9..9b5139dc94 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -45,7 +45,7 @@ var ( _ chain.ChainEntry = &chainObj{} _ chain.ChainRequests = &chainObj{} _ chain.ChainEvents = &chainObj{} - _ chain.ChainStats = &chainObj{} + _ chain.ChainMetrics = &chainObj{} ) type chainObj struct { diff --git a/packages/chain/chainimpl/metrics.go b/packages/chain/chainimpl/metrics.go new file mode 100644 index 0000000000..650f96769d --- /dev/null +++ b/packages/chain/chainimpl/metrics.go @@ -0,0 +1,13 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// Provides implementations for chain.ChainMetrics methods +package chainimpl + +import ( + "github.com/iotaledger/wasp/packages/metrics/nodeconnmetrics" +) + +func (c *chainObj) GetNodeConnectionMetrics() nodeconnmetrics.NodeConnectionMessagesMetrics { + return c.nodeConn.GetMetrics() +} diff --git a/packages/chain/chainimpl/stats.go b/packages/chain/chainimpl/stats.go deleted file mode 100644 index 7adf5cfe61..0000000000 --- a/packages/chain/chainimpl/stats.go +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// Provides implementations for chain.ChainStats methods -package chainimpl - -import ( - "github.com/iotaledger/wasp/packages/chain" -) - -func (c *chainObj) GetNodeConnectionStats() chain.NodeConnectionMessagesStats { - return c.nodeConn.GetStats() -} diff --git a/packages/chain/nodeconnimpl/nodeconnimpl.go b/packages/chain/nodeconnimpl/nodeconnimpl.go index 1d04e738ee..a744f67919 100644 --- a/packages/chain/nodeconnimpl/nodeconnimpl.go +++ b/packages/chain/nodeconnimpl/nodeconnimpl.go @@ -7,6 +7,7 @@ import ( "github.com/iotaledger/hive.go/events" "github.com/iotaledger/hive.go/logger" "github.com/iotaledger/wasp/packages/chain" + "github.com/iotaledger/wasp/packages/metrics/nodeconnmetrics" ) type nodeConnImplementation struct { @@ -15,26 +16,26 @@ type nodeConnImplementation struct { iStateHandlers map[ledgerstate.AliasAddress]chain.NodeConnectionHandleInclusionStateFun outputHandlers map[ledgerstate.AliasAddress]chain.NodeConnectionHandleOutputFun unspentAOutputHandlers map[ledgerstate.AliasAddress]chain.NodeConnectionHandleUnspentAliasOutputFun - stats *chain.NodeConnectionStats + metrics nodeconnmetrics.NodeConnectionMetrics log *logger.Logger // general chains logger } var _ chain.NodeConnection = &nodeConnImplementation{} -func NewNodeConnection(nodeConnClient *txstream_client.Client, log *logger.Logger) chain.NodeConnection { +func NewNodeConnection(nodeConnClient *txstream_client.Client, metrics nodeconnmetrics.NodeConnectionMetrics, log *logger.Logger) chain.NodeConnection { ret := &nodeConnImplementation{ client: nodeConnClient, transactionHandlers: make(map[ledgerstate.AliasAddress]chain.NodeConnectionHandleTransactionFun), iStateHandlers: make(map[ledgerstate.AliasAddress]chain.NodeConnectionHandleInclusionStateFun), outputHandlers: make(map[ledgerstate.AliasAddress]chain.NodeConnectionHandleOutputFun), unspentAOutputHandlers: make(map[ledgerstate.AliasAddress]chain.NodeConnectionHandleUnspentAliasOutputFun), - stats: &chain.NodeConnectionStats{}, + metrics: metrics, log: log, } ret.client.Events.TransactionReceived.Attach(events.NewClosure(func(msg *txstream.MsgTransaction) { ret.log.Debugf("NodeConnnection::TransactionReceived...") defer ret.log.Debugf("NodeConnnection::TransactionReceived... Done") - chain.CountMessageStats(&ret.stats.InTransaction, msg) + ret.metrics.GetInTransaction().CountLastMessage(msg) aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) if !ok { ret.log.Warnf("NodeConnnection::TransactionReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) @@ -50,7 +51,7 @@ func NewNodeConnection(nodeConnClient *txstream_client.Client, log *logger.Logge ret.client.Events.InclusionStateReceived.Attach(events.NewClosure(func(msg *txstream.MsgTxInclusionState) { ret.log.Debugf("NodeConnnection::InclusionStateReceived...") defer ret.log.Debugf("NodeConnnection::InclusionStateReceived... Done") - chain.CountMessageStats(&ret.stats.InInclusionState, msg) + ret.metrics.GetInInclusionState().CountLastMessage(msg) aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) if !ok { ret.log.Warnf("NodeConnnection::InclusionStateReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) @@ -66,7 +67,7 @@ func NewNodeConnection(nodeConnClient *txstream_client.Client, log *logger.Logge ret.client.Events.OutputReceived.Attach(events.NewClosure(func(msg *txstream.MsgOutput) { ret.log.Debugf("NodeConnnection::OutputReceived...") defer ret.log.Debugf("NodeConnnection::OutputReceived... Done") - chain.CountMessageStats(&ret.stats.InOutput, msg) + ret.metrics.GetInOutput().CountLastMessage(msg) aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) if !ok { ret.log.Warnf("NodeConnnection::OutputReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) @@ -82,7 +83,7 @@ func NewNodeConnection(nodeConnClient *txstream_client.Client, log *logger.Logge ret.client.Events.UnspentAliasOutputReceived.Attach(events.NewClosure(func(msg *txstream.MsgUnspentAliasOutput) { ret.log.Debugf("NodeConnnection::UnspentAliasOutputReceived...") defer ret.log.Debugf("NodeConnnection::UnspentAliasOutputReceived... Done") - chain.CountMessageStats(&ret.stats.InUnspentAliasOutput, msg) + ret.metrics.GetInUnspentAliasOutput().CountLastMessage(msg) handler, ok := ret.unspentAOutputHandlers[*msg.AliasAddress] if !ok { ret.log.Warnf("NodeConnnection::UnspentAliasOutputReceived: no handler for address %v", msg.AliasAddress.String()) @@ -96,12 +97,12 @@ func NewNodeConnection(nodeConnClient *txstream_client.Client, log *logger.Logge // NOTE: NodeConnectionSender methods are logged through each chain logger in ChainNodeConnImplementation func (n *nodeConnImplementation) PullState(addr *ledgerstate.AliasAddress) { - chain.CountMessageStats(&n.stats.OutPullState, addr) + n.metrics.GetOutPullState().CountLastMessage(addr) n.client.RequestUnspentAliasOutput(addr) } func (n *nodeConnImplementation) PullTransactionInclusionState(addr ledgerstate.Address, txid ledgerstate.TransactionID) { - chain.CountMessageStats(&n.stats.OutPullTransactionInclusionState, struct { + n.metrics.GetOutPullTransactionInclusionState().CountLastMessage(struct { Address ledgerstate.Address TransactionID ledgerstate.TransactionID }{ @@ -112,7 +113,7 @@ func (n *nodeConnImplementation) PullTransactionInclusionState(addr ledgerstate. } func (n *nodeConnImplementation) PullConfirmedOutput(addr ledgerstate.Address, outputID ledgerstate.OutputID) { - chain.CountMessageStats(&n.stats.OutPullConfirmedOutput, struct { + n.metrics.GetOutPullConfirmedOutput().CountLastMessage(struct { Address ledgerstate.Address OutputID ledgerstate.OutputID }{ @@ -123,7 +124,7 @@ func (n *nodeConnImplementation) PullConfirmedOutput(addr ledgerstate.Address, o } func (n *nodeConnImplementation) PostTransaction(tx *ledgerstate.Transaction) { - chain.CountMessageStats(&n.stats.OutPostTransaction, tx) + n.metrics.GetOutPostTransaction().CountLastMessage(tx) n.client.PostTransaction(tx) } @@ -147,22 +148,16 @@ func (n *nodeConnImplementation) Subscribe(addr ledgerstate.Address) { n.log.Debugf("NodeConnnection::Subscribing to %v...", addr.String()) defer n.log.Debugf("NodeConnnection::Subscribing done") n.client.Subscribe(addr) - n.stats.Subscribed = append(n.stats.Subscribed, addr) + n.metrics.SetSubscribed(addr) } func (n *nodeConnImplementation) Unsubscribe(addr ledgerstate.Address) { n.log.Debugf("NodeConnnection::Unsubscribing from %v...", addr.String()) defer n.log.Debugf("NodeConnnection::Unsubscribing done") + n.metrics.SetUnsubscribed(addr) n.client.Unsubscribe(addr) - var i int - for i = 0; i < len(n.stats.Subscribed); i++ { - if n.stats.Subscribed[i] == addr { - n.stats.Subscribed = append(n.stats.Subscribed[:i], n.stats.Subscribed[i+1:]...) - break - } - } } -func (n *nodeConnImplementation) GetStats() chain.NodeConnectionStats { - return *n.stats +func (n *nodeConnImplementation) GetMetrics() nodeconnmetrics.NodeConnectionMetrics { + return n.metrics } diff --git a/packages/chain/nodeconnimpl/nodeconnimpl_chain.go b/packages/chain/nodeconnimpl/nodeconnimpl_chain.go index ab3b5a9fa0..ec7a717970 100644 --- a/packages/chain/nodeconnimpl/nodeconnimpl_chain.go +++ b/packages/chain/nodeconnimpl/nodeconnimpl_chain.go @@ -8,12 +8,13 @@ import ( "github.com/iotaledger/hive.go/logger" "github.com/iotaledger/wasp/packages/chain" "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/metrics/nodeconnmetrics" ) type chainNodeConnImplementation struct { chainID *iscp.ChainID nodeConn chain.NodeConnection - stats *chain.NodeConnectionMessagesStats + metrics nodeconnmetrics.NodeConnectionMessagesMetrics log *logger.Logger // logger for one chain } @@ -23,21 +24,21 @@ func NewChainNodeConnection(chainID *iscp.ChainID, nodeConn chain.NodeConnection return &chainNodeConnImplementation{ chainID: chainID, nodeConn: nodeConn, - stats: &chain.NodeConnectionMessagesStats{}, + metrics: nodeConn.GetMetrics().NewMessagesMetrics(chainID), log: log, } } func (c *chainNodeConnImplementation) AttachToTransactionReceived(fun chain.NodeConnectionHandleTransactionFun) { c.nodeConn.AttachToTransactionReceived(c.chainID.AsAliasAddress(), func(tx *ledgerstate.Transaction) { - chain.CountMessageStats(&c.stats.InTransaction, tx) + c.metrics.GetInTransaction().CountLastMessage(tx) fun(tx) }) } func (c *chainNodeConnImplementation) AttachToInclusionStateReceived(fun chain.NodeConnectionHandleInclusionStateFun) { c.nodeConn.AttachToInclusionStateReceived(c.chainID.AsAliasAddress(), func(txID ledgerstate.TransactionID, iState ledgerstate.InclusionState) { - chain.CountMessageStats(&c.stats.InInclusionState, struct { + c.metrics.GetInInclusionState().CountLastMessage(struct { TransactionID ledgerstate.TransactionID InclusionState ledgerstate.InclusionState }{ @@ -50,14 +51,14 @@ func (c *chainNodeConnImplementation) AttachToInclusionStateReceived(fun chain.N func (c *chainNodeConnImplementation) AttachToOutputReceived(fun chain.NodeConnectionHandleOutputFun) { c.nodeConn.AttachToOutputReceived(c.chainID.AsAliasAddress(), func(output ledgerstate.Output) { - chain.CountMessageStats(&c.stats.InOutput, output) + c.metrics.GetInOutput().CountLastMessage(output) fun(output) }) } func (c *chainNodeConnImplementation) AttachToUnspentAliasOutputReceived(fun chain.NodeConnectionHandleUnspentAliasOutputFun) { c.nodeConn.AttachToUnspentAliasOutputReceived(c.chainID.AsAliasAddress(), func(output *ledgerstate.AliasOutput, timestamp time.Time) { - chain.CountMessageStats(&c.stats.InUnspentAliasOutput, struct { + c.metrics.GetInUnspentAliasOutput().CountLastMessage(struct { AliasOutput *ledgerstate.AliasOutput Timestamp time.Time }{ @@ -70,7 +71,7 @@ func (c *chainNodeConnImplementation) AttachToUnspentAliasOutputReceived(fun cha func (c *chainNodeConnImplementation) PullState() { c.log.Debugf("ChainNodeConnection::PullState...") - chain.CountMessageStats(&c.stats.OutPullState, nil) + c.metrics.GetOutPullState().CountLastMessage(nil) c.nodeConn.PullState(c.chainID.AsAliasAddress()) c.log.Debugf("ChainNodeConnection::PullState... Done") } @@ -78,7 +79,7 @@ func (c *chainNodeConnImplementation) PullState() { func (c *chainNodeConnImplementation) PullTransactionInclusionState(txID ledgerstate.TransactionID) { txIDStr := txID.Base58() c.log.Debugf("ChainNodeConnImplementation::PullTransactionInclusionState(txID=%v)...", txIDStr) - chain.CountMessageStats(&c.stats.OutPullTransactionInclusionState, txID) + c.metrics.GetOutPullTransactionInclusionState().CountLastMessage(txID) c.nodeConn.PullTransactionInclusionState(c.chainID.AsAddress(), txID) c.log.Debugf("ChainNodeConnImplementation::PullTransactionInclusionState(txID=%v)... Done", txIDStr) } @@ -86,7 +87,7 @@ func (c *chainNodeConnImplementation) PullTransactionInclusionState(txID ledgers func (c *chainNodeConnImplementation) PullConfirmedOutput(outputID ledgerstate.OutputID) { outputIDStr := iscp.OID(outputID) c.log.Debugf("ChainNodeConnImplementation::PullConfirmedOutput(outputID=%v)...", outputIDStr) - chain.CountMessageStats(&c.stats.OutPullConfirmedOutput, outputID) + c.metrics.GetOutPullConfirmedOutput().CountLastMessage(outputID) c.nodeConn.PullConfirmedOutput(c.chainID.AsAddress(), outputID) c.log.Debugf("ChainNodeConnImplementation::PullConfirmedOutput(outputID=%v)... Done", outputIDStr) } @@ -94,11 +95,11 @@ func (c *chainNodeConnImplementation) PullConfirmedOutput(outputID ledgerstate.O func (c *chainNodeConnImplementation) PostTransaction(tx *ledgerstate.Transaction) { txIDStr := tx.ID().Base58() c.log.Debugf("ChainNodeConnImplementation::PostTransaction(txID=%s)...", txIDStr) - chain.CountMessageStats(&c.stats.OutPostTransaction, tx) + c.metrics.GetOutPostTransaction().CountLastMessage(tx) c.nodeConn.PostTransaction(tx) c.log.Debugf("ChainNodeConnImplementation::PostTransaction(txID=%s)... Done", txIDStr) } -func (c *chainNodeConnImplementation) GetStats() chain.NodeConnectionMessagesStats { - return *c.stats +func (c *chainNodeConnImplementation) GetMetrics() nodeconnmetrics.NodeConnectionMessagesMetrics { + return c.metrics } diff --git a/packages/chain/nodeconnimpl/nodeconnimpl_test.go b/packages/chain/nodeconnimpl/nodeconnimpl_test.go index ceca17c522..c20585cca1 100644 --- a/packages/chain/nodeconnimpl/nodeconnimpl_test.go +++ b/packages/chain/nodeconnimpl/nodeconnimpl_test.go @@ -7,6 +7,7 @@ import ( "github.com/iotaledger/goshimmer/packages/ledgerstate" txstream "github.com/iotaledger/goshimmer/packages/txstream/client" + "github.com/iotaledger/wasp/packages/metrics/nodeconnmetrics" "github.com/iotaledger/wasp/packages/testutil/testlogger" "golang.org/x/xerrors" ) @@ -18,7 +19,7 @@ func TestBasic(t *testing.T) { nconn := txstream.New("dummyID", logger, func() (addr string, conn net.Conn, err error) { return "", nil, xerrors.New("dummy dial error") }) - nconnimpl := NewNodeConnection(nconn, logger) + nconnimpl := NewNodeConnection(nconn, nodeconnmetrics.NewEmptyNodeConnectionMetrics(), logger) nconnimpl.AttachToTransactionReceived(&addr, func(*ledgerstate.Transaction) {}) nconnimpl.AttachToInclusionStateReceived(&addr, func(ledgerstate.TransactionID, ledgerstate.InclusionState) {}) nconnimpl.AttachToOutputReceived(&addr, func(ledgerstate.Output) {}) diff --git a/packages/chain/util.go b/packages/chain/util.go index 1213c5e8b3..f3fc917ad6 100644 --- a/packages/chain/util.go +++ b/packages/chain/util.go @@ -2,7 +2,6 @@ package chain import ( "strconv" - "time" "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/hive.go/logger" @@ -66,9 +65,3 @@ func PublishGovernanceTransition(stateOutput *ledgerstate.AliasOutput) { stateHash.String(), ) } - -func CountMessageStats(stats *NodeConnectionMessageStats, msg interface{}) { - stats.Total.Inc() - stats.LastEvent = time.Now() - stats.LastMessage = msg -} diff --git a/packages/chains/chains.go b/packages/chains/chains.go index 024d735458..3fdeaf7bd5 100644 --- a/packages/chains/chains.go +++ b/packages/chains/chains.go @@ -11,6 +11,7 @@ import ( "github.com/iotaledger/wasp/packages/database/dbmanager" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/metrics" + "github.com/iotaledger/wasp/packages/metrics/nodeconnmetrics" "github.com/iotaledger/wasp/packages/parameters" "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/registry" @@ -189,6 +190,6 @@ func (c *Chains) Get(chainID *iscp.ChainID) chain.Chain { return ret } -func (c *Chains) GetNodeConnectionStats() chain.NodeConnectionStats { - return c.nodeConn.GetStats() +func (c *Chains) GetNodeConnectionMetrics() nodeconnmetrics.NodeConnectionMetrics { + return c.nodeConn.GetMetrics() } diff --git a/packages/metrics/metrics.go b/packages/metrics/metrics.go index 602a38ee3f..a963bad557 100644 --- a/packages/metrics/metrics.go +++ b/packages/metrics/metrics.go @@ -8,6 +8,7 @@ import ( "github.com/iotaledger/hive.go/logger" "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/metrics/nodeconnmetrics" "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" "github.com/prometheus/client_golang/prometheus" @@ -24,6 +25,7 @@ type Metrics struct { requestAckMessages *prometheus.CounterVec requestProcessingTime *prometheus.GaugeVec vmRunTime *prometheus.GaugeVec + nodeconnMetrics nodeconnmetrics.NodeConnectionMetrics } func (m *Metrics) NewChainMetrics(chainID *iscp.ChainID) ChainMetrics { @@ -38,7 +40,10 @@ func (m *Metrics) NewChainMetrics(chainID *iscp.ChainID) ChainMetrics { } func New(log *logger.Logger) *Metrics { - return &Metrics{log: log} + return &Metrics{ + log: log, + nodeconnMetrics: nodeconnmetrics.New(log), + } } var once sync.Once @@ -69,6 +74,7 @@ func (m *Metrics) Stop() error { } func (m *Metrics) registerMetrics() { + m.nodeconnMetrics.RegisterMetrics() m.log.Info("Registering mempool metrics to prometheus") m.offLedgerRequestCounter = prometheus.NewCounterVec(prometheus.CounterOpts{ Name: "wasp_off_ledger_request_counter", @@ -112,3 +118,10 @@ func (m *Metrics) registerMetrics() { }, []string{"chain"}) prometheus.MustRegister(m.vmRunTime) } + +func (m *Metrics) GetNodeConnectionMetrics() nodeconnmetrics.NodeConnectionMetrics { + if m == nil { + return nodeconnmetrics.NewEmptyNodeConnectionMetrics() + } + return m.nodeconnMetrics +} diff --git a/packages/metrics/nodeconnmetrics/empty_message.go b/packages/metrics/nodeconnmetrics/empty_message.go new file mode 100644 index 0000000000..617fb1fdcf --- /dev/null +++ b/packages/metrics/nodeconnmetrics/empty_message.go @@ -0,0 +1,18 @@ +package nodeconnmetrics + +import ( + "time" +) + +type emptyNodeConnectionMessageMetrics struct{} + +var _ NodeConnectionMessageMetrics = &emptyNodeConnectionMessageMetrics{} + +func newEmptyNodeConnectionMessageMetrics() NodeConnectionMessageMetrics { + return &emptyNodeConnectionMessageMetrics{} +} + +func (ncmmi *emptyNodeConnectionMessageMetrics) CountLastMessage(msg interface{}) {} +func (ncmmi *emptyNodeConnectionMessageMetrics) GetMessageTotal() uint32 { return 0 } +func (ncmmi *emptyNodeConnectionMessageMetrics) GetLastEvent() time.Time { return time.Time{} } +func (ncmmi *emptyNodeConnectionMessageMetrics) GetLastMessage() interface{} { return nil } diff --git a/packages/metrics/nodeconnmetrics/empty_messages.go b/packages/metrics/nodeconnmetrics/empty_messages.go new file mode 100644 index 0000000000..6a7c66ff4b --- /dev/null +++ b/packages/metrics/nodeconnmetrics/empty_messages.go @@ -0,0 +1,43 @@ +package nodeconnmetrics + +type emptyNodeConnectionMessagesMetrics struct { + empty NodeConnectionMessageMetrics +} + +var _ NodeConnectionMessagesMetrics = &emptyNodeConnectionMessagesMetrics{} + +func NewEmptyNodeConnectionMessagesMetrics() NodeConnectionMessagesMetrics { + return &emptyNodeConnectionMessagesMetrics{empty: newEmptyNodeConnectionMessageMetrics()} +} + +func (ecmm *emptyNodeConnectionMessagesMetrics) GetOutPullState() NodeConnectionMessageMetrics { + return ecmm.empty +} + +func (ecmm *emptyNodeConnectionMessagesMetrics) GetOutPullTransactionInclusionState() NodeConnectionMessageMetrics { + return ecmm.empty +} + +func (ecmm *emptyNodeConnectionMessagesMetrics) GetOutPullConfirmedOutput() NodeConnectionMessageMetrics { + return ecmm.empty +} + +func (ecmm *emptyNodeConnectionMessagesMetrics) GetOutPostTransaction() NodeConnectionMessageMetrics { + return ecmm.empty +} + +func (ecmm *emptyNodeConnectionMessagesMetrics) GetInTransaction() NodeConnectionMessageMetrics { + return ecmm.empty +} + +func (ecmm *emptyNodeConnectionMessagesMetrics) GetInInclusionState() NodeConnectionMessageMetrics { + return ecmm.empty +} + +func (ecmm *emptyNodeConnectionMessagesMetrics) GetInOutput() NodeConnectionMessageMetrics { + return ecmm.empty +} + +func (ecmm *emptyNodeConnectionMessagesMetrics) GetInUnspentAliasOutput() NodeConnectionMessageMetrics { + return ecmm.empty +} diff --git a/packages/metrics/nodeconnmetrics/empty_metrics.go b/packages/metrics/nodeconnmetrics/empty_metrics.go new file mode 100644 index 0000000000..7743ca02ac --- /dev/null +++ b/packages/metrics/nodeconnmetrics/empty_metrics.go @@ -0,0 +1,28 @@ +package nodeconnmetrics + +import ( + "github.com/iotaledger/goshimmer/packages/ledgerstate" + "github.com/iotaledger/wasp/packages/iscp" +) + +type emptyNodeConnectionMetrics struct { + NodeConnectionMessagesMetrics +} + +var _ NodeConnectionMetrics = &emptyNodeConnectionMetrics{} + +func NewEmptyNodeConnectionMetrics() NodeConnectionMetrics { + return &emptyNodeConnectionMetrics{ + NodeConnectionMessagesMetrics: NewEmptyNodeConnectionMessagesMetrics(), + } +} + +func (ncmi *emptyNodeConnectionMetrics) RegisterMetrics() {} +func (ncmi *emptyNodeConnectionMetrics) NewMessagesMetrics(chainID *iscp.ChainID) NodeConnectionMessagesMetrics { + return NewEmptyNodeConnectionMessagesMetrics() +} +func (ncmi *emptyNodeConnectionMetrics) SetSubscribed(address ledgerstate.Address) {} +func (ncmi *emptyNodeConnectionMetrics) SetUnsubscribed(address ledgerstate.Address) {} +func (ncmi *emptyNodeConnectionMetrics) GetSubscribed() []ledgerstate.Address { + return []ledgerstate.Address{} +} diff --git a/packages/metrics/nodeconnmetrics/interface.go b/packages/metrics/nodeconnmetrics/interface.go new file mode 100644 index 0000000000..bf073bcbbe --- /dev/null +++ b/packages/metrics/nodeconnmetrics/interface.go @@ -0,0 +1,39 @@ +package nodeconnmetrics + +import ( + "time" + + "github.com/iotaledger/goshimmer/packages/ledgerstate" + "github.com/iotaledger/wasp/packages/iscp" +) + +type NodeConnectionMessageMetrics interface { + CountLastMessage(interface{}) + + GetMessageTotal() uint32 + GetLastEvent() time.Time + GetLastMessage() interface{} +} + +type NodeConnectionMessagesMetrics interface { + GetOutPullState() NodeConnectionMessageMetrics + GetOutPullTransactionInclusionState() NodeConnectionMessageMetrics + GetOutPullConfirmedOutput() NodeConnectionMessageMetrics + GetOutPostTransaction() NodeConnectionMessageMetrics + + GetInTransaction() NodeConnectionMessageMetrics + GetInInclusionState() NodeConnectionMessageMetrics + GetInOutput() NodeConnectionMessageMetrics + GetInUnspentAliasOutput() NodeConnectionMessageMetrics +} + +type NodeConnectionMetrics interface { + NodeConnectionMessagesMetrics + + SetSubscribed(ledgerstate.Address) + SetUnsubscribed(ledgerstate.Address) + GetSubscribed() []ledgerstate.Address + + RegisterMetrics() + NewMessagesMetrics(chainID *iscp.ChainID) NodeConnectionMessagesMetrics +} diff --git a/packages/metrics/nodeconnmetrics/message.go b/packages/metrics/nodeconnmetrics/message.go new file mode 100644 index 0000000000..3090fe2509 --- /dev/null +++ b/packages/metrics/nodeconnmetrics/message.go @@ -0,0 +1,59 @@ +package nodeconnmetrics + +import ( + "time" + + "github.com/iotaledger/wasp/packages/iscp" + "github.com/prometheus/client_golang/prometheus" + "go.uber.org/atomic" +) + +type nodeConnectionMessageMetricsImpl struct { + nodeConnMetrics *nodeConnectionMetricsImpl + metricsLabel prometheus.Labels + total atomic.Uint32 + lastEvent time.Time + lastMessage interface{} +} + +var _ NodeConnectionMessageMetrics = &nodeConnectionMessageMetricsImpl{} + +func newNodeConnectionMessageMetrics(ncmi *nodeConnectionMetricsImpl, chainID *iscp.ChainID, msgType string) NodeConnectionMessageMetrics { + return &nodeConnectionMessageMetricsImpl{ + nodeConnMetrics: ncmi, + metricsLabel: ncmi.getMetricsLabel(chainID, msgType), + } +} + +func (ncmmi *nodeConnectionMessageMetricsImpl) incMessageTotal() { + ncmmi.total.Inc() + ncmmi.nodeConnMetrics.messageTotalCounter.With(ncmmi.metricsLabel).Inc() +} + +func (ncmmi *nodeConnectionMessageMetricsImpl) setLastEventToNow() { + ncmmi.lastEvent = time.Now() + ncmmi.nodeConnMetrics.lastEventTimeGauge.With(ncmmi.metricsLabel).SetToCurrentTime() +} + +// TODO: connect last message to Prometheus +func (ncmmi *nodeConnectionMessageMetricsImpl) setLastMessage(msg interface{}) { + ncmmi.lastMessage = msg +} + +func (ncmmi *nodeConnectionMessageMetricsImpl) CountLastMessage(msg interface{}) { + ncmmi.incMessageTotal() + ncmmi.setLastEventToNow() + ncmmi.setLastMessage(msg) +} + +func (ncmmi *nodeConnectionMessageMetricsImpl) GetMessageTotal() uint32 { + return ncmmi.total.Load() +} + +func (ncmmi *nodeConnectionMessageMetricsImpl) GetLastEvent() time.Time { + return ncmmi.lastEvent +} + +func (ncmmi *nodeConnectionMessageMetricsImpl) GetLastMessage() interface{} { + return ncmmi.lastMessage +} diff --git a/packages/metrics/nodeconnmetrics/messages.go b/packages/metrics/nodeconnmetrics/messages.go new file mode 100644 index 0000000000..b69ae73a4c --- /dev/null +++ b/packages/metrics/nodeconnmetrics/messages.go @@ -0,0 +1,65 @@ +package nodeconnmetrics + +import ( + "github.com/iotaledger/wasp/packages/iscp" +) + +type nodeConnectionMessagesMetricsImpl struct { + outPullStateMetrics NodeConnectionMessageMetrics + outPullTransactionInclusionStateMetrics NodeConnectionMessageMetrics + outPullConfirmedOutputMetrics NodeConnectionMessageMetrics + outPostTransactionMetrics NodeConnectionMessageMetrics + + inTransactionMetrics NodeConnectionMessageMetrics + inInclusionStateMetrics NodeConnectionMessageMetrics + inOutputMetrics NodeConnectionMessageMetrics + inUnspentAliasOutputMetrics NodeConnectionMessageMetrics +} + +var _ NodeConnectionMessagesMetrics = &nodeConnectionMessagesMetricsImpl{} + +func newNodeConnectionMessagesMetrics(ncmi *nodeConnectionMetricsImpl, chainID *iscp.ChainID) NodeConnectionMessagesMetrics { + return &nodeConnectionMessagesMetricsImpl{ + outPullStateMetrics: newNodeConnectionMessageMetrics(ncmi, chainID, "out_pull_state"), + outPullTransactionInclusionStateMetrics: newNodeConnectionMessageMetrics(ncmi, chainID, "out_pull_transaction_inclusion_state"), + outPullConfirmedOutputMetrics: newNodeConnectionMessageMetrics(ncmi, chainID, "out_pull_confirmed_output"), + outPostTransactionMetrics: newNodeConnectionMessageMetrics(ncmi, chainID, "out_post_transaction"), + + inTransactionMetrics: newNodeConnectionMessageMetrics(ncmi, chainID, "in_transaction"), + inInclusionStateMetrics: newNodeConnectionMessageMetrics(ncmi, chainID, "in_inclusion_state"), + inOutputMetrics: newNodeConnectionMessageMetrics(ncmi, chainID, "in_output"), + inUnspentAliasOutputMetrics: newNodeConnectionMessageMetrics(ncmi, chainID, "in_alias_output"), + } +} + +func (ncmmi *nodeConnectionMessagesMetricsImpl) GetOutPullState() NodeConnectionMessageMetrics { + return ncmmi.outPullStateMetrics +} + +func (ncmmi *nodeConnectionMessagesMetricsImpl) GetOutPullTransactionInclusionState() NodeConnectionMessageMetrics { + return ncmmi.outPullTransactionInclusionStateMetrics +} + +func (ncmmi *nodeConnectionMessagesMetricsImpl) GetOutPullConfirmedOutput() NodeConnectionMessageMetrics { + return ncmmi.outPullConfirmedOutputMetrics +} + +func (ncmmi *nodeConnectionMessagesMetricsImpl) GetOutPostTransaction() NodeConnectionMessageMetrics { + return ncmmi.outPostTransactionMetrics +} + +func (ncmmi *nodeConnectionMessagesMetricsImpl) GetInTransaction() NodeConnectionMessageMetrics { + return ncmmi.inTransactionMetrics +} + +func (ncmmi *nodeConnectionMessagesMetricsImpl) GetInInclusionState() NodeConnectionMessageMetrics { + return ncmmi.inInclusionStateMetrics +} + +func (ncmmi *nodeConnectionMessagesMetricsImpl) GetInOutput() NodeConnectionMessageMetrics { + return ncmmi.inOutputMetrics +} + +func (ncmmi *nodeConnectionMessagesMetricsImpl) GetInUnspentAliasOutput() NodeConnectionMessageMetrics { + return ncmmi.inUnspentAliasOutputMetrics +} diff --git a/packages/metrics/nodeconnmetrics/metrics.go b/packages/metrics/nodeconnmetrics/metrics.go new file mode 100644 index 0000000000..05e0d6025d --- /dev/null +++ b/packages/metrics/nodeconnmetrics/metrics.go @@ -0,0 +1,81 @@ +package nodeconnmetrics + +import ( + "github.com/iotaledger/goshimmer/packages/ledgerstate" + "github.com/iotaledger/hive.go/logger" + "github.com/iotaledger/wasp/packages/iscp" + "github.com/prometheus/client_golang/prometheus" +) + +type nodeConnectionMetricsImpl struct { + NodeConnectionMessagesMetrics + log *logger.Logger + messageTotalCounter *prometheus.CounterVec + lastEventTimeGauge *prometheus.GaugeVec + subscribed []ledgerstate.Address +} + +var _ NodeConnectionMetrics = &nodeConnectionMetricsImpl{} + +const ( + chainLabelName = "chain" + msgTypeLabelName = "message_type" +) + +func New(log *logger.Logger) NodeConnectionMetrics { + ret := &nodeConnectionMetricsImpl{log: log.Named("nodeconn")} + ret.NodeConnectionMessagesMetrics = newNodeConnectionMessagesMetrics(ret, nil) + return ret +} + +func (ncmi *nodeConnectionMetricsImpl) RegisterMetrics() { + ncmi.log.Debug("Registering nodeconnection metrics to prometheus...") + ncmi.messageTotalCounter = prometheus.NewCounterVec(prometheus.CounterOpts{ + Name: "wasp_nodeconn_message_total_counter", + Help: "Number of messages send/received by node connection of the chain", + }, []string{chainLabelName, msgTypeLabelName}) + prometheus.MustRegister(ncmi.messageTotalCounter) + ncmi.lastEventTimeGauge = prometheus.NewGaugeVec(prometheus.GaugeOpts{ + Name: "wasp_nodeconn_last_event_time_gauge", + Help: "Last time when the message was sent/received by node connection of the chain", + }, []string{chainLabelName, msgTypeLabelName}) + prometheus.MustRegister(ncmi.messageTotalCounter) + ncmi.log.Info("Registering nodeconnection metrics to prometheus... Done") +} + +func (ncmi *nodeConnectionMetricsImpl) NewMessagesMetrics(chainID *iscp.ChainID) NodeConnectionMessagesMetrics { + return newNodeConnectionMessagesMetrics(ncmi, chainID) +} + +func (ncmi *nodeConnectionMetricsImpl) getMetricsLabel(chainID *iscp.ChainID, msgType string) prometheus.Labels { + var chainIDStr string + if chainID == nil { + chainIDStr = "" + } else { + chainIDStr = chainID.String() + } + return prometheus.Labels{ + chainLabelName: chainIDStr, + msgTypeLabelName: msgType, + } +} + +// TODO: connect subscribed to Prometheus +func (ncmi *nodeConnectionMetricsImpl) SetSubscribed(address ledgerstate.Address) { + ncmi.subscribed = append(ncmi.subscribed, address) +} + +// TODO: connect subscribed to Prometheus +func (ncmi *nodeConnectionMetricsImpl) SetUnsubscribed(address ledgerstate.Address) { + var i int + for i = 0; i < len(ncmi.subscribed); i++ { + if ncmi.subscribed[i] == address { + ncmi.subscribed = append(ncmi.subscribed[:i], ncmi.subscribed[i+1:]...) + return + } + } +} + +func (ncmi *nodeConnectionMetricsImpl) GetSubscribed() []ledgerstate.Address { + return ncmi.subscribed +} diff --git a/packages/testutil/testchain/mock_nodeconn.go b/packages/testutil/testchain/mock_nodeconn.go index 0b237ef3d6..572d52fa6a 100644 --- a/packages/testutil/testchain/mock_nodeconn.go +++ b/packages/testutil/testchain/mock_nodeconn.go @@ -3,6 +3,7 @@ package testchain import ( "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/wasp/packages/chain" + "github.com/iotaledger/wasp/packages/metrics/nodeconnmetrics" ) type MockedNodeConn struct { @@ -62,6 +63,6 @@ func (m *MockedNodeConn) AttachToOutputReceived(chain.NodeConnectionHandleOutput func (m *MockedNodeConn) AttachToUnspentAliasOutputReceived(chain.NodeConnectionHandleUnspentAliasOutputFun) { } -func (m *MockedNodeConn) GetStats() chain.NodeConnectionMessagesStats { - return chain.NodeConnectionMessagesStats{} +func (m *MockedNodeConn) GetMetrics() nodeconnmetrics.NodeConnectionMessagesMetrics { + return nodeconnmetrics.NewEmptyNodeConnectionMessagesMetrics() } diff --git a/packages/webapi/admapi/chainstats.go b/packages/webapi/admapi/chainnodeconnmetrics.go similarity index 76% rename from packages/webapi/admapi/chainstats.go rename to packages/webapi/admapi/chainnodeconnmetrics.go index 7b86dc5fe6..1a261c7c80 100644 --- a/packages/webapi/admapi/chainstats.go +++ b/packages/webapi/admapi/chainnodeconnmetrics.go @@ -15,51 +15,51 @@ import ( ) func addChainStatsEndpoints(adm echoswagger.ApiGroup, chainsProvider chains.Provider) { - chainExample := &model.NodeConnectionMessagesStats{ - OutPullState: &model.NodeConnectionMessageStats{ + chainExample := &model.NodeConnectionMessagesMetrics{ + OutPullState: &model.NodeConnectionMessageMetrics{ Total: 15, LastEvent: time.Now().Add(-10 * time.Second), LastMessage: "Last sent PullState message structure", }, - OutPullTransactionInclusionState: &model.NodeConnectionMessageStats{ + OutPullTransactionInclusionState: &model.NodeConnectionMessageMetrics{ Total: 28, LastEvent: time.Now().Add(-5 * time.Second), LastMessage: "Last sent PullTransactionInclusionState message structure", }, - OutPullConfirmedOutput: &model.NodeConnectionMessageStats{ + OutPullConfirmedOutput: &model.NodeConnectionMessageMetrics{ Total: 132, LastEvent: time.Now().Add(100 * time.Second), LastMessage: "Last sent PullConfirmedOutput message structure", }, - OutPostTransaction: &model.NodeConnectionMessageStats{ + OutPostTransaction: &model.NodeConnectionMessageMetrics{ Total: 3, LastEvent: time.Now().Add(-2 * time.Millisecond), LastMessage: "Last sent PostTransaction message structure", }, - InTransaction: &model.NodeConnectionMessageStats{ + InTransaction: &model.NodeConnectionMessageMetrics{ Total: 101, LastEvent: time.Now().Add(-8 * time.Second), LastMessage: "Last received Transaction message structure", }, - InInclusionState: &model.NodeConnectionMessageStats{ + InInclusionState: &model.NodeConnectionMessageMetrics{ Total: 203, LastEvent: time.Now().Add(-123 * time.Millisecond), LastMessage: "Last received InclusionState message structure", }, - InOutput: &model.NodeConnectionMessageStats{ + InOutput: &model.NodeConnectionMessageMetrics{ Total: 85, LastEvent: time.Now().Add(-2 * time.Second), LastMessage: "Last received Output message structure", }, - InUnspentAliasOutput: &model.NodeConnectionMessageStats{ + InUnspentAliasOutput: &model.NodeConnectionMessageMetrics{ Total: 999, LastEvent: time.Now().Add(-1 * time.Second), LastMessage: "Last received UnspentAliasOutput message structure", }, } - example := &model.NodeConnectionStats{ - NodeConnectionMessagesStats: *chainExample, + example := &model.NodeConnectionMetrics{ + NodeConnectionMessagesMetrics: *chainExample, Subscribed: []model.Address{ model.NewAddress(iscp.RandomChainID().AsAddress()), model.NewAddress(iscp.RandomChainID().AsAddress()), @@ -83,9 +83,10 @@ type chainStatsService struct { } func (cssT *chainStatsService) handleGetChainsStats(c echo.Context) error { - stats := cssT.chains().GetNodeConnectionStats() + metrics := cssT.chains().GetNodeConnectionMetrics() + metricsModel := model.NewNodeConnectionMetrics(metrics) - return c.JSON(http.StatusOK, stats) + return c.JSON(http.StatusOK, metricsModel) } func (cssT *chainStatsService) handleGetChainStats(c echo.Context) error { @@ -97,7 +98,8 @@ func (cssT *chainStatsService) handleGetChainStats(c echo.Context) error { if theChain == nil { return httperrors.NotFound(fmt.Sprintf("Active chain %s not found", chainID)) } - stats := theChain.GetNodeConnectionStats() + metrics := theChain.GetNodeConnectionMetrics() + metricsModel := model.NewNodeConnectionMessagesMetrics(metrics) - return c.JSON(http.StatusOK, stats) + return c.JSON(http.StatusOK, metricsModel) } diff --git a/packages/webapi/model/node_connection_stats.go b/packages/webapi/model/node_connection_stats.go index 02ef630a7c..e4a9044711 100644 --- a/packages/webapi/model/node_connection_stats.go +++ b/packages/webapi/model/node_connection_stats.go @@ -4,62 +4,63 @@ import ( "fmt" "time" - "github.com/iotaledger/wasp/packages/chain" + "github.com/iotaledger/wasp/packages/metrics/nodeconnmetrics" ) -type NodeConnectionMessageStats struct { +type NodeConnectionMessageMetrics struct { Total uint32 `swagger:"desc(Total number of messages sent/received)"` LastEvent time.Time `swagger:"desc(Last time the message was sent/received)"` LastMessage string `swagger:"desc(The print out of the last message)"` } -type NodeConnectionMessagesStats struct { - OutPullState *NodeConnectionMessageStats `swagger:"desc(Stats of sent out PullState messages)"` - OutPullTransactionInclusionState *NodeConnectionMessageStats `swagger:"desc(Stats of sent out PullTransactionInclusionState messages)"` - OutPullConfirmedOutput *NodeConnectionMessageStats `swagger:"desc(Stats of sent out PullConfirmedOutput messages)"` - OutPostTransaction *NodeConnectionMessageStats `swagger:"desc(Stats of sent out PostTransaction messages)"` +type NodeConnectionMessagesMetrics struct { + OutPullState *NodeConnectionMessageMetrics `swagger:"desc(Stats of sent out PullState messages)"` + OutPullTransactionInclusionState *NodeConnectionMessageMetrics `swagger:"desc(Stats of sent out PullTransactionInclusionState messages)"` + OutPullConfirmedOutput *NodeConnectionMessageMetrics `swagger:"desc(Stats of sent out PullConfirmedOutput messages)"` + OutPostTransaction *NodeConnectionMessageMetrics `swagger:"desc(Stats of sent out PostTransaction messages)"` - InTransaction *NodeConnectionMessageStats `swagger:"desc(Stats of received Transaction messages)"` - InInclusionState *NodeConnectionMessageStats `swagger:"desc(Stats of received InclusionState messages)"` - InOutput *NodeConnectionMessageStats `swagger:"desc(Stats of received Output messages)"` - InUnspentAliasOutput *NodeConnectionMessageStats `swagger:"desc(Stats of received UnspentAliasOutput messages)"` + InTransaction *NodeConnectionMessageMetrics `swagger:"desc(Stats of received Transaction messages)"` + InInclusionState *NodeConnectionMessageMetrics `swagger:"desc(Stats of received InclusionState messages)"` + InOutput *NodeConnectionMessageMetrics `swagger:"desc(Stats of received Output messages)"` + InUnspentAliasOutput *NodeConnectionMessageMetrics `swagger:"desc(Stats of received UnspentAliasOutput messages)"` } -type NodeConnectionStats struct { - NodeConnectionMessagesStats +type NodeConnectionMetrics struct { + NodeConnectionMessagesMetrics Subscribed []Address } -func NewNodeConnectionStats(stats *chain.NodeConnectionStats) *NodeConnectionStats { - ncms := NewNodeConnectionMessagesStats(&stats.NodeConnectionMessagesStats) - s := make([]Address, len(stats.Subscribed)) +func NewNodeConnectionMetrics(metrics nodeconnmetrics.NodeConnectionMetrics) *NodeConnectionMetrics { + ncmm := NewNodeConnectionMessagesMetrics(metrics) + subscribed := metrics.GetSubscribed() + s := make([]Address, len(subscribed)) for i := range s { - s[i] = NewAddress(stats.Subscribed[i]) + s[i] = NewAddress(subscribed[i]) } - return &NodeConnectionStats{ - NodeConnectionMessagesStats: *ncms, - Subscribed: s, + return &NodeConnectionMetrics{ + NodeConnectionMessagesMetrics: *ncmm, + Subscribed: s, } } -func NewNodeConnectionMessagesStats(stats *chain.NodeConnectionMessagesStats) *NodeConnectionMessagesStats { - return &NodeConnectionMessagesStats{ - OutPullState: NewNodeConnectionMessageStats(&stats.OutPullState), - OutPullTransactionInclusionState: NewNodeConnectionMessageStats(&stats.OutPullTransactionInclusionState), - OutPullConfirmedOutput: NewNodeConnectionMessageStats(&stats.OutPullConfirmedOutput), - OutPostTransaction: NewNodeConnectionMessageStats(&stats.OutPostTransaction), +func NewNodeConnectionMessagesMetrics(metrics nodeconnmetrics.NodeConnectionMessagesMetrics) *NodeConnectionMessagesMetrics { + return &NodeConnectionMessagesMetrics{ + OutPullState: NewNodeConnectionMessageMetrics(metrics.GetOutPullState()), + OutPullTransactionInclusionState: NewNodeConnectionMessageMetrics(metrics.GetOutPullTransactionInclusionState()), + OutPullConfirmedOutput: NewNodeConnectionMessageMetrics(metrics.GetOutPullConfirmedOutput()), + OutPostTransaction: NewNodeConnectionMessageMetrics(metrics.GetOutPostTransaction()), - InTransaction: NewNodeConnectionMessageStats(&stats.InTransaction), - InInclusionState: NewNodeConnectionMessageStats(&stats.InInclusionState), - InOutput: NewNodeConnectionMessageStats(&stats.InOutput), - InUnspentAliasOutput: NewNodeConnectionMessageStats(&stats.InUnspentAliasOutput), + InTransaction: NewNodeConnectionMessageMetrics(metrics.GetInTransaction()), + InInclusionState: NewNodeConnectionMessageMetrics(metrics.GetInInclusionState()), + InOutput: NewNodeConnectionMessageMetrics(metrics.GetInOutput()), + InUnspentAliasOutput: NewNodeConnectionMessageMetrics(metrics.GetInUnspentAliasOutput()), } } -func NewNodeConnectionMessageStats(stats *chain.NodeConnectionMessageStats) *NodeConnectionMessageStats { - return &NodeConnectionMessageStats{ - Total: stats.Total.Load(), - LastEvent: stats.LastEvent, - LastMessage: fmt.Sprintf("%v", stats.LastMessage), +func NewNodeConnectionMessageMetrics(metrics nodeconnmetrics.NodeConnectionMessageMetrics) *NodeConnectionMessageMetrics { + return &NodeConnectionMessageMetrics{ + Total: metrics.GetMessageTotal(), + LastEvent: metrics.GetLastEvent(), + LastMessage: fmt.Sprintf("%v", metrics.GetLastMessage()), } } diff --git a/packages/webapi/request/request_test.go b/packages/webapi/request/request_test.go index fac8c39764..fd85bc900c 100644 --- a/packages/webapi/request/request_test.go +++ b/packages/webapi/request/request_test.go @@ -12,6 +12,7 @@ import ( "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/colored" "github.com/iotaledger/wasp/packages/iscp/request" + "github.com/iotaledger/wasp/packages/metrics/nodeconnmetrics" util "github.com/iotaledger/wasp/packages/testutil" "github.com/iotaledger/wasp/packages/testutil/testchain" "github.com/iotaledger/wasp/packages/testutil/testlogger" @@ -52,7 +53,7 @@ func (m *mockedChain) IsDismissed() bool { panic("implement me") } -func (m *mockedChain) GetNodeConnectionStats() chain.NodeConnectionMessagesStats { +func (m *mockedChain) GetNodeConnectionMetrics() nodeconnmetrics.NodeConnectionMessagesMetrics { panic("implement me") } diff --git a/plugins/chains/plugin.go b/plugins/chains/plugin.go index 1a4d606c66..252423ff76 100644 --- a/plugins/chains/plugin.go +++ b/plugins/chains/plugin.go @@ -48,10 +48,10 @@ func run(_ *node.Plugin) { database.GetOrCreateKVStore, ) err := daemon.BackgroundWorker(PluginName, func(shutdownSignal <-chan struct{}) { - allChains.SetNodeConn(nodeconnimpl.NewNodeConnection(nodeconn.NodeConnection(), log)) if parameters.GetBool(parameters.MetricsEnabled) { allMetrics = metrics.AllMetrics() } + allChains.SetNodeConn(nodeconnimpl.NewNodeConnection(nodeconn.NodeConnection(), allMetrics.GetNodeConnectionMetrics(), log)) if err := allChains.ActivateAllFromRegistry(registry.DefaultRegistry, allMetrics); err != nil { log.Errorf("failed to read chain activation records from registry: %v", err) return From 9f191a436498dc57aca78092acea133072b894fd Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 30 Nov 2021 14:59:22 +0200 Subject: [PATCH 142/198] Trace message constant instead of commenting out --- packages/peering/lpp/lppPeer.go | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/peering/lpp/lppPeer.go b/packages/peering/lpp/lppPeer.go index 929747abce..b5dbf946c9 100644 --- a/packages/peering/lpp/lppPeer.go +++ b/packages/peering/lpp/lppPeer.go @@ -19,6 +19,7 @@ const ( inactiveDeadline = 1 * time.Minute inactivePingTime = 30 * time.Second maxPeerMsgBuffer = 10000 + traceMessages = false ) type peer struct { @@ -128,8 +129,10 @@ func (p *peer) SendMsg(msg *peering.PeerMessageData) { } func (p *peer) RecvMsg(msg *peering.PeerMessageNet) { - // p.log.Debugf("Peer message received from peer %v, peeringID %v, receiver %v, type %v, length %v, first bytes %v", - // p.NetID(), msg.PeeringID, msg.MsgReceiver, msg.MsgType, len(msg.MsgData), firstBytes(16, msg.MsgData)) + if traceMessages { + p.log.Debugf("Peer message received from peer %v, peeringID %v, receiver %v, type %v, length %v, first bytes %v", + p.NetID(), msg.PeeringID, msg.MsgReceiver, msg.MsgType, len(msg.MsgData), firstBytes(16, msg.MsgData)) + } p.noteReceived() p.recvPipe.In() <- msg } @@ -169,16 +172,18 @@ func (p *peer) sendMsgDirect(msg *peering.PeerMessageNet) { p.accessLock.Lock() p.lastMsgSent = time.Now() p.accessLock.Unlock() - // p.log.Debugf("Peer message sent to peer %v, peeringID %v, receiver %v, type %v, length %v, first bytes %v", - // p.NetID(), msg.PeeringID, msg.MsgReceiver, msg.MsgType, len(msg.MsgData), firstBytes(16, msg.MsgData)) + if traceMessages { + p.log.Debugf("Peer message sent to peer %v, peeringID %v, receiver %v, type %v, length %v, first bytes %v", + p.NetID(), msg.PeeringID, msg.MsgReceiver, msg.MsgType, len(msg.MsgData), firstBytes(16, msg.MsgData)) + } } -/*func firstBytes(maxCount int, array []byte) []byte { +func firstBytes(maxCount int, array []byte) []byte { if len(array) <= maxCount { return array } return array[:maxCount] -}*/ +} // IsAlive implements peering.PeerSender and peering.PeerStatusProvider interfaces for the remote peers. // Return true if is alive and average latencyRingBuf in nanosec. From 1864218c0c6702469ae088351bb714950d3f08dd Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 30 Nov 2021 15:00:39 +0200 Subject: [PATCH 143/198] Spelling --- packages/chain/chain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/chain/chain.go b/packages/chain/chain.go index d3f2a9b46f..dd6f32fe97 100644 --- a/packages/chain/chain.go +++ b/packages/chain/chain.go @@ -30,7 +30,7 @@ type ChainCore interface { GetStateReader() state.OptimisticStateReader Log() *logger.Logger - // Most of these methods are made publick for mocking in tests + // Most of these methods are made public for mocking in tests EnqueueDismissChain(reason string) // This one should really be public EnqueueLedgerState(chainOutput *ledgerstate.AliasOutput, timestamp time.Time) EnqueueOffLedgerRequestMsg(msg *messages.OffLedgerRequestMsgIn) From ad60cf396f5d7ac4f5fa519d02a30fd5d3ef6109 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 30 Nov 2021 15:21:49 +0200 Subject: [PATCH 144/198] Peering message receiver constants moved to peering module to be in one place --- packages/chain/chain.go | 2 - packages/chain/chainimpl/chainimpl.go | 4 +- packages/chain/chainimpl/eventproc.go | 3 +- packages/chain/chainimpl/interface.go | 5 ++- packages/chain/consensus/action.go | 7 ++-- .../consensus/commonsubset/commonsubset.go | 2 +- .../commonsubset/commonsubset_test.go | 8 +--- .../commonsubset/commonsubsetcoordinator.go | 4 +- packages/chain/consensus/consensus.go | 4 +- packages/chain/consensus/setup_test.go | 6 +-- packages/chain/statemgr/eventproc.go | 3 +- packages/chain/statemgr/setup_test.go | 6 +-- packages/chain/statemgr/statemgr.go | 4 +- packages/chain/statemgr/syncmgr.go | 3 +- packages/dkg/messages.go | 3 -- packages/dkg/node.go | 18 ++++----- packages/dkg/proc.go | 38 +++++++++---------- packages/peering/peering.go | 7 ++++ 18 files changed, 58 insertions(+), 69 deletions(-) diff --git a/packages/chain/chain.go b/packages/chain/chain.go index dd6f32fe97..bf80aafc7f 100644 --- a/packages/chain/chain.go +++ b/packages/chain/chain.go @@ -209,8 +209,6 @@ const ( ) const ( - PeerMessageReceiverChain = byte(3) - PeerMsgTypeMissingRequestIDs = iota PeerMsgTypeMissingRequest PeerMsgTypeOffLedgerRequest diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index 3a2035240d..104b287863 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -152,7 +152,7 @@ func NewChain( return nil } ret.stateMgr = statemgr.New(db, ret, ret.chainPeers, ret.nodeConn) - ret.chainPeers.Attach(chain.PeerMessageReceiverChain, ret.receiveChainPeerMessages) + ret.chainPeers.Attach(peering.PeerMessageReceiverChain, ret.receiveChainPeerMessages) go ret.handleMessagesLoop() ret.startTimer() return ret @@ -360,7 +360,7 @@ func (c *chainObj) createNewCommitteeAndConsensus(cmtRec *registry.CommitteeReco return xerrors.Errorf("createNewCommitteeAndConsensus: failed to create committee object for state address %s: %w", cmtRec.Address.Base58(), err) } - cmtPeerGroup.Attach(chain.PeerMessageReceiverChain, c.receiveCommitteePeerMessages) + cmtPeerGroup.Attach(peering.PeerMessageReceiverChain, c.receiveCommitteePeerMessages) c.log.Debugf("creating new consensus object...") c.consensus = consensus.New(c, c.mempool, cmt, cmtPeerGroup, c.nodeConn, c.pullMissingRequestsFromCommittee, c.chainMetrics) c.setCommittee(cmt) diff --git a/packages/chain/chainimpl/eventproc.go b/packages/chain/chainimpl/eventproc.go index 72bae3e83d..802e712045 100644 --- a/packages/chain/chainimpl/eventproc.go +++ b/packages/chain/chainimpl/eventproc.go @@ -11,6 +11,7 @@ import ( "github.com/iotaledger/wasp/packages/chain/messages" "github.com/iotaledger/wasp/packages/hashing" "github.com/iotaledger/wasp/packages/iscp/request" + "github.com/iotaledger/wasp/packages/peering" "golang.org/x/xerrors" ) @@ -179,7 +180,7 @@ func (c *chainObj) handleMissingRequestIDsMsg(msg *messages.MissingRequestIDsMsg c.log.Debugf("handleMissingRequestIDsMsg: finding reqID %s...", reqID.Base58()) if req := c.mempool.GetRequest(reqID); req != nil { resultMsg := &messages.MissingRequestMsg{Request: req} - c.chainPeers.SendMsgByNetID(msg.SenderNetID, chain.PeerMessageReceiverChain, chain.PeerMsgTypeMissingRequest, resultMsg.Bytes()) + c.chainPeers.SendMsgByNetID(msg.SenderNetID, peering.PeerMessageReceiverChain, chain.PeerMsgTypeMissingRequest, resultMsg.Bytes()) c.log.Warnf("handleMissingRequestIDsMsg: reqID %s sent to %v.", reqID.Base58(), msg.SenderNetID) } else { c.log.Warnf("handleMissingRequestIDsMsg: reqID %s not found.", reqID.Base58()) diff --git a/packages/chain/chainimpl/interface.go b/packages/chain/chainimpl/interface.go index 35908826d9..25a5931940 100644 --- a/packages/chain/chainimpl/interface.go +++ b/packages/chain/chainimpl/interface.go @@ -14,6 +14,7 @@ import ( "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/coreutil" "github.com/iotaledger/wasp/packages/iscp/request" + "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/publisher" "github.com/iotaledger/wasp/packages/registry" "github.com/iotaledger/wasp/packages/state" @@ -123,7 +124,7 @@ func (c *chainObj) broadcastOffLedgerRequest(req *request.OffLedger) { for _, peerID := range peerIDs { if shouldSendToPeer(peerID, ackPeers) { c.log.Debugf("sending offledger request ID: reqID: %s, peerID: %s", req.ID().Base58(), peerID) - c.chainPeers.SendMsgByNetID(peerID, chain.PeerMessageReceiverChain, chain.PeerMsgTypeOffLedgerRequest, msg.Bytes()) + c.chainPeers.SendMsgByNetID(peerID, peering.PeerMessageReceiverChain, chain.PeerMsgTypeOffLedgerRequest, msg.Bytes()) } } } @@ -162,7 +163,7 @@ func (c *chainObj) sendRequestAcknowledgementMsg(reqID iscp.RequestID, peerID st return } msg := &messages.RequestAckMsg{ReqID: &reqID} - c.chainPeers.SendMsgByNetID(peerID, chain.PeerMessageReceiverChain, chain.PeerMsgTypeRequestAck, msg.Bytes()) + c.chainPeers.SendMsgByNetID(peerID, peering.PeerMessageReceiverChain, chain.PeerMsgTypeRequestAck, msg.Bytes()) } func (c *chainObj) ReceiveTransaction(tx *ledgerstate.Transaction) { diff --git a/packages/chain/consensus/action.go b/packages/chain/consensus/action.go index 00435c383a..69b846bde7 100644 --- a/packages/chain/consensus/action.go +++ b/packages/chain/consensus/action.go @@ -18,6 +18,7 @@ import ( "github.com/iotaledger/wasp/packages/iscp/request" "github.com/iotaledger/wasp/packages/iscp/rotate" "github.com/iotaledger/wasp/packages/kv/dict" + "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/transaction" "github.com/iotaledger/wasp/packages/util" "github.com/iotaledger/wasp/packages/vm" @@ -177,7 +178,7 @@ func (c *consensus) pollMissingRequests(missingRequestIndexes []int) { } c.log.Debugf("runVMIfNeeded: asking for missing requests, ids: [%v]", missingRequestIDsString) msg := &messages.MissingRequestIDsMsg{IDs: missingRequestIds} - c.committeePeerGroup.SendMsgBroadcast(chain.PeerMessageReceiverChain, chain.PeerMsgTypeMissingRequestIDs, msg.Bytes()) + c.committeePeerGroup.SendMsgBroadcast(peering.PeerMessageReceiverChain, chain.PeerMsgTypeMissingRequestIDs, msg.Bytes()) } // sortBatch deterministically sorts batch based on the value extracted from the consensus entropy @@ -264,7 +265,7 @@ func (c *consensus) broadcastSignedResultIfNeeded() { EssenceHash: signedResult.EssenceHash, SigShare: signedResult.SigShare, } - c.committeePeerGroup.SendMsgBroadcast(peerMessageReceiverConsensus, peerMsgTypeSignedResult, util.MustBytes(msg), c.resultSigAck...) + c.committeePeerGroup.SendMsgBroadcast(peering.PeerMessageReceiverConsensus, peerMsgTypeSignedResult, util.MustBytes(msg), c.resultSigAck...) c.delaySendingSignedResult = time.Now().Add(c.timers.BroadcastSignedResultRetry) c.log.Debugf("broadcastSignedResult: broadcasted: essence hash: %s, chain input %s", @@ -763,7 +764,7 @@ func (c *consensus) receiveSignedResult(msg *messages.SignedResultMsgIn) { ChainInputID: msg.ChainInputID, EssenceHash: msg.EssenceHash, } - c.committeePeerGroup.SendMsgByIndex(msg.SenderIndex, peerMessageReceiverConsensus, peerMsgTypeSignedResultAck, util.MustBytes(msgAck)) + c.committeePeerGroup.SendMsgByIndex(msg.SenderIndex, peering.PeerMessageReceiverConsensus, peerMsgTypeSignedResultAck, util.MustBytes(msgAck)) } func (c *consensus) receiveSignedResultAck(msg *messages.SignedResultAckMsgIn) { diff --git a/packages/chain/consensus/commonsubset/commonsubset.go b/packages/chain/consensus/commonsubset/commonsubset.go index 0a8540cb71..5dffeca7aa 100644 --- a/packages/chain/consensus/commonsubset/commonsubset.go +++ b/packages/chain/consensus/commonsubset/commonsubset.go @@ -376,7 +376,7 @@ func (cs *CommonSubset) send(msgBatch *msgBatch) { return } cs.log.Debugf("ACS::IO - Sending a msgBatch=%+v", msgBatch) - cs.committeePeerGroup.SendMsgByIndex(msgBatch.dst, peerMessageReceiverCommonSubset, peerMsgTypeBatch, msgBatch.Bytes()) + cs.committeePeerGroup.SendMsgByIndex(msgBatch.dst, peering.PeerMessageReceiverCommonSubset, peerMsgTypeBatch, msgBatch.Bytes()) } // endregion /////////////////////////////////////////////////////////////////// diff --git a/packages/chain/consensus/commonsubset/commonsubset_test.go b/packages/chain/consensus/commonsubset/commonsubset_test.go index 3034288fe6..53a67c4f7e 100644 --- a/packages/chain/consensus/commonsubset/commonsubset_test.go +++ b/packages/chain/consensus/commonsubset/commonsubset_test.go @@ -65,7 +65,7 @@ func testBasic(t *testing.T, peerCount, threshold uint16, allRandom bool) { require.Nil(t, err) acsLog := testlogger.WithLevel(log.Named(fmt.Sprintf("ACS[%02d]", a)), logger.LevelInfo, false) acsPeers[a], err = NewCommonSubset(0, 0, group, dkShares[a], allRandom, nil, acsLog) - group.Attach(peerMessageReceiverCommonSubset, makeReceiveCommitteePeerMessagesFun(acsPeers[a], log)) + group.Attach(peering.PeerMessageReceiverCommonSubset, makeReceiveCommitteePeerMessagesFun(acsPeers[a], log)) require.Nil(t, err) } t.Logf("ACS Nodes created.") @@ -114,7 +114,7 @@ func TestRandomized(t *testing.T) { require.Nil(t, err) acsLog := testlogger.WithLevel(log.Named(fmt.Sprintf("ACS[%02d]", a)), logger.LevelInfo, false) acsPeers[a], err = NewCommonSubset(0, 0, group, dkShares[a], true, nil, acsLog) - group.Attach(peerMessageReceiverCommonSubset, makeReceiveCommitteePeerMessagesFun(acsPeers[a], log)) + group.Attach(peering.PeerMessageReceiverCommonSubset, makeReceiveCommitteePeerMessagesFun(acsPeers[a], log)) require.Nil(t, err) } t.Logf("ACS Nodes created.") @@ -164,10 +164,6 @@ func TestRandomized(t *testing.T) { func makeReceiveCommitteePeerMessagesFun(peer *CommonSubset, log *logger.Logger) func(peerMsg *peering.PeerMessageGroupIn) { return func(peerMsg *peering.PeerMessageGroupIn) { - if peerMsg.MsgReceiver != peerMessageReceiverCommonSubset { - panic(fmt.Errorf("Committee does not accept peer messages of other receiver type %v, message type=%v", - peerMsg.MsgReceiver, peerMsg.MsgType)) - } if peerMsg.MsgType != peerMsgTypeBatch { panic(fmt.Errorf("Wrong type of committee message: %v", peerMsg.MsgType)) } diff --git a/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go b/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go index b794fbe9f2..c61ff26e91 100644 --- a/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go +++ b/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go @@ -17,8 +17,6 @@ const ( futureInstances = 5 // How many future instances to accept. pastInstances = 2 // How many past instance to keep not closed. - peerMessageReceiverCommonSubset = byte(2) - peerMsgTypeBatch = iota ) @@ -70,7 +68,7 @@ func NewCommonSubsetCoordinator( dkShare: dkShare, log: log, } - netGroup.Attach(peerMessageReceiverCommonSubset, ret.receiveCommitteePeerMessages) + netGroup.Attach(peering.PeerMessageReceiverCommonSubset, ret.receiveCommitteePeerMessages) return ret } diff --git a/packages/chain/consensus/consensus.go b/packages/chain/consensus/consensus.go index cc22002d84..ed15e4ea99 100644 --- a/packages/chain/consensus/consensus.go +++ b/packages/chain/consensus/consensus.go @@ -84,8 +84,6 @@ type workflowFlags struct { var _ chain.Consensus = &consensus{} const ( - peerMessageReceiverConsensus = byte(1) - peerMsgTypeSignedResult = iota peerMsgTypeSignedResultAck @@ -122,7 +120,7 @@ func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Commi pullMissingRequestsFromCommittee: pullMissingRequestsFromCommittee, consensusMetrics: consensusMetrics, } - ret.committeePeerGroup.Attach(peerMessageReceiverConsensus, ret.receiveCommitteePeerMessages) + ret.committeePeerGroup.Attach(peering.PeerMessageReceiverConsensus, ret.receiveCommitteePeerMessages) ret.refreshConsensusInfo() go ret.recvLoop() return ret diff --git a/packages/chain/consensus/setup_test.go b/packages/chain/consensus/setup_test.go index c353edcbb1..882abb9fc2 100644 --- a/packages/chain/consensus/setup_test.go +++ b/packages/chain/consensus/setup_test.go @@ -227,12 +227,8 @@ func (env *MockedEnv) NewNode(nodeIndex uint16, timers ConsensusTimers) *mockedN acs..., ) require.NoError(env.T, err) - cmtPeerGroup.Attach(peerMessageReceiverConsensus, func(peerMsg *peering.PeerMessageGroupIn) { + cmtPeerGroup.Attach(peering.PeerMessageReceiverConsensus, func(peerMsg *peering.PeerMessageGroupIn) { log.Debugf("Consensus received peer message from %v of type %v", peerMsg.SenderNetID, peerMsg.MsgType) - if peerMsg.MsgReceiver != peerMessageReceiverConsensus { - env.T.Fatalf("Consensus does not accept peer messages of other receiver type %v, message type=%v", - peerMsg.MsgReceiver, peerMsg.MsgType) - } switch peerMsg.MsgType { case peerMsgTypeSignedResult: msg, err := messages.NewSignedResultMsg(peerMsg.MsgData) diff --git a/packages/chain/statemgr/eventproc.go b/packages/chain/statemgr/eventproc.go index 4893203407..e980b78991 100644 --- a/packages/chain/statemgr/eventproc.go +++ b/packages/chain/statemgr/eventproc.go @@ -8,6 +8,7 @@ import ( "github.com/iotaledger/wasp/packages/chain/messages" "github.com/iotaledger/wasp/packages/hashing" "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/state" "github.com/iotaledger/wasp/packages/util" ) @@ -45,7 +46,7 @@ func (sm *stateManager) handleGetBlockMsg(msg *messages.GetBlockMsgIn) { sm.log.Debugf("handleGetBlockMsg: responding to peer %s by block %v", msg.SenderNetID, msg.BlockIndex) blockMsg := &messages.BlockMsg{BlockBytes: blockBytes} - sm.chainPeers.SendMsgByNetID(msg.SenderNetID, peerMessageReceiverStateManager, peerMsgTypeBlock, util.MustBytes(blockMsg)) + sm.chainPeers.SendMsgByNetID(msg.SenderNetID, peering.PeerMessageReceiverStateManager, peerMsgTypeBlock, util.MustBytes(blockMsg)) } // EventBlockMsg diff --git a/packages/chain/statemgr/setup_test.go b/packages/chain/statemgr/setup_test.go index 44597ba915..3f643728ae 100644 --- a/packages/chain/statemgr/setup_test.go +++ b/packages/chain/statemgr/setup_test.go @@ -202,12 +202,8 @@ func (env *MockedEnv) NewMockedNode(nodeIndex int, timers StateManagerTimers) *M ret.ChainCore.OnGetStateReader(func() state.OptimisticStateReader { return state.NewOptimisticStateReader(ret.store, ret.stateSync) }) - ret.ChainPeers.Attach(peerMessageReceiverStateManager, func(peerMsg *peering.PeerMessageIn) { + ret.ChainPeers.Attach(peering.PeerMessageReceiverStateManager, func(peerMsg *peering.PeerMessageIn) { log.Debugf("State manager recvEvent from %v of type %v", peerMsg.SenderNetID, peerMsg.MsgType) - if peerMsg.MsgReceiver != peerMessageReceiverStateManager { - env.T.Fatalf("State manager does not accept peer messages of other receiver type %v, message type=%v", - peerMsg.MsgReceiver, peerMsg.MsgType) - } switch peerMsg.MsgType { case peerMsgTypeGetBlock: msg, err := messages.NewGetBlockMsg(peerMsg.MsgData) diff --git a/packages/chain/statemgr/statemgr.go b/packages/chain/statemgr/statemgr.go index 3eee0022c4..e8f0b51e0c 100644 --- a/packages/chain/statemgr/statemgr.go +++ b/packages/chain/statemgr/statemgr.go @@ -53,8 +53,6 @@ const ( maxBlocksToCommitConst = 10000 // 10k maxMsgBuffer = 1000 - peerMessageReceiverStateManager = byte(0) - peerMsgTypeGetBlock = iota peerMsgTypeBlock ) @@ -83,7 +81,7 @@ func New(store kvstore.KVStore, c chain.ChainCore, peers peering.PeerDomainProvi eventStateCandidateMsgPipe: pipe.NewLimitInfinitePipe(maxMsgBuffer), eventTimerMsgPipe: pipe.NewLimitInfinitePipe(1), } - ret.chainPeers.Attach(peerMessageReceiverStateManager, ret.receiveChainPeerMessages) + ret.chainPeers.Attach(peering.PeerMessageReceiverStateManager, ret.receiveChainPeerMessages) go ret.initLoadState() return ret diff --git a/packages/chain/statemgr/syncmgr.go b/packages/chain/statemgr/syncmgr.go index c16ae67cda..c87aab45ba 100644 --- a/packages/chain/statemgr/syncmgr.go +++ b/packages/chain/statemgr/syncmgr.go @@ -9,6 +9,7 @@ import ( "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/wasp/packages/chain/messages" "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/state" "github.com/iotaledger/wasp/packages/util" ) @@ -87,7 +88,7 @@ func (sm *stateManager) doSyncActionIfNeeded() { // have to pull sm.log.Debugf("doSyncAction: requesting block index %v from %v random peers", i, numberOfNodesToRequestBlockFromConst) getBlockMsg := &messages.GetBlockMsg{BlockIndex: i} - sm.chainPeers.SendPeerMsgToRandomPeers(numberOfNodesToRequestBlockFromConst, peerMessageReceiverStateManager, peerMsgTypeGetBlock, util.MustBytes(getBlockMsg)) + sm.chainPeers.SendPeerMsgToRandomPeers(numberOfNodesToRequestBlockFromConst, peering.PeerMessageReceiverStateManager, peerMsgTypeGetBlock, util.MustBytes(getBlockMsg)) sm.syncingBlocks.startSyncingIfNeeded(i) sm.syncingBlocks.setRequestBlockRetryTime(i, nowis.Add(sm.timers.GetBlockRetry)) if blockCandidatesCount == 0 { diff --git a/packages/dkg/messages.go b/packages/dkg/messages.go index c0a01948e5..a5372b1c46 100644 --- a/packages/dkg/messages.go +++ b/packages/dkg/messages.go @@ -56,9 +56,6 @@ const ( // in response to duplicated messages from other peers. They should be treated // in a special way to avoid infinite message loops. rabinEcho byte = peering.FirstUserMsgCode + 44 - - peerMessageReceiverDkg = byte(4) - peerMessageReceiverDkgInit = byte(5) ) var initPeeringID peering.PeeringID diff --git a/packages/dkg/node.go b/packages/dkg/node.go index c542670c76..75fd0dfbed 100644 --- a/packages/dkg/node.go +++ b/packages/dkg/node.go @@ -66,13 +66,13 @@ func NewNode( initMsgQueue: make(chan *initiatorInitMsgIn), log: log, } - n.attachID = netProvider.Attach(&initPeeringID, peerMessageReceiverDkgInit, n.receiveInitMessage) + n.attachID = netProvider.Attach(&initPeeringID, peering.PeerMessageReceiverDkgInit, n.receiveInitMessage) go n.recvLoop() return &n, nil } func (n *Node) receiveInitMessage(peerMsg *peering.PeerMessageIn) { - if peerMsg.MsgReceiver != peerMessageReceiverDkgInit { + if peerMsg.MsgReceiver != peering.PeerMessageReceiverDkgInit { panic(fmt.Errorf("DKG init handler does not accept peer messages of other receiver type %v, message type=%v", peerMsg.MsgReceiver, peerMsg.MsgType)) } @@ -128,7 +128,7 @@ func (n *Node) GenerateDistributedKey( } defer netGroup.Close() recvCh := make(chan *peering.PeerMessageIn, peerCount*2) - attachID := n.netProvider.Attach(&dkgID, peerMessageReceiverDkg, func(recv *peering.PeerMessageIn) { + attachID := n.netProvider.Attach(&dkgID, peering.PeerMessageReceiverDkg, func(recv *peering.PeerMessageIn) { recvCh <- recv }) defer n.netProvider.Detach(attachID) @@ -153,7 +153,7 @@ func (n *Node) GenerateDistributedKey( if err = n.exchangeInitiatorAcks(netGroup, netGroup.AllNodes(), recvCh, rTimeout, gTimeout, rabinStep0Initialize, func(peerIdx uint16, peer peering.PeerSender) { n.log.Debugf("Initiator sends step=%v command to %v", rabinStep0Initialize, peer.NetID()) - peer.SendMsg(makePeerMessage(initPeeringID, peerMessageReceiverDkgInit, rabinStep0Initialize, &initiatorInitMsg{ + peer.SendMsg(makePeerMessage(initPeeringID, peering.PeerMessageReceiverDkgInit, rabinStep0Initialize, &initiatorInitMsg{ dkgRef: dkgID.String(), // It could be some other identifier. peeringID: dkgID, peerNetIDs: peerNetIDs, @@ -194,7 +194,7 @@ func (n *Node) GenerateDistributedKey( if err = n.exchangeInitiatorMsgs(netGroup, netGroup.AllNodes(), recvCh, rTimeout, gTimeout, rabinStep6R6SendReconstructCommits, func(peerIdx uint16, peer peering.PeerSender) { n.log.Debugf("Initiator sends step=%v command to %v", rabinStep6R6SendReconstructCommits, peer.NetID()) - peer.SendMsg(makePeerMessage(dkgID, peerMessageReceiverDkg, rabinStep6R6SendReconstructCommits, &initiatorStepMsg{})) + peer.SendMsg(makePeerMessage(dkgID, peering.PeerMessageReceiverDkg, rabinStep6R6SendReconstructCommits, &initiatorStepMsg{})) }, func(recv *peering.PeerMessageGroupIn, initMsg initiatorMsg) (bool, error) { switch msg := initMsg.(type) { @@ -242,7 +242,7 @@ func (n *Node) GenerateDistributedKey( if err = n.exchangeInitiatorAcks(netGroup, netGroup.AllNodes(), recvCh, rTimeout, gTimeout, rabinStep7CommitAndTerminate, func(peerIdx uint16, peer peering.PeerSender) { n.log.Debugf("Initiator sends step=%v command to %v", rabinStep7CommitAndTerminate, peer.NetID()) - peer.SendMsg(makePeerMessage(dkgID, peerMessageReceiverDkg, rabinStep7CommitAndTerminate, &initiatorDoneMsg{ + peer.SendMsg(makePeerMessage(dkgID, peering.PeerMessageReceiverDkg, rabinStep7CommitAndTerminate, &initiatorDoneMsg{ pubShares: publicShares, })) }, @@ -278,7 +278,7 @@ func (n *Node) onInitMsg(msg *initiatorInitMsgIn) { // To have idempotence for retries, we need to consider duplicate // messages as success, if process is already created. n.procLock.RUnlock() - n.netProvider.SendMsgByNetID(msg.SenderNetID, makePeerMessage(msg.peeringID, peerMessageReceiverDkg, msg.step, &initiatorStatusMsg{ + n.netProvider.SendMsgByNetID(msg.SenderNetID, makePeerMessage(msg.peeringID, peering.PeerMessageReceiverDkg, msg.step, &initiatorStatusMsg{ error: nil, })) return @@ -292,7 +292,7 @@ func (n *Node) onInitMsg(msg *initiatorInitMsgIn) { n.processes[p.dkgRef] = p } n.procLock.Unlock() - n.netProvider.SendMsgByNetID(msg.SenderNetID, makePeerMessage(msg.peeringID, peerMessageReceiverDkg, msg.step, &initiatorStatusMsg{ + n.netProvider.SendMsgByNetID(msg.SenderNetID, makePeerMessage(msg.peeringID, peering.PeerMessageReceiverDkg, msg.step, &initiatorStatusMsg{ error: err, })) }() @@ -320,7 +320,7 @@ func (n *Node) exchangeInitiatorStep( ) error { sendCB := func(peerIdx uint16, peer peering.PeerSender) { n.log.Debugf("Initiator sends step=%v command to %v", step, peer.NetID()) - peer.SendMsg(makePeerMessage(dkgID, peerMessageReceiverDkg, step, &initiatorStepMsg{})) + peer.SendMsg(makePeerMessage(dkgID, peering.PeerMessageReceiverDkg, step, &initiatorStepMsg{})) } return n.exchangeInitiatorAcks(netGroup, peers, recvCh, retryTimeout, giveUpTimeout, step, sendCB) } diff --git a/packages/dkg/proc.go b/packages/dkg/proc.go index 11d2db029e..cfd19fb98d 100644 --- a/packages/dkg/proc.go +++ b/packages/dkg/proc.go @@ -146,7 +146,7 @@ func onInitiatorInit(dkgID peering.PeeringID, msg *initiatorInitMsg, node *Node) ) } go p.processLoop(msg.timeout, p.steps[rabinStep7CommitAndTerminate].doneCh) - p.attachID = p.netGroup.Attach(peerMessageReceiverDkg, p.onPeerMessage) + p.attachID = p.netGroup.Attach(peering.PeerMessageReceiverDkg, p.onPeerMessage) stepsStart <- make(map[uint16]*peering.PeerMessageData) return &p, nil } @@ -212,7 +212,7 @@ func (p *proc) rabinStep1R21SendDealsMakeSent(step byte, initRecv *peering.PeerM p.dkgLock.Unlock() sentMsgs := make(map[uint16]*peering.PeerMessageData) for i := range deals { - sentMsgs[uint16(i)] = makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &rabinDealMsg{ + sentMsgs[uint16(i)] = makePeerMessage(p.dkgID, peering.PeerMessageReceiverDkg, step, &rabinDealMsg{ deal: deals[i], }) } @@ -220,7 +220,7 @@ func (p *proc) rabinStep1R21SendDealsMakeSent(step byte, initRecv *peering.PeerM } func (p *proc) rabinStep1R21SendDealsMakeResp(step byte, initRecv *peering.PeerMessageGroupIn, recvMsgs map[uint16]*peering.PeerMessageData) (*peering.PeerMessageData, error) { - return makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &initiatorStatusMsg{error: nil}), nil + return makePeerMessage(p.dkgID, peering.PeerMessageReceiverDkg, step, &initiatorStatusMsg{error: nil}), nil } // @@ -260,7 +260,7 @@ func (p *proc) rabinStep2R22SendResponsesMakeSent(step byte, initRecv *peering.P // Produce the sent messages. sentMsgs := make(map[uint16]*peering.PeerMessageData) for i := range prevMsgs { // Use peerIdx from the previous round. - sentMsgs[i] = makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &rabinResponseMsg{ + sentMsgs[i] = makePeerMessage(p.dkgID, peering.PeerMessageReceiverDkg, step, &rabinResponseMsg{ responses: ourResponses, }) } @@ -268,7 +268,7 @@ func (p *proc) rabinStep2R22SendResponsesMakeSent(step byte, initRecv *peering.P } func (p *proc) rabinStep2R22SendResponsesMakeResp(step byte, initRecv *peering.PeerMessageGroupIn, recvMsgs map[uint16]*peering.PeerMessageData) (*peering.PeerMessageData, error) { - return makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &initiatorStatusMsg{error: nil}), nil + return makePeerMessage(p.dkgID, peering.PeerMessageReceiverDkg, step, &initiatorStatusMsg{error: nil}), nil } // @@ -313,7 +313,7 @@ func (p *proc) rabinStep3R23SendJustificationsMakeSent(step byte, initRecv *peer // Produce the sent messages. sentMsgs := make(map[uint16]*peering.PeerMessageData) for i := range prevMsgs { // Use peerIdx from the previous round. - sentMsgs[i] = makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &rabinJustificationMsg{ + sentMsgs[i] = makePeerMessage(p.dkgID, peering.PeerMessageReceiverDkg, step, &rabinJustificationMsg{ justifications: ourJustifications, }) } @@ -321,7 +321,7 @@ func (p *proc) rabinStep3R23SendJustificationsMakeSent(step byte, initRecv *peer } func (p *proc) rabinStep3R23SendJustificationsMakeResp(step byte, initRecv *peering.PeerMessageGroupIn, recvMsgs map[uint16]*peering.PeerMessageData) (*peering.PeerMessageData, error) { - return makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &initiatorStatusMsg{error: nil}), nil + return makePeerMessage(p.dkgID, peering.PeerMessageReceiverDkg, step, &initiatorStatusMsg{error: nil}), nil } // @@ -379,11 +379,11 @@ func (p *proc) rabinStep4R4SendSecretCommitsMakeSent(step byte, initRecv *peerin sentMsgs := make(map[uint16]*peering.PeerMessageData) for i := range prevMsgs { // Use peerIdx from the previous round. if thisInQual && p.nodeInQUAL(i) { - sentMsgs[i] = makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &rabinSecretCommitsMsg{ + sentMsgs[i] = makePeerMessage(p.dkgID, peering.PeerMessageReceiverDkg, step, &rabinSecretCommitsMsg{ secretCommits: ourSecretCommits, }) } else { - sentMsgs[i] = makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &rabinSecretCommitsMsg{ + sentMsgs[i] = makePeerMessage(p.dkgID, peering.PeerMessageReceiverDkg, step, &rabinSecretCommitsMsg{ secretCommits: nil, }) } @@ -392,7 +392,7 @@ func (p *proc) rabinStep4R4SendSecretCommitsMakeSent(step byte, initRecv *peerin } func (p *proc) rabinStep4R4SendSecretCommitsMakeResp(step byte, initRecv *peering.PeerMessageGroupIn, recvMsgs map[uint16]*peering.PeerMessageData) (*peering.PeerMessageData, error) { - return makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &initiatorStatusMsg{error: nil}), nil + return makePeerMessage(p.dkgID, peering.PeerMessageReceiverDkg, step, &initiatorStatusMsg{error: nil}), nil } // @@ -438,11 +438,11 @@ func (p *proc) rabinStep5R5SendComplaintCommitsMakeSent(step byte, initRecv *pee sentMsgs := make(map[uint16]*peering.PeerMessageData) for i := range prevMsgs { // Use peerIdx from the previous round. if p.nodeInQUAL(i) { - sentMsgs[i] = makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &rabinComplaintCommitsMsg{ + sentMsgs[i] = makePeerMessage(p.dkgID, peering.PeerMessageReceiverDkg, step, &rabinComplaintCommitsMsg{ complaintCommits: ourComplaintCommits, }) } else { - sentMsgs[i] = makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &rabinComplaintCommitsMsg{ + sentMsgs[i] = makePeerMessage(p.dkgID, peering.PeerMessageReceiverDkg, step, &rabinComplaintCommitsMsg{ complaintCommits: []*rabin_dkg.ComplaintCommits{}, }) } @@ -451,7 +451,7 @@ func (p *proc) rabinStep5R5SendComplaintCommitsMakeSent(step byte, initRecv *pee } func (p *proc) rabinStep5R5SendComplaintCommitsMakeResp(step byte, initRecv *peering.PeerMessageGroupIn, recvMsgs map[uint16]*peering.PeerMessageData) (*peering.PeerMessageData, error) { - return makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &initiatorStatusMsg{error: nil}), nil + return makePeerMessage(p.dkgID, peering.PeerMessageReceiverDkg, step, &initiatorStatusMsg{error: nil}), nil } // @@ -497,11 +497,11 @@ func (p *proc) rabinStep6R6SendReconstructCommitsMakeSent(step byte, initRecv *p sentMsgs := make(map[uint16]*peering.PeerMessageData) for i := range prevMsgs { // Use peerIdx from the previous round. if p.nodeInQUAL(i) { - sentMsgs[i] = makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &rabinReconstructCommitsMsg{ + sentMsgs[i] = makePeerMessage(p.dkgID, peering.PeerMessageReceiverDkg, step, &rabinReconstructCommitsMsg{ reconstructCommits: ourReconstructCommits, }) } else { - sentMsgs[i] = makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &rabinReconstructCommitsMsg{ + sentMsgs[i] = makePeerMessage(p.dkgID, peering.PeerMessageReceiverDkg, step, &rabinReconstructCommitsMsg{ reconstructCommits: []*rabin_dkg.ReconstructCommits{}, }) } @@ -583,7 +583,7 @@ func (p *proc) rabinStep6R6SendReconstructCommitsMakeResp(step byte, initRecv *p if pubShareMsg, err = p.makeInitiatorPubShareMsg(step); err != nil { return nil, err } - return makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, pubShareMsg), nil + return makePeerMessage(p.dkgID, peering.PeerMessageReceiverDkg, step, pubShareMsg), nil } // @@ -607,7 +607,7 @@ func (p *proc) rabinStep7CommitAndTerminateMakeSent(step byte, initRecv *peering } func (p *proc) rabinStep7CommitAndTerminateMakeResp(step byte, initRecv *peering.PeerMessageGroupIn, recvMsgs map[uint16]*peering.PeerMessageData) (*peering.PeerMessageData, error) { - return makePeerMessage(p.dkgID, peerMessageReceiverDkg, step, &initiatorStatusMsg{error: nil}), nil + return makePeerMessage(p.dkgID, peering.PeerMessageReceiverDkg, step, &initiatorStatusMsg{error: nil}), nil } func (p *proc) nodeInQUAL(nodeIdx uint16) bool { @@ -750,7 +750,7 @@ func (s *procStep) run() { if s.sentMsgs, err = s.makeSent(s.step, s.initRecv, s.prevMsgs); err != nil { s.log.Errorf("Step %v failed to make round messages, reason=%v", s.step, err) s.sentMsgs = make(map[uint16]*peering.PeerMessageData) // No messages will be sent on error. - s.markDone(makePeerMessage(s.proc.dkgID, peerMessageReceiverDkg, s.step, &initiatorStatusMsg{error: err})) + s.markDone(makePeerMessage(s.proc.dkgID, peering.PeerMessageReceiverDkg, s.step, &initiatorStatusMsg{error: err})) } for i := range s.sentMsgs { netID, _ := s.proc.netGroup.NetIDByIndex(i) @@ -827,7 +827,7 @@ func (s *procStep) makeDone() { var initResp *peering.PeerMessageData if initResp, err = s.makeResp(s.step, s.initRecv, s.recvMsgs); err != nil { s.log.Errorf("Step failed to make round response, reason=%v", err) - s.markDone(makePeerMessage(s.proc.dkgID, peerMessageReceiverDkg, s.step, &initiatorStatusMsg{error: err})) + s.markDone(makePeerMessage(s.proc.dkgID, peering.PeerMessageReceiverDkg, s.step, &initiatorStatusMsg{error: err})) } else { s.markDone(initResp) } diff --git a/packages/peering/peering.go b/packages/peering/peering.go index 02a5ef49c6..0b4005136f 100644 --- a/packages/peering/peering.go +++ b/packages/peering/peering.go @@ -24,6 +24,13 @@ const ( // All the equal and larger msg types are committee messages. // those with smaller are reserved by the package for heartbeat and handshake messages FirstUserMsgCode = byte(0x10) + + PeerMessageReceiverStateManager = byte(iota) + PeerMessageReceiverConsensus + PeerMessageReceiverCommonSubset + PeerMessageReceiverChain + PeerMessageReceiverDkg + PeerMessageReceiverDkgInit ) // NetworkProvider stands for the peer-to-peer network, as seen From d58b41ea9804b01d388153ec5763175a5fa811d2 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 30 Nov 2021 16:42:14 +0200 Subject: [PATCH 145/198] BugFix: avoid race condition on chain dismiss --- packages/chain/chainimpl/interface.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/chain/chainimpl/interface.go b/packages/chain/chainimpl/interface.go index 25a5931940..7afc28dab1 100644 --- a/packages/chain/chainimpl/interface.go +++ b/packages/chain/chainimpl/interface.go @@ -50,9 +50,9 @@ func (c *chainObj) startTimer() { c.stateMgr.Ready().MustWait() tick := 0 for !c.IsDismissed() { - time.Sleep(chain.TimerTickPeriod) c.EnqueueTimerTick(tick) tick++ + time.Sleep(chain.TimerTickPeriod) } }() } @@ -63,14 +63,6 @@ func (c *chainObj) Dismiss(reason string) { c.dismissOnce.Do(func() { c.dismissed.Store(true) - c.dismissChainMsgPipe.Close() - c.stateMsgPipe.Close() - c.offLedgerRequestPeerMsgPipe.Close() - c.requestAckPeerMsgPipe.Close() - c.missingRequestIDsPeerMsgPipe.Close() - c.missingRequestPeerMsgPipe.Close() - c.timerTickMsgPipe.Close() - c.mempool.Close() c.stateMgr.Close() cmt := c.getCommittee() @@ -83,6 +75,14 @@ func (c *chainObj) Dismiss(reason string) { c.eventRequestProcessed.DetachAll() c.eventChainTransition.DetachAll() c.chainPeers.Close() + + c.dismissChainMsgPipe.Close() + c.stateMsgPipe.Close() + c.offLedgerRequestPeerMsgPipe.Close() + c.requestAckPeerMsgPipe.Close() + c.missingRequestIDsPeerMsgPipe.Close() + c.missingRequestPeerMsgPipe.Close() + c.timerTickMsgPipe.Close() }) publisher.Publish("dismissed_chain", c.chainID.Base58()) From fba34fb89cc48137c813a32eb150f34a5336684f Mon Sep 17 00:00:00 2001 From: Ivange Larry Date: Tue, 30 Nov 2021 16:06:15 +0100 Subject: [PATCH 146/198] Add more metrics (#637) * Add more metrics - count number times the vm run was triggered - size of blocks - blocks per chain --- packages/chain/chainimpl/chainimpl.go | 2 +- packages/chain/consensus/action.go | 1 + packages/chain/mempool/mempool.go | 1 + packages/chain/mempool/mempool_test.go | 2 ++ packages/chain/statemgr/setup_test.go | 8 +++++++- packages/chain/statemgr/statemgr.go | 5 ++++- packages/chain/statemgr/syncmgr.go | 3 +++ packages/metrics/chain.go | 28 +++++++++++++++++++++++--- packages/metrics/metrics.go | 21 +++++++++++++++++++ 9 files changed, 65 insertions(+), 6 deletions(-) diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index d21c4a6922..350886f262 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -156,7 +156,7 @@ func NewChain( log.Errorf("NewChain: %v", err) return nil } - ret.stateMgr = statemgr.New(db, ret, peers, ret.nodeConn) + ret.stateMgr = statemgr.New(db, ret, peers, ret.nodeConn, chainMetrics) ret.peers = &peers var peeringID peering.PeeringID = ret.chainID.Array() peers.Attach(&peeringID, func(recv *peering.RecvEvent) { diff --git a/packages/chain/consensus/action.go b/packages/chain/consensus/action.go index f9adaad88e..3685b37062 100644 --- a/packages/chain/consensus/action.go +++ b/packages/chain/consensus/action.go @@ -146,6 +146,7 @@ func (c *Consensus) runVMIfNeeded() { ) c.workflow.vmStarted = true vmTask.StartTime = time.Now() + c.consensusMetrics.CountVMRuns() go c.vmRunner.Run(vmTask) } else { c.log.Errorf("runVM: error preparing VM task") diff --git a/packages/chain/mempool/mempool.go b/packages/chain/mempool/mempool.go index 15f2978935..9230d87679 100644 --- a/packages/chain/mempool/mempool.go +++ b/packages/chain/mempool/mempool.go @@ -179,6 +179,7 @@ func (m *Mempool) RemoveRequests(reqs ...iscp.RequestID) { } m.outPoolCounter++ m.mempoolMetrics.CountRequestOut() + m.mempoolMetrics.CountBlocksPerChain() elapsed := time.Since(m.pool[rid].whenReceived) m.mempoolMetrics.RecordRequestProcessingTime(rid, elapsed) delete(m.pool, rid) diff --git a/packages/chain/mempool/mempool_test.go b/packages/chain/mempool/mempool_test.go index ad8fe8eb61..a2ae936dcf 100644 --- a/packages/chain/mempool/mempool_test.go +++ b/packages/chain/mempool/mempool_test.go @@ -87,6 +87,8 @@ func (m *MockMempoolMetrics) CountRequestOut() { func (m *MockMempoolMetrics) RecordRequestProcessingTime(reqID iscp.RequestID, elapse time.Duration) { } +func (m *MockMempoolMetrics) CountBlocksPerChain() {} + // Test if mempool is created func TestMempool(t *testing.T) { log := testlogger.NewLogger(t) diff --git a/packages/chain/statemgr/setup_test.go b/packages/chain/statemgr/setup_test.go index 3b054405fb..3d4bdb97a7 100644 --- a/packages/chain/statemgr/setup_test.go +++ b/packages/chain/statemgr/setup_test.go @@ -63,6 +63,10 @@ type MockedNode struct { Log *logger.Logger } +type MockedStateManagerMetrics struct{} + +func (c *MockedStateManagerMetrics) RecordBlockSize(_ uint32, _ float64) {} + func NewMockedEnv(nodeCount int, t *testing.T, debug bool) (*MockedEnv, *ledgerstate.Transaction) { level := zapcore.InfoLevel if debug { @@ -195,13 +199,15 @@ func (env *MockedEnv) NewMockedNode(nodeIndex int, timers StateManagerTimers) *M Peers: peers, Log: log, } + + stateMgrMetrics := new(MockedStateManagerMetrics) ret.ChainCore.OnGlobalStateSync(func() coreutil.ChainStateSync { return ret.stateSync }) ret.ChainCore.OnGetStateReader(func() state.OptimisticStateReader { return state.NewOptimisticStateReader(ret.store, ret.stateSync) }) - ret.StateManager = New(ret.store, ret.ChainCore, ret.Peers, ret.NodeConn, timers) + ret.StateManager = New(ret.store, ret.ChainCore, ret.Peers, ret.NodeConn, stateMgrMetrics, timers) ret.StateTransition = testchain.NewMockedStateTransition(env.T, env.OriginatorKeyPair) ret.StateTransition.OnNextState(func(vstate state.VirtualStateAccess, tx *ledgerstate.Transaction) { log.Debugf("MockedEnv.onNextState: state index %d", vstate.BlockIndex()) diff --git a/packages/chain/statemgr/statemgr.go b/packages/chain/statemgr/statemgr.go index dbd0b63783..ca60c21a15 100644 --- a/packages/chain/statemgr/statemgr.go +++ b/packages/chain/statemgr/statemgr.go @@ -14,6 +14,7 @@ import ( "github.com/iotaledger/hive.go/logger" "github.com/iotaledger/wasp/packages/chain" "github.com/iotaledger/wasp/packages/chain/messages" + "github.com/iotaledger/wasp/packages/metrics" "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/state" "github.com/iotaledger/wasp/packages/util/ready" @@ -44,6 +45,7 @@ type stateManager struct { eventStateCandidateMsgCh chan *messages.StateCandidateMsg eventTimerMsgCh chan messages.TimerTick closeCh chan bool + stateManagerMetrics metrics.StateManagerMetrics } const ( @@ -51,7 +53,7 @@ const ( maxBlocksToCommitConst = 10000 // 10k ) -func New(store kvstore.KVStore, c chain.ChainCore, peers peering.PeerDomainProvider, nodeconn chain.NodeConnection, timersOpt ...StateManagerTimers) chain.StateManager { +func New(store kvstore.KVStore, c chain.ChainCore, peers peering.PeerDomainProvider, nodeconn chain.NodeConnection, stateManagerMetrics metrics.StateManagerMetrics, timersOpt ...StateManagerTimers) chain.StateManager { var timers StateManagerTimers if len(timersOpt) > 0 { timers = timersOpt[0] @@ -75,6 +77,7 @@ func New(store kvstore.KVStore, c chain.ChainCore, peers peering.PeerDomainProvi eventStateCandidateMsgCh: make(chan *messages.StateCandidateMsg), eventTimerMsgCh: make(chan messages.TimerTick), closeCh: make(chan bool), + stateManagerMetrics: stateManagerMetrics, } go ret.initLoadState() diff --git a/packages/chain/statemgr/syncmgr.go b/packages/chain/statemgr/syncmgr.go index cdb31e75c6..41ce3f4740 100644 --- a/packages/chain/statemgr/syncmgr.go +++ b/packages/chain/statemgr/syncmgr.go @@ -180,6 +180,9 @@ func (sm *stateManager) commitCandidates(candidates []*candidateBlock, tentative // - any view call will return 'state invalidated message' sm.chain.GlobalStateSync().InvalidateSolidIndex() err := tentativeState.Commit(blocks...) + for _, block := range blocks { + sm.stateManagerMetrics.RecordBlockSize(block.BlockIndex(), float64(len(block.Bytes()))) + } sm.chain.GlobalStateSync().SetSolidIndex(tentativeState.BlockIndex()) if err != nil { diff --git a/packages/metrics/chain.go b/packages/metrics/chain.go index 0762d6779d..338d627c14 100644 --- a/packages/metrics/chain.go +++ b/packages/metrics/chain.go @@ -1,21 +1,23 @@ package metrics import ( + "fmt" "time" "github.com/iotaledger/wasp/packages/iscp" "github.com/prometheus/client_golang/prometheus" ) -// type StateManagerMetrics interface { -// } -// +type StateManagerMetrics interface { + RecordBlockSize(blockIndex uint32, size float64) +} type ChainMetrics interface { CountMessages() CountRequestAckMessages() MempoolMetrics ConsensusMetrics + StateManagerMetrics } type MempoolMetrics interface { @@ -23,10 +25,12 @@ type MempoolMetrics interface { CountOnLedgerRequestIn() CountRequestOut() RecordRequestProcessingTime(iscp.RequestID, time.Duration) + CountBlocksPerChain() } type ConsensusMetrics interface { RecordVMRunTime(time.Duration) + CountVMRuns() } type chainMetricsObj struct { @@ -67,6 +71,18 @@ func (c *chainMetricsObj) RecordVMRunTime(elapse time.Duration) { c.metrics.vmRunTime.With(prometheus.Labels{"chain": c.chainID.String()}).Set(elapse.Seconds()) } +func (c *chainMetricsObj) CountVMRuns() { + c.metrics.vmRunCounter.With(prometheus.Labels{"chain": c.chainID.String()}).Inc() +} + +func (c *chainMetricsObj) CountBlocksPerChain() { + c.metrics.blocksPerChain.With(prometheus.Labels{"chain": c.chainID.String()}).Inc() +} + +func (c *chainMetricsObj) RecordBlockSize(blockIndex uint32, blockSize float64) { + c.metrics.blockSizes.With(prometheus.Labels{"chain": c.chainID.String(), "block_index": fmt.Sprintf("%d", blockIndex)}).Set(blockSize) +} + type defaultChainMetrics struct{} func DefaultChainMetrics() ChainMetrics { @@ -86,3 +102,9 @@ func (m *defaultChainMetrics) CountRequestAckMessages() {} func (m *defaultChainMetrics) RecordRequestProcessingTime(_ iscp.RequestID, _ time.Duration) {} func (m *defaultChainMetrics) RecordVMRunTime(_ time.Duration) {} + +func (m *defaultChainMetrics) CountVMRuns() {} + +func (m *defaultChainMetrics) CountBlocksPerChain() {} + +func (m *defaultChainMetrics) RecordBlockSize(_ uint32, _ float64) {} diff --git a/packages/metrics/metrics.go b/packages/metrics/metrics.go index 602a38ee3f..4a8e1705fe 100644 --- a/packages/metrics/metrics.go +++ b/packages/metrics/metrics.go @@ -24,6 +24,9 @@ type Metrics struct { requestAckMessages *prometheus.CounterVec requestProcessingTime *prometheus.GaugeVec vmRunTime *prometheus.GaugeVec + vmRunCounter *prometheus.CounterVec + blocksPerChain *prometheus.CounterVec + blockSizes *prometheus.GaugeVec } func (m *Metrics) NewChainMetrics(chainID *iscp.ChainID) ChainMetrics { @@ -111,4 +114,22 @@ func (m *Metrics) registerMetrics() { Help: "Time it takes to run the vm", }, []string{"chain"}) prometheus.MustRegister(m.vmRunTime) + + m.vmRunCounter = prometheus.NewCounterVec(prometheus.CounterOpts{ + Name: "wasp_vm_run_counter", + Help: "Time it takes to run the vm", + }, []string{"chain"}) + prometheus.MustRegister(m.vmRunCounter) + + m.blocksPerChain = prometheus.NewCounterVec(prometheus.CounterOpts{ + Name: "wasp_block_counter", + Help: "Number of blocks per chain", + }, []string{"chain"}) + prometheus.MustRegister(m.blocksPerChain) + + m.blockSizes = prometheus.NewGaugeVec(prometheus.GaugeOpts{ + Name: "wasp_block_size", + Help: "Block sizes", + }, []string{"block_index", "chain"}) + prometheus.MustRegister(m.blockSizes) } From ee6045617bc1d6f41127dba512b3310d89be4674 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 30 Nov 2021 17:31:59 +0200 Subject: [PATCH 147/198] Just naming changes to make it more uniform --- packages/chain/chain.go | 18 +++++++++--------- packages/chain/chainimpl/chainimpl.go | 2 +- packages/chain/chainimpl/eventproc.go | 6 +++--- packages/chain/chainimpl/interface.go | 6 +++--- packages/chain/consensus/action.go | 4 ++-- packages/chain/consensus/consensus.go | 10 +++++----- packages/chain/consensus/eventproc.go | 20 ++++++++++---------- packages/chain/consensus/setup_test.go | 6 +++--- packages/chain/statemgr/eventproc.go | 16 ++++++++-------- packages/chain/statemgr/setup_test.go | 10 +++++----- packages/chain/statemgr/statemgr.go | 8 ++++---- 11 files changed, 53 insertions(+), 53 deletions(-) diff --git a/packages/chain/chain.go b/packages/chain/chain.go index bf80aafc7f..133d5f9460 100644 --- a/packages/chain/chain.go +++ b/packages/chain/chain.go @@ -98,22 +98,22 @@ type StateManager interface { Ready() *ready.Ready EnqueueGetBlockMsg(msg *messages.GetBlockMsgIn) EnqueueBlockMsg(msg *messages.BlockMsgIn) - EventStateMsg(msg *messages.StateMsg) - EventOutputMsg(msg ledgerstate.Output) - EventStateCandidateMsg(state.VirtualStateAccess, ledgerstate.OutputID) - EventTimerMsg(msg messages.TimerTick) + EnqueueStateMsg(msg *messages.StateMsg) + EnqueueOutputMsg(msg ledgerstate.Output) + EnqueueStateCandidateMsg(state.VirtualStateAccess, ledgerstate.OutputID) + EnqueueTimerMsg(msg messages.TimerTick) GetStatusSnapshot() *SyncInfo Close() } type Consensus interface { - EventStateTransitionMsg(state.VirtualStateAccess, *ledgerstate.AliasOutput, time.Time) + EnqueueStateTransitionMsg(state.VirtualStateAccess, *ledgerstate.AliasOutput, time.Time) EnqueueSignedResultMsg(*messages.SignedResultMsgIn) EnqueueSignedResultAckMsg(*messages.SignedResultAckMsgIn) - EventInclusionsStateMsg(ledgerstate.TransactionID, ledgerstate.InclusionState) - EventAsynchronousCommonSubsetMsg(msg *messages.AsynchronousCommonSubsetMsg) - EventVMResultMsg(msg *messages.VMResultMsg) - EventTimerMsg(messages.TimerTick) + EnqueueInclusionsStateMsg(ledgerstate.TransactionID, ledgerstate.InclusionState) + EnqueueAsynchronousCommonSubsetMsg(msg *messages.AsynchronousCommonSubsetMsg) + EnqueueVMResultMsg(msg *messages.VMResultMsg) + EnqueueTimerMsg(messages.TimerTick) IsReady() bool Close() GetStatusSnapshot() *ConsensusInfo diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index 104b287863..1a04a1bf51 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -257,7 +257,7 @@ func (c *chainObj) processChainTransition(msg *chain.ChainTransitionEventData) { if c.consensus == nil { c.log.Warnf("processChainTransition: skipping notifying consensus as it is not initiated") } else { - c.consensus.EventStateTransitionMsg(msg.VirtualState, msg.ChainOutput, msg.OutputTimestamp) + c.consensus.EnqueueStateTransitionMsg(msg.VirtualState, msg.ChainOutput, msg.OutputTimestamp) } c.log.Debugf("processChainTransition completed: state index: %d, state hash: %s", stateIndex, msg.VirtualState.StateCommitment().String()) } diff --git a/packages/chain/chainimpl/eventproc.go b/packages/chain/chainimpl/eventproc.go index 802e712045..d6128039b6 100644 --- a/packages/chain/chainimpl/eventproc.go +++ b/packages/chain/chainimpl/eventproc.go @@ -120,7 +120,7 @@ func (c *chainObj) handleLedgerState(msg *messages.StateMsg) { c.log.Errorf("processStateMessage: %v", err) return } - c.stateMgr.EventStateMsg(msg) + c.stateMgr.EnqueueStateMsg(msg) c.log.Debugf("handleLedgerState passed to state manager") } @@ -215,9 +215,9 @@ func (c *chainObj) EnqueueTimerTick(tick int) { func (c *chainObj) handleTimerTick(msg messages.TimerTick) { if msg%2 == 0 { - c.stateMgr.EventTimerMsg(msg / 2) + c.stateMgr.EnqueueTimerMsg(msg / 2) } else if c.consensus != nil { - c.consensus.EventTimerMsg(msg / 2) + c.consensus.EnqueueTimerMsg(msg / 2) } if msg%40 == 0 { stats := c.mempool.Info() diff --git a/packages/chain/chainimpl/interface.go b/packages/chain/chainimpl/interface.go index 7afc28dab1..7f528440cf 100644 --- a/packages/chain/chainimpl/interface.go +++ b/packages/chain/chainimpl/interface.go @@ -94,7 +94,7 @@ func (c *chainObj) IsDismissed() bool { } func (c *chainObj) StateCandidateToStateManager(virtualState state.VirtualStateAccess, outputID ledgerstate.OutputID) { - c.stateMgr.EventStateCandidateMsg(virtualState, outputID) + c.stateMgr.EnqueueStateCandidateMsg(virtualState, outputID) } func shouldSendToPeer(peerID string, ackPeers []string) bool { @@ -189,12 +189,12 @@ func (c *chainObj) ReceiveState(stateOutput *ledgerstate.AliasOutput, timestamp func (c *chainObj) ReceiveInclusionState(txID ledgerstate.TransactionID, inclusionState ledgerstate.InclusionState) { if c.consensus != nil { - c.consensus.EventInclusionsStateMsg(txID, inclusionState) // TODO special entry point + c.consensus.EnqueueInclusionsStateMsg(txID, inclusionState) // TODO special entry point } } func (c *chainObj) ReceiveOutput(output ledgerstate.Output) { - c.stateMgr.EventOutputMsg(output) + c.stateMgr.EnqueueOutputMsg(output) } func (c *chainObj) BlobCache() registry.BlobCache { diff --git a/packages/chain/consensus/action.go b/packages/chain/consensus/action.go index 69b846bde7..62edfc0788 100644 --- a/packages/chain/consensus/action.go +++ b/packages/chain/consensus/action.go @@ -70,7 +70,7 @@ func (c *consensus) proposeBatchIfNeeded() { // call the ACS consensus. The call should spawn goroutine itself c.committee.RunACSConsensus(proposal.Bytes(), c.acsSessionID, c.stateOutput.GetStateIndex(), func(sessionID uint64, acs [][]byte) { c.log.Debugf("proposeBatch RunACSConsensus callback: responding to ACS session ID %v: len = %d", sessionID, len(acs)) - go c.EventAsynchronousCommonSubsetMsg(&messages.AsynchronousCommonSubsetMsg{ + go c.EnqueueAsynchronousCommonSubsetMsg(&messages.AsynchronousCommonSubsetMsg{ ProposedBatchesBin: acs, SessionID: sessionID, }) @@ -240,7 +240,7 @@ func (c *consensus) prepareVMTask(reqs []iscp.Request) *vm.VMTask { } c.log.Debugf("runVM OnFinish callback: responding by state index: %d state hash: %s", task.VirtualStateAccess.BlockIndex(), task.VirtualStateAccess.StateCommitment()) - c.EventVMResultMsg(&messages.VMResultMsg{ + c.EnqueueVMResultMsg(&messages.VMResultMsg{ Task: task, }) elapsed := time.Since(task.StartTime) diff --git a/packages/chain/consensus/consensus.go b/packages/chain/consensus/consensus.go index ed15e4ea99..a0afd17d23 100644 --- a/packages/chain/consensus/consensus.go +++ b/packages/chain/consensus/consensus.go @@ -199,7 +199,7 @@ func (c *consensus) recvLoop() { case msg, ok := <-eventStateTransitionMsgCh: if ok { c.log.Debugf("Consensus::recvLoop, eventStateTransitionMsg...") - c.eventStateTransitionMsg(msg.(*messages.StateTransitionMsg)) + c.handleStateTransitionMsg(msg.(*messages.StateTransitionMsg)) c.log.Debugf("Consensus::recvLoop, eventStateTransitionMsg... Done") } else { eventStateTransitionMsgCh = nil @@ -223,7 +223,7 @@ func (c *consensus) recvLoop() { case msg, ok := <-eventInclusionStateMsgCh: if ok { c.log.Debugf("Consensus::recvLoop, eventInclusionState...") - c.eventInclusionState(msg.(*messages.InclusionStateMsg)) + c.handleInclusionState(msg.(*messages.InclusionStateMsg)) c.log.Debugf("Consensus::recvLoop, eventInclusionState... Done") } else { eventInclusionStateMsgCh = nil @@ -231,7 +231,7 @@ func (c *consensus) recvLoop() { case msg, ok := <-eventACSMsgCh: if ok { c.log.Debugf("Consensus::recvLoop, eventAsynchronousCommonSubset...") - c.eventAsynchronousCommonSubset(msg.(*messages.AsynchronousCommonSubsetMsg)) + c.handleAsynchronousCommonSubset(msg.(*messages.AsynchronousCommonSubsetMsg)) c.log.Debugf("Consensus::recvLoop, eventAsynchronousCommonSubset... Done") } else { eventACSMsgCh = nil @@ -239,7 +239,7 @@ func (c *consensus) recvLoop() { case msg, ok := <-eventVMResultMsgCh: if ok { c.log.Debugf("Consensus::recvLoop, eventVMResultMsg...") - c.eventVMResultMsg(msg.(*messages.VMResultMsg)) + c.handleVMResultMsg(msg.(*messages.VMResultMsg)) c.log.Debugf("Consensus::recvLoop, eventVMResultMsg... Done") } else { eventVMResultMsgCh = nil @@ -247,7 +247,7 @@ func (c *consensus) recvLoop() { case msg, ok := <-eventTimerMsgCh: if ok { c.log.Debugf("Consensus::recvLoop, eventTimerMsg...") - c.eventTimerMsg(msg.(messages.TimerTick)) + c.handleTimerMsg(msg.(messages.TimerTick)) c.log.Debugf("Consensus::recvLoop, eventTimerMsg... Done") } else { eventTimerMsgCh = nil diff --git a/packages/chain/consensus/eventproc.go b/packages/chain/consensus/eventproc.go index eef6e9c712..8f5d3247d2 100644 --- a/packages/chain/consensus/eventproc.go +++ b/packages/chain/consensus/eventproc.go @@ -14,7 +14,7 @@ import ( "github.com/iotaledger/wasp/packages/state" ) -func (c *consensus) EventStateTransitionMsg(virtualState state.VirtualStateAccess, stateOutput *ledgerstate.AliasOutput, stateTimestamp time.Time) { +func (c *consensus) EnqueueStateTransitionMsg(virtualState state.VirtualStateAccess, stateOutput *ledgerstate.AliasOutput, stateTimestamp time.Time) { c.eventStateTransitionMsgPipe.In() <- &messages.StateTransitionMsg{ State: virtualState, StateOutput: stateOutput, @@ -22,7 +22,7 @@ func (c *consensus) EventStateTransitionMsg(virtualState state.VirtualStateAcces } } -func (c *consensus) eventStateTransitionMsg(msg *messages.StateTransitionMsg) { +func (c *consensus) handleStateTransitionMsg(msg *messages.StateTransitionMsg) { c.log.Debugf("StateTransitionMsg received: state index: %d, state output: %s, timestamp: %v", msg.State.BlockIndex(), iscp.OID(msg.StateOutput.ID()), msg.StateTimestamp) if c.setNewState(msg) { @@ -52,36 +52,36 @@ func (c *consensus) handleSignedResultAckMsg(msg *messages.SignedResultAckMsgIn) c.takeAction() } -func (c *consensus) EventInclusionsStateMsg(txID ledgerstate.TransactionID, inclusionState ledgerstate.InclusionState) { +func (c *consensus) EnqueueInclusionsStateMsg(txID ledgerstate.TransactionID, inclusionState ledgerstate.InclusionState) { c.eventInclusionStateMsgPipe.In() <- &messages.InclusionStateMsg{ TxID: txID, State: inclusionState, } } -func (c *consensus) eventInclusionState(msg *messages.InclusionStateMsg) { +func (c *consensus) handleInclusionState(msg *messages.InclusionStateMsg) { c.log.Debugf("InclusionStateMsg received: %s: '%s'", msg.TxID.Base58(), msg.State.String()) c.processInclusionState(msg) c.takeAction() } -func (c *consensus) EventAsynchronousCommonSubsetMsg(msg *messages.AsynchronousCommonSubsetMsg) { +func (c *consensus) EnqueueAsynchronousCommonSubsetMsg(msg *messages.AsynchronousCommonSubsetMsg) { c.eventACSMsgPipe.In() <- msg } -func (c *consensus) eventAsynchronousCommonSubset(msg *messages.AsynchronousCommonSubsetMsg) { +func (c *consensus) handleAsynchronousCommonSubset(msg *messages.AsynchronousCommonSubsetMsg) { c.log.Debugf("AsynchronousCommonSubsetMsg received for session %v: len = %d", msg.SessionID, len(msg.ProposedBatchesBin)) c.receiveACS(msg.ProposedBatchesBin, msg.SessionID) c.takeAction() } -func (c *consensus) EventVMResultMsg(msg *messages.VMResultMsg) { +func (c *consensus) EnqueueVMResultMsg(msg *messages.VMResultMsg) { c.eventVMResultMsgPipe.In() <- msg } -func (c *consensus) eventVMResultMsg(msg *messages.VMResultMsg) { +func (c *consensus) handleVMResultMsg(msg *messages.VMResultMsg) { var essenceString string if msg.Task.ResultTransactionEssence == nil { essenceString = "essence is nil" @@ -94,11 +94,11 @@ func (c *consensus) eventVMResultMsg(msg *messages.VMResultMsg) { c.takeAction() } -func (c *consensus) EventTimerMsg(msg messages.TimerTick) { +func (c *consensus) EnqueueTimerMsg(msg messages.TimerTick) { c.eventTimerMsgPipe.In() <- msg } -func (c *consensus) eventTimerMsg(msg messages.TimerTick) { +func (c *consensus) handleTimerMsg(msg messages.TimerTick) { c.lastTimerTick.Store(int64(msg)) c.refreshConsensusInfo() if msg%40 == 0 { diff --git a/packages/chain/consensus/setup_test.go b/packages/chain/consensus/setup_test.go index 882abb9fc2..84448adfd2 100644 --- a/packages/chain/consensus/setup_test.go +++ b/packages/chain/consensus/setup_test.go @@ -197,7 +197,7 @@ func (env *MockedEnv) NewNode(nodeIndex uint16, timers ConsensusTimers) *mockedN }) ret.NodeConn.OnPullTransactionInclusionState(func(addr ledgerstate.Address, txid ledgerstate.TransactionID) { if _, already := env.Ledger.GetTransaction(txid); already { - go ret.Consensus.EventInclusionsStateMsg(txid, ledgerstate.Confirmed) + go ret.Consensus.EnqueueInclusionsStateMsg(txid, ledgerstate.Confirmed) } }) mempoolMetrics := metrics.DefaultChainMetrics() @@ -335,7 +335,7 @@ func (n *mockedNode) EventStateTransition() { n.ChainCore.GlobalStateSync().SetSolidIndex(n.SolidState.BlockIndex()) - n.Consensus.EventStateTransitionMsg(n.SolidState.Copy(), n.StateOutput, time.Now()) + n.Consensus.EnqueueStateTransitionMsg(n.SolidState.Copy(), n.StateOutput, time.Now()) } func (env *MockedEnv) StartTimers() { @@ -349,7 +349,7 @@ func (n *mockedNode) StartTimer() { go func() { counter := 0 for { - n.Consensus.EventTimerMsg(messages.TimerTick(counter)) + n.Consensus.EnqueueTimerMsg(messages.TimerTick(counter)) counter++ time.Sleep(50 * time.Millisecond) } diff --git a/packages/chain/statemgr/eventproc.go b/packages/chain/statemgr/eventproc.go index e980b78991..c3a5a4c2cf 100644 --- a/packages/chain/statemgr/eventproc.go +++ b/packages/chain/statemgr/eventproc.go @@ -77,11 +77,11 @@ func (sm *stateManager) handleBlockMsg(msg *messages.BlockMsgIn) { } } -func (sm *stateManager) EventOutputMsg(msg ledgerstate.Output) { +func (sm *stateManager) EnqueueOutputMsg(msg ledgerstate.Output) { sm.eventOutputMsgPipe.In() <- msg } -func (sm *stateManager) eventOutputMsg(msg ledgerstate.Output) { +func (sm *stateManager) handleOutputMsg(msg ledgerstate.Output) { sm.log.Debugf("EventOutputMsg received: %s", iscp.OID(msg.ID())) chainOutput, ok := msg.(*ledgerstate.AliasOutput) if !ok { @@ -95,11 +95,11 @@ func (sm *stateManager) eventOutputMsg(msg ledgerstate.Output) { // EventStateTransactionMsg triggered whenever new state transaction arrives // the state transaction may be confirmed or not -func (sm *stateManager) EventStateMsg(msg *messages.StateMsg) { +func (sm *stateManager) EnqueueStateMsg(msg *messages.StateMsg) { sm.eventStateOutputMsgPipe.In() <- msg } -func (sm *stateManager) eventStateMsg(msg *messages.StateMsg) { +func (sm *stateManager) handleStateMsg(msg *messages.StateMsg) { sm.log.Debugw("EventStateMsg received: ", "state index", msg.ChainOutput.GetStateIndex(), "chainOutput", iscp.OID(msg.ChainOutput.ID()), @@ -115,14 +115,14 @@ func (sm *stateManager) eventStateMsg(msg *messages.StateMsg) { } } -func (sm *stateManager) EventStateCandidateMsg(virtualState state.VirtualStateAccess, outputID ledgerstate.OutputID) { +func (sm *stateManager) EnqueueStateCandidateMsg(virtualState state.VirtualStateAccess, outputID ledgerstate.OutputID) { sm.eventStateCandidateMsgPipe.In() <- &messages.StateCandidateMsg{ State: virtualState, ApprovingOutputID: outputID, } } -func (sm *stateManager) eventStateCandidateMsg(msg *messages.StateCandidateMsg) { +func (sm *stateManager) handleStateCandidateMsg(msg *messages.StateCandidateMsg) { sm.log.Debugf("EventStateCandidateMsg received: state index: %d, timestamp: %v", msg.State.BlockIndex(), msg.State.Timestamp(), ) @@ -135,13 +135,13 @@ func (sm *stateManager) eventStateCandidateMsg(msg *messages.StateCandidateMsg) } } -func (sm *stateManager) EventTimerMsg(msg messages.TimerTick) { +func (sm *stateManager) EnqueueTimerMsg(msg messages.TimerTick) { if msg%2 == 0 { sm.eventTimerMsgPipe.In() <- msg } } -func (sm *stateManager) eventTimerMsg() { +func (sm *stateManager) handleTimerMsg() { sm.log.Debugf("EventTimerMsg received") sm.takeAction() } diff --git a/packages/chain/statemgr/setup_test.go b/packages/chain/statemgr/setup_test.go index 3f643728ae..928db714a6 100644 --- a/packages/chain/statemgr/setup_test.go +++ b/packages/chain/statemgr/setup_test.go @@ -127,7 +127,7 @@ func (env *MockedEnv) pushStateToNodesIfSet(tx *ledgerstate.Transaction) { require.NoError(env.T, err) for _, node := range env.Nodes { - go node.StateManager.EventStateMsg(&messages.StateMsg{ + go node.StateManager.EnqueueStateMsg(&messages.StateMsg{ ChainOutput: stateOutput, Timestamp: tx.Essence().Timestamp(), }) @@ -233,7 +233,7 @@ func (env *MockedEnv) NewMockedNode(nodeIndex int, timers StateManagerTimers) *M log.Debugf("MockedEnv.onNextState: state index %d", vstate.BlockIndex()) stateOutput, err := utxoutil.GetSingleChainedAliasOutput(tx) require.NoError(env.T, err) - go ret.StateManager.EventStateCandidateMsg(vstate, stateOutput.ID()) + go ret.StateManager.EnqueueStateCandidateMsg(vstate, stateOutput.ID()) go ret.NodeConn.PostTransaction(tx) }) ret.NodeConn.OnPostTransaction(func(tx *ledgerstate.Transaction) { @@ -244,13 +244,13 @@ func (env *MockedEnv) NewMockedNode(nodeIndex int, timers StateManagerTimers) *M log.Debugf("MockedNode.OnPullState request received for address %v", addr.Base58) response := env.PullStateFromLedger(addr) log.Debugf("MockedNode.OnPullState call EventStateMsg: chain output %s", iscp.OID(response.ChainOutput.ID())) - go ret.StateManager.EventStateMsg(response) + go ret.StateManager.EnqueueStateMsg(response) }) ret.NodeConn.OnPullConfirmedOutput(func(addr ledgerstate.Address, outputID ledgerstate.OutputID) { log.Debugf("MockedNode.OnPullConfirmedOutput %v", iscp.OID(outputID)) response := env.PullConfirmedOutputFromLedger(addr, outputID) log.Debugf("MockedNode.OnPullConfirmedOutput call EventOutputMsg") - go ret.StateManager.EventOutputMsg(response) + go ret.StateManager.EnqueueOutputMsg(response) }) return ret @@ -261,7 +261,7 @@ func (node *MockedNode) StartTimer() { node.StateManager.Ready().MustWait() counter := 0 for { - node.StateManager.EventTimerMsg(messages.TimerTick(counter)) + node.StateManager.EnqueueTimerMsg(messages.TimerTick(counter)) counter++ time.Sleep(50 * time.Millisecond) } diff --git a/packages/chain/statemgr/statemgr.go b/packages/chain/statemgr/statemgr.go index e8f0b51e0c..80486e10d4 100644 --- a/packages/chain/statemgr/statemgr.go +++ b/packages/chain/statemgr/statemgr.go @@ -194,25 +194,25 @@ func (sm *stateManager) recvLoop() { } case msg, ok := <-eventStateOutputMsgCh: if ok { - sm.eventStateMsg(msg.(*messages.StateMsg)) + sm.handleStateMsg(msg.(*messages.StateMsg)) } else { eventStateOutputMsgCh = nil } case msg, ok := <-eventOutputMsgCh: if ok { - sm.eventOutputMsg(msg.(ledgerstate.Output)) + sm.handleOutputMsg(msg.(ledgerstate.Output)) } else { eventOutputMsgCh = nil } case msg, ok := <-eventStateCandidateMsgCh: if ok { - sm.eventStateCandidateMsg(msg.(*messages.StateCandidateMsg)) + sm.handleStateCandidateMsg(msg.(*messages.StateCandidateMsg)) } else { eventStateCandidateMsgCh = nil } case _, ok := <-eventTimerMsgCh: if ok { - sm.eventTimerMsg() + sm.handleTimerMsg() } else { eventTimerMsgCh = nil } From 559fc53ca4c9895d92b6ee34c6ae3395dbd561bb Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 30 Nov 2021 17:43:05 +0200 Subject: [PATCH 148/198] Another tiny rename --- packages/chain/chainimpl/chainimpl.go | 2 +- packages/chain/chainimpl/eventproc.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index cdcfcbe609..94b37e143b 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -153,7 +153,7 @@ func NewChain( } ret.stateMgr = statemgr.New(db, ret, ret.chainPeers, ret.nodeConn, chainMetrics) ret.chainPeers.Attach(peering.PeerMessageReceiverChain, ret.receiveChainPeerMessages) - go ret.handleMessagesLoop() + go ret.recvLoop() ret.startTimer() return ret } diff --git a/packages/chain/chainimpl/eventproc.go b/packages/chain/chainimpl/eventproc.go index d6128039b6..972459742d 100644 --- a/packages/chain/chainimpl/eventproc.go +++ b/packages/chain/chainimpl/eventproc.go @@ -15,7 +15,7 @@ import ( "golang.org/x/xerrors" ) -func (c *chainObj) handleMessagesLoop() { +func (c *chainObj) recvLoop() { dismissChainMsgChannel := c.dismissChainMsgPipe.Out() stateMsgChannel := c.stateMsgPipe.Out() offLedgerRequestMsgChannel := c.offLedgerRequestPeerMsgPipe.Out() From e435e944fc0aee2cb5aed2fa030b8666b0bb77ce Mon Sep 17 00:00:00 2001 From: Jorge Silva Date: Tue, 30 Nov 2021 16:08:39 +0000 Subject: [PATCH 149/198] chore: fix skip CI makes community contributions to docs hang forever --- .github/workflows/build-test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index f2715fce21..88e2d2a5cb 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -3,9 +3,6 @@ name: Test on: pull_request: branches: [develop] - paths-ignore: - - 'documentation/**' - - 'temupdates/**' jobs: build: From f60ff32def0790a8c3c72bc6bc0ec1bc2c838b33 Mon Sep 17 00:00:00 2001 From: pascalbrunner <74254639+brunnerpascal@users.noreply.github.com> Date: Tue, 23 Nov 2021 19:31:15 +0100 Subject: [PATCH 150/198] Update running-a-node.md Just a directlink to find testnets easier --- documentation/docs/guide/chains_and_nodes/running-a-node.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/docs/guide/chains_and_nodes/running-a-node.md b/documentation/docs/guide/chains_and_nodes/running-a-node.md index 4f34e6e8e8..36cbb82581 100644 --- a/documentation/docs/guide/chains_and_nodes/running-a-node.md +++ b/documentation/docs/guide/chains_and_nodes/running-a-node.md @@ -189,7 +189,7 @@ Grafana provides a dashboard to visualize system metrics. It can use the prometh ## Goshimmer Provider -For the Wasp node to communicate with the L1 (Tangle/Goshimmer Network), it needs access to a Goshimmer node with the TXStream plugin enabled. You can use any publicly available node, or [set up your own node](https://wiki.iota.org/goshimmer/tutorials/setup/). +For the Wasp node to communicate with the L1 (Tangle/Goshimmer Network), it needs access to a Goshimmer node with the TXStream plugin enabled. You can use any [publicly available node](https://wiki.iota.org/wasp/guide/chains_and_nodes/testnet), or [set up your own node](https://wiki.iota.org/goshimmer/tutorials/setup/). :::info note From f2e9b17259e2611d2f9c79acf565ea2f44c6aadf Mon Sep 17 00:00:00 2001 From: Dr-Electron Date: Tue, 30 Nov 2021 03:04:16 +0100 Subject: [PATCH 151/198] Fix Whitepaper link --- documentation/docs/guide/core_concepts/iscp-architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/docs/guide/core_concepts/iscp-architecture.md b/documentation/docs/guide/core_concepts/iscp-architecture.md index 94203e4b6b..8b80b839f3 100644 --- a/documentation/docs/guide/core_concepts/iscp-architecture.md +++ b/documentation/docs/guide/core_concepts/iscp-architecture.md @@ -19,4 +19,4 @@ The multi-chain nature of ISCP makes it a more complex implementation of smart c ![ISCP multichain architecture](../../../static/img/multichain.png) The comprehensive overview of architectural design decisions of IOTA Smart Contracts can be found in the -[whitepaper](https://github.com/iotaledger/wasp/raw/master/documentation/ISC_WP_Nov_10_2021.pdf). +[whitepaper](https://github.com/iotaledger/wasp/raw/develop/documentation/ISC_WP_Nov_10_2021.pdf). From ec16673daafa1aa2f170e49874276e4210f98a6e Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Tue, 30 Nov 2021 21:05:59 -0800 Subject: [PATCH 152/198] Added erc20 missing event --- contracts/wasm/dividend/test/dividend_bg.wasm | Bin 32303 -> 32303 bytes .../test/donatewithfeedback_bg.wasm | Bin 36517 -> 36517 bytes contracts/wasm/erc20/go/erc20/erc20.go | 11 ++++++----- contracts/wasm/erc20/go/erc20/events.go | 8 ++++++++ contracts/wasm/erc20/schema.yaml | 4 ++++ contracts/wasm/erc20/src/erc20.rs | 11 ++++++----- contracts/wasm/erc20/src/events.rs | 8 ++++++++ contracts/wasm/erc20/test/erc20_bg.wasm | Bin 35401 -> 35497 bytes contracts/wasm/erc20/ts/erc20/erc20.ts | 11 ++++++----- contracts/wasm/erc20/ts/erc20/events.ts | 8 ++++++++ .../wasm/fairauction/test/fairauction_bg.wasm | Bin 42692 -> 42692 bytes .../fairroulette/test/fairroulette_bg.wasm | Bin 40086 -> 40086 bytes .../wasm/inccounter/test/inccounter_bg.wasm | Bin 37007 -> 37007 bytes contracts/wasm/testcore/test/testcore_bg.wasm | Bin 53154 -> 53154 bytes .../wasm/testwasmlib/test/testwasmlib_bg.wasm | Bin 41300 -> 41300 bytes .../tokenregistry/test/tokenregistry_bg.wasm | Bin 32026 -> 32026 bytes .../sbtests/sbtestsc/testcore_bg.wasm | Bin 53154 -> 53154 bytes packages/vm/wasmlib/src/hashtypes.rs | 6 ++++++ tools/cluster/tests/wasm/inccounter_bg.wasm | Bin 37007 -> 37007 bytes 19 files changed, 52 insertions(+), 15 deletions(-) diff --git a/contracts/wasm/dividend/test/dividend_bg.wasm b/contracts/wasm/dividend/test/dividend_bg.wasm index 6a7f37621677b6538e9c078212542fed513445b0..a5d425d168cd0f18e38082ef9e2b83908b0e7276 100644 GIT binary patch delta 22 ecmZ4ghjINM#tjE^86_tl%2j9d+WaclRR92e;R)mb delta 22 ecmZ4ghjINM#tjE^8O0|b%2j7{+x#lmRR92eu?gM) diff --git a/contracts/wasm/donatewithfeedback/test/donatewithfeedback_bg.wasm b/contracts/wasm/donatewithfeedback/test/donatewithfeedback_bg.wasm index 993bf2ab9f1c0481a5f656d7153d0c3d45df3e3c..4e68cc1c4cd25cdb8af36614a35242e4c1cb995e 100644 GIT binary patch delta 16 YcmZ2Fmucx-rVZ@1j9!~LYUc_905+`!?f?J) delta 16 YcmZ2Fmucx-rVZ@1jBcAbYUc_905+8c>Hq)$ diff --git a/contracts/wasm/erc20/go/erc20/erc20.go b/contracts/wasm/erc20/go/erc20/erc20.go index 731a27083e..fb6ef50a97 100644 --- a/contracts/wasm/erc20/go/erc20/erc20.go +++ b/contracts/wasm/erc20/go/erc20/erc20.go @@ -17,11 +17,12 @@ import ( func funcApprove(ctx wasmlib.ScFuncContext, f *ApproveContext) { delegation := f.Params.Delegation().Value() amount := f.Params.Amount().Value() - ctx.Require(amount > 0, "erc20.approve.fail: wrong 'amount' parameter") + ctx.Require(amount >= 0, "erc20.approve.fail: wrong 'amount' parameter") // all allowances are in the map under the name of he owner allowances := f.State.AllAllowances().GetAllowancesForAgent(ctx.Caller()) allowances.GetInt64(delegation).SetValue(amount) + f.Events.Approval(amount, ctx.Caller(), delegation) } // on_init is a constructor entry point. It initializes the smart contract with the @@ -52,7 +53,7 @@ func funcInit(ctx wasmlib.ScFuncContext, f *InitContext) { // - PARAM_AMOUNT: i64 func funcTransfer(ctx wasmlib.ScFuncContext, f *TransferContext) { amount := f.Params.Amount().Value() - ctx.Require(amount > 0, "erc20.transfer.fail: wrong 'amount' parameter") + ctx.Require(amount >= 0, "erc20.transfer.fail: wrong 'amount' parameter") balances := f.State.Balances() sourceAgent := ctx.Caller() @@ -62,7 +63,7 @@ func funcTransfer(ctx wasmlib.ScFuncContext, f *TransferContext) { targetAgent := f.Params.Account().Value() targetBalance := balances.GetInt64(targetAgent) result := targetBalance.Value() + amount - ctx.Require(result > 0, "erc20.transfer.fail: overflow") + ctx.Require(result >= 0, "erc20.transfer.fail: overflow") sourceBalance.SetValue(sourceBalance.Value() - amount) targetBalance.SetValue(targetBalance.Value() + amount) @@ -80,7 +81,7 @@ func funcTransfer(ctx wasmlib.ScFuncContext, f *TransferContext) { func funcTransferFrom(ctx wasmlib.ScFuncContext, f *TransferFromContext) { // validate parameters amount := f.Params.Amount().Value() - ctx.Require(amount > 0, "erc20.transfer_from.fail: wrong 'amount' parameter") + ctx.Require(amount >= 0, "erc20.transfer_from.fail: wrong 'amount' parameter") // allowances are in the map under the name of the account sourceAgent := f.Params.Account().Value() @@ -95,7 +96,7 @@ func funcTransferFrom(ctx wasmlib.ScFuncContext, f *TransferFromContext) { targetAgent := f.Params.Recipient().Value() targetBalance := balances.GetInt64(targetAgent) result := targetBalance.Value() + amount - ctx.Require(result > 0, "erc20.transfer_from.fail: overflow") + ctx.Require(result >= 0, "erc20.transfer_from.fail: overflow") sourceBalance.SetValue(sourceBalance.Value() - amount) targetBalance.SetValue(targetBalance.Value() + amount) diff --git a/contracts/wasm/erc20/go/erc20/events.go b/contracts/wasm/erc20/go/erc20/events.go index eb32d7a60a..7de35ec0a2 100644 --- a/contracts/wasm/erc20/go/erc20/events.go +++ b/contracts/wasm/erc20/go/erc20/events.go @@ -12,6 +12,14 @@ import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" type Erc20Events struct{} +func (e Erc20Events) Approval(amount int64, owner wasmlib.ScAgentID, spender wasmlib.ScAgentID) { + wasmlib.NewEventEncoder("erc20.approval"). + Int64(amount). + AgentID(owner). + AgentID(spender). + Emit() +} + func (e Erc20Events) Transfer(amount int64, from wasmlib.ScAgentID, to wasmlib.ScAgentID) { wasmlib.NewEventEncoder("erc20.transfer"). Int64(amount). diff --git a/contracts/wasm/erc20/schema.yaml b/contracts/wasm/erc20/schema.yaml index 7bb44b4a24..dc54a60a38 100644 --- a/contracts/wasm/erc20/schema.yaml +++ b/contracts/wasm/erc20/schema.yaml @@ -1,6 +1,10 @@ name: Erc20 description: ERC-20 PoC for IOTA Smart Contracts events: + approval: + amount: Int64 + owner: AgentID + spender: AgentID transfer: amount: Int64 from: AgentID diff --git a/contracts/wasm/erc20/src/erc20.rs b/contracts/wasm/erc20/src/erc20.rs index 9f9aed7d39..f056e80706 100644 --- a/contracts/wasm/erc20/src/erc20.rs +++ b/contracts/wasm/erc20/src/erc20.rs @@ -15,11 +15,12 @@ use crate::*; pub fn func_approve(ctx: &ScFuncContext, f: &ApproveContext) { let delegation = f.params.delegation().value(); let amount = f.params.amount().value(); - ctx.require(amount > 0, "erc20.approve.fail: wrong 'amount' parameter"); + ctx.require(amount >= 0, "erc20.approve.fail: wrong 'amount' parameter"); // all allowances are in the map under the name of he owner let allowances = f.state.all_allowances().get_allowances_for_agent(&ctx.caller()); allowances.get_int64(&delegation).set_value(amount); + f.events.approval(amount, &ctx.caller(), &delegation); } // on_init is a constructor entry point. It initializes the smart contract with the @@ -50,7 +51,7 @@ pub fn func_init(ctx: &ScFuncContext, f: &InitContext) { // - PARAM_AMOUNT: i64 pub fn func_transfer(ctx: &ScFuncContext, f: &TransferContext) { let amount = f.params.amount().value(); - ctx.require(amount > 0, "erc20.transfer.fail: wrong 'amount' parameter"); + ctx.require(amount >= 0, "erc20.transfer.fail: wrong 'amount' parameter"); let balances = f.state.balances(); let source_agent = ctx.caller(); @@ -60,7 +61,7 @@ pub fn func_transfer(ctx: &ScFuncContext, f: &TransferContext) { let target_agent = f.params.account().value(); let target_balance = balances.get_int64(&target_agent); let result = target_balance.value() + amount; - ctx.require(result > 0, "erc20.transfer.fail: overflow"); + ctx.require(result >= 0, "erc20.transfer.fail: overflow"); source_balance.set_value(source_balance.value() - amount); target_balance.set_value(target_balance.value() + amount); @@ -78,7 +79,7 @@ pub fn func_transfer(ctx: &ScFuncContext, f: &TransferContext) { pub fn func_transfer_from(ctx: &ScFuncContext, f: &TransferFromContext) { // validate parameters let amount = f.params.amount().value(); - ctx.require(amount > 0, "erc20.transfer_from.fail: wrong 'amount' parameter"); + ctx.require(amount >= 0, "erc20.transfer_from.fail: wrong 'amount' parameter"); // allowances are in the map under the name of the account let source_agent = f.params.account().value(); @@ -93,7 +94,7 @@ pub fn func_transfer_from(ctx: &ScFuncContext, f: &TransferFromContext) { let target_agent = f.params.recipient().value(); let target_balance = balances.get_int64(&target_agent); let result = target_balance.value() + amount; - ctx.require(result > 0, "erc20.transfer_from.fail: overflow"); + ctx.require(result >= 0, "erc20.transfer_from.fail: overflow"); source_balance.set_value(source_balance.value() - amount); target_balance.set_value(target_balance.value() + amount); diff --git a/contracts/wasm/erc20/src/events.rs b/contracts/wasm/erc20/src/events.rs index d943007f53..74bf775813 100644 --- a/contracts/wasm/erc20/src/events.rs +++ b/contracts/wasm/erc20/src/events.rs @@ -14,6 +14,14 @@ pub struct Erc20Events { impl Erc20Events { + pub fn approval(&self, amount: i64, owner: &ScAgentID, spender: &ScAgentID) { + let mut encoder = EventEncoder::new("erc20.approval"); + encoder.int64(amount); + encoder.agent_id(&owner); + encoder.agent_id(&spender); + encoder.emit(); + } + pub fn transfer(&self, amount: i64, from: &ScAgentID, to: &ScAgentID) { let mut encoder = EventEncoder::new("erc20.transfer"); encoder.int64(amount); diff --git a/contracts/wasm/erc20/test/erc20_bg.wasm b/contracts/wasm/erc20/test/erc20_bg.wasm index f70613a735478f4d20d8ad373a1c847573a51627..1626bfaa7ad2f6119e4d6cc429d75a52f5570d87 100644 GIT binary patch delta 10424 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 delta 10306 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 diff --git a/contracts/wasm/erc20/ts/erc20/erc20.ts b/contracts/wasm/erc20/ts/erc20/erc20.ts index 161a48b736..fbd3d19d3f 100644 --- a/contracts/wasm/erc20/ts/erc20/erc20.ts +++ b/contracts/wasm/erc20/ts/erc20/erc20.ts @@ -14,11 +14,12 @@ import * as sc from "./index"; export function funcApprove(ctx: wasmlib.ScFuncContext, f: sc.ApproveContext): void { let delegation = f.params.delegation().value(); let amount = f.params.amount().value(); - ctx.require(amount > 0, "erc20.approve.fail: wrong 'amount' parameter"); + ctx.require(amount >= 0, "erc20.approve.fail: wrong 'amount' parameter"); // all allowances are in the map under the name of he owner let allowances = f.state.allAllowances().getAllowancesForAgent(ctx.caller()); allowances.getInt64(delegation).setValue(amount); + f.events.approval(amount, ctx.caller(), delegation) } // onInit is a constructor entry point. It initializes the smart contract with the @@ -49,7 +50,7 @@ export function funcInit(ctx: wasmlib.ScFuncContext, f: sc.InitContext): void { // - PARAM_AMOUNT: i64 export function funcTransfer(ctx: wasmlib.ScFuncContext, f: sc.TransferContext): void { let amount = f.params.amount().value(); - ctx.require(amount > 0, "erc20.transfer.fail: wrong 'amount' parameter"); + ctx.require(amount >= 0, "erc20.transfer.fail: wrong 'amount' parameter"); let balances = f.state.balances(); let sourceAgent = ctx.caller(); @@ -59,7 +60,7 @@ export function funcTransfer(ctx: wasmlib.ScFuncContext, f: sc.TransferContext): let targetAgent = f.params.account().value(); let targetBalance = balances.getInt64(targetAgent); let result = targetBalance.value() + amount; - ctx.require(result > 0, "erc20.transfer.fail: overflow"); + ctx.require(result >= 0, "erc20.transfer.fail: overflow"); sourceBalance.setValue(sourceBalance.value() - amount); targetBalance.setValue(targetBalance.value() + amount); @@ -77,7 +78,7 @@ export function funcTransfer(ctx: wasmlib.ScFuncContext, f: sc.TransferContext): export function funcTransferFrom(ctx: wasmlib.ScFuncContext, f: sc.TransferFromContext): void { // validate parameters let amount = f.params.amount().value(); - ctx.require(amount > 0, "erc20.transferFrom.fail: wrong 'amount' parameter"); + ctx.require(amount >= 0, "erc20.transferFrom.fail: wrong 'amount' parameter"); // allowances are in the map under the name of the account let sourceAgent = f.params.account().value(); @@ -92,7 +93,7 @@ export function funcTransferFrom(ctx: wasmlib.ScFuncContext, f: sc.TransferFromC let targetAgent = f.params.recipient().value(); let recipientBalance = balances.getInt64(targetAgent); let result = recipientBalance.value() + amount; - ctx.require(result > 0, "erc20.transferFrom.fail: overflow"); + ctx.require(result >= 0, "erc20.transferFrom.fail: overflow"); sourceBalance.setValue(sourceBalance.value() - amount); recipientBalance.setValue(recipientBalance.value() + amount); diff --git a/contracts/wasm/erc20/ts/erc20/events.ts b/contracts/wasm/erc20/ts/erc20/events.ts index 6b4142fa39..a8dd067940 100644 --- a/contracts/wasm/erc20/ts/erc20/events.ts +++ b/contracts/wasm/erc20/ts/erc20/events.ts @@ -9,6 +9,14 @@ import * as wasmlib from "wasmlib"; export class Erc20Events { + approval(amount: i64, owner: wasmlib.ScAgentID, spender: wasmlib.ScAgentID): void { + new wasmlib.EventEncoder("erc20.approval"). + int64(amount). + agentID(owner). + agentID(spender). + emit(); + } + transfer(amount: i64, from: wasmlib.ScAgentID, to: wasmlib.ScAgentID): void { new wasmlib.EventEncoder("erc20.transfer"). int64(amount). diff --git a/contracts/wasm/fairauction/test/fairauction_bg.wasm b/contracts/wasm/fairauction/test/fairauction_bg.wasm index b23c98911b18d44c0f5e05882fcc3bc80fa2414c..cdfc3829f98d5c898b97cc38a2eb117b6e37df52 100644 GIT binary patch delta 28 jcmX?dmg&e@rVZDoFnUeCK1H3edh&lDxoorg)VYEH%>xZS delta 28 jcmX?dmg&e@rVZDoFuF~?K1H3eeDZ%FxoETc)VYEH%ySJg diff --git a/contracts/wasm/fairroulette/test/fairroulette_bg.wasm b/contracts/wasm/fairroulette/test/fairroulette_bg.wasm index 0456ec46ee632cab3aa8208e91067fae59a32fd5..b91b1a18e00425bbf7e284e69a0b4a0ecc68f7f2 100644 GIT binary patch delta 28 kcmbQXlWE#crVUTJ8NDVy?N(>3p3K{$&Uk*aX-}d60Jka&y8r+H delta 28 kcmbQXlWE#crVUTJ8Qms7?N( ScAddress { ScAddress { id: bytes.try_into().expect("invalid address id length") } @@ -57,6 +59,8 @@ pub struct ScAgentID { } impl ScAgentID { + pub const ZERO: ScAgentID = ScAgentID { id: [0; 37] }; + // construct from address and contract name hash pub fn new(address: &ScAddress, hname: ScHname) -> ScAgentID { let mut agent_id = ScAgentID { id: [0; 37] }; @@ -196,6 +200,8 @@ pub struct ScHash { } impl ScHash { + pub const ZERO: ScHash = ScHash { id: [0; 32] }; + // construct from byte array pub fn from_bytes(bytes: &[u8]) -> ScHash { ScHash { id: bytes.try_into().expect("invalid hash id length") } diff --git a/tools/cluster/tests/wasm/inccounter_bg.wasm b/tools/cluster/tests/wasm/inccounter_bg.wasm index 9e243c6fb4540d609f4655129f8e5cf17b33933e..024b43f447e2d6b1bb10c172e7b2f9b7cf5ce49a 100644 GIT binary patch delta 16 XcmeBQ$ke}(X@hP9WA$dehC~4XH&+G_ delta 16 XcmeBQ$ke}(X@hP9WBF#ihC~4XH$Mgp From 5dfd340bfc42df61a7c9394bab7e3832afc37ffd Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Wed, 1 Dec 2021 09:03:36 +0200 Subject: [PATCH 153/198] Less exporting of chainimpl inner fields --- packages/chain/chain.go | 10 ++----- packages/chain/chainimpl/chainimpl.go | 1 - packages/chain/chainimpl/interface.go | 18 ++++++------ packages/chain/statemgr/action.go | 2 +- .../testutil/testchain/mock_chain_core.go | 12 ++------ packages/webapi/reqstatus/reqstatus.go | 6 ++-- packages/webapi/reqstatus/reqstatus_test.go | 8 +++++- packages/webapi/request/request_test.go | 28 +++++++++++++++---- 8 files changed, 46 insertions(+), 39 deletions(-) diff --git a/packages/chain/chain.go b/packages/chain/chain.go index 8801ef6cb9..d8ca8dd0ab 100644 --- a/packages/chain/chain.go +++ b/packages/chain/chain.go @@ -25,7 +25,7 @@ type ChainCore interface { ID() *iscp.ChainID GetCommitteeInfo() *CommitteeInfo StateCandidateToStateManager(state.VirtualStateAccess, ledgerstate.OutputID) - Events() ChainEvents + TriggerChainTransition(*ChainTransitionEventData) Processors() *processors.Cache GlobalStateSync() coreutil.ChainStateSync GetStateReader() state.OptimisticStateReader @@ -53,18 +53,14 @@ type ChainEntry interface { // ChainRequests is an interface to query status of the request type ChainRequests interface { GetRequestProcessingStatus(id iscp.RequestID) RequestProcessingStatus - EventRequestProcessed() *events.Event + AttachToRequestProcessed(func(iscp.RequestID)) (attachID *events.Closure) + DetachFromRequestProcessed(attachID *events.Closure) } type ChainMetrics interface { GetNodeConnectionMetrics() nodeconnmetrics.NodeConnectionMessagesMetrics } -type ChainEvents interface { - RequestProcessed() *events.Event - ChainTransition() *events.Event -} - type Chain interface { ChainCore ChainRequests diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index 2feed96143..5b37352bd4 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -42,7 +42,6 @@ var ( _ chain.ChainCore = &chainObj{} _ chain.ChainEntry = &chainObj{} _ chain.ChainRequests = &chainObj{} - _ chain.ChainEvents = &chainObj{} _ chain.ChainMetrics = &chainObj{} ) diff --git a/packages/chain/chainimpl/interface.go b/packages/chain/chainimpl/interface.go index 016d24ca74..fa839d23d6 100644 --- a/packages/chain/chainimpl/interface.go +++ b/packages/chain/chainimpl/interface.go @@ -212,20 +212,18 @@ func (c *chainObj) Processors() *processors.Cache { return c.procset } -func (c *chainObj) EventRequestProcessed() *events.Event { - return c.eventRequestProcessed +func (c *chainObj) AttachToRequestProcessed(handler func(iscp.RequestID)) *events.Closure { + closure := events.NewClosure(handler) + c.eventRequestProcessed.Attach(closure) + return closure } -func (c *chainObj) RequestProcessed() *events.Event { - return c.eventRequestProcessed +func (c *chainObj) DetachFromRequestProcessed(attachID *events.Closure) { + c.eventRequestProcessed.Detach(attachID) } -func (c *chainObj) ChainTransition() *events.Event { - return c.eventChainTransition -} - -func (c *chainObj) Events() chain.ChainEvents { - return c +func (c *chainObj) TriggerChainTransition(data *chain.ChainTransitionEventData) { + c.eventChainTransition.Trigger(data) } // GetStateReader returns a new copy of the optimistic state reader, with own baseline diff --git a/packages/chain/statemgr/action.go b/packages/chain/statemgr/action.go index 04caa9dd5b..81aaeb9253 100644 --- a/packages/chain/statemgr/action.go +++ b/packages/chain/statemgr/action.go @@ -48,7 +48,7 @@ func (sm *stateManager) notifyChainTransitionIfNeeded() { } sm.log.Debugf("notifyStateTransition: %sstate IS SYNCED to index %d and is approved by output %v", gu, stateOutputIndex, iscp.OID(stateOutputID)) - sm.chain.Events().ChainTransition().Trigger(&chain.ChainTransitionEventData{ + sm.chain.TriggerChainTransition(&chain.ChainTransitionEventData{ VirtualState: sm.solidState.Copy(), ChainOutput: sm.stateOutput, OutputTimestamp: sm.stateOutputTimestamp, diff --git a/packages/testutil/testchain/mock_chain_core.go b/packages/testutil/testchain/mock_chain_core.go index 665cbf9506..70833248d2 100644 --- a/packages/testutil/testchain/mock_chain_core.go +++ b/packages/testutil/testchain/mock_chain_core.go @@ -147,20 +147,12 @@ func (m *MockedChainCore) EnqueueTimerTick(tick int) { m.onTimerTick(tick) } -func (m *MockedChainCore) Events() chain.ChainEvents { - return m -} - func (m *MockedChainCore) Processors() *processors.Cache { return m.processors } -func (m *MockedChainCore) RequestProcessed() *events.Event { - return m.eventRequestProcessed -} - -func (m *MockedChainCore) ChainTransition() *events.Event { - return m.eventStateTransition +func (m *MockedChainCore) TriggerChainTransition(data *chain.ChainTransitionEventData) { + m.eventStateTransition.Trigger(data) } func (m *MockedChainCore) OnStateTransition(f func(data *chain.ChainTransitionEventData)) { diff --git a/packages/webapi/reqstatus/reqstatus.go b/packages/webapi/reqstatus/reqstatus.go index 0515662b3f..ffcfeb86e4 100644 --- a/packages/webapi/reqstatus/reqstatus.go +++ b/packages/webapi/reqstatus/reqstatus.go @@ -5,7 +5,6 @@ import ( "net/http" "time" - "github.com/iotaledger/hive.go/events" "github.com/iotaledger/wasp/packages/chain" "github.com/iotaledger/wasp/packages/chains" "github.com/iotaledger/wasp/packages/iscp" @@ -77,13 +76,12 @@ func (r *reqstatusWebAPI) handleWaitRequestProcessed(c echo.Context) error { // subscribe to event requestProcessed := make(chan bool) - handler := events.NewClosure(func(rid iscp.RequestID) { + attachID := ch.AttachToRequestProcessed(func(rid iscp.RequestID) { if rid == reqID { requestProcessed <- true } }) - ch.EventRequestProcessed().Attach(handler) - defer ch.EventRequestProcessed().Detach(handler) + defer ch.DetachFromRequestProcessed(attachID) select { case <-requestProcessed: diff --git a/packages/webapi/reqstatus/reqstatus_test.go b/packages/webapi/reqstatus/reqstatus_test.go index a935191289..30d7e919d2 100644 --- a/packages/webapi/reqstatus/reqstatus_test.go +++ b/packages/webapi/reqstatus/reqstatus_test.go @@ -16,11 +16,17 @@ import ( type mockChain struct{} +var _ chain.ChainRequests = &mockChain{} + func (m *mockChain) GetRequestProcessingStatus(id iscp.RequestID) chain.RequestProcessingStatus { return chain.RequestProcessingStatusCompleted } -func (m *mockChain) EventRequestProcessed() *events.Event { +func (m *mockChain) AttachToRequestProcessed(func(iscp.RequestID)) (attachID *events.Closure) { + panic("not implemented") +} + +func (m *mockChain) DetachFromRequestProcessed(attachID *events.Closure) { panic("not implemented") } diff --git a/packages/webapi/request/request_test.go b/packages/webapi/request/request_test.go index 0aafc7dc58..028c8295e6 100644 --- a/packages/webapi/request/request_test.go +++ b/packages/webapi/request/request_test.go @@ -12,7 +12,6 @@ import ( "github.com/iotaledger/wasp/packages/chains" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/colored" - "github.com/iotaledger/wasp/packages/iscp/request" "github.com/iotaledger/wasp/packages/metrics/nodeconnmetrics" util "github.com/iotaledger/wasp/packages/testutil" "github.com/iotaledger/wasp/packages/testutil/testchain" @@ -27,23 +26,36 @@ type mockedChain struct { *testchain.MockedChainCore } +var ( + _ chain.Chain = &mockedChain{} + _ chain.ChainCore = &mockedChain{} // from testchain.MockedChainCore + _ chain.ChainEntry = &mockedChain{} + _ chain.ChainRequests = &mockedChain{} + _ chain.ChainMetrics = &mockedChain{} +) + +// chain.ChainRequests implementation + func (m *mockedChain) GetRequestProcessingStatus(_ iscp.RequestID) chain.RequestProcessingStatus { panic("implement me") } -func (m *mockedChain) EventRequestProcessed() *events.Event { +func (m *mockedChain) AttachToRequestProcessed(func(iscp.RequestID)) (attachID *events.Closure) { panic("implement me") } -func (m *mockedChain) ReceiveTransaction(_ *ledgerstate.Transaction) { +func (m *mockedChain) DetachFromRequestProcessed(attachID *events.Closure) { panic("implement me") } -func (m *mockedChain) ReceiveState(_ *ledgerstate.AliasOutput, _ time.Time) { +// chain.ChainEntry implementation + +func (m *mockedChain) ReceiveTransaction(_ *ledgerstate.Transaction) { panic("implement me") } -func (m *mockedChain) ReceiveOffLedgerRequest(_ *request.OffLedger, _ string) { +func (m *mockedChain) ReceiveState(_ *ledgerstate.AliasOutput, _ time.Time) { + panic("implement me") } func (m *mockedChain) Dismiss(_ string) { @@ -54,10 +66,14 @@ func (m *mockedChain) IsDismissed() bool { panic("implement me") } +// chain.ChainMetrics implementation + func (m *mockedChain) GetNodeConnectionMetrics() nodeconnmetrics.NodeConnectionMessagesMetrics { panic("implement me") } +// private methods + func createMockedGetChain(t *testing.T) chains.ChainProvider { return func(chainID *iscp.ChainID) chain.Chain { chainCore := testchain.NewMockedChainCore(t, chainID, testlogger.NewLogger(t)) @@ -100,6 +116,8 @@ func testRequest(t *testing.T, instance *offLedgerReqAPI, chainID *iscp.ChainID, ) } +// Tests + func TestNewRequestBase64(t *testing.T) { instance := newMockedAPI(t) chainID := iscp.RandomChainID() From 5026c699fcac68d240b604237490802be639ca02 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Wed, 1 Dec 2021 09:30:45 +0200 Subject: [PATCH 154/198] Reorganising chainimpl code --- packages/chain/chainimpl/chainimpl.go | 103 ++--------- packages/chain/chainimpl/core.go | 59 +++++++ packages/chain/chainimpl/entry.go | 72 ++++++++ packages/chain/chainimpl/eventproc.go | 160 +++++++++++++++++ packages/chain/chainimpl/interface.go | 236 -------------------------- packages/chain/chainimpl/requests.go | 39 +++++ 6 files changed, 342 insertions(+), 327 deletions(-) create mode 100644 packages/chain/chainimpl/core.go create mode 100644 packages/chain/chainimpl/entry.go delete mode 100644 packages/chain/chainimpl/interface.go create mode 100644 packages/chain/chainimpl/requests.go diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index 5b37352bd4..ad724b8b47 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -7,13 +7,10 @@ import ( "sync" "time" - "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/hive.go/events" "github.com/iotaledger/hive.go/kvstore" "github.com/iotaledger/hive.go/logger" "github.com/iotaledger/wasp/packages/chain" - "github.com/iotaledger/wasp/packages/chain/committee" - "github.com/iotaledger/wasp/packages/chain/consensus" "github.com/iotaledger/wasp/packages/chain/mempool" "github.com/iotaledger/wasp/packages/chain/messages" "github.com/iotaledger/wasp/packages/chain/nodeconnimpl" @@ -27,12 +24,10 @@ import ( "github.com/iotaledger/wasp/packages/publisher" "github.com/iotaledger/wasp/packages/registry" "github.com/iotaledger/wasp/packages/state" - "github.com/iotaledger/wasp/packages/util" "github.com/iotaledger/wasp/packages/util/pipe" "github.com/iotaledger/wasp/packages/vm/core/blocklog" "github.com/iotaledger/wasp/packages/vm/processors" "go.uber.org/atomic" - "golang.org/x/xerrors" ) const maxMsgBuffer = 1000 @@ -159,6 +154,18 @@ func NewChain( return ret } +func (c *chainObj) startTimer() { + go func() { + c.stateMgr.Ready().MustWait() + tick := 0 + for !c.IsDismissed() { + c.EnqueueTimerTick(tick) + tick++ + time.Sleep(chain.TimerTickPeriod) + } + }() +} + func (c *chainObj) receiveCommitteePeerMessages(peerMsg *peering.PeerMessageGroupIn) { if peerMsg.MsgType != chain.PeerMsgTypeMissingRequestIDs { c.log.Warnf("Wrong type of chain message (with committee peering ID): %v, ignoring it", peerMsg.MsgType) @@ -284,92 +291,6 @@ func (c *chainObj) publishNewBlockEvents(blockIndex uint32) { }() } -func (c *chainObj) rotateCommitteeIfNeeded(anchorOutput *ledgerstate.AliasOutput, currentCmt chain.Committee) error { - if currentCmt.Address().Equals(anchorOutput.GetStateAddress()) { - // nothing changed. no rotation - return nil - } - // address changed - if !anchorOutput.GetIsGovernanceUpdated() { - return xerrors.Errorf("rotateCommitteeIfNeeded: inconsistency. Governance transition expected... New output: %s", anchorOutput.String()) - } - rec, err := c.getOwnCommitteeRecord(anchorOutput.GetStateAddress()) - if err != nil { - return xerrors.Errorf("rotateCommitteeIfNeeded: %w", err) - } - // rotation needed - // close current in any case - c.log.Infof("CLOSING COMMITTEE for %s", currentCmt.Address().Base58()) - - currentCmt.Close() - c.consensus.Close() - c.setCommittee(nil) - c.consensus = nil - if rec != nil { - // create new if committee record is available - if err = c.createNewCommitteeAndConsensus(rec); err != nil { - return xerrors.Errorf("rotateCommitteeIfNeeded: creating committee and consensus: %v", err) - } - } - return nil -} - -func (c *chainObj) createCommitteeIfNeeded(anchorOutput *ledgerstate.AliasOutput) error { - // check if I am in the committee - rec, err := c.getOwnCommitteeRecord(anchorOutput.GetStateAddress()) - if err != nil { - return xerrors.Errorf("rotateCommitteeIfNeeded: %w", err) - } - if rec != nil { - // create if record is present - if err = c.createNewCommitteeAndConsensus(rec); err != nil { - return xerrors.Errorf("rotateCommitteeIfNeeded: creating committee and consensus: %v", err) - } - } - return nil -} - -func (c *chainObj) getOwnCommitteeRecord(addr ledgerstate.Address) (*registry.CommitteeRecord, error) { - rec, err := c.committeeRegistry.GetCommitteeRecord(addr) - if err != nil { - return nil, xerrors.Errorf("createCommitteeIfNeeded: reading committee record: %v", err) - } - if rec == nil { - // committee record wasn't found in th registry, I am not the part of the committee - return nil, nil - } - // just in case check if I am among committee nodes - // should not happen - if !util.StringInList(c.peerNetworkConfig.OwnNetID(), rec.Nodes) { - return nil, xerrors.Errorf("createCommitteeIfNeeded: I am not among nodes of the committee record. Inconsistency") - } - return rec, nil -} - -func (c *chainObj) createNewCommitteeAndConsensus(cmtRec *registry.CommitteeRecord) error { - c.log.Debugf("createNewCommitteeAndConsensus: creating a new committee...") - cmt, cmtPeerGroup, err := committee.New( - cmtRec, - c.chainID, - c.netProvider, - c.peerNetworkConfig, - c.dksProvider, - c.log, - ) - if err != nil { - c.setCommittee(nil) - return xerrors.Errorf("createNewCommitteeAndConsensus: failed to create committee object for state address %s: %w", - cmtRec.Address.Base58(), err) - } - cmtPeerGroup.Attach(peering.PeerMessageReceiverChain, c.receiveCommitteePeerMessages) - c.log.Debugf("creating new consensus object...") - c.consensus = consensus.New(c, c.mempool, cmt, cmtPeerGroup, c.nodeConn, c.pullMissingRequestsFromCommittee, c.chainMetrics) - c.setCommittee(cmt) - - c.log.Infof("NEW COMMITTEE OF VALIDATORS has been initialized for the state address %s", cmtRec.Address.Base58()) - return nil -} - func (c *chainObj) getCommittee() chain.Committee { ret := c.committee.Load().(*committeeStruct) if !ret.valid { diff --git a/packages/chain/chainimpl/core.go b/packages/chain/chainimpl/core.go new file mode 100644 index 0000000000..3c05d06d99 --- /dev/null +++ b/packages/chain/chainimpl/core.go @@ -0,0 +1,59 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// Provides implementations for chain.ChainCore methods except the Enqueue*, +// which are provided in eventproc.go +package chainimpl + +import ( + "github.com/iotaledger/goshimmer/packages/ledgerstate" + "github.com/iotaledger/hive.go/logger" + "github.com/iotaledger/wasp/packages/chain" + "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/iscp/coreutil" + "github.com/iotaledger/wasp/packages/state" + "github.com/iotaledger/wasp/packages/vm/processors" +) + +func (c *chainObj) ID() *iscp.ChainID { + return c.chainID +} + +func (c *chainObj) GetCommitteeInfo() *chain.CommitteeInfo { + cmt := c.getCommittee() + if cmt == nil { + return nil + } + return &chain.CommitteeInfo{ + Address: cmt.DKShare().Address, + Size: cmt.Size(), + Quorum: cmt.Quorum(), + QuorumIsAlive: cmt.QuorumIsAlive(), + PeerStatus: cmt.PeerStatus(), + } +} + +func (c *chainObj) StateCandidateToStateManager(virtualState state.VirtualStateAccess, outputID ledgerstate.OutputID) { + c.stateMgr.EnqueueStateCandidateMsg(virtualState, outputID) +} + +func (c *chainObj) TriggerChainTransition(data *chain.ChainTransitionEventData) { + c.eventChainTransition.Trigger(data) +} + +func (c *chainObj) Processors() *processors.Cache { + return c.procset +} + +func (c *chainObj) GlobalStateSync() coreutil.ChainStateSync { + return c.chainStateSync +} + +// GetStateReader returns a new copy of the optimistic state reader, with own baseline +func (c *chainObj) GetStateReader() state.OptimisticStateReader { + return state.NewOptimisticStateReader(c.db, c.chainStateSync) +} + +func (c *chainObj) Log() *logger.Logger { + return c.log +} diff --git a/packages/chain/chainimpl/entry.go b/packages/chain/chainimpl/entry.go new file mode 100644 index 0000000000..1414ca86b2 --- /dev/null +++ b/packages/chain/chainimpl/entry.go @@ -0,0 +1,72 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// Provides implementations for chain.ChainEntry methods +package chainimpl + +import ( + "time" + + "github.com/iotaledger/goshimmer/packages/ledgerstate" + "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/iscp/request" + "github.com/iotaledger/wasp/packages/publisher" + "github.com/iotaledger/wasp/packages/transaction" +) + +func (c *chainObj) ReceiveTransaction(tx *ledgerstate.Transaction) { + c.log.Debugf("ReceiveTransaction: %s", tx.ID().Base58()) + reqs, err := request.OnLedgerFromTransaction(tx, c.chainID.AsAddress()) + if err != nil { + c.log.Warnf("failed to parse transaction %s: %v", tx.ID().Base58(), err) + return + } + for _, req := range reqs { + c.mempool.ReceiveRequest(req) + } + if chainOut := transaction.GetAliasOutput(tx, c.chainID.AsAddress()); chainOut != nil { + c.ReceiveState(chainOut, tx.Essence().Timestamp()) + } +} + +func (c *chainObj) ReceiveState(stateOutput *ledgerstate.AliasOutput, timestamp time.Time) { + c.log.Debugf("ReceiveState #%d: outputID: %s, stateAddr: %s", + stateOutput.GetStateIndex(), iscp.OID(stateOutput.ID()), stateOutput.GetStateAddress().Base58()) + c.EnqueueLedgerState(stateOutput, timestamp) +} + +func (c *chainObj) Dismiss(reason string) { + c.log.Infof("Dismiss chain. Reason: '%s'", reason) + + c.dismissOnce.Do(func() { + c.dismissed.Store(true) + + c.mempool.Close() + c.stateMgr.Close() + cmt := c.getCommittee() + if cmt != nil { + cmt.Close() + } + if c.consensus != nil { + c.consensus.Close() + } + c.eventRequestProcessed.DetachAll() + c.eventChainTransition.DetachAll() + c.chainPeers.Close() + + c.dismissChainMsgPipe.Close() + c.stateMsgPipe.Close() + c.offLedgerRequestPeerMsgPipe.Close() + c.requestAckPeerMsgPipe.Close() + c.missingRequestIDsPeerMsgPipe.Close() + c.missingRequestPeerMsgPipe.Close() + c.timerTickMsgPipe.Close() + }) + + publisher.Publish("dismissed_chain", c.chainID.Base58()) + c.log.Debug("Chain dismissed") +} + +func (c *chainObj) IsDismissed() bool { + return c.dismissed.Load() +} diff --git a/packages/chain/chainimpl/eventproc.go b/packages/chain/chainimpl/eventproc.go index 972459742d..9c34bcd50a 100644 --- a/packages/chain/chainimpl/eventproc.go +++ b/packages/chain/chainimpl/eventproc.go @@ -8,10 +8,15 @@ import ( "github.com/iotaledger/goshimmer/packages/ledgerstate" "github.com/iotaledger/wasp/packages/chain" + "github.com/iotaledger/wasp/packages/chain/committee" + "github.com/iotaledger/wasp/packages/chain/consensus" "github.com/iotaledger/wasp/packages/chain/messages" "github.com/iotaledger/wasp/packages/hashing" + "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/request" "github.com/iotaledger/wasp/packages/peering" + "github.com/iotaledger/wasp/packages/registry" + "github.com/iotaledger/wasp/packages/util" "golang.org/x/xerrors" ) @@ -124,6 +129,92 @@ func (c *chainObj) handleLedgerState(msg *messages.StateMsg) { c.log.Debugf("handleLedgerState passed to state manager") } +func (c *chainObj) rotateCommitteeIfNeeded(anchorOutput *ledgerstate.AliasOutput, currentCmt chain.Committee) error { + if currentCmt.Address().Equals(anchorOutput.GetStateAddress()) { + // nothing changed. no rotation + return nil + } + // address changed + if !anchorOutput.GetIsGovernanceUpdated() { + return xerrors.Errorf("rotateCommitteeIfNeeded: inconsistency. Governance transition expected... New output: %s", anchorOutput.String()) + } + rec, err := c.getOwnCommitteeRecord(anchorOutput.GetStateAddress()) + if err != nil { + return xerrors.Errorf("rotateCommitteeIfNeeded: %w", err) + } + // rotation needed + // close current in any case + c.log.Infof("CLOSING COMMITTEE for %s", currentCmt.Address().Base58()) + + currentCmt.Close() + c.consensus.Close() + c.setCommittee(nil) + c.consensus = nil + if rec != nil { + // create new if committee record is available + if err = c.createNewCommitteeAndConsensus(rec); err != nil { + return xerrors.Errorf("rotateCommitteeIfNeeded: creating committee and consensus: %v", err) + } + } + return nil +} + +func (c *chainObj) createCommitteeIfNeeded(anchorOutput *ledgerstate.AliasOutput) error { + // check if I am in the committee + rec, err := c.getOwnCommitteeRecord(anchorOutput.GetStateAddress()) + if err != nil { + return xerrors.Errorf("rotateCommitteeIfNeeded: %w", err) + } + if rec != nil { + // create if record is present + if err = c.createNewCommitteeAndConsensus(rec); err != nil { + return xerrors.Errorf("rotateCommitteeIfNeeded: creating committee and consensus: %v", err) + } + } + return nil +} + +func (c *chainObj) getOwnCommitteeRecord(addr ledgerstate.Address) (*registry.CommitteeRecord, error) { + rec, err := c.committeeRegistry.GetCommitteeRecord(addr) + if err != nil { + return nil, xerrors.Errorf("createCommitteeIfNeeded: reading committee record: %v", err) + } + if rec == nil { + // committee record wasn't found in th registry, I am not the part of the committee + return nil, nil + } + // just in case check if I am among committee nodes + // should not happen + if !util.StringInList(c.peerNetworkConfig.OwnNetID(), rec.Nodes) { + return nil, xerrors.Errorf("createCommitteeIfNeeded: I am not among nodes of the committee record. Inconsistency") + } + return rec, nil +} + +func (c *chainObj) createNewCommitteeAndConsensus(cmtRec *registry.CommitteeRecord) error { + c.log.Debugf("createNewCommitteeAndConsensus: creating a new committee...") + cmt, cmtPeerGroup, err := committee.New( + cmtRec, + c.chainID, + c.netProvider, + c.peerNetworkConfig, + c.dksProvider, + c.log, + ) + if err != nil { + c.setCommittee(nil) + return xerrors.Errorf("createNewCommitteeAndConsensus: failed to create committee object for state address %s: %w", + cmtRec.Address.Base58(), err) + } + cmtPeerGroup.Attach(peering.PeerMessageReceiverChain, c.receiveCommitteePeerMessages) + c.log.Debugf("creating new consensus object...") + c.consensus = consensus.New(c, c.mempool, cmt, cmtPeerGroup, c.nodeConn, c.pullMissingRequestsFromCommittee, c.chainMetrics) + c.setCommittee(cmt) + + c.log.Infof("NEW COMMITTEE OF VALIDATORS has been initialized for the state address %s", cmtRec.Address.Base58()) + return nil +} + func (c *chainObj) EnqueueOffLedgerRequestMsg(msg *messages.OffLedgerRequestMsgIn) { c.offLedgerRequestPeerMsgPipe.In() <- msg c.chainMetrics.CountMessages() @@ -147,10 +238,79 @@ func (c *chainObj) handleOffLedgerRequestMsg(msg *messages.OffLedgerRequestMsgIn c.log.Debugf("handleOffLedgerRequestMsg message added to mempool and broadcasted: reqID: %s", msg.Req.ID().Base58()) } +func (c *chainObj) sendRequestAcknowledgementMsg(reqID iscp.RequestID, peerID string) { + c.log.Debugf("sendRequestAcknowledgementMsg: reqID: %s, peerID: %s", reqID.Base58(), peerID) + if peerID == "" { + return + } + msg := &messages.RequestAckMsg{ReqID: &reqID} + c.chainPeers.SendMsgByNetID(peerID, peering.PeerMessageReceiverChain, chain.PeerMsgTypeRequestAck, msg.Bytes()) +} + func (c *chainObj) isRequestValid(req *request.OffLedger) bool { return req.ChainID().Equals(c.ID()) && req.VerifySignature() } +func (c *chainObj) broadcastOffLedgerRequest(req *request.OffLedger) { + c.log.Debugf("broadcastOffLedgerRequest: toNPeers: %d, reqID: %s", c.offledgerBroadcastUpToNPeers, req.ID().Base58()) + msg := &messages.OffLedgerRequestMsg{ + ChainID: c.chainID, + Req: req, + } + cmt := c.getCommittee() + getPeerIDs := c.chainPeers.GetRandomPeers + + if cmt != nil { + getPeerIDs = cmt.GetRandomValidators + } + + sendMessage := func(ackPeers []string) { + peerIDs := getPeerIDs(c.offledgerBroadcastUpToNPeers) + for _, peerID := range peerIDs { + if shouldSendToPeer(peerID, ackPeers) { + c.log.Debugf("sending offledger request ID: reqID: %s, peerID: %s", req.ID().Base58(), peerID) + c.chainPeers.SendMsgByNetID(peerID, peering.PeerMessageReceiverChain, chain.PeerMsgTypeOffLedgerRequest, msg.Bytes()) + } + } + } + + ticker := time.NewTicker(c.offledgerBroadcastInterval) + stopBroadcast := func() { + c.offLedgerReqsAcksMutex.Lock() + delete(c.offLedgerReqsAcks, req.ID()) + c.offLedgerReqsAcksMutex.Unlock() + ticker.Stop() + } + + go func() { + defer stopBroadcast() + for { + <-ticker.C + // check if processed (request already left the mempool) + if !c.mempool.HasRequest(req.ID()) { + return + } + c.offLedgerReqsAcksMutex.RLock() + ackPeers := c.offLedgerReqsAcks[(*req).ID()] + c.offLedgerReqsAcksMutex.RUnlock() + if cmt != nil && len(ackPeers) >= int(cmt.Size())-1 { + // this node is part of the committee and the message has already been received by every other committee node + return + } + sendMessage(ackPeers) + } + }() +} + +func shouldSendToPeer(peerID string, ackPeers []string) bool { + for _, p := range ackPeers { + if p == peerID { + return false + } + } + return true +} + func (c *chainObj) EnqueueRequestAckMsg(msg *messages.RequestAckMsgIn) { c.requestAckPeerMsgPipe.In() <- msg c.chainMetrics.CountMessages() diff --git a/packages/chain/chainimpl/interface.go b/packages/chain/chainimpl/interface.go deleted file mode 100644 index fa839d23d6..0000000000 --- a/packages/chain/chainimpl/interface.go +++ /dev/null @@ -1,236 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -package chainimpl - -import ( - "time" - - "github.com/iotaledger/goshimmer/packages/ledgerstate" - "github.com/iotaledger/hive.go/events" - "github.com/iotaledger/hive.go/logger" - "github.com/iotaledger/wasp/packages/chain" - "github.com/iotaledger/wasp/packages/chain/messages" - "github.com/iotaledger/wasp/packages/iscp" - "github.com/iotaledger/wasp/packages/iscp/coreutil" - "github.com/iotaledger/wasp/packages/iscp/request" - "github.com/iotaledger/wasp/packages/peering" - "github.com/iotaledger/wasp/packages/publisher" - "github.com/iotaledger/wasp/packages/registry" - "github.com/iotaledger/wasp/packages/state" - "github.com/iotaledger/wasp/packages/transaction" - "github.com/iotaledger/wasp/packages/vm/core/blocklog" - "github.com/iotaledger/wasp/packages/vm/processors" -) - -func (c *chainObj) ID() *iscp.ChainID { - return c.chainID -} - -func (c *chainObj) GlobalStateSync() coreutil.ChainStateSync { - return c.chainStateSync -} - -func (c *chainObj) GetCommitteeInfo() *chain.CommitteeInfo { - cmt := c.getCommittee() - if cmt == nil { - return nil - } - return &chain.CommitteeInfo{ - Address: cmt.DKShare().Address, - Size: cmt.Size(), - Quorum: cmt.Quorum(), - QuorumIsAlive: cmt.QuorumIsAlive(), - PeerStatus: cmt.PeerStatus(), - } -} - -func (c *chainObj) startTimer() { - go func() { - c.stateMgr.Ready().MustWait() - tick := 0 - for !c.IsDismissed() { - c.EnqueueTimerTick(tick) - tick++ - time.Sleep(chain.TimerTickPeriod) - } - }() -} - -func (c *chainObj) Dismiss(reason string) { - c.log.Infof("Dismiss chain. Reason: '%s'", reason) - - c.dismissOnce.Do(func() { - c.dismissed.Store(true) - - c.mempool.Close() - c.stateMgr.Close() - cmt := c.getCommittee() - if cmt != nil { - cmt.Close() - } - if c.consensus != nil { - c.consensus.Close() - } - c.eventRequestProcessed.DetachAll() - c.eventChainTransition.DetachAll() - c.chainPeers.Close() - - c.dismissChainMsgPipe.Close() - c.stateMsgPipe.Close() - c.offLedgerRequestPeerMsgPipe.Close() - c.requestAckPeerMsgPipe.Close() - c.missingRequestIDsPeerMsgPipe.Close() - c.missingRequestPeerMsgPipe.Close() - c.timerTickMsgPipe.Close() - }) - - publisher.Publish("dismissed_chain", c.chainID.Base58()) - c.log.Debug("Chain dismissed") -} - -func (c *chainObj) IsDismissed() bool { - return c.dismissed.Load() -} - -func (c *chainObj) StateCandidateToStateManager(virtualState state.VirtualStateAccess, outputID ledgerstate.OutputID) { - c.stateMgr.EnqueueStateCandidateMsg(virtualState, outputID) -} - -func shouldSendToPeer(peerID string, ackPeers []string) bool { - for _, p := range ackPeers { - if p == peerID { - return false - } - } - return true -} - -func (c *chainObj) broadcastOffLedgerRequest(req *request.OffLedger) { - c.log.Debugf("broadcastOffLedgerRequest: toNPeers: %d, reqID: %s", c.offledgerBroadcastUpToNPeers, req.ID().Base58()) - msg := &messages.OffLedgerRequestMsg{ - ChainID: c.chainID, - Req: req, - } - committee := c.getCommittee() - getPeerIDs := c.chainPeers.GetRandomPeers - - if committee != nil { - getPeerIDs = committee.GetRandomValidators - } - - sendMessage := func(ackPeers []string) { - peerIDs := getPeerIDs(c.offledgerBroadcastUpToNPeers) - for _, peerID := range peerIDs { - if shouldSendToPeer(peerID, ackPeers) { - c.log.Debugf("sending offledger request ID: reqID: %s, peerID: %s", req.ID().Base58(), peerID) - c.chainPeers.SendMsgByNetID(peerID, peering.PeerMessageReceiverChain, chain.PeerMsgTypeOffLedgerRequest, msg.Bytes()) - } - } - } - - ticker := time.NewTicker(c.offledgerBroadcastInterval) - stopBroadcast := func() { - c.offLedgerReqsAcksMutex.Lock() - delete(c.offLedgerReqsAcks, req.ID()) - c.offLedgerReqsAcksMutex.Unlock() - ticker.Stop() - } - - go func() { - defer stopBroadcast() - for { - <-ticker.C - // check if processed (request already left the mempool) - if !c.mempool.HasRequest(req.ID()) { - return - } - c.offLedgerReqsAcksMutex.RLock() - ackPeers := c.offLedgerReqsAcks[(*req).ID()] - c.offLedgerReqsAcksMutex.RUnlock() - if committee != nil && len(ackPeers) >= int(committee.Size())-1 { - // this node is part of the committee and the message has already been received by every other committee node - return - } - sendMessage(ackPeers) - } - }() -} - -func (c *chainObj) sendRequestAcknowledgementMsg(reqID iscp.RequestID, peerID string) { - c.log.Debugf("sendRequestAcknowledgementMsg: reqID: %s, peerID: %s", reqID.Base58(), peerID) - if peerID == "" { - return - } - msg := &messages.RequestAckMsg{ReqID: &reqID} - c.chainPeers.SendMsgByNetID(peerID, peering.PeerMessageReceiverChain, chain.PeerMsgTypeRequestAck, msg.Bytes()) -} - -func (c *chainObj) ReceiveTransaction(tx *ledgerstate.Transaction) { - c.log.Debugf("ReceiveTransaction: %s", tx.ID().Base58()) - reqs, err := request.OnLedgerFromTransaction(tx, c.chainID.AsAddress()) - if err != nil { - c.log.Warnf("failed to parse transaction %s: %v", tx.ID().Base58(), err) - return - } - for _, req := range reqs { - c.mempool.ReceiveRequest(req) - } - if chainOut := transaction.GetAliasOutput(tx, c.chainID.AsAddress()); chainOut != nil { - c.ReceiveState(chainOut, tx.Essence().Timestamp()) - } -} - -func (c *chainObj) ReceiveState(stateOutput *ledgerstate.AliasOutput, timestamp time.Time) { - c.log.Debugf("ReceiveState #%d: outputID: %s, stateAddr: %s", - stateOutput.GetStateIndex(), iscp.OID(stateOutput.ID()), stateOutput.GetStateAddress().Base58()) - c.EnqueueLedgerState(stateOutput, timestamp) -} - -func (c *chainObj) BlobCache() registry.BlobCache { - return c.blobProvider -} - -func (c *chainObj) GetRequestProcessingStatus(reqID iscp.RequestID) chain.RequestProcessingStatus { - if c.IsDismissed() { - return chain.RequestProcessingStatusUnknown - } - if c.consensus != nil { - if c.mempool.HasRequest(reqID) { - return chain.RequestProcessingStatusBacklog - } - } - c.stateReader.SetBaseline() - processed, err := blocklog.IsRequestProcessed(c.stateReader.KVStoreReader(), &reqID) - if err != nil || !processed { - return chain.RequestProcessingStatusUnknown - } - return chain.RequestProcessingStatusCompleted -} - -func (c *chainObj) Processors() *processors.Cache { - return c.procset -} - -func (c *chainObj) AttachToRequestProcessed(handler func(iscp.RequestID)) *events.Closure { - closure := events.NewClosure(handler) - c.eventRequestProcessed.Attach(closure) - return closure -} - -func (c *chainObj) DetachFromRequestProcessed(attachID *events.Closure) { - c.eventRequestProcessed.Detach(attachID) -} - -func (c *chainObj) TriggerChainTransition(data *chain.ChainTransitionEventData) { - c.eventChainTransition.Trigger(data) -} - -// GetStateReader returns a new copy of the optimistic state reader, with own baseline -func (c *chainObj) GetStateReader() state.OptimisticStateReader { - return state.NewOptimisticStateReader(c.db, c.chainStateSync) -} - -func (c *chainObj) Log() *logger.Logger { - return c.log -} diff --git a/packages/chain/chainimpl/requests.go b/packages/chain/chainimpl/requests.go new file mode 100644 index 0000000000..b3db610ba2 --- /dev/null +++ b/packages/chain/chainimpl/requests.go @@ -0,0 +1,39 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// Provides implementations for chain.ChainRequests methods +package chainimpl + +import ( + "github.com/iotaledger/hive.go/events" + "github.com/iotaledger/wasp/packages/chain" + "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/vm/core/blocklog" +) + +func (c *chainObj) GetRequestProcessingStatus(reqID iscp.RequestID) chain.RequestProcessingStatus { + if c.IsDismissed() { + return chain.RequestProcessingStatusUnknown + } + if c.consensus != nil { + if c.mempool.HasRequest(reqID) { + return chain.RequestProcessingStatusBacklog + } + } + c.stateReader.SetBaseline() + processed, err := blocklog.IsRequestProcessed(c.stateReader.KVStoreReader(), &reqID) + if err != nil || !processed { + return chain.RequestProcessingStatusUnknown + } + return chain.RequestProcessingStatusCompleted +} + +func (c *chainObj) AttachToRequestProcessed(handler func(iscp.RequestID)) *events.Closure { + closure := events.NewClosure(handler) + c.eventRequestProcessed.Attach(closure) + return closure +} + +func (c *chainObj) DetachFromRequestProcessed(attachID *events.Closure) { + c.eventRequestProcessed.Detach(attachID) +} From a259dec1e4a9237a386f5e385747a1c14a0bf59e Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Wed, 1 Dec 2021 11:31:54 +0200 Subject: [PATCH 155/198] BugFix: what is attached, is detached when not needed --- packages/chain/chain.go | 12 ++ packages/chain/chainimpl/chainimpl.go | 83 ++++---- packages/chain/chainimpl/entry.go | 7 + packages/chain/chainimpl/eventproc.go | 8 +- .../commonsubset/commonsubsetcoordinator.go | 12 +- packages/chain/consensus/consensus.go | 6 +- packages/chain/nodeconnimpl/nodeconnimpl.go | 196 ++++++++++++------ .../chain/nodeconnimpl/nodeconnimpl_chain.go | 32 +++ packages/chain/statemgr/statemgr.go | 34 +-- packages/testutil/testchain/mock_nodeconn.go | 7 + 10 files changed, 276 insertions(+), 121 deletions(-) diff --git a/packages/chain/chain.go b/packages/chain/chain.go index d8ca8dd0ab..ef7b0a1f9f 100644 --- a/packages/chain/chain.go +++ b/packages/chain/chain.go @@ -107,6 +107,12 @@ type NodeConnection interface { PostTransaction(tx *ledgerstate.Transaction) GetMetrics() nodeconnmetrics.NodeConnectionMetrics + + DetachFromTransactionReceived(*ledgerstate.AliasAddress) + DetachFromInclusionStateReceived(*ledgerstate.AliasAddress) + DetachFromOutputReceived(*ledgerstate.AliasAddress) + DetachFromUnspentAliasOutputReceived(*ledgerstate.AliasAddress) + Close() } type ChainNodeConnection interface { @@ -121,6 +127,12 @@ type ChainNodeConnection interface { PostTransaction(tx *ledgerstate.Transaction) GetMetrics() nodeconnmetrics.NodeConnectionMessagesMetrics + + DetachFromTransactionReceived() + DetachFromInclusionStateReceived() + DetachFromOutputReceived() + DetachFromUnspentAliasOutputReceived() + Close() } type StateManager interface { diff --git a/packages/chain/chainimpl/chainimpl.go b/packages/chain/chainimpl/chainimpl.go index ad724b8b47..c1a72b1686 100644 --- a/packages/chain/chainimpl/chainimpl.go +++ b/packages/chain/chainimpl/chainimpl.go @@ -41,41 +41,44 @@ var ( ) type chainObj struct { - committee atomic.Value - mempool chain.Mempool - mempoolLastCleanedIndex uint32 - dismissed atomic.Bool - dismissOnce sync.Once - chainID *iscp.ChainID - chainStateSync coreutil.ChainStateSync - stateReader state.OptimisticStateReader - procset *processors.Cache - stateMgr chain.StateManager - consensus chain.Consensus - log *logger.Logger - nodeConn chain.ChainNodeConnection - db kvstore.KVStore - peerNetworkConfig registry.PeerNetworkConfigProvider - netProvider peering.NetworkProvider - dksProvider registry.DKShareRegistryProvider - committeeRegistry registry.CommitteeRegistryProvider - blobProvider registry.BlobCache - eventRequestProcessed *events.Event - eventChainTransition *events.Event - chainPeers peering.PeerDomainProvider - offLedgerReqsAcksMutex sync.RWMutex - offLedgerReqsAcks map[iscp.RequestID][]string - offledgerBroadcastUpToNPeers int - offledgerBroadcastInterval time.Duration - pullMissingRequestsFromCommittee bool - chainMetrics metrics.ChainMetrics - dismissChainMsgPipe pipe.Pipe - stateMsgPipe pipe.Pipe - offLedgerRequestPeerMsgPipe pipe.Pipe - requestAckPeerMsgPipe pipe.Pipe - missingRequestIDsPeerMsgPipe pipe.Pipe - missingRequestPeerMsgPipe pipe.Pipe - timerTickMsgPipe pipe.Pipe + committee atomic.Value + mempool chain.Mempool + mempoolLastCleanedIndex uint32 + dismissed atomic.Bool + dismissOnce sync.Once + chainID *iscp.ChainID + chainStateSync coreutil.ChainStateSync + stateReader state.OptimisticStateReader + procset *processors.Cache + stateMgr chain.StateManager + consensus chain.Consensus + log *logger.Logger + nodeConn chain.ChainNodeConnection + db kvstore.KVStore + peerNetworkConfig registry.PeerNetworkConfigProvider + netProvider peering.NetworkProvider + dksProvider registry.DKShareRegistryProvider + committeeRegistry registry.CommitteeRegistryProvider + blobProvider registry.BlobCache + eventRequestProcessed *events.Event + eventChainTransition *events.Event + eventChainTransitionClosure *events.Closure + receiveChainPeerMessagesAttachID interface{} + detachFromCommitteePeerMessagesFun func() + chainPeers peering.PeerDomainProvider + offLedgerReqsAcksMutex sync.RWMutex + offLedgerReqsAcks map[iscp.RequestID][]string + offledgerBroadcastUpToNPeers int + offledgerBroadcastInterval time.Duration + pullMissingRequestsFromCommittee bool + chainMetrics metrics.ChainMetrics + dismissChainMsgPipe pipe.Pipe + stateMsgPipe pipe.Pipe + offLedgerRequestPeerMsgPipe pipe.Pipe + requestAckPeerMsgPipe pipe.Pipe + missingRequestIDsPeerMsgPipe pipe.Pipe + missingRequestPeerMsgPipe pipe.Pipe + timerTickMsgPipe pipe.Pipe } type committeeStruct struct { @@ -137,9 +140,6 @@ func NewChain( timerTickMsgPipe: pipe.NewLimitInfinitePipe(1), } ret.committee.Store(&committeeStruct{}) - ret.eventChainTransition.Attach(events.NewClosure(ret.processChainTransition)) - ret.nodeConn.AttachToTransactionReceived(ret.ReceiveTransaction) - ret.nodeConn.AttachToUnspentAliasOutputReceived(ret.ReceiveState) var err error ret.chainPeers, err = netProvider.PeerDomain(chainID.Array(), peerNetConfig.Neighbors()) @@ -148,7 +148,12 @@ func NewChain( return nil } ret.stateMgr = statemgr.New(db, ret, ret.chainPeers, ret.nodeConn, chainMetrics) - ret.chainPeers.Attach(peering.PeerMessageReceiverChain, ret.receiveChainPeerMessages) + + ret.eventChainTransitionClosure = events.NewClosure(ret.processChainTransition) + ret.eventChainTransition.Attach(ret.eventChainTransitionClosure) + ret.nodeConn.AttachToTransactionReceived(ret.ReceiveTransaction) + ret.nodeConn.AttachToUnspentAliasOutputReceived(ret.ReceiveState) + ret.receiveChainPeerMessagesAttachID = ret.chainPeers.Attach(peering.PeerMessageReceiverChain, ret.receiveChainPeerMessages) go ret.recvLoop() ret.startTimer() return ret diff --git a/packages/chain/chainimpl/entry.go b/packages/chain/chainimpl/entry.go index 1414ca86b2..bd7c889cb9 100644 --- a/packages/chain/chainimpl/entry.go +++ b/packages/chain/chainimpl/entry.go @@ -40,19 +40,26 @@ func (c *chainObj) Dismiss(reason string) { c.dismissOnce.Do(func() { c.dismissed.Store(true) + c.chainPeers.Detach(c.receiveChainPeerMessagesAttachID) + c.nodeConn.DetachFromUnspentAliasOutputReceived() + c.nodeConn.DetachFromTransactionReceived() + c.eventChainTransition.Detach(c.eventChainTransitionClosure) c.mempool.Close() c.stateMgr.Close() cmt := c.getCommittee() if cmt != nil { + c.detachFromCommitteePeerMessagesFun() cmt.Close() } if c.consensus != nil { c.consensus.Close() } + c.eventRequestProcessed.DetachAll() c.eventChainTransition.DetachAll() c.chainPeers.Close() + c.nodeConn.Close() c.dismissChainMsgPipe.Close() c.stateMsgPipe.Close() diff --git a/packages/chain/chainimpl/eventproc.go b/packages/chain/chainimpl/eventproc.go index 9c34bcd50a..59bc90b82b 100644 --- a/packages/chain/chainimpl/eventproc.go +++ b/packages/chain/chainimpl/eventproc.go @@ -193,6 +193,9 @@ func (c *chainObj) getOwnCommitteeRecord(addr ledgerstate.Address) (*registry.Co func (c *chainObj) createNewCommitteeAndConsensus(cmtRec *registry.CommitteeRecord) error { c.log.Debugf("createNewCommitteeAndConsensus: creating a new committee...") + if c.detachFromCommitteePeerMessagesFun != nil { + c.detachFromCommitteePeerMessagesFun() + } cmt, cmtPeerGroup, err := committee.New( cmtRec, c.chainID, @@ -206,7 +209,10 @@ func (c *chainObj) createNewCommitteeAndConsensus(cmtRec *registry.CommitteeReco return xerrors.Errorf("createNewCommitteeAndConsensus: failed to create committee object for state address %s: %w", cmtRec.Address.Base58(), err) } - cmtPeerGroup.Attach(peering.PeerMessageReceiverChain, c.receiveCommitteePeerMessages) + attachID := cmtPeerGroup.Attach(peering.PeerMessageReceiverChain, c.receiveCommitteePeerMessages) + c.detachFromCommitteePeerMessagesFun = func() { + cmtPeerGroup.Detach(attachID) + } c.log.Debugf("creating new consensus object...") c.consensus = consensus.New(c, c.mempool, cmt, cmtPeerGroup, c.nodeConn, c.pullMissingRequestsFromCommittee, c.chainMetrics) c.setCommittee(cmt) diff --git a/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go b/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go index c61ff26e91..9110522e14 100644 --- a/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go +++ b/packages/chain/consensus/commonsubset/commonsubsetcoordinator.go @@ -44,10 +44,11 @@ const ( // until they will be discarded because of the growing StateIndex in the new branch. // type CommonSubsetCoordinator struct { - csInsts map[uint64]*CommonSubset // The actual instances can be created on request or on peer message. - csAsked map[uint64]bool // Indicates, which instances are already asked by this nodes. - currentStateIndex uint32 // Last state index passed by this node. - lock sync.RWMutex + csInsts map[uint64]*CommonSubset // The actual instances can be created on request or on peer message. + csAsked map[uint64]bool // Indicates, which instances are already asked by this nodes. + currentStateIndex uint32 // Last state index passed by this node. + receivePeerMessagesAttachID interface{} + lock sync.RWMutex netGroup peering.GroupProvider dkShare *tcrypto.DKShare @@ -68,12 +69,13 @@ func NewCommonSubsetCoordinator( dkShare: dkShare, log: log, } - netGroup.Attach(peering.PeerMessageReceiverCommonSubset, ret.receiveCommitteePeerMessages) + ret.receivePeerMessagesAttachID = ret.netGroup.Attach(peering.PeerMessageReceiverCommonSubset, ret.receiveCommitteePeerMessages) return ret } // Close implements the AsynchronousCommonSubsetRunner interface. func (csc *CommonSubsetCoordinator) Close() { + csc.netGroup.Detach(csc.receivePeerMessagesAttachID) for i := range csc.csInsts { csc.csInsts[i].Close() } diff --git a/packages/chain/consensus/consensus.go b/packages/chain/consensus/consensus.go index 5d01080154..ea579de2d8 100644 --- a/packages/chain/consensus/consensus.go +++ b/packages/chain/consensus/consensus.go @@ -66,6 +66,7 @@ type consensus struct { missingRequestsFromBatch map[iscp.RequestID][32]byte missingRequestsMutex sync.Mutex pullMissingRequestsFromCommittee bool + receivePeerMessagesAttachID interface{} consensusMetrics metrics.ConsensusMetrics } @@ -120,7 +121,7 @@ func New(chainCore chain.ChainCore, mempool chain.Mempool, committee chain.Commi pullMissingRequestsFromCommittee: pullMissingRequestsFromCommittee, consensusMetrics: consensusMetrics, } - ret.committeePeerGroup.Attach(peering.PeerMessageReceiverConsensus, ret.receiveCommitteePeerMessages) + ret.receivePeerMessagesAttachID = ret.committeePeerGroup.Attach(peering.PeerMessageReceiverConsensus, ret.receiveCommitteePeerMessages) ret.nodeConn.AttachToInclusionStateReceived(func(txID ledgerstate.TransactionID, inclusionState ledgerstate.InclusionState) { ret.EnqueueInclusionsStateMsg(txID, inclusionState) }) @@ -161,6 +162,9 @@ func (c *consensus) IsReady() bool { } func (c *consensus) Close() { + c.nodeConn.DetachFromInclusionStateReceived() + c.committeePeerGroup.Detach(c.receivePeerMessagesAttachID) + c.eventStateTransitionMsgPipe.Close() c.eventSignedResultMsgPipe.Close() c.eventSignedResultAckMsgPipe.Close() diff --git a/packages/chain/nodeconnimpl/nodeconnimpl.go b/packages/chain/nodeconnimpl/nodeconnimpl.go index a744f67919..cd8c471401 100644 --- a/packages/chain/nodeconnimpl/nodeconnimpl.go +++ b/packages/chain/nodeconnimpl/nodeconnimpl.go @@ -16,6 +16,10 @@ type nodeConnImplementation struct { iStateHandlers map[ledgerstate.AliasAddress]chain.NodeConnectionHandleInclusionStateFun outputHandlers map[ledgerstate.AliasAddress]chain.NodeConnectionHandleOutputFun unspentAOutputHandlers map[ledgerstate.AliasAddress]chain.NodeConnectionHandleUnspentAliasOutputFun + transactionClosure *events.Closure + iStateClosure *events.Closure + outputClosure *events.Closure + unspentAOutputClosure *events.Closure metrics nodeconnmetrics.NodeConnectionMetrics log *logger.Logger // general chains logger } @@ -32,69 +36,86 @@ func NewNodeConnection(nodeConnClient *txstream_client.Client, metrics nodeconnm metrics: metrics, log: log, } - ret.client.Events.TransactionReceived.Attach(events.NewClosure(func(msg *txstream.MsgTransaction) { - ret.log.Debugf("NodeConnnection::TransactionReceived...") - defer ret.log.Debugf("NodeConnnection::TransactionReceived... Done") - ret.metrics.GetInTransaction().CountLastMessage(msg) - aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) - if !ok { - ret.log.Warnf("NodeConnnection::TransactionReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) - return - } - handler, ok := ret.transactionHandlers[*aliasAddr] - if !ok { - ret.log.Warnf("NodeConnnection::TransactionReceived: no handler for address %v", aliasAddr.String()) - return - } - handler(msg.Tx) - })) - ret.client.Events.InclusionStateReceived.Attach(events.NewClosure(func(msg *txstream.MsgTxInclusionState) { - ret.log.Debugf("NodeConnnection::InclusionStateReceived...") - defer ret.log.Debugf("NodeConnnection::InclusionStateReceived... Done") - ret.metrics.GetInInclusionState().CountLastMessage(msg) - aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) - if !ok { - ret.log.Warnf("NodeConnnection::InclusionStateReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) - return - } - handler, ok := ret.iStateHandlers[*aliasAddr] - if !ok { - ret.log.Warnf("NodeConnnection::InclusionStateReceived: no handler for address %v", aliasAddr.String()) - return - } - handler(msg.TxID, msg.State) - })) - ret.client.Events.OutputReceived.Attach(events.NewClosure(func(msg *txstream.MsgOutput) { - ret.log.Debugf("NodeConnnection::OutputReceived...") - defer ret.log.Debugf("NodeConnnection::OutputReceived... Done") - ret.metrics.GetInOutput().CountLastMessage(msg) - aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) - if !ok { - ret.log.Warnf("NodeConnnection::OutputReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) - return - } - handler, ok := ret.outputHandlers[*aliasAddr] - if !ok { - ret.log.Warnf("NodeConnnection::OutputReceived: no handler for address %v", aliasAddr.String()) - return - } - handler(msg.Output) - })) - ret.client.Events.UnspentAliasOutputReceived.Attach(events.NewClosure(func(msg *txstream.MsgUnspentAliasOutput) { - ret.log.Debugf("NodeConnnection::UnspentAliasOutputReceived...") - defer ret.log.Debugf("NodeConnnection::UnspentAliasOutputReceived... Done") - ret.metrics.GetInUnspentAliasOutput().CountLastMessage(msg) - handler, ok := ret.unspentAOutputHandlers[*msg.AliasAddress] - if !ok { - ret.log.Warnf("NodeConnnection::UnspentAliasOutputReceived: no handler for address %v", msg.AliasAddress.String()) - return - } - handler(msg.AliasOutput, msg.Timestamp) - })) + + ret.transactionClosure = events.NewClosure(ret.handleTransactionReceived) + ret.client.Events.TransactionReceived.Attach(ret.transactionClosure) + + ret.iStateClosure = events.NewClosure(ret.handleInclusionStateReceived) + ret.client.Events.InclusionStateReceived.Attach(ret.iStateClosure) + + ret.outputClosure = events.NewClosure(ret.handleOutputReceived) + ret.client.Events.OutputReceived.Attach(ret.outputClosure) + + ret.unspentAOutputClosure = events.NewClosure(ret.handleUnspentAliasOutputReceived) + ret.client.Events.UnspentAliasOutputReceived.Attach(ret.unspentAOutputClosure) + return ret } -// NOTE: NodeConnectionSender methods are logged through each chain logger in ChainNodeConnImplementation +func (n *nodeConnImplementation) handleTransactionReceived(msg *txstream.MsgTransaction) { + n.log.Debugf("NodeConnnection::TransactionReceived...") + defer n.log.Debugf("NodeConnnection::TransactionReceived... Done") + n.metrics.GetInTransaction().CountLastMessage(msg) + aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) + if !ok { + n.log.Warnf("NodeConnnection::TransactionReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) + return + } + handler, ok := n.transactionHandlers[*aliasAddr] + if !ok { + n.log.Warnf("NodeConnnection::TransactionReceived: no handler for address %v", aliasAddr.String()) + return + } + handler(msg.Tx) +} + +func (n *nodeConnImplementation) handleInclusionStateReceived(msg *txstream.MsgTxInclusionState) { + n.log.Debugf("NodeConnnection::InclusionStateReceived...") + defer n.log.Debugf("NodeConnnection::InclusionStateReceived... Done") + n.metrics.GetInInclusionState().CountLastMessage(msg) + aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) + if !ok { + n.log.Warnf("NodeConnnection::InclusionStateReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) + return + } + handler, ok := n.iStateHandlers[*aliasAddr] + if !ok { + n.log.Warnf("NodeConnnection::InclusionStateReceived: no handler for address %v", aliasAddr.String()) + return + } + handler(msg.TxID, msg.State) +} + +func (n *nodeConnImplementation) handleOutputReceived(msg *txstream.MsgOutput) { + n.log.Debugf("NodeConnnection::OutputReceived...") + defer n.log.Debugf("NodeConnnection::OutputReceived... Done") + n.metrics.GetInOutput().CountLastMessage(msg) + aliasAddr, ok := msg.Address.(*ledgerstate.AliasAddress) + if !ok { + n.log.Warnf("NodeConnnection::OutputReceived: cannot dispatch transaction message to non-alias address %v", msg.Address.String()) + return + } + handler, ok := n.outputHandlers[*aliasAddr] + if !ok { + n.log.Warnf("NodeConnnection::OutputReceived: no handler for address %v", aliasAddr.String()) + return + } + handler(msg.Output) +} + +func (n *nodeConnImplementation) handleUnspentAliasOutputReceived(msg *txstream.MsgUnspentAliasOutput) { + n.log.Debugf("NodeConnnection::UnspentAliasOutputReceived...") + defer n.log.Debugf("NodeConnnection::UnspentAliasOutputReceived... Done") + n.metrics.GetInUnspentAliasOutput().CountLastMessage(msg) + handler, ok := n.unspentAOutputHandlers[*msg.AliasAddress] + if !ok { + n.log.Warnf("NodeConnnection::UnspentAliasOutputReceived: no handler for address %v", msg.AliasAddress.String()) + return + } + handler(msg.AliasOutput, msg.Timestamp) +} + +// NOTE: request to client methods are logged through each chain logger in chainNodeConnImplementation func (n *nodeConnImplementation) PullState(addr *ledgerstate.AliasAddress) { n.metrics.GetOutPullState().CountLastMessage(addr) @@ -129,21 +150,61 @@ func (n *nodeConnImplementation) PostTransaction(tx *ledgerstate.Transaction) { } func (n *nodeConnImplementation) AttachToTransactionReceived(addr *ledgerstate.AliasAddress, handler chain.NodeConnectionHandleTransactionFun) { + n.log.Debugf("NodeConnnection::AttachToTransactionReceived to %v", addr.String()) + _, ok := n.transactionHandlers[*addr] + if ok { + n.log.Panicf("NodeConnnection::AttachToTransactionReceived to %v failed: handler already registered") + } n.transactionHandlers[*addr] = handler } func (n *nodeConnImplementation) AttachToInclusionStateReceived(addr *ledgerstate.AliasAddress, handler chain.NodeConnectionHandleInclusionStateFun) { + n.log.Debugf("NodeConnnection::AttachToInclusionStateReceived to %v", addr.String()) + _, ok := n.iStateHandlers[*addr] + if ok { + n.log.Panicf("NodeConnnection::AttachToInclusionStateReceived to %v failed: handler already registered") + } n.iStateHandlers[*addr] = handler } func (n *nodeConnImplementation) AttachToOutputReceived(addr *ledgerstate.AliasAddress, handler chain.NodeConnectionHandleOutputFun) { + n.log.Debugf("NodeConnnection::AttachToOutputReceived to %v", addr.String()) + _, ok := n.outputHandlers[*addr] + if ok { + n.log.Panicf("NodeConnnection::AttachToOutputReceived to %v failed: handler already registered") + } n.outputHandlers[*addr] = handler } func (n *nodeConnImplementation) AttachToUnspentAliasOutputReceived(addr *ledgerstate.AliasAddress, handler chain.NodeConnectionHandleUnspentAliasOutputFun) { + n.log.Debugf("NodeConnnection::AttachToUnspentAliasOutputReceived to %v", addr.String()) + _, ok := n.unspentAOutputHandlers[*addr] + if ok { + n.log.Panicf("NodeConnnection::AttachToUnspentAliasOutputReceived to %v failed: handler already registered") + } n.unspentAOutputHandlers[*addr] = handler } +func (n *nodeConnImplementation) DetachFromTransactionReceived(addr *ledgerstate.AliasAddress) { + n.log.Debugf("NodeConnnection::DetachFromTransactionReceived to %v", addr.String()) + delete(n.transactionHandlers, *addr) +} + +func (n *nodeConnImplementation) DetachFromInclusionStateReceived(addr *ledgerstate.AliasAddress) { + n.log.Debugf("NodeConnnection::DetachFromInclusionStateReceived to %v", addr.String()) + delete(n.iStateHandlers, *addr) +} + +func (n *nodeConnImplementation) DetachFromOutputReceived(addr *ledgerstate.AliasAddress) { + n.log.Debugf("NodeConnnection::DetachFromOutputReceived to %v", addr.String()) + delete(n.outputHandlers, *addr) +} + +func (n *nodeConnImplementation) DetachFromUnspentAliasOutputReceived(addr *ledgerstate.AliasAddress) { + n.log.Debugf("NodeConnnection::DetachFromUnspentAliasOutputReceived to %v", addr.String()) + delete(n.unspentAOutputHandlers, *addr) +} + func (n *nodeConnImplementation) Subscribe(addr ledgerstate.Address) { n.log.Debugf("NodeConnnection::Subscribing to %v...", addr.String()) defer n.log.Debugf("NodeConnnection::Subscribing done") @@ -161,3 +222,18 @@ func (n *nodeConnImplementation) Unsubscribe(addr ledgerstate.Address) { func (n *nodeConnImplementation) GetMetrics() nodeconnmetrics.NodeConnectionMetrics { return n.metrics } + +func (n *nodeConnImplementation) Close() { + n.log.Debugf("NodeConnnection::Close") + n.client.Events.TransactionReceived.Detach(n.transactionClosure) + n.transactionHandlers = make(map[ledgerstate.AliasAddress]chain.NodeConnectionHandleTransactionFun) + + n.client.Events.InclusionStateReceived.Detach(n.iStateClosure) + n.iStateHandlers = make(map[ledgerstate.AliasAddress]chain.NodeConnectionHandleInclusionStateFun) + + n.client.Events.OutputReceived.Detach(n.outputClosure) + n.outputHandlers = make(map[ledgerstate.AliasAddress]chain.NodeConnectionHandleOutputFun) + + n.client.Events.UnspentAliasOutputReceived.Detach(n.unspentAOutputClosure) + n.unspentAOutputHandlers = make(map[ledgerstate.AliasAddress]chain.NodeConnectionHandleUnspentAliasOutputFun) +} diff --git a/packages/chain/nodeconnimpl/nodeconnimpl_chain.go b/packages/chain/nodeconnimpl/nodeconnimpl_chain.go index ec7a717970..365a7e7a67 100644 --- a/packages/chain/nodeconnimpl/nodeconnimpl_chain.go +++ b/packages/chain/nodeconnimpl/nodeconnimpl_chain.go @@ -30,6 +30,7 @@ func NewChainNodeConnection(chainID *iscp.ChainID, nodeConn chain.NodeConnection } func (c *chainNodeConnImplementation) AttachToTransactionReceived(fun chain.NodeConnectionHandleTransactionFun) { + c.log.Debugf("ChainNodeConnImplementation::AttachToTransactionReceived") c.nodeConn.AttachToTransactionReceived(c.chainID.AsAliasAddress(), func(tx *ledgerstate.Transaction) { c.metrics.GetInTransaction().CountLastMessage(tx) fun(tx) @@ -37,6 +38,7 @@ func (c *chainNodeConnImplementation) AttachToTransactionReceived(fun chain.Node } func (c *chainNodeConnImplementation) AttachToInclusionStateReceived(fun chain.NodeConnectionHandleInclusionStateFun) { + c.log.Debugf("ChainNodeConnImplementation::AttachToInclusionStateReceived") c.nodeConn.AttachToInclusionStateReceived(c.chainID.AsAliasAddress(), func(txID ledgerstate.TransactionID, iState ledgerstate.InclusionState) { c.metrics.GetInInclusionState().CountLastMessage(struct { TransactionID ledgerstate.TransactionID @@ -50,6 +52,7 @@ func (c *chainNodeConnImplementation) AttachToInclusionStateReceived(fun chain.N } func (c *chainNodeConnImplementation) AttachToOutputReceived(fun chain.NodeConnectionHandleOutputFun) { + c.log.Debugf("ChainNodeConnImplementation::AttachToOutputReceived") c.nodeConn.AttachToOutputReceived(c.chainID.AsAliasAddress(), func(output ledgerstate.Output) { c.metrics.GetInOutput().CountLastMessage(output) fun(output) @@ -57,6 +60,7 @@ func (c *chainNodeConnImplementation) AttachToOutputReceived(fun chain.NodeConne } func (c *chainNodeConnImplementation) AttachToUnspentAliasOutputReceived(fun chain.NodeConnectionHandleUnspentAliasOutputFun) { + c.log.Debugf("ChainNodeConnImplementation::AttachToUnspentAliasOutputReceived") c.nodeConn.AttachToUnspentAliasOutputReceived(c.chainID.AsAliasAddress(), func(output *ledgerstate.AliasOutput, timestamp time.Time) { c.metrics.GetInUnspentAliasOutput().CountLastMessage(struct { AliasOutput *ledgerstate.AliasOutput @@ -69,6 +73,26 @@ func (c *chainNodeConnImplementation) AttachToUnspentAliasOutputReceived(fun cha }) } +func (c *chainNodeConnImplementation) DetachFromTransactionReceived() { + c.log.Debugf("ChainNodeConnImplementation::DetachFromTransactionReceived") + c.nodeConn.DetachFromTransactionReceived(c.chainID.AsAliasAddress()) +} + +func (c *chainNodeConnImplementation) DetachFromInclusionStateReceived() { + c.log.Debugf("ChainNodeConnImplementation::DetachFromInclusionStateReceived") + c.nodeConn.DetachFromInclusionStateReceived(c.chainID.AsAliasAddress()) +} + +func (c *chainNodeConnImplementation) DetachFromOutputReceived() { + c.log.Debugf("ChainNodeConnImplementation::DetachFromOutputReceived") + c.nodeConn.DetachFromOutputReceived(c.chainID.AsAliasAddress()) +} + +func (c *chainNodeConnImplementation) DetachFromUnspentAliasOutputReceived() { + c.log.Debugf("ChainNodeConnImplementation::DetachFromUnspentAliasOutputReceived") + c.nodeConn.DetachFromUnspentAliasOutputReceived(c.chainID.AsAliasAddress()) +} + func (c *chainNodeConnImplementation) PullState() { c.log.Debugf("ChainNodeConnection::PullState...") c.metrics.GetOutPullState().CountLastMessage(nil) @@ -103,3 +127,11 @@ func (c *chainNodeConnImplementation) PostTransaction(tx *ledgerstate.Transactio func (c *chainNodeConnImplementation) GetMetrics() nodeconnmetrics.NodeConnectionMessagesMetrics { return c.metrics } + +func (c *chainNodeConnImplementation) Close() { + c.log.Debugf("ChainNodeConnImplementation::Close") + c.DetachFromTransactionReceived() + c.DetachFromInclusionStateReceived() + c.DetachFromOutputReceived() + c.DetachFromUnspentAliasOutputReceived() +} diff --git a/packages/chain/statemgr/statemgr.go b/packages/chain/statemgr/statemgr.go index 220098ebe7..af97409e56 100644 --- a/packages/chain/statemgr/statemgr.go +++ b/packages/chain/statemgr/statemgr.go @@ -23,20 +23,21 @@ import ( ) type stateManager struct { - ready *ready.Ready - store kvstore.KVStore - chain chain.ChainCore - chainPeers peering.PeerDomainProvider - nodeConn chain.ChainNodeConnection - pullStateRetryTime time.Time - solidState state.VirtualStateAccess - stateOutput *ledgerstate.AliasOutput - stateOutputTimestamp time.Time - currentSyncData atomic.Value - notifiedAnchorOutputID ledgerstate.OutputID - syncingBlocks *syncingBlocks - timers StateManagerTimers - log *logger.Logger + ready *ready.Ready + store kvstore.KVStore + chain chain.ChainCore + chainPeers peering.PeerDomainProvider + nodeConn chain.ChainNodeConnection + pullStateRetryTime time.Time + solidState state.VirtualStateAccess + stateOutput *ledgerstate.AliasOutput + stateOutputTimestamp time.Time + currentSyncData atomic.Value + notifiedAnchorOutputID ledgerstate.OutputID + syncingBlocks *syncingBlocks + receivePeerMessagesAttachID interface{} + timers StateManagerTimers + log *logger.Logger // Channels for accepting external events. eventGetBlockMsgPipe pipe.Pipe @@ -84,7 +85,7 @@ func New(store kvstore.KVStore, c chain.ChainCore, peers peering.PeerDomainProvi eventTimerMsgPipe: pipe.NewLimitInfinitePipe(1), stateManagerMetrics: stateManagerMetrics, } - ret.chainPeers.Attach(peering.PeerMessageReceiverStateManager, ret.receiveChainPeerMessages) + ret.receivePeerMessagesAttachID = ret.chainPeers.Attach(peering.PeerMessageReceiverStateManager, ret.receiveChainPeerMessages) ret.nodeConn.AttachToOutputReceived(ret.EnqueueOutputMsg) go ret.initLoadState() @@ -119,6 +120,9 @@ func (sm *stateManager) receiveChainPeerMessages(peerMsg *peering.PeerMessageIn) } func (sm *stateManager) Close() { + sm.nodeConn.DetachFromOutputReceived() + sm.chainPeers.Detach(sm.receivePeerMessagesAttachID) + sm.eventGetBlockMsgPipe.Close() sm.eventBlockMsgPipe.Close() sm.eventStateOutputMsgPipe.Close() diff --git a/packages/testutil/testchain/mock_nodeconn.go b/packages/testutil/testchain/mock_nodeconn.go index 572d52fa6a..489d8fdb6e 100644 --- a/packages/testutil/testchain/mock_nodeconn.go +++ b/packages/testutil/testchain/mock_nodeconn.go @@ -63,6 +63,13 @@ func (m *MockedNodeConn) AttachToOutputReceived(chain.NodeConnectionHandleOutput func (m *MockedNodeConn) AttachToUnspentAliasOutputReceived(chain.NodeConnectionHandleUnspentAliasOutputFun) { } +func (m *MockedNodeConn) DetachFromTransactionReceived() {} +func (m *MockedNodeConn) DetachFromInclusionStateReceived() {} +func (m *MockedNodeConn) DetachFromOutputReceived() {} +func (m *MockedNodeConn) DetachFromUnspentAliasOutputReceived() {} + +func (m *MockedNodeConn) Close() {} + func (m *MockedNodeConn) GetMetrics() nodeconnmetrics.NodeConnectionMessagesMetrics { return nodeconnmetrics.NewEmptyNodeConnectionMessagesMetrics() } From 08b788ec903b154306d589ab9b28fbcca615cd30 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Wed, 1 Dec 2021 13:58:07 +0200 Subject: [PATCH 156/198] BugFix in metrics registration --- packages/metrics/nodeconnmetrics/metrics.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/metrics/nodeconnmetrics/metrics.go b/packages/metrics/nodeconnmetrics/metrics.go index 05e0d6025d..466aaf9123 100644 --- a/packages/metrics/nodeconnmetrics/metrics.go +++ b/packages/metrics/nodeconnmetrics/metrics.go @@ -39,7 +39,7 @@ func (ncmi *nodeConnectionMetricsImpl) RegisterMetrics() { Name: "wasp_nodeconn_last_event_time_gauge", Help: "Last time when the message was sent/received by node connection of the chain", }, []string{chainLabelName, msgTypeLabelName}) - prometheus.MustRegister(ncmi.messageTotalCounter) + prometheus.MustRegister(ncmi.lastEventTimeGauge) ncmi.log.Info("Registering nodeconnection metrics to prometheus... Done") } From 2c118994583c2577d073eceb8cc7d6a3c96f4d10 Mon Sep 17 00:00:00 2001 From: Karolis Petrauskas Date: Wed, 1 Dec 2021 16:19:23 +0200 Subject: [PATCH 157/198] Governace SC: manage the access nodes. --- Makefile | 9 +- packages/kv/codec/encodego.go | 2 + packages/kv/collections/map.go | 8 +- packages/vm/core/governance/accessnodes.go | 165 ++++++++++++++++++ packages/vm/core/governance/chaininfo.go | 3 + packages/vm/core/governance/contractfees.go | 3 + .../governanceimpl/accessnodesImpl.go | 119 +++++++++++++ .../governance/governanceimpl/chaininfo.go | 3 + .../governance/governanceimpl/chainowner.go | 3 + .../vm/core/governance/governanceimpl/fees.go | 3 + .../vm/core/governance/governanceimpl/impl.go | 13 ++ .../governanceimpl/statecontroller.go | 3 + packages/vm/core/governance/interface.go | 27 +++ packages/vm/core/governance/internal.go | 3 + packages/vm/core/testcore/governance_test.go | 76 ++++++++ 15 files changed, 437 insertions(+), 3 deletions(-) create mode 100644 packages/vm/core/governance/accessnodes.go create mode 100644 packages/vm/core/governance/governanceimpl/accessnodesImpl.go diff --git a/Makefile b/Makefile index 021324d442..e20bd94800 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,13 @@ GIT_COMMIT_SHA := $(shell git rev-list -1 HEAD) BUILD_TAGS = rocksdb,builtin_static BUILD_LD_FLAGS = "-X github.com/iotaledger/wasp/packages/wasp.VersionHash=$(GIT_COMMIT_SHA)" +# +# You can override these e.g. as +# make test TEST_PKG=./packages/vm/core/testcore/ TEST_ARG="-v --run TestAccessNodes" +# +TEST_PKG=./... +TEST_ARG= + all: build-lint build: @@ -16,7 +23,7 @@ test-full: install go test -tags $(BUILD_TAGS),runheavy ./... --timeout 60m --count 1 -failfast test: install - go test -tags $(BUILD_TAGS) ./... --timeout 30m --count 1 -failfast + go test -tags $(BUILD_TAGS) $(TEST_PKG) --timeout 30m --count 1 -failfast $(TEST_ARG) test-short: go test -tags $(BUILD_TAGS) --short --count 1 -failfast ./... diff --git a/packages/kv/codec/encodego.go b/packages/kv/codec/encodego.go index 686ca25c3b..6d9f41a939 100644 --- a/packages/kv/codec/encodego.go +++ b/packages/kv/codec/encodego.go @@ -13,6 +13,8 @@ import ( func Encode(v interface{}) []byte { switch vt := v.(type) { + case bool: + return EncodeBool(vt) case int: // default to int64 return EncodeInt64(int64(vt)) case byte: diff --git a/packages/kv/collections/map.go b/packages/kv/collections/map.go index 46dbb2d658..6ef6347e99 100644 --- a/packages/kv/collections/map.go +++ b/packages/kv/collections/map.go @@ -167,9 +167,13 @@ func (m *ImmutableMap) Len() (uint32, error) { return util.MustUint32From4Bytes(v), nil } +// Erase the map. +// TODO: Improve by using DelPrefix method in KVStore. func (m *Map) Erase() { - // TODO needs DelPrefix method in KVStore - panic("implement me") + m.MustIterateKeys(func(elemKey []byte) bool { + m.MustDelAt(elemKey) + return true + }) } // Iterate non-deterministic diff --git a/packages/vm/core/governance/accessnodes.go b/packages/vm/core/governance/accessnodes.go new file mode 100644 index 0000000000..aecb5b6b79 --- /dev/null +++ b/packages/vm/core/governance/accessnodes.go @@ -0,0 +1,165 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +package governance + +import ( + "bytes" + "crypto/ed25519" + + "github.com/iotaledger/wasp/packages/kv/codec" + "github.com/iotaledger/wasp/packages/kv/collections" + "github.com/iotaledger/wasp/packages/kv/dict" + "github.com/iotaledger/wasp/packages/util" + "golang.org/x/xerrors" +) + +type AccessNodeInfo struct { + PubKey []byte + Validator bool + API string +} + +func NewAccessNodeInfoFromBytes(pubKey, value []byte) (*AccessNodeInfo, error) { + var a AccessNodeInfo + var err error + r := bytes.NewReader(value) + if err := util.ReadBoolByte(r, &a.Validator); err != nil { + return nil, xerrors.Errorf("failed to read AccessNodeInfo.Validator: %v", err) + } + if a.API, err = util.ReadString16(r); err != nil { + return nil, xerrors.Errorf("failed to read AccessNodeInfo.API: %v", err) + } + a.PubKey = pubKey + return &a, nil +} + +func NewAccessNodeInfoListFromMap(infoMap *collections.ImmutableMap) ([]*AccessNodeInfo, error) { + res := make([]*AccessNodeInfo, 0) + var accErr error + err := infoMap.Iterate(func(elemKey, value []byte) bool { + var a *AccessNodeInfo + if a, accErr = NewAccessNodeInfoFromBytes(elemKey, value); accErr != nil { + return false + } + res = append(res, a) + return true + }) + if accErr != nil { + return nil, xerrors.Errorf("failed to iterate over AccessNodeInfo list: %v", accErr) + } + if err != nil { + return nil, xerrors.Errorf("failed to iterate over AccessNodeInfo list: %v", err) + } + return res, nil +} + +func (a *AccessNodeInfo) Bytes() []byte { + w := bytes.Buffer{} + if err := util.WriteBoolByte(&w, a.Validator); err != nil { + panic(xerrors.Errorf("failed to write AccessNodeInfo.Validator: %v", err)) + } + if err := util.WriteString16(&w, a.API); err != nil { + panic(xerrors.Errorf("failed to write AccessNodeInfo.Validator: %v", err)) + } + return w.Bytes() +} + +// +// GetChainNodesRequest +// +type GetChainNodesRequest struct{} + +func (req GetChainNodesRequest) AsDict() dict.Dict { + return dict.New() +} + +// +// GetChainNodesResponse +// +type GetChainNodesResponse struct { + AccessNodeCandidates []*AccessNodeInfo // Application info for the AccessNodes. + AccessNodes []ed25519.PublicKey // Public Keys of Access Nodes. +} + +func NewGetChainNodesResponseFromDict(d dict.Dict) *GetChainNodesResponse { + res := GetChainNodesResponse{ + AccessNodeCandidates: make([]*AccessNodeInfo, 0), + AccessNodes: make([]ed25519.PublicKey, 0), + } + + ac := collections.NewMapReadOnly(d, ParamGetChainNodesAccessNodeCandidates) + ac.MustIterate(func(pubKey, value []byte) bool { + ani, err := NewAccessNodeInfoFromBytes(pubKey, value) + if err != nil { + panic(xerrors.Errorf("unable to decode access node info: %v", err)) + } + res.AccessNodeCandidates = append(res.AccessNodeCandidates, ani) + return true + }) + + an := collections.NewMapReadOnly(d, ParamGetChainNodesAccessNodes) + an.MustIterate(func(pubKey, value []byte) bool { + res.AccessNodes = append(res.AccessNodes, ed25519.PublicKey(pubKey)) + return true + }) + return &res +} + +// +// CandidateNodeRequest +// +type CandidateNodeRequest struct { + Candidate bool + Validator bool + PubKey []byte + Cert []byte + API string +} + +func (req CandidateNodeRequest) AsDict() dict.Dict { + d := dict.New() + d.Set(ParamCandidateNodeCandidate, codec.EncodeBool(req.Candidate)) + d.Set(ParamCandidateNodeValidator, codec.EncodeBool(req.Validator)) + d.Set(ParamCandidateNodePubKey, req.PubKey) + d.Set(ParamCandidateNodeCert, req.Cert) + d.Set(ParamCandidateNodeAPI, codec.EncodeString(req.API)) + return d +} + +// +// ChangeAccessNodesRequest +// +type ChangeAccessNodesRequest struct { + actions map[string]byte +} + +func NewChangeAccessNodesRequest() *ChangeAccessNodesRequest { + return &ChangeAccessNodesRequest{ + actions: make(map[string]byte), + } +} + +func (req *ChangeAccessNodesRequest) Remove(pubKey ed25519.PublicKey) *ChangeAccessNodesRequest { + req.actions[string(pubKey)] = 0 + return req +} + +func (req *ChangeAccessNodesRequest) Accept(pubKey ed25519.PublicKey) *ChangeAccessNodesRequest { + req.actions[string(pubKey)] = 1 + return req +} + +func (req *ChangeAccessNodesRequest) Drop(pubKey ed25519.PublicKey) *ChangeAccessNodesRequest { + req.actions[string(pubKey)] = 2 + return req +} + +func (req *ChangeAccessNodesRequest) AsDict() dict.Dict { + d := dict.New() + actionsMap := collections.NewMap(d, ParamChangeAccessNodesActions) + for pubKey, action := range req.actions { + actionsMap.MustSetAt([]byte(pubKey), []byte{action}) + } + return d +} diff --git a/packages/vm/core/governance/chaininfo.go b/packages/vm/core/governance/chaininfo.go index 12a60d40c3..71d7b7642c 100644 --- a/packages/vm/core/governance/chaininfo.go +++ b/packages/vm/core/governance/chaininfo.go @@ -1,3 +1,6 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + package governance import ( diff --git a/packages/vm/core/governance/contractfees.go b/packages/vm/core/governance/contractfees.go index d3a4f67b9d..4663d4205a 100644 --- a/packages/vm/core/governance/contractfees.go +++ b/packages/vm/core/governance/contractfees.go @@ -1,3 +1,6 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + package governance import ( diff --git a/packages/vm/core/governance/governanceimpl/accessnodesImpl.go b/packages/vm/core/governance/governanceimpl/accessnodesImpl.go new file mode 100644 index 0000000000..6d513ad575 --- /dev/null +++ b/packages/vm/core/governance/governanceimpl/accessnodesImpl.go @@ -0,0 +1,119 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// This file provides implementation for the governance SC, the ChainNode +// management functions. +// +// State of the SC (the ChainNodes part): +// +// VarAccessNodeCandidates: map[pubKey] => AccessNodeInfo // A set of Access Node Info. +// VarAccessNodes: map[pubKey] => byte[0] // A set of nodes. +// VarValidatorNodes: pubKey[] // An ordered list of nodes. +// +package governanceimpl + +import ( + "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/iscp/assert" + "github.com/iotaledger/wasp/packages/kv/collections" + "github.com/iotaledger/wasp/packages/kv/dict" + "github.com/iotaledger/wasp/packages/kv/kvdecoder" + "github.com/iotaledger/wasp/packages/vm/core/governance" +) + +// SC Query Function handler. +// +// getChainNodes() => ( +// accessNodeCandidates :: map(pubKey => AccessNodeInfo), +// accessNodes :: map(pubKey => ()) +// ) +// +func getChainNodesFuncHandler(ctx iscp.SandboxView) (dict.Dict, error) { + res := dict.New() + ac := collections.NewMap(res, governance.ParamGetChainNodesAccessNodeCandidates) + an := collections.NewMap(res, governance.ParamGetChainNodesAccessNodes) + collections.NewMapReadOnly(ctx.State(), governance.VarAccessNodeCandidates).MustIterate(func(key, value []byte) bool { + ac.MustSetAt(key, value) + return true + }) + collections.NewMapReadOnly(ctx.State(), governance.VarAccessNodes).MustIterate(func(key, value []byte) bool { + an.MustSetAt(key, value) + return true + }) + return res, nil +} + +// SC Command Function handler. +// +// candidateNode( +// candidate: bool = true // true, if we are adding the node as a candidate to access nodes. +// validator: bool = false // true, if we also want the node to become a validator. +// pubKey: []byte // Public key of the node. +// cert: []byte // Signature by the node over its public key. +// api: string = "" // Optional: API URL for the access node. +// ) => () +// +// It is possible that after executing `candidateNode(false, false, ...)` a node will stay +// in the list of validators, and will be absent in the candidate or an access node set. +// The node is removed from the list of access nodes immediately, but the validator rotation +// must be initiated by the chain owner explicitly. +// +func candidateNodeFuncHandler(ctx iscp.Sandbox) (dict.Dict, error) { + a := assert.NewAssert(ctx.Log()) + params := kvdecoder.New(ctx.Params(), ctx.Log()) + paramCandidate := params.MustGetBool(governance.ParamCandidateNodeCandidate, true) + paramValidator := params.MustGetBool(governance.ParamCandidateNodeValidator, false) + paramsPubKey := params.MustGetBytes(governance.ParamCandidateNodePubKey) + paramsCert := params.MustGetBytes(governance.ParamCandidateNodeCert) + paramsAPI := params.MustGetString(governance.ParamCandidateNodeAPI, "") + + // TODO: Check against the Request sender? This approach is vulnerable to the replay attacks. + a.Require(ctx.Utils().ED25519().ValidSignature(paramsPubKey, paramsPubKey, paramsCert), "certificate invalid") + + if paramCandidate { + ani := governance.AccessNodeInfo{ + Validator: paramValidator, + API: paramsAPI, + } + accessNodeCandidates := collections.NewMap(ctx.State(), governance.VarAccessNodeCandidates) + accessNodeCandidates.MustSetAt(paramsPubKey, ani.Bytes()) + } else { + accessNodeCandidates := collections.NewMap(ctx.State(), governance.VarAccessNodeCandidates) + accessNodeCandidates.MustDelAt(paramsPubKey) + accessNodes := collections.NewMap(ctx.State(), governance.VarAccessNodes) + accessNodes.MustDelAt(paramsPubKey) + } + return nil, nil +} + +// SC Command Function handler. +// Can only be invoked by the chain owner. +// +// changeAccessNodes( +// actions: map(pubKey => {0:remove, 1:accept, 2:drop}) +// ) => () +// +func changeAccessNodesFuncHandler(ctx iscp.Sandbox) (dict.Dict, error) { + a := assert.NewAssert(ctx.Log()) + a.RequireCaller(ctx, []*iscp.AgentID{ctx.ChainOwnerID()}) + + accessNodeCandidates := collections.NewMap(ctx.State(), governance.VarAccessNodeCandidates) + accessNodes := collections.NewMap(ctx.State(), governance.VarAccessNodes) + paramNodeActions := collections.NewMapReadOnly(ctx.Params(), governance.ParamChangeAccessNodesActions) + paramNodeActions.MustIterate(func(pubKey, actionBin []byte) bool { + a.Require(len(actionBin) == 1, "action should be a single byte") + switch actionBin[0] { + case 0: // remove from a list of access nodes. + accessNodes.MustDelAt(pubKey) + case 1: // accept to a list of access nodes. + accessNodes.MustSetAt(pubKey, make([]byte, 0)) + case 2: // drop from a list of candidates and the access nodes. + accessNodes.MustDelAt(pubKey) + accessNodeCandidates.MustDelAt(pubKey) + default: + a.Require(false, "unexpected action") + } + return true + }) + return nil, nil +} diff --git a/packages/vm/core/governance/governanceimpl/chaininfo.go b/packages/vm/core/governance/governanceimpl/chaininfo.go index a5f696a50e..8b2c8f3a64 100644 --- a/packages/vm/core/governance/governanceimpl/chaininfo.go +++ b/packages/vm/core/governance/governanceimpl/chaininfo.go @@ -1,3 +1,6 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + package governanceimpl import ( diff --git a/packages/vm/core/governance/governanceimpl/chainowner.go b/packages/vm/core/governance/governanceimpl/chainowner.go index 3d1025cd20..b9182c4b17 100644 --- a/packages/vm/core/governance/governanceimpl/chainowner.go +++ b/packages/vm/core/governance/governanceimpl/chainowner.go @@ -1,3 +1,6 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + package governanceimpl import ( diff --git a/packages/vm/core/governance/governanceimpl/fees.go b/packages/vm/core/governance/governanceimpl/fees.go index b50e300acd..c9c2f012ba 100644 --- a/packages/vm/core/governance/governanceimpl/fees.go +++ b/packages/vm/core/governance/governanceimpl/fees.go @@ -1,3 +1,6 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + package governanceimpl import ( diff --git a/packages/vm/core/governance/governanceimpl/impl.go b/packages/vm/core/governance/governanceimpl/impl.go index 89e60ca158..c289cdcc97 100644 --- a/packages/vm/core/governance/governanceimpl/impl.go +++ b/packages/vm/core/governance/governanceimpl/impl.go @@ -1,9 +1,13 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + package governanceimpl import ( "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/colored" "github.com/iotaledger/wasp/packages/kv/codec" + "github.com/iotaledger/wasp/packages/kv/collections" "github.com/iotaledger/wasp/packages/kv/dict" "github.com/iotaledger/wasp/packages/kv/kvdecoder" "github.com/iotaledger/wasp/packages/vm/core/governance" @@ -29,6 +33,11 @@ var Processor = governance.Contract.Processor(initialize, governance.FuncGetChainInfo.WithHandler(getChainInfo), governance.FuncSetChainInfo.WithHandler(setChainInfo), governance.FuncGetMaxBlobSize.WithHandler(getMaxBlobSize), + + // access nodes. + governance.FuncGetChainNodes.WithHandler(getChainNodesFuncHandler), + governance.FuncCandidateNode.WithHandler(candidateNodeFuncHandler), + governance.FuncChangeAccessNodes.WithHandler(changeAccessNodesFuncHandler), ) func initialize(ctx iscp.Sandbox) (dict.Dict, error) { @@ -55,5 +64,9 @@ func initialize(ctx iscp.Sandbox) (dict.Dict, error) { if feeColorSet { state.Set(governance.VarFeeColor, codec.EncodeColor(feeColor)) } + + collections.NewMap(state, governance.VarAccessNodeCandidates).Erase() + collections.NewMap(state, governance.VarAccessNodes).Erase() + collections.NewArray16(state, governance.VarValidatorNodes).MustErase() return nil, nil } diff --git a/packages/vm/core/governance/governanceimpl/statecontroller.go b/packages/vm/core/governance/governanceimpl/statecontroller.go index 7b6eb46536..88c6e820e0 100644 --- a/packages/vm/core/governance/governanceimpl/statecontroller.go +++ b/packages/vm/core/governance/governanceimpl/statecontroller.go @@ -1,3 +1,6 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + package governanceimpl import ( diff --git a/packages/vm/core/governance/interface.go b/packages/vm/core/governance/interface.go index 621a000092..7c4663660a 100644 --- a/packages/vm/core/governance/interface.go +++ b/packages/vm/core/governance/interface.go @@ -1,3 +1,6 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + // in the blocklog core contract the VM keeps indices of blocks and requests in an optimized way // for fast checking and timestamp access. package governance @@ -37,6 +40,11 @@ var ( FuncSetChainInfo = coreutil.Func("setChainInfo") FuncGetChainInfo = coreutil.ViewFunc("getChainInfo") FuncGetMaxBlobSize = coreutil.ViewFunc("getMaxBlobSize") + + // access nodes + FuncGetChainNodes = coreutil.ViewFunc("getChainNodes") + FuncCandidateNode = coreutil.Func("candidateNode") + FuncChangeAccessNodes = coreutil.Func("changeAccessNodes") ) // state variables @@ -63,6 +71,11 @@ const ( VarMaxBlobSize = "mb" VarMaxEventSize = "me" VarMaxEventsPerReq = "mr" + + // access nodes + VarAccessNodes = "an" + VarAccessNodeCandidates = "ac" + VarValidatorNodes = "vn" ) // params @@ -86,4 +99,18 @@ const ( ParamMaxBlobSize = "bs" ParamMaxEventSize = "es" ParamMaxEventsPerRequest = "ne" + + // access nodes: getChainNodes + ParamGetChainNodesAccessNodeCandidates = "c" + ParamGetChainNodesAccessNodes = "a" + + // access nodes: candidateNode + ParamCandidateNodeCandidate = "c" + ParamCandidateNodeValidator = "v" + ParamCandidateNodePubKey = "pk" + ParamCandidateNodeCert = "cr" + ParamCandidateNodeAPI = "a" + + // access nodes: changeAccessNodes + ParamChangeAccessNodesActions = "a" ) diff --git a/packages/vm/core/governance/internal.go b/packages/vm/core/governance/internal.go index bd224a14f7..b35c4a0c06 100644 --- a/packages/vm/core/governance/internal.go +++ b/packages/vm/core/governance/internal.go @@ -1,3 +1,6 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + package governance import ( diff --git a/packages/vm/core/testcore/governance_test.go b/packages/vm/core/testcore/governance_test.go index f6e4324a21..7e76b7ea0e 100644 --- a/packages/vm/core/testcore/governance_test.go +++ b/packages/vm/core/testcore/governance_test.go @@ -4,8 +4,10 @@ import ( "strings" "testing" + "github.com/iotaledger/wasp/packages/kv/dict" "github.com/iotaledger/wasp/packages/solo" "github.com/iotaledger/wasp/packages/vm/core" + "github.com/iotaledger/wasp/packages/vm/core/governance" "github.com/stretchr/testify/require" ) @@ -106,3 +108,77 @@ func TestRotate(t *testing.T) { require.True(t, chain.WaitForRequestsThrough(4)) }) } + +func TestAccessNodes(t *testing.T) { + env := solo.New(t, true, true) + node1KP, _ := env.NewKeyPairWithFunds() + chainKP, _ := env.NewKeyPairWithFunds() + chain := env.NewChain(chainKP, "chain1") + defer chain.Log.Sync() + var res dict.Dict + var err error + + // + // Initially the state is empty. + res, err = chain.CallView( + governance.Contract.Name, + governance.FuncGetChainNodes.Name, + governance.GetChainNodesRequest{}.AsDict(), + ) + require.NoError(t, err) + getChainNodesResponse := governance.NewGetChainNodesResponseFromDict(res) + require.Empty(t, getChainNodesResponse.AccessNodeCandidates) + require.Empty(t, getChainNodesResponse.AccessNodes) + + // + // Add a single access node candidate. + _, err = chain.PostRequestSync( + solo.NewCallParamsFromDic( + governance.Contract.Name, + governance.FuncCandidateNode.Name, + governance.CandidateNodeRequest{ + Candidate: true, + Validator: false, + PubKey: node1KP.PublicKey.Bytes(), + Cert: node1KP.PrivateKey.Sign(node1KP.PublicKey[:]).Bytes(), + API: "http://my-api/url", + }.AsDict(), + ).WithIotas(1), + chainKP, + ) + require.NoError(t, err) + + res, err = chain.CallView( + governance.Contract.Name, + governance.FuncGetChainNodes.Name, + governance.GetChainNodesRequest{}.AsDict(), + ) + require.NoError(t, err) + getChainNodesResponse = governance.NewGetChainNodesResponseFromDict(res) + require.Equal(t, 1, len(getChainNodesResponse.AccessNodeCandidates)) // Candidate registered. + require.Equal(t, "http://my-api/url", getChainNodesResponse.AccessNodeCandidates[0].API) + require.Empty(t, getChainNodesResponse.AccessNodes) + + // + // Accept the node as an access node. + _, err = chain.PostRequestSync( + solo.NewCallParamsFromDic( + governance.Contract.Name, + governance.FuncChangeAccessNodes.Name, + governance.NewChangeAccessNodesRequest().Accept(node1KP.PublicKey[:]).AsDict(), + ).WithIotas(1), + chainKP, + ) + require.NoError(t, err) + + res, err = chain.CallView( + governance.Contract.Name, + governance.FuncGetChainNodes.Name, + governance.GetChainNodesRequest{}.AsDict(), + ) + require.NoError(t, err) + getChainNodesResponse = governance.NewGetChainNodesResponseFromDict(res) + require.Equal(t, 1, len(getChainNodesResponse.AccessNodeCandidates)) // Candidate registered. + require.Equal(t, "http://my-api/url", getChainNodesResponse.AccessNodeCandidates[0].API) + require.Equal(t, 1, len(getChainNodesResponse.AccessNodes)) +} From 1c9ab80f4fb6d4aa1da9ff560327f67038e096d8 Mon Sep 17 00:00:00 2001 From: Karolis Petrauskas Date: Wed, 1 Dec 2021 16:33:29 +0200 Subject: [PATCH 158/198] Linter ignre added for a long type switch. --- packages/kv/codec/encodego.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/kv/codec/encodego.go b/packages/kv/codec/encodego.go index 6d9f41a939..0a4dc2ed86 100644 --- a/packages/kv/codec/encodego.go +++ b/packages/kv/codec/encodego.go @@ -11,7 +11,7 @@ import ( "github.com/iotaledger/wasp/packages/iscp" ) -func Encode(v interface{}) []byte { +func Encode(v interface{}) []byte { //nolint:funlen switch vt := v.(type) { case bool: return EncodeBool(vt) @@ -61,7 +61,6 @@ func Encode(v interface{}) []byte { return vt.Bytes() case time.Time: return EncodeTime(vt) - default: panic(fmt.Sprintf("Can't encode value %v", v)) } From c7d07a48aeeb578ccbf449d66eecb38cde6f3cba Mon Sep 17 00:00:00 2001 From: Karolis Petrauskas Date: Wed, 1 Dec 2021 16:58:01 +0200 Subject: [PATCH 159/198] Governance: access node candidate cert validation changed. --- .../vm/core/governance/governanceimpl/accessnodesImpl.go | 8 ++++++-- packages/vm/core/testcore/governance_test.go | 9 +++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/packages/vm/core/governance/governanceimpl/accessnodesImpl.go b/packages/vm/core/governance/governanceimpl/accessnodesImpl.go index 6d513ad575..092a0ad7b3 100644 --- a/packages/vm/core/governance/governanceimpl/accessnodesImpl.go +++ b/packages/vm/core/governance/governanceimpl/accessnodesImpl.go @@ -13,6 +13,8 @@ package governanceimpl import ( + "bytes" + "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/assert" "github.com/iotaledger/wasp/packages/kv/collections" @@ -67,8 +69,10 @@ func candidateNodeFuncHandler(ctx iscp.Sandbox) (dict.Dict, error) { paramsCert := params.MustGetBytes(governance.ParamCandidateNodeCert) paramsAPI := params.MustGetString(governance.ParamCandidateNodeAPI, "") - // TODO: Check against the Request sender? This approach is vulnerable to the replay attacks. - a.Require(ctx.Utils().ED25519().ValidSignature(paramsPubKey, paramsPubKey, paramsCert), "certificate invalid") + signedData := bytes.Buffer{} // TODO: Double-check, if such scheme is good enough. + signedData.Write(paramsPubKey) + signedData.Write(ctx.Request().SenderAddress().Bytes()) + a.Require(ctx.Utils().ED25519().ValidSignature(signedData.Bytes(), paramsPubKey, paramsCert), "certificate invalid") if paramCandidate { ani := governance.AccessNodeInfo{ diff --git a/packages/vm/core/testcore/governance_test.go b/packages/vm/core/testcore/governance_test.go index 7e76b7ea0e..7a4c3ced96 100644 --- a/packages/vm/core/testcore/governance_test.go +++ b/packages/vm/core/testcore/governance_test.go @@ -1,6 +1,7 @@ package testcore import ( + "bytes" "strings" "testing" @@ -112,6 +113,7 @@ func TestRotate(t *testing.T) { func TestAccessNodes(t *testing.T) { env := solo.New(t, true, true) node1KP, _ := env.NewKeyPairWithFunds() + node1OwnerKP, node1OwnerAddr := env.NewKeyPairWithFunds() chainKP, _ := env.NewKeyPairWithFunds() chain := env.NewChain(chainKP, "chain1") defer chain.Log.Sync() @@ -132,6 +134,9 @@ func TestAccessNodes(t *testing.T) { // // Add a single access node candidate. + certData := bytes.Buffer{} + certData.Write(node1KP.PublicKey.Bytes()) + certData.Write(node1OwnerAddr.Bytes()) _, err = chain.PostRequestSync( solo.NewCallParamsFromDic( governance.Contract.Name, @@ -140,11 +145,11 @@ func TestAccessNodes(t *testing.T) { Candidate: true, Validator: false, PubKey: node1KP.PublicKey.Bytes(), - Cert: node1KP.PrivateKey.Sign(node1KP.PublicKey[:]).Bytes(), + Cert: node1KP.PrivateKey.Sign(certData.Bytes()).Bytes(), API: "http://my-api/url", }.AsDict(), ).WithIotas(1), - chainKP, + node1OwnerKP, // Sender should match data used to create the Cert field value. ) require.NoError(t, err) From d5f6d4ff250ccb8edc9c49837c5ba0e3e494527b Mon Sep 17 00:00:00 2001 From: Karolis Petrauskas Date: Wed, 1 Dec 2021 17:14:19 +0200 Subject: [PATCH 160/198] Governance: use an enum for access node actions. --- packages/vm/core/governance/accessnodes.go | 21 +++++++++++++------ .../governanceimpl/accessnodesImpl.go | 10 ++++----- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/packages/vm/core/governance/accessnodes.go b/packages/vm/core/governance/accessnodes.go index aecb5b6b79..d33c713bb8 100644 --- a/packages/vm/core/governance/accessnodes.go +++ b/packages/vm/core/governance/accessnodes.go @@ -130,28 +130,37 @@ func (req CandidateNodeRequest) AsDict() dict.Dict { // // ChangeAccessNodesRequest // + +type ChangeAccessNodeAction byte + +const ( + ChangeAccessNodeActionRemove = ChangeAccessNodeAction(iota) + ChangeAccessNodeActionAccept + ChangeAccessNodeActionDrop +) + type ChangeAccessNodesRequest struct { - actions map[string]byte + actions map[string]ChangeAccessNodeAction } func NewChangeAccessNodesRequest() *ChangeAccessNodesRequest { return &ChangeAccessNodesRequest{ - actions: make(map[string]byte), + actions: make(map[string]ChangeAccessNodeAction), } } func (req *ChangeAccessNodesRequest) Remove(pubKey ed25519.PublicKey) *ChangeAccessNodesRequest { - req.actions[string(pubKey)] = 0 + req.actions[string(pubKey)] = ChangeAccessNodeActionRemove return req } func (req *ChangeAccessNodesRequest) Accept(pubKey ed25519.PublicKey) *ChangeAccessNodesRequest { - req.actions[string(pubKey)] = 1 + req.actions[string(pubKey)] = ChangeAccessNodeActionAccept return req } func (req *ChangeAccessNodesRequest) Drop(pubKey ed25519.PublicKey) *ChangeAccessNodesRequest { - req.actions[string(pubKey)] = 2 + req.actions[string(pubKey)] = ChangeAccessNodeActionDrop return req } @@ -159,7 +168,7 @@ func (req *ChangeAccessNodesRequest) AsDict() dict.Dict { d := dict.New() actionsMap := collections.NewMap(d, ParamChangeAccessNodesActions) for pubKey, action := range req.actions { - actionsMap.MustSetAt([]byte(pubKey), []byte{action}) + actionsMap.MustSetAt([]byte(pubKey), []byte{byte(action)}) } return d } diff --git a/packages/vm/core/governance/governanceimpl/accessnodesImpl.go b/packages/vm/core/governance/governanceimpl/accessnodesImpl.go index 092a0ad7b3..5dbd6ff71c 100644 --- a/packages/vm/core/governance/governanceimpl/accessnodesImpl.go +++ b/packages/vm/core/governance/governanceimpl/accessnodesImpl.go @@ -94,7 +94,7 @@ func candidateNodeFuncHandler(ctx iscp.Sandbox) (dict.Dict, error) { // Can only be invoked by the chain owner. // // changeAccessNodes( -// actions: map(pubKey => {0:remove, 1:accept, 2:drop}) +// actions: map(pubKey => ChangeAccessNodeAction) // ) => () // func changeAccessNodesFuncHandler(ctx iscp.Sandbox) (dict.Dict, error) { @@ -106,12 +106,12 @@ func changeAccessNodesFuncHandler(ctx iscp.Sandbox) (dict.Dict, error) { paramNodeActions := collections.NewMapReadOnly(ctx.Params(), governance.ParamChangeAccessNodesActions) paramNodeActions.MustIterate(func(pubKey, actionBin []byte) bool { a.Require(len(actionBin) == 1, "action should be a single byte") - switch actionBin[0] { - case 0: // remove from a list of access nodes. + switch governance.ChangeAccessNodeAction(actionBin[0]) { + case governance.ChangeAccessNodeActionRemove: accessNodes.MustDelAt(pubKey) - case 1: // accept to a list of access nodes. + case governance.ChangeAccessNodeActionAccept: accessNodes.MustSetAt(pubKey, make([]byte, 0)) - case 2: // drop from a list of candidates and the access nodes. + case governance.ChangeAccessNodeActionDrop: accessNodes.MustDelAt(pubKey) accessNodeCandidates.MustDelAt(pubKey) default: From ca836740985c7ef53afb00651dadf2cdfa14e378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=B6ller?= Date: Thu, 2 Dec 2021 15:35:10 +0100 Subject: [PATCH 161/198] Add first devnet compose file, add dns resolution to admin whitelist --- plugins/webapi/plugin.go | 13 +++- tools/devnet/docker-compose.yml | 71 ++++++++++++++++++++++ tools/devnet/goshimmer.config.json | 93 +++++++++++++++++++++++++++++ tools/devnet/snapshot.bin | Bin 0 -> 592 bytes tools/devnet/wasp.config.json | 46 ++++++++++++++ 5 files changed, 222 insertions(+), 1 deletion(-) create mode 100644 tools/devnet/docker-compose.yml create mode 100644 tools/devnet/goshimmer.config.json create mode 100644 tools/devnet/snapshot.bin create mode 100644 tools/devnet/wasp.config.json diff --git a/plugins/webapi/plugin.go b/plugins/webapi/plugin.go index 3f29aea4aa..e19db24be1 100644 --- a/plugins/webapi/plugin.go +++ b/plugins/webapi/plugin.go @@ -92,7 +92,18 @@ func configure(*node.Plugin) { func adminWhitelist() []net.IP { r := make([]net.IP, 0) for _, ip := range parameters.GetStringSlice(parameters.WebAPIAdminWhitelist) { - r = append(r, net.ParseIP(ip)) + parsedIP := net.ParseIP(ip) + + if parsedIP == nil { + ips, err := net.LookupIP(ip) + + if err != nil { + r = append(r, ips...) + } + } else { + r = append(r, parsedIP) + } + } return r } diff --git a/tools/devnet/docker-compose.yml b/tools/devnet/docker-compose.yml new file mode 100644 index 0000000000..32a859db6c --- /dev/null +++ b/tools/devnet/docker-compose.yml @@ -0,0 +1,71 @@ +version: "3.5" + +services: + devnet_wasp: + build: + context: ../../ + dockerfile: Dockerfile + container_name: devnet_wasp + networks: + - wasp-devnet + volumes: + - wasp-db:/wasp/db + - ./wasp.config.json:/etc/wasp_config.json + expose: + - "7000/tcp" # Dashboard + - "9090/tcp" # Web API + - "5550/tcp" # Nano MSG + - "4000/udp" # Peering + ports: + - "127.0.0.1:7000:7000/tcp" # Dashboard + - "127.0.0.1:9090:9090/tcp" # WebAPI + - "127.0.0.1:5550:5550/tcp" # Nano MSG + - "127.0.0.1:4000:4000/tcp" # Peering + devnet_goshimmer: + depends_on: + - devnet_wasp + restart: always + container_name: devnet_goshimmer + image: iotaledger/goshimmer:v0.7.5 + stop_grace_period: 1m + networks: + - wasp-devnet + command: > + --config=/tmp/config.json + --database.directory=/tmp/devnetdb + --messageLayer.snapshot.file=/tmp/snapshot.bin + --messageLayer.snapshot.genesisNode= + --messageLayer.startSynced=true + --txstream.bindAddress=:5000 + --prometheus.bindAddress=0.0.0.0:9312 + --prometheus.processMetrics=false + --node.enablePlugins=bootstrap,analysis-server,snapshot,analysis-dashboard,prometheus,txstream,"webapi tools endpoint",faucet,activity,spammer + --node.disablePlugins=autopeering,portcheck,gossip + #--node.disablePlugins=portcheck,clock,dashboard,analysis-client,gossip,drng,issuer,messagelayer,mana,pow,valuetransfers,consensus,webapi,webapibroadcastdataendpoint,webapifindtransactionhashesendpoint,webapigetneighborsendpoint,webapigettransactionobjectsbyhashendpoint,webapigettransactiontrytesbyhashendpoint + volumes: + - goshimmer-db:/tmp/devnetdb + - ./goshimmer.config.json:/tmp/config.json:ro + - ./snapshot.bin:/tmp/snapshot.bin:ro + ports: + - "127.0.0.1:8080:8080/tcp" # GoShimmer API + - "127.0.0.1:8081:8081/tcp" # GoShimmer Dashboard + - "127.0.0.1:9000:9000/tcp" # Analysis Dashboard + - "127.0.0.1:9312:9312/tcp" # Prometheus + - "127.0.0.1:5000:5000/tcp" # TX Stream + expose: + - "1888/tcp" # Analysis Server (within Docker network) + - "5000/tcp" # TXStream + - "9000/tcp" # Analysis Dashboard + - "9312/tcp" # Prometheus + - "7000/tcp" # + - "8080/tcp" # GoShimmer API + - "8081/tcp" # GoShimmer Dashboard + +volumes: + goshimmer-db: + name: goshimmer-db + wasp-db: + name: wasp-db + +networks: + wasp-devnet: {} diff --git a/tools/devnet/goshimmer.config.json b/tools/devnet/goshimmer.config.json new file mode 100644 index 0000000000..3489271c1a --- /dev/null +++ b/tools/devnet/goshimmer.config.json @@ -0,0 +1,93 @@ +{ + "analysis": { + "client": { + "serverAddress": "devnet_goshimmer:1888" + }, + "server": { + "bindAddress": "0.0.0.0:1888" + }, + "dashboard": { + "bindAddress": "0.0.0.0:9000", + "dev": false + } + }, + "manualpeering": { + "knownPeers": [] + }, + "autopeering": { + "enabled": false, + "_entryNodes": [ + "DLoMdp3nJ7jnFT1K13R2m5nZN7ijLcmaZhCdTPJs2duo@devnet_goshimmer:14626" + ], + "enableGossipIntegration": false, + "port": 14626 + }, + "dashboard": { + "bindAddress": "0.0.0.0:8081", + "dev": false, + "basic_auth": { + "enabled": false, + "username": "goshimmer", + "password": "goshimmer" + } + }, + "database": { + "directory": "mainnetdb" + }, + "drng": { + "custom": { + "instanceId": 111, + "threshold": 3, + "distributedPubKey": "", + "committeeMembers": ["EYsaGXnUVA9aTYL9FwYEvoQ8d1HCJveQVL7vogu6pqCP"] + } + }, + "fpc": { + "drngInstanceID": 111 + }, + "logger": { + "level": "info", + "disableCaller": false, + "disableStacktrace": false, + "encoding": "console", + "outputPaths": [ + "stdout" + ], + "disableEvents": true, + "remotelog": { + "serverAddress": "remotelog.goshimmer.iota.cafe:5213" + } + }, + "metrics":{ + "manaUpdateInterval": 5, + "local": false, + "global": true + }, + "network": { + "bindAddress": "0.0.0.0", + "externalAddress": "auto" + }, + "node": { + "disablePlugins": "portcheck", + "enablePlugins": [] + }, + "pow": { + "difficulty": 2, + "numThreads": 1, + "timeout": "10s", + "parentsRefreshInterval": "300ms" + }, + "webapi": { + "basic_auth": { + "enabled": false, + "username": "goshimmer", + "password": "goshimmer" + }, + "bindAddress": "0.0.0.0:8080" + }, + "faucet": { + "powDifficulty": 12, + "seed": "7R1itJx5hVuo9w9hjg5cwKFmek4HMSoBDgJZN8hKGxih" + } + } + \ No newline at end of file diff --git a/tools/devnet/snapshot.bin b/tools/devnet/snapshot.bin new file mode 100644 index 0000000000000000000000000000000000000000..b0e1caa152d238307695136753dec68f7a8e684d GIT binary patch literal 592 zcmZQ#U|=`|#B!CKYL>7K+xMt#=Eb-aDwF{yMX+@M-Uk-%GT-sf;X->~`E<)I$CFrV$B+%lfs++|iq z-ST&r?Ati=RNT&GPd5>gC&DivmyzaY4Tgt8dBPJ#qW7#jVQ^)qeUL`~{dtmiW~N?I n-!VUlr61@)G(R%|MF>R?1A~d$*K8hVfsBv@kO_pmhOQm}83wmY literal 0 HcmV?d00001 diff --git a/tools/devnet/wasp.config.json b/tools/devnet/wasp.config.json new file mode 100644 index 0000000000..64087bc3c6 --- /dev/null +++ b/tools/devnet/wasp.config.json @@ -0,0 +1,46 @@ +{ + "database": { + "directory": "waspdb" + }, + "logger": { + "level": "debug", + "disableCaller": false, + "disableStacktrace": true, + "encoding": "console", + "outputPaths": [ + "stdout", + "wasp.log" + ], + "disableEvents": true + }, + "network": { + "bindAddress": "0.0.0.0", + "externalAddress": "auto" + }, + "node": { + "disablePlugins": [], + "enablePlugins": [] + }, + "webapi": { + "bindAddress": "0.0.0.0:9090", + "adminWhitelist":["host.docker.internal", "127.0.0.1"] + }, + "dashboard": { + "auth": { + "scheme": "basic", + "username": "wasp", + "password": "wasp" + }, + "bindAddress": "0.0.0.0:7000" + }, + "peering":{ + "port": 4000, + "netid": "127.0.0.1:4000" + }, + "nodeconn": { + "address": "devnet_goshimmer:5000" + }, + "nanomsg":{ + "port": 5550 + } +} From db3c441706b7c3675c18c0f8a86fd04a1f42e1ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=B6ller?= Date: Thu, 2 Dec 2021 16:00:11 +0100 Subject: [PATCH 162/198] Fix error handler --- plugins/webapi/plugin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/webapi/plugin.go b/plugins/webapi/plugin.go index e19db24be1..5fba276a4e 100644 --- a/plugins/webapi/plugin.go +++ b/plugins/webapi/plugin.go @@ -97,7 +97,7 @@ func adminWhitelist() []net.IP { if parsedIP == nil { ips, err := net.LookupIP(ip) - if err != nil { + if err == nil { r = append(r, ips...) } } else { From cfca0350fbab91d7bcad2dfe7b11b557bb5c94f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=B6ller?= Date: Thu, 2 Dec 2021 22:40:46 +0100 Subject: [PATCH 163/198] Add devnet compose setup with out of the box configuration and deactivation of the admin whitelist --- packages/parameters/parameters.go | 8 +++++--- packages/webapi/admapi/endpoints.go | 7 ++++++- tools/devnet/docker-compose.yml | 17 ++++------------ tools/devnet/goshimmer.config.json | 31 +++++++++++++---------------- tools/devnet/wasp.config.json | 2 +- 5 files changed, 30 insertions(+), 35 deletions(-) diff --git a/packages/parameters/parameters.go b/packages/parameters/parameters.go index 458d9b063d..549b70ec13 100644 --- a/packages/parameters/parameters.go +++ b/packages/parameters/parameters.go @@ -22,9 +22,10 @@ const ( DatabaseDir = "database.directory" DatabaseInMemory = "database.inMemory" - WebAPIBindAddress = "webapi.bindAddress" - WebAPIAdminWhitelist = "webapi.adminWhitelist" - WebAPIAuth = "webapi.auth" + WebAPIBindAddress = "webapi.bindAddress" + WebAPIAdminWhitelist = "webapi.adminWhitelist" + WebAPIAdminWhitelistDisabled = "webapi.adminWhitelistDisabled" + WebAPIAuth = "webapi.auth" DashboardBindAddress = "dashboard.bindAddress" DashboardExploreAddressURL = "dashboard.exploreAddressUrl" @@ -70,6 +71,7 @@ func Init() *configuration.Configuration { flag.String(WebAPIBindAddress, "127.0.0.1:8080", "the bind address for the web API") flag.StringSlice(WebAPIAdminWhitelist, []string{}, "IP whitelist for /adm wndpoints") flag.StringToString(WebAPIAuth, nil, "authentication scheme for web API") + flag.Bool(WebAPIAdminWhitelistDisabled, false, "Disables IP whitelisting and allows requests from _any_ IP") flag.String(DashboardBindAddress, "127.0.0.1:7000", "the bind address for the node dashboard") flag.String(DashboardExploreAddressURL, "", "URL to add as href to addresses in the dashboard [default: :8081/explorer/address]") diff --git a/packages/webapi/admapi/endpoints.go b/packages/webapi/admapi/endpoints.go index 29fd066b48..bfd9c020a7 100644 --- a/packages/webapi/admapi/endpoints.go +++ b/packages/webapi/admapi/endpoints.go @@ -11,6 +11,7 @@ import ( "github.com/iotaledger/wasp/packages/chains" "github.com/iotaledger/wasp/packages/dkg" metricspkg "github.com/iotaledger/wasp/packages/metrics" + "github.com/iotaledger/wasp/packages/parameters" "github.com/iotaledger/wasp/packages/peering" "github.com/iotaledger/wasp/packages/registry" "github.com/labstack/echo/v4" @@ -36,7 +37,11 @@ func AddEndpoints( ) { initLogger() - adm.EchoGroup().Use(protected(adminWhitelist)) + echoGroup := adm.EchoGroup() + + if !parameters.GetBool(parameters.WebAPIAdminWhitelistDisabled) { + echoGroup.Use(protected(adminWhitelist)) + } addShutdownEndpoint(adm, shutdown) addChainRecordEndpoints(adm, registryProvider) diff --git a/tools/devnet/docker-compose.yml b/tools/devnet/docker-compose.yml index 32a859db6c..69a627464d 100644 --- a/tools/devnet/docker-compose.yml +++ b/tools/devnet/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.5" +version: "3.4" services: devnet_wasp: @@ -12,21 +12,19 @@ services: - wasp-db:/wasp/db - ./wasp.config.json:/etc/wasp_config.json expose: - - "7000/tcp" # Dashboard + - "7000/tcp" # Wasp Dashboard - "9090/tcp" # Web API - "5550/tcp" # Nano MSG - "4000/udp" # Peering ports: - - "127.0.0.1:7000:7000/tcp" # Dashboard + - "127.0.0.1:7000:7000/tcp" # Wasp Dashboard - "127.0.0.1:9090:9090/tcp" # WebAPI - "127.0.0.1:5550:5550/tcp" # Nano MSG - "127.0.0.1:4000:4000/tcp" # Peering devnet_goshimmer: - depends_on: - - devnet_wasp restart: always container_name: devnet_goshimmer - image: iotaledger/goshimmer:v0.7.5 + image: iotaledger/goshimmer:feat-document-devnet stop_grace_period: 1m networks: - wasp-devnet @@ -36,12 +34,6 @@ services: --messageLayer.snapshot.file=/tmp/snapshot.bin --messageLayer.snapshot.genesisNode= --messageLayer.startSynced=true - --txstream.bindAddress=:5000 - --prometheus.bindAddress=0.0.0.0:9312 - --prometheus.processMetrics=false - --node.enablePlugins=bootstrap,analysis-server,snapshot,analysis-dashboard,prometheus,txstream,"webapi tools endpoint",faucet,activity,spammer - --node.disablePlugins=autopeering,portcheck,gossip - #--node.disablePlugins=portcheck,clock,dashboard,analysis-client,gossip,drng,issuer,messagelayer,mana,pow,valuetransfers,consensus,webapi,webapibroadcastdataendpoint,webapifindtransactionhashesendpoint,webapigetneighborsendpoint,webapigettransactionobjectsbyhashendpoint,webapigettransactiontrytesbyhashendpoint volumes: - goshimmer-db:/tmp/devnetdb - ./goshimmer.config.json:/tmp/config.json:ro @@ -57,7 +49,6 @@ services: - "5000/tcp" # TXStream - "9000/tcp" # Analysis Dashboard - "9312/tcp" # Prometheus - - "7000/tcp" # - "8080/tcp" # GoShimmer API - "8081/tcp" # GoShimmer Dashboard diff --git a/tools/devnet/goshimmer.config.json b/tools/devnet/goshimmer.config.json index 3489271c1a..ec95c0b1a7 100644 --- a/tools/devnet/goshimmer.config.json +++ b/tools/devnet/goshimmer.config.json @@ -11,14 +11,15 @@ "dev": false } }, + "prometheus": { + "bindAddress": "0.0.0.0:9312", + "processMetrics": true + }, "manualpeering": { "knownPeers": [] }, "autopeering": { "enabled": false, - "_entryNodes": [ - "DLoMdp3nJ7jnFT1K13R2m5nZN7ijLcmaZhCdTPJs2duo@devnet_goshimmer:14626" - ], "enableGossipIntegration": false, "port": 14626 }, @@ -32,18 +33,7 @@ } }, "database": { - "directory": "mainnetdb" - }, - "drng": { - "custom": { - "instanceId": 111, - "threshold": 3, - "distributedPubKey": "", - "committeeMembers": ["EYsaGXnUVA9aTYL9FwYEvoQ8d1HCJveQVL7vogu6pqCP"] - } - }, - "fpc": { - "drngInstanceID": 111 + "directory": "/tmp/devnetdb" }, "logger": { "level": "info", @@ -67,9 +57,16 @@ "bindAddress": "0.0.0.0", "externalAddress": "auto" }, + "messageLayer" : { + "startSynced": true, + "snapshot": { + "genesisNode": "", + "file": "/tmp/snapshot.bin" + } + }, "node": { - "disablePlugins": "portcheck", - "enablePlugins": [] + "disablePlugins": ["portcheck"], + "enablePlugins": ["analysis-server","snapshot","analysis-dashboard","prometheus","txstream","\"webapi tools endpoint\"","faucet","activity","spammer"] }, "pow": { "difficulty": 2, diff --git a/tools/devnet/wasp.config.json b/tools/devnet/wasp.config.json index 64087bc3c6..1d7f3ff6f2 100644 --- a/tools/devnet/wasp.config.json +++ b/tools/devnet/wasp.config.json @@ -23,7 +23,7 @@ }, "webapi": { "bindAddress": "0.0.0.0:9090", - "adminWhitelist":["host.docker.internal", "127.0.0.1"] + "adminWhitelistDisabled": true }, "dashboard": { "auth": { From 09934dd413bcf9325736ea2d693aa2356883d1cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=B6ller?= Date: Thu, 2 Dec 2021 22:42:37 +0100 Subject: [PATCH 164/198] Revert whitelist filter --- plugins/webapi/plugin.go | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/plugins/webapi/plugin.go b/plugins/webapi/plugin.go index 5fba276a4e..3f29aea4aa 100644 --- a/plugins/webapi/plugin.go +++ b/plugins/webapi/plugin.go @@ -92,18 +92,7 @@ func configure(*node.Plugin) { func adminWhitelist() []net.IP { r := make([]net.IP, 0) for _, ip := range parameters.GetStringSlice(parameters.WebAPIAdminWhitelist) { - parsedIP := net.ParseIP(ip) - - if parsedIP == nil { - ips, err := net.LookupIP(ip) - - if err == nil { - r = append(r, ips...) - } - } else { - r = append(r, parsedIP) - } - + r = append(r, net.ParseIP(ip)) } return r } From f73f98f4260764c29a65b97335421eb795c5f403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=B6ller?= Date: Thu, 2 Dec 2021 22:43:53 +0100 Subject: [PATCH 165/198] Cleanup docker compose file --- tools/devnet/docker-compose.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/devnet/docker-compose.yml b/tools/devnet/docker-compose.yml index 69a627464d..00554750f8 100644 --- a/tools/devnet/docker-compose.yml +++ b/tools/devnet/docker-compose.yml @@ -12,15 +12,15 @@ services: - wasp-db:/wasp/db - ./wasp.config.json:/etc/wasp_config.json expose: - - "7000/tcp" # Wasp Dashboard - - "9090/tcp" # Web API - - "5550/tcp" # Nano MSG - "4000/udp" # Peering + - "5550/tcp" # Nano MSG + - "7000/tcp" # Wasp Dashboard + - "9090/tcp" # Wasp WebAPI ports: - - "127.0.0.1:7000:7000/tcp" # Wasp Dashboard - - "127.0.0.1:9090:9090/tcp" # WebAPI - - "127.0.0.1:5550:5550/tcp" # Nano MSG - "127.0.0.1:4000:4000/tcp" # Peering + - "127.0.0.1:5550:5550/tcp" # Nano MSG + - "127.0.0.1:7000:7000/tcp" # Wasp Dashboard + - "127.0.0.1:9090:9090/tcp" # Wasp WebAPI devnet_goshimmer: restart: always container_name: devnet_goshimmer @@ -39,18 +39,18 @@ services: - ./goshimmer.config.json:/tmp/config.json:ro - ./snapshot.bin:/tmp/snapshot.bin:ro ports: + - "127.0.0.1:5000:5000/tcp" # TX Stream - "127.0.0.1:8080:8080/tcp" # GoShimmer API - "127.0.0.1:8081:8081/tcp" # GoShimmer Dashboard - "127.0.0.1:9000:9000/tcp" # Analysis Dashboard - "127.0.0.1:9312:9312/tcp" # Prometheus - - "127.0.0.1:5000:5000/tcp" # TX Stream expose: - "1888/tcp" # Analysis Server (within Docker network) - "5000/tcp" # TXStream - - "9000/tcp" # Analysis Dashboard - - "9312/tcp" # Prometheus - "8080/tcp" # GoShimmer API - "8081/tcp" # GoShimmer Dashboard + - "9000/tcp" # Analysis Dashboard + - "9312/tcp" # Prometheus volumes: goshimmer-db: From b36259515105664ac27ee6568ee33a61a6ec9ef4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=B6ller?= Date: Thu, 2 Dec 2021 22:49:12 +0100 Subject: [PATCH 166/198] Update docker compose file --- tools/devnet/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/devnet/docker-compose.yml b/tools/devnet/docker-compose.yml index 00554750f8..06d7c23a8b 100644 --- a/tools/devnet/docker-compose.yml +++ b/tools/devnet/docker-compose.yml @@ -9,7 +9,7 @@ services: networks: - wasp-devnet volumes: - - wasp-db:/wasp/db + - wasp-db:/wasp/waspdb - ./wasp.config.json:/etc/wasp_config.json expose: - "4000/udp" # Peering From 8bf0423185502796e86bf60c7bfa13ec3394b5ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=B6ller?= Date: Thu, 2 Dec 2021 22:49:54 +0100 Subject: [PATCH 167/198] Fix wasp db path --- tools/devnet/wasp.config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/devnet/wasp.config.json b/tools/devnet/wasp.config.json index 1d7f3ff6f2..5e390495b3 100644 --- a/tools/devnet/wasp.config.json +++ b/tools/devnet/wasp.config.json @@ -1,6 +1,6 @@ { "database": { - "directory": "waspdb" + "directory": "/wasp/waspdb" }, "logger": { "level": "debug", From 9ab0a0654cfb0c7c4c9da27d0b6d45b12f00a75c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=B6ller?= Date: Thu, 2 Dec 2021 22:52:52 +0100 Subject: [PATCH 168/198] Remove remote log configuration --- tools/devnet/goshimmer.config.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/devnet/goshimmer.config.json b/tools/devnet/goshimmer.config.json index ec95c0b1a7..b2f3c8fb1c 100644 --- a/tools/devnet/goshimmer.config.json +++ b/tools/devnet/goshimmer.config.json @@ -43,10 +43,7 @@ "outputPaths": [ "stdout" ], - "disableEvents": true, - "remotelog": { - "serverAddress": "remotelog.goshimmer.iota.cafe:5213" - } + "disableEvents": true }, "metrics":{ "manaUpdateInterval": 5, From 6525121aea5a134789e05d4086b31d89f3413a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=B6ller?= Date: Thu, 2 Dec 2021 23:09:21 +0100 Subject: [PATCH 169/198] Update docker compose file --- tools/devnet/goshimmer.config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/devnet/goshimmer.config.json b/tools/devnet/goshimmer.config.json index b2f3c8fb1c..8126e4196e 100644 --- a/tools/devnet/goshimmer.config.json +++ b/tools/devnet/goshimmer.config.json @@ -63,7 +63,7 @@ }, "node": { "disablePlugins": ["portcheck"], - "enablePlugins": ["analysis-server","snapshot","analysis-dashboard","prometheus","txstream","\"webapi tools endpoint\"","faucet","activity","spammer"] + "enablePlugins": ["analysis-server","snapshot","analysis-dashboard","prometheus","txstream","webapi tools endpoint","faucet","activity","spammer"] }, "pow": { "difficulty": 2, From 41b3b449940a33f1a39f19a9c7ee72e64bf8df17 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Fri, 3 Dec 2021 09:46:17 +0200 Subject: [PATCH 170/198] Rename: stats -> metrics --- .../{node_connection_stats.go => node_connection_metrics.go} | 0 packages/webapi/routes/routes.go | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename packages/webapi/model/{node_connection_stats.go => node_connection_metrics.go} (100%) diff --git a/packages/webapi/model/node_connection_stats.go b/packages/webapi/model/node_connection_metrics.go similarity index 100% rename from packages/webapi/model/node_connection_stats.go rename to packages/webapi/model/node_connection_metrics.go diff --git a/packages/webapi/routes/routes.go b/packages/webapi/routes/routes.go index 550c7133d5..ca9c88eee7 100644 --- a/packages/webapi/routes/routes.go +++ b/packages/webapi/routes/routes.go @@ -56,11 +56,11 @@ func GetCommitteeRecord(addr string) string { } func GetChainsStats() string { - return "/adm/chain/stats" + return "/adm/chain/metrics" } func GetChainStats(chainID string) string { - return "/adm/chain/" + chainID + "/stats" + return "/adm/chain/" + chainID + "/metrics" } func GetCommitteeForChain(chainID string) string { From 5c9017bbb56e9d7b8f3ccc0a0214912d26faf797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=B6ller?= Date: Fri, 3 Dec 2021 13:33:50 +0100 Subject: [PATCH 171/198] Update goshimmer image --- packages/webapi/admapi/endpoints.go | 4 +++- tools/devnet/docker-compose.yml | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/webapi/admapi/endpoints.go b/packages/webapi/admapi/endpoints.go index bfd9c020a7..97c7290cc9 100644 --- a/packages/webapi/admapi/endpoints.go +++ b/packages/webapi/admapi/endpoints.go @@ -37,9 +37,11 @@ func AddEndpoints( ) { initLogger() + isWhitelistEnabled := !parameters.GetBool(parameters.WebAPIAdminWhitelistDisabled) + echoGroup := adm.EchoGroup() - if !parameters.GetBool(parameters.WebAPIAdminWhitelistDisabled) { + if isWhitelistEnabled { echoGroup.Use(protected(adminWhitelist)) } diff --git a/tools/devnet/docker-compose.yml b/tools/devnet/docker-compose.yml index 06d7c23a8b..c2b370017e 100644 --- a/tools/devnet/docker-compose.yml +++ b/tools/devnet/docker-compose.yml @@ -24,13 +24,16 @@ services: devnet_goshimmer: restart: always container_name: devnet_goshimmer - image: iotaledger/goshimmer:feat-document-devnet + #https://github.com/lmoe/goshimmer + image: lukasmoe/goshimmer:wasp-testnet-additions stop_grace_period: 1m networks: - wasp-devnet command: > --config=/tmp/config.json --database.directory=/tmp/devnetdb + --mana.snapshotResetTime=true + --node.seed=base58:3YX6e7AL28hHihZewKdq6CMkEYVsTJBLgRiprUNiNq5E --messageLayer.snapshot.file=/tmp/snapshot.bin --messageLayer.snapshot.genesisNode= --messageLayer.startSynced=true From 90d691ad9a6979fe4d285fb64374658cbe6b36cd Mon Sep 17 00:00:00 2001 From: Karolis Petrauskas Date: Fri, 3 Dec 2021 16:16:56 +0200 Subject: [PATCH 172/198] No need to erase maps on SC init. --- packages/vm/core/governance/governanceimpl/impl.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/vm/core/governance/governanceimpl/impl.go b/packages/vm/core/governance/governanceimpl/impl.go index c289cdcc97..97a6fe23fb 100644 --- a/packages/vm/core/governance/governanceimpl/impl.go +++ b/packages/vm/core/governance/governanceimpl/impl.go @@ -7,7 +7,6 @@ import ( "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/colored" "github.com/iotaledger/wasp/packages/kv/codec" - "github.com/iotaledger/wasp/packages/kv/collections" "github.com/iotaledger/wasp/packages/kv/dict" "github.com/iotaledger/wasp/packages/kv/kvdecoder" "github.com/iotaledger/wasp/packages/vm/core/governance" @@ -65,8 +64,5 @@ func initialize(ctx iscp.Sandbox) (dict.Dict, error) { state.Set(governance.VarFeeColor, codec.EncodeColor(feeColor)) } - collections.NewMap(state, governance.VarAccessNodeCandidates).Erase() - collections.NewMap(state, governance.VarAccessNodes).Erase() - collections.NewArray16(state, governance.VarValidatorNodes).MustErase() return nil, nil } From 8c38ecf64143c7cd28a6b4dfcd4c73e32bada262 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Fri, 3 Dec 2021 16:26:51 +0200 Subject: [PATCH 173/198] More renaming: Stats -> Metrics --- packages/webapi/admapi/chainnodeconnmetrics.go | 4 ++-- packages/webapi/routes/routes.go | 4 ++-- plugins/metrics/plugin.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/webapi/admapi/chainnodeconnmetrics.go b/packages/webapi/admapi/chainnodeconnmetrics.go index 1a261c7c80..0c819c5dde 100644 --- a/packages/webapi/admapi/chainnodeconnmetrics.go +++ b/packages/webapi/admapi/chainnodeconnmetrics.go @@ -68,11 +68,11 @@ func addChainStatsEndpoints(adm echoswagger.ApiGroup, chainsProvider chains.Prov s := &chainStatsService{chainsProvider} - adm.GET(routes.GetChainsStats(), s.handleGetChainsStats). + adm.GET(routes.GetChainsMetrics(), s.handleGetChainsStats). SetSummary("Get cummulative chains state statistics"). AddResponse(http.StatusOK, "Chains Stats", example, nil) - adm.GET(routes.GetChainStats(":chainID"), s.handleGetChainStats). + adm.GET(routes.GetChainMetrics(":chainID"), s.handleGetChainStats). SetSummary("Get chain state statistics for the given chain ID"). AddParamPath("", "chainID", "ChainID (base58)"). AddResponse(http.StatusOK, "Chain Stats", chainExample, nil) diff --git a/packages/webapi/routes/routes.go b/packages/webapi/routes/routes.go index ca9c88eee7..181d63bece 100644 --- a/packages/webapi/routes/routes.go +++ b/packages/webapi/routes/routes.go @@ -55,11 +55,11 @@ func GetCommitteeRecord(addr string) string { return "/adm/committeerecord/" + addr } -func GetChainsStats() string { +func GetChainsMetrics() string { return "/adm/chain/metrics" } -func GetChainStats(chainID string) string { +func GetChainMetrics(chainID string) string { return "/adm/chain/" + chainID + "/metrics" } diff --git a/plugins/metrics/plugin.go b/plugins/metrics/plugin.go index e27d5f443b..21f681684e 100644 --- a/plugins/metrics/plugin.go +++ b/plugins/metrics/plugin.go @@ -16,7 +16,7 @@ var ( ) func Init() *node.Plugin { - return node.NewPlugin(PluginName, node.Disabled, configure, run) + return node.NewPlugin(PluginName, node.Enabled, configure, run) } func configure(_ *node.Plugin) { From 1ceec358f8025c7e25977a0eb78c356eda1e3935 Mon Sep 17 00:00:00 2001 From: Karolis Petrauskas Date: Fri, 3 Dec 2021 17:16:51 +0200 Subject: [PATCH 174/198] Governance: store more data in the state. --- packages/vm/core/governance/accessnodes.go | 83 ++++++++++--------- .../governanceimpl/accessnodesImpl.go | 38 ++++----- packages/vm/core/governance/interface.go | 10 +-- packages/vm/core/testcore/governance_test.go | 14 ++-- 4 files changed, 71 insertions(+), 74 deletions(-) diff --git a/packages/vm/core/governance/accessnodes.go b/packages/vm/core/governance/accessnodes.go index d33c713bb8..467f5b543e 100644 --- a/packages/vm/core/governance/accessnodes.go +++ b/packages/vm/core/governance/accessnodes.go @@ -7,6 +7,7 @@ import ( "bytes" "crypto/ed25519" + "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/kv/codec" "github.com/iotaledger/wasp/packages/kv/collections" "github.com/iotaledger/wasp/packages/kv/dict" @@ -15,56 +16,58 @@ import ( ) type AccessNodeInfo struct { - PubKey []byte - Validator bool - API string + NodePubKey []byte // Public Key of the node. Stored as a key in the SC State and Params. + ValidatorAddr []byte // Address of the validator owning the node. Not sent via parameters. + Certificate []byte // Proof that Validator owns the Node. + ForCommittee bool // true, if Node should be a candidate to a committee. + AccessAPI string // API URL, if any. } func NewAccessNodeInfoFromBytes(pubKey, value []byte) (*AccessNodeInfo, error) { var a AccessNodeInfo var err error r := bytes.NewReader(value) - if err := util.ReadBoolByte(r, &a.Validator); err != nil { - return nil, xerrors.Errorf("failed to read AccessNodeInfo.Validator: %v", err) + a.NodePubKey = pubKey // NodePubKey stored as a map key. + if a.ValidatorAddr, err = util.ReadBytes16(r); err != nil { + return nil, xerrors.Errorf("failed to read AccessNodeInfo.ValidatorAddr: %v", err) } - if a.API, err = util.ReadString16(r); err != nil { - return nil, xerrors.Errorf("failed to read AccessNodeInfo.API: %v", err) + if a.Certificate, err = util.ReadBytes16(r); err != nil { + return nil, xerrors.Errorf("failed to read AccessNodeInfo.Certificate: %v", err) } - a.PubKey = pubKey - return &a, nil -} - -func NewAccessNodeInfoListFromMap(infoMap *collections.ImmutableMap) ([]*AccessNodeInfo, error) { - res := make([]*AccessNodeInfo, 0) - var accErr error - err := infoMap.Iterate(func(elemKey, value []byte) bool { - var a *AccessNodeInfo - if a, accErr = NewAccessNodeInfoFromBytes(elemKey, value); accErr != nil { - return false - } - res = append(res, a) - return true - }) - if accErr != nil { - return nil, xerrors.Errorf("failed to iterate over AccessNodeInfo list: %v", accErr) + if err := util.ReadBoolByte(r, &a.ForCommittee); err != nil { + return nil, xerrors.Errorf("failed to read AccessNodeInfo.ForCommittee: %v", err) } - if err != nil { - return nil, xerrors.Errorf("failed to iterate over AccessNodeInfo list: %v", err) + if a.AccessAPI, err = util.ReadString16(r); err != nil { + return nil, xerrors.Errorf("failed to read AccessNodeInfo.AccessAPI: %v", err) } - return res, nil + return &a, nil } func (a *AccessNodeInfo) Bytes() []byte { w := bytes.Buffer{} - if err := util.WriteBoolByte(&w, a.Validator); err != nil { - panic(xerrors.Errorf("failed to write AccessNodeInfo.Validator: %v", err)) + // NodePubKey stored as a map key. + if err := util.WriteBytes16(&w, a.ValidatorAddr); err != nil { + panic(xerrors.Errorf("failed to write AccessNodeInfo.ValidatorAddr: %v", err)) + } + if err := util.WriteBytes16(&w, a.Certificate); err != nil { + panic(xerrors.Errorf("failed to write AccessNodeInfo.Certificate: %v", err)) + } + if err := util.WriteBoolByte(&w, a.ForCommittee); err != nil { + panic(xerrors.Errorf("failed to write AccessNodeInfo.ForCommittee: %v", err)) } - if err := util.WriteString16(&w, a.API); err != nil { - panic(xerrors.Errorf("failed to write AccessNodeInfo.Validator: %v", err)) + if err := util.WriteString16(&w, a.AccessAPI); err != nil { + panic(xerrors.Errorf("failed to write AccessNodeInfo.AccessAPI: %v", err)) } return w.Bytes() } +func (a *AccessNodeInfo) ValidateCert(ctx iscp.Sandbox) bool { + signedData := bytes.Buffer{} + signedData.Write(a.NodePubKey) + signedData.Write(a.ValidatorAddr) + return ctx.Utils().ED25519().ValidSignature(signedData.Bytes(), a.NodePubKey, a.Certificate) +} + // // GetChainNodesRequest // @@ -110,20 +113,20 @@ func NewGetChainNodesResponseFromDict(d dict.Dict) *GetChainNodesResponse { // CandidateNodeRequest // type CandidateNodeRequest struct { - Candidate bool - Validator bool - PubKey []byte - Cert []byte - API string + Candidate bool + ForCommittee bool + NodePubKey []byte + Certificate []byte + AccessAPI string } func (req CandidateNodeRequest) AsDict() dict.Dict { d := dict.New() d.Set(ParamCandidateNodeCandidate, codec.EncodeBool(req.Candidate)) - d.Set(ParamCandidateNodeValidator, codec.EncodeBool(req.Validator)) - d.Set(ParamCandidateNodePubKey, req.PubKey) - d.Set(ParamCandidateNodeCert, req.Cert) - d.Set(ParamCandidateNodeAPI, codec.EncodeString(req.API)) + d.Set(ParamCandidateNodeForCommittee, codec.EncodeBool(req.ForCommittee)) + d.Set(ParamCandidateNodePubKey, req.NodePubKey) + d.Set(ParamCandidateNodeCertificate, req.Certificate) + d.Set(ParamCandidateNodeAccessAPI, codec.EncodeString(req.AccessAPI)) return d } diff --git a/packages/vm/core/governance/governanceimpl/accessnodesImpl.go b/packages/vm/core/governance/governanceimpl/accessnodesImpl.go index 5dbd6ff71c..1021af81d0 100644 --- a/packages/vm/core/governance/governanceimpl/accessnodesImpl.go +++ b/packages/vm/core/governance/governanceimpl/accessnodesImpl.go @@ -13,8 +13,6 @@ package governanceimpl import ( - "bytes" - "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/iscp/assert" "github.com/iotaledger/wasp/packages/kv/collections" @@ -48,11 +46,11 @@ func getChainNodesFuncHandler(ctx iscp.SandboxView) (dict.Dict, error) { // SC Command Function handler. // // candidateNode( -// candidate: bool = true // true, if we are adding the node as a candidate to access nodes. -// validator: bool = false // true, if we also want the node to become a validator. -// pubKey: []byte // Public key of the node. -// cert: []byte // Signature by the node over its public key. -// api: string = "" // Optional: API URL for the access node. +// candidate: bool = true // true, if we are adding the node as a candidate to access nodes. +// forCommittee: bool = false // true, if we also want the node to become a validator. +// nodePubKey: []byte // Public key of the node. +// certificate: []byte // Signature by the node over its publicKey||validatorAddress. +// accessAPI: string = "" // Optional: API URL for the access node. // ) => () // // It is possible that after executing `candidateNode(false, false, ...)` a node will stay @@ -64,28 +62,24 @@ func candidateNodeFuncHandler(ctx iscp.Sandbox) (dict.Dict, error) { a := assert.NewAssert(ctx.Log()) params := kvdecoder.New(ctx.Params(), ctx.Log()) paramCandidate := params.MustGetBool(governance.ParamCandidateNodeCandidate, true) - paramValidator := params.MustGetBool(governance.ParamCandidateNodeValidator, false) - paramsPubKey := params.MustGetBytes(governance.ParamCandidateNodePubKey) - paramsCert := params.MustGetBytes(governance.ParamCandidateNodeCert) - paramsAPI := params.MustGetString(governance.ParamCandidateNodeAPI, "") - signedData := bytes.Buffer{} // TODO: Double-check, if such scheme is good enough. - signedData.Write(paramsPubKey) - signedData.Write(ctx.Request().SenderAddress().Bytes()) - a.Require(ctx.Utils().ED25519().ValidSignature(signedData.Bytes(), paramsPubKey, paramsCert), "certificate invalid") + ani := governance.AccessNodeInfo{ + NodePubKey: params.MustGetBytes(governance.ParamCandidateNodePubKey), + ValidatorAddr: ctx.Request().SenderAddress().Bytes(), // Not from params, to have it validated. + Certificate: params.MustGetBytes(governance.ParamCandidateNodeCertificate), + ForCommittee: params.MustGetBool(governance.ParamCandidateNodeForCommittee, false), + AccessAPI: params.MustGetString(governance.ParamCandidateNodeAccessAPI, ""), + } + a.Require(ani.ValidateCert(ctx), "certificate invalid") if paramCandidate { - ani := governance.AccessNodeInfo{ - Validator: paramValidator, - API: paramsAPI, - } accessNodeCandidates := collections.NewMap(ctx.State(), governance.VarAccessNodeCandidates) - accessNodeCandidates.MustSetAt(paramsPubKey, ani.Bytes()) + accessNodeCandidates.MustSetAt(ani.NodePubKey, ani.Bytes()) } else { accessNodeCandidates := collections.NewMap(ctx.State(), governance.VarAccessNodeCandidates) - accessNodeCandidates.MustDelAt(paramsPubKey) + accessNodeCandidates.MustDelAt(ani.NodePubKey) accessNodes := collections.NewMap(ctx.State(), governance.VarAccessNodes) - accessNodes.MustDelAt(paramsPubKey) + accessNodes.MustDelAt(ani.NodePubKey) } return nil, nil } diff --git a/packages/vm/core/governance/interface.go b/packages/vm/core/governance/interface.go index 7c4663660a..78528f6873 100644 --- a/packages/vm/core/governance/interface.go +++ b/packages/vm/core/governance/interface.go @@ -105,11 +105,11 @@ const ( ParamGetChainNodesAccessNodes = "a" // access nodes: candidateNode - ParamCandidateNodeCandidate = "c" - ParamCandidateNodeValidator = "v" - ParamCandidateNodePubKey = "pk" - ParamCandidateNodeCert = "cr" - ParamCandidateNodeAPI = "a" + ParamCandidateNodeCandidate = "c" + ParamCandidateNodeForCommittee = "fc" + ParamCandidateNodePubKey = "pk" + ParamCandidateNodeCertificate = "cr" + ParamCandidateNodeAccessAPI = "a" // access nodes: changeAccessNodes ParamChangeAccessNodesActions = "a" diff --git a/packages/vm/core/testcore/governance_test.go b/packages/vm/core/testcore/governance_test.go index 7a4c3ced96..5096d126fe 100644 --- a/packages/vm/core/testcore/governance_test.go +++ b/packages/vm/core/testcore/governance_test.go @@ -142,11 +142,11 @@ func TestAccessNodes(t *testing.T) { governance.Contract.Name, governance.FuncCandidateNode.Name, governance.CandidateNodeRequest{ - Candidate: true, - Validator: false, - PubKey: node1KP.PublicKey.Bytes(), - Cert: node1KP.PrivateKey.Sign(certData.Bytes()).Bytes(), - API: "http://my-api/url", + Candidate: true, + ForCommittee: false, + NodePubKey: node1KP.PublicKey.Bytes(), + Certificate: node1KP.PrivateKey.Sign(certData.Bytes()).Bytes(), + AccessAPI: "http://my-api/url", }.AsDict(), ).WithIotas(1), node1OwnerKP, // Sender should match data used to create the Cert field value. @@ -161,7 +161,7 @@ func TestAccessNodes(t *testing.T) { require.NoError(t, err) getChainNodesResponse = governance.NewGetChainNodesResponseFromDict(res) require.Equal(t, 1, len(getChainNodesResponse.AccessNodeCandidates)) // Candidate registered. - require.Equal(t, "http://my-api/url", getChainNodesResponse.AccessNodeCandidates[0].API) + require.Equal(t, "http://my-api/url", getChainNodesResponse.AccessNodeCandidates[0].AccessAPI) require.Empty(t, getChainNodesResponse.AccessNodes) // @@ -184,6 +184,6 @@ func TestAccessNodes(t *testing.T) { require.NoError(t, err) getChainNodesResponse = governance.NewGetChainNodesResponseFromDict(res) require.Equal(t, 1, len(getChainNodesResponse.AccessNodeCandidates)) // Candidate registered. - require.Equal(t, "http://my-api/url", getChainNodesResponse.AccessNodeCandidates[0].API) + require.Equal(t, "http://my-api/url", getChainNodesResponse.AccessNodeCandidates[0].AccessAPI) require.Equal(t, 1, len(getChainNodesResponse.AccessNodes)) } From 10a70a999c31cf41b9a9c40afef56f41fafc20ff Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Fri, 3 Dec 2021 12:57:39 -0800 Subject: [PATCH 175/198] Added erc721 demo contract in all languages --- contracts/wasm/Cargo.lock | 10 + contracts/wasm/Cargo.toml | 1 + contracts/wasm/erc721/Cargo.toml | 26 ++ contracts/wasm/erc721/LICENSE | 216 ++++++++++ contracts/wasm/erc721/README.md | 85 ++++ contracts/wasm/erc721/client/app.ts | 30 ++ contracts/wasm/erc721/client/events.ts | 108 +++++ contracts/wasm/erc721/client/service.ts | 212 ++++++++++ contracts/wasm/erc721/go/erc721/consts.go | 82 ++++ contracts/wasm/erc721/go/erc721/contract.go | 173 ++++++++ contracts/wasm/erc721/go/erc721/erc721.go | 225 +++++++++++ contracts/wasm/erc721/go/erc721/events.go | 52 +++ contracts/wasm/erc721/go/erc721/keys.go | 68 ++++ contracts/wasm/erc721/go/erc721/lib.go | 345 ++++++++++++++++ contracts/wasm/erc721/go/erc721/params.go | 274 +++++++++++++ contracts/wasm/erc721/go/erc721/results.go | 122 ++++++ contracts/wasm/erc721/go/erc721/state.go | 136 +++++++ contracts/wasm/erc721/go/erc721/typedefs.go | 34 ++ contracts/wasm/erc721/go/main.go | 24 ++ contracts/wasm/erc721/schema.yaml | 95 +++++ contracts/wasm/erc721/src/consts.rs | 70 ++++ contracts/wasm/erc721/src/contract.rs | 227 +++++++++++ contracts/wasm/erc721/src/erc721.rs | 224 +++++++++++ contracts/wasm/erc721/src/events.rs | 55 +++ contracts/wasm/erc721/src/keys.rs | 74 ++++ contracts/wasm/erc721/src/lib.rs | 375 ++++++++++++++++++ contracts/wasm/erc721/src/params.rs | 352 ++++++++++++++++ contracts/wasm/erc721/src/results.rs | 170 ++++++++ contracts/wasm/erc721/src/state.rs | 160 ++++++++ contracts/wasm/erc721/src/typedefs.rs | 39 ++ contracts/wasm/erc721/test/erc721_bg.wasm | Bin 0 -> 39563 bytes contracts/wasm/erc721/test/erc721_test.go | 208 ++++++++++ contracts/wasm/erc721/ts/erc721/consts.ts | 68 ++++ contracts/wasm/erc721/ts/erc721/contract.ts | 252 ++++++++++++ contracts/wasm/erc721/ts/erc721/erc721.ts | 223 +++++++++++ contracts/wasm/erc721/ts/erc721/events.ts | 50 +++ contracts/wasm/erc721/ts/erc721/index.ts | 18 + contracts/wasm/erc721/ts/erc721/keys.ts | 63 +++ contracts/wasm/erc721/ts/erc721/lib.ts | 186 +++++++++ contracts/wasm/erc721/ts/erc721/params.ts | 225 +++++++++++ contracts/wasm/erc721/ts/erc721/results.ts | 93 +++++ contracts/wasm/erc721/ts/erc721/state.ts | 155 ++++++++ contracts/wasm/erc721/ts/erc721/tsconfig.json | 4 + contracts/wasm/erc721/ts/erc721/typedefs.ts | 43 ++ 44 files changed, 5652 insertions(+) create mode 100644 contracts/wasm/erc721/Cargo.toml create mode 100644 contracts/wasm/erc721/LICENSE create mode 100644 contracts/wasm/erc721/README.md create mode 100644 contracts/wasm/erc721/client/app.ts create mode 100644 contracts/wasm/erc721/client/events.ts create mode 100644 contracts/wasm/erc721/client/service.ts create mode 100644 contracts/wasm/erc721/go/erc721/consts.go create mode 100644 contracts/wasm/erc721/go/erc721/contract.go create mode 100644 contracts/wasm/erc721/go/erc721/erc721.go create mode 100644 contracts/wasm/erc721/go/erc721/events.go create mode 100644 contracts/wasm/erc721/go/erc721/keys.go create mode 100644 contracts/wasm/erc721/go/erc721/lib.go create mode 100644 contracts/wasm/erc721/go/erc721/params.go create mode 100644 contracts/wasm/erc721/go/erc721/results.go create mode 100644 contracts/wasm/erc721/go/erc721/state.go create mode 100644 contracts/wasm/erc721/go/erc721/typedefs.go create mode 100644 contracts/wasm/erc721/go/main.go create mode 100644 contracts/wasm/erc721/schema.yaml create mode 100644 contracts/wasm/erc721/src/consts.rs create mode 100644 contracts/wasm/erc721/src/contract.rs create mode 100644 contracts/wasm/erc721/src/erc721.rs create mode 100644 contracts/wasm/erc721/src/events.rs create mode 100644 contracts/wasm/erc721/src/keys.rs create mode 100644 contracts/wasm/erc721/src/lib.rs create mode 100644 contracts/wasm/erc721/src/params.rs create mode 100644 contracts/wasm/erc721/src/results.rs create mode 100644 contracts/wasm/erc721/src/state.rs create mode 100644 contracts/wasm/erc721/src/typedefs.rs create mode 100644 contracts/wasm/erc721/test/erc721_bg.wasm create mode 100644 contracts/wasm/erc721/test/erc721_test.go create mode 100644 contracts/wasm/erc721/ts/erc721/consts.ts create mode 100644 contracts/wasm/erc721/ts/erc721/contract.ts create mode 100644 contracts/wasm/erc721/ts/erc721/erc721.ts create mode 100644 contracts/wasm/erc721/ts/erc721/events.ts create mode 100644 contracts/wasm/erc721/ts/erc721/index.ts create mode 100644 contracts/wasm/erc721/ts/erc721/keys.ts create mode 100644 contracts/wasm/erc721/ts/erc721/lib.ts create mode 100644 contracts/wasm/erc721/ts/erc721/params.ts create mode 100644 contracts/wasm/erc721/ts/erc721/results.ts create mode 100644 contracts/wasm/erc721/ts/erc721/state.ts create mode 100644 contracts/wasm/erc721/ts/erc721/tsconfig.json create mode 100644 contracts/wasm/erc721/ts/erc721/typedefs.ts diff --git a/contracts/wasm/Cargo.lock b/contracts/wasm/Cargo.lock index a466f074ce..291995c168 100644 --- a/contracts/wasm/Cargo.lock +++ b/contracts/wasm/Cargo.lock @@ -58,6 +58,16 @@ dependencies = [ "wee_alloc", ] +[[package]] +name = "erc721" +version = "0.1.0" +dependencies = [ + "console_error_panic_hook", + "wasm-bindgen-test", + "wasmlib", + "wee_alloc", +] + [[package]] name = "fairauction" version = "0.1.0" diff --git a/contracts/wasm/Cargo.toml b/contracts/wasm/Cargo.toml index 6bab15ed67..08c3d6d18b 100644 --- a/contracts/wasm/Cargo.toml +++ b/contracts/wasm/Cargo.toml @@ -6,6 +6,7 @@ members = [ "dividend", "donatewithfeedback", "erc20", + "erc721", "fairauction", "fairroulette", "helloworld", diff --git a/contracts/wasm/erc721/Cargo.toml b/contracts/wasm/erc721/Cargo.toml new file mode 100644 index 0000000000..8485099a71 --- /dev/null +++ b/contracts/wasm/erc721/Cargo.toml @@ -0,0 +1,26 @@ +# Copyright 2020 IOTA Stiftung +# SPDX-License-Identifier: Apache-2.0 + +[package] +name = "erc721" +description = "ERC-721 NFT PoC for IOTA Smart Contracts" +license = "Apache-2.0" +version = "0.1.0" +authors = ["John Doe "] +edition = "2018" +repository = "https://github.com/iotaledger/wasp" + +[lib] +crate-type = ["cdylib", "rlib"] + +[features] +default = ["console_error_panic_hook"] + +[dependencies] +wasmlib = { path = "../../../packages/vm/wasmlib" } +#wasmlib = { git = "https://github.com/iotaledger/wasp", branch = "develop" } +console_error_panic_hook = { version = "0.1.6", optional = true } +wee_alloc = { version = "0.4.5", optional = true } + +[dev-dependencies] +wasm-bindgen-test = "0.3.13" diff --git a/contracts/wasm/erc721/LICENSE b/contracts/wasm/erc721/LICENSE new file mode 100644 index 0000000000..d22c90e122 --- /dev/null +++ b/contracts/wasm/erc721/LICENSE @@ -0,0 +1,216 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2019 IOTA Foundation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +For the errors package: + +Copyright (c) 2015, Dave Cheney +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/contracts/wasm/erc721/README.md b/contracts/wasm/erc721/README.md new file mode 100644 index 0000000000..01fbc435e3 --- /dev/null +++ b/contracts/wasm/erc721/README.md @@ -0,0 +1,85 @@ +# ERC721 as IOTA smart contract + +### Deploy new chain (optional) + +```bash +$ ./wasp-cli chain deploy --committee=0 --quorum=1 --chain=wasptest --description="ArgentinaHub" +# You can replace the amount of committees and quorum by your needs +``` + +### Deposit IOTA tokens to the chain +```bash +$ ./wasp-cli chain deposit IOTA:1000 +``` + +### Deploy contract +```bash +./wasp-cli --verbose chain deploy-contract wasmtime erc721 "Argentina Hub" contracts/wasm/erc721/pkg/nft_bg.wasm string n string ArgHub string s string ARH +# n: Name +# s: Symbol +``` + +### Mint new erc721 +```bash +./wasp-cli --verbose chain post-request erc721 mint string tokenid int +string tokenuri string +#Example +# = 73798465 +# = "" +``` + +### Transfer ownership of the erc721 +```bash +./wasp-cli --verbose chain post-request erc721 transferFrom string from agentid string to agentid string tokenid int +# Example +# = A/1urERbzXL1iraoW2jMvkLdFuMmPS711BYtA8u4L6sS53::00000000 +# = A/111111111111111111111111111111111::00000000 +# = 73798465 +``` + +### Approves another agentid to transfer the given token +```bash +./wasp-cli --verbose chain post-request erc721 approve string to agentid string tokenid int +# Example +# = A/1urERbzXL1iraoW2jMvkLdFuMmPS711BYtA8u4L6sS53::00000000 +# = 73798465 +``` + +### Balance Of +```bash +./wasp-cli chain call-view erc721 balanceOf string account agentid | ./wasp-cli decode string amount int +# Example +# = A/1urERbzXL1iraoW2jMvkLdFuMmPS711BYtA8u4L6sS53::00000000 +``` + +### Name of contract +```bash +./wasp-cli chain call-view erc721 name | ./wasp-cli decode string name string +``` + +### Symbol of contract +```bash +./wasp-cli chain call-view erc721 name | ./wasp-cli decode string name string +``` + +### Check agent id if it's approved (1 = true ; 0 = false) +```bash +./wasp-cli chain call-view erc721 isApproved string tokenid int string operator agentid | ./wasp-cli decode string approved int +# Example +# = 73798465 +# = A/12uApMh48Nq9EZGB8idco4W5NpZtyu6vv4sXpZuP5FUKs::00000000 +``` + +### Get token URI +```bash +./wasp-cli chain call-view erc721 tokenURI string tokenid int | ./wasp-cli decode string uri string +# Example +# = 73798465 +``` + +### Set approval for all (1 = true ; 0 = false) +```bash +./wasp-cli --verbose chain post-request erc721 setApprovalForAll string operator agentid string approved int 1 +# Example +# = A/12uApMh48Nq9EZGB8idco4W5NpZtyu6vv4sXpZuP5FUKs::00000000 +``` \ No newline at end of file diff --git a/contracts/wasm/erc721/client/app.ts b/contracts/wasm/erc721/client/app.ts new file mode 100644 index 0000000000..910cf4cc20 --- /dev/null +++ b/contracts/wasm/erc721/client/app.ts @@ -0,0 +1,30 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "./wasmlib" +import * as events from "./events" +import * as service from "./service" + +let erc721Service: service.Erc721Service; + +export function subscribeToErc721Events(): void { + + erc721Service.on('erc721_approval', (event: events.EventApproval) => { + }); + + erc721Service.on('erc721_approvalForAll', (event: events.EventApprovalForAll) => { + }); + + erc721Service.on('erc721_init', (event: events.EventInit) => { + }); + + erc721Service.on('erc721_mint', (event: events.EventMint) => { + }); + + erc721Service.on('erc721_transfer', (event: events.EventTransfer) => { + }); +} diff --git a/contracts/wasm/erc721/client/events.ts b/contracts/wasm/erc721/client/events.ts new file mode 100644 index 0000000000..65935b6188 --- /dev/null +++ b/contracts/wasm/erc721/client/events.ts @@ -0,0 +1,108 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "./wasmlib" +import * as service from "./service" + + +export interface EventApproval { + timestamp: wasmlib.Int32; + approved: wasmlib.AgentID; + owner: wasmlib.AgentID; + tokenID: wasmlib.Hash; +} + +export interface EventApprovalForAll { + timestamp: wasmlib.Int32; + approval: wasmlib.Bool; + operator: wasmlib.AgentID; + owner: wasmlib.AgentID; +} + +export interface EventInit { + timestamp: wasmlib.Int32; + name: wasmlib.String; + symbol: wasmlib.String; +} + +export interface EventMint { + timestamp: wasmlib.Int32; + balance: wasmlib.Uint64; + owner: wasmlib.AgentID; + tokenID: wasmlib.Hash; +} + +export interface EventTransfer { + timestamp: wasmlib.Int32; + from: wasmlib.AgentID; + to: wasmlib.AgentID; + tokenID: wasmlib.Hash; +} + +export interface Erc721Events { + erc721_approval: (event: EventApproval) => void; + erc721_approvalForAll: (event: EventApprovalForAll) => void; + erc721_init: (event: EventInit) => void; + erc721_mint: (event: EventMint) => void; + erc721_transfer: (event: EventTransfer) => void; +} + +export function handleVmMessage(message: string[]): void { + const messageHandlers: wasmlib.MessageHandlers = { + 'erc721.approval': (index) => { + const evt: EventApproval = { + timestamp: Number(message[++index]), + approved: message[++index], + owner: message[++index], + tokenID: message[++index], + }; + this.emitter.emit('erc721_approval', evt); + }, + 'erc721.approvalForAll': (index) => { + const evt: EventApprovalForAll = { + timestamp: Number(message[++index]), + approval: message[++index][0]!='0', + operator: message[++index], + owner: message[++index], + }; + this.emitter.emit('erc721_approvalForAll', evt); + }, + 'erc721.init': (index) => { + const evt: EventInit = { + timestamp: Number(message[++index]), + name: message[++index], + symbol: message[++index], + }; + this.emitter.emit('erc721_init', evt); + }, + 'erc721.mint': (index) => { + const evt: EventMint = { + timestamp: Number(message[++index]), + balance: BigInt(message[++index]), + owner: message[++index], + tokenID: message[++index], + }; + this.emitter.emit('erc721_mint', evt); + }, + 'erc721.transfer': (index) => { + const evt: EventTransfer = { + timestamp: Number(message[++index]), + from: message[++index], + to: message[++index], + tokenID: message[++index], + }; + this.emitter.emit('erc721_transfer', evt); + }, + }; + + const topicIndex = 3; + const topic = message[topicIndex]; + + if (typeof messageHandlers[topic] != 'undefined') { + messageHandlers[topic](topicIndex); + } +} diff --git a/contracts/wasm/erc721/client/service.ts b/contracts/wasm/erc721/client/service.ts new file mode 100644 index 0000000000..688443213f --- /dev/null +++ b/contracts/wasm/erc721/client/service.ts @@ -0,0 +1,212 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "./wasmlib" +import * as events from "./events" + +export interface BalanceOfResult { + amount: wasmlib.Uint64; +} + +export interface GetApprovedResult { + approved: wasmlib.AgentID; +} + +export interface IsApprovedForAllResult { + approval: wasmlib.Bool; +} + +export interface NameResult { + name: wasmlib.String; +} + +export interface OwnerOfResult { + owner: wasmlib.AgentID; +} + +export interface SymbolResult { + symbol: wasmlib.String; +} + +export interface TokenURIResult { + tokenURI: wasmlib.String; +} + +export class Erc721Service extends wasmlib.Service { + + constructor(client: BasicClient, chainId: string) { + super(client, chainId, 0xd967c216); + } + + public async approve(approved: wasmlib.AgentID, tokenID: wasmlib.Hash): Promise { + const args: wasmlib.Argument[] = [ + { key: 'approved', value: approved, }, + { key: 'tokenID', value: tokenID, }, + ]; + await this.postRequest(0xa0661268, args); + } + + public async burn(tokenID: wasmlib.Hash): Promise { + const args: wasmlib.Argument[] = [ + { key: 'tokenID', value: tokenID, }, + ]; + await this.postRequest(0x7bc1efb1, args); + } + + public async init(name: wasmlib.String, symbol: wasmlib.String): Promise { + const args: wasmlib.Argument[] = [ + { key: 'name', value: name, }, + { key: 'symbol', value: symbol, }, + ]; + await this.postRequest(0x1f44d644, args); + } + + public async mint(tokenID: wasmlib.Hash): Promise { + const args: wasmlib.Argument[] = [ + { key: 'tokenID', value: tokenID, }, + ]; + await this.postRequest(0xa29addcf, args); + } + + public async safeTransferFrom(data: wasmlib.Bytes, from: wasmlib.AgentID, to: wasmlib.AgentID, tokenID: wasmlib.Hash): Promise { + const args: wasmlib.Argument[] = [ + { key: 'data', value: data, }, + { key: 'from', value: from, }, + { key: 'to', value: to, }, + { key: 'tokenID', value: tokenID, }, + ]; + await this.postRequest(0x130ce158, args); + } + + public async setApprovalForAll(approval: wasmlib.Bool, operator: wasmlib.AgentID): Promise { + const args: wasmlib.Argument[] = [ + { key: 'approval', value: approval, }, + { key: 'operator', value: operator, }, + ]; + await this.postRequest(0xb8d8c776, args); + } + + public async transferFrom(from: wasmlib.AgentID, to: wasmlib.AgentID, tokenID: wasmlib.Hash): Promise { + const args: wasmlib.Argument[] = [ + { key: 'from', value: from, }, + { key: 'to', value: to, }, + { key: 'tokenID', value: tokenID, }, + ]; + await this.postRequest(0xd5e0a602, args); + } + + public async balanceOf(owner: wasmlib.AgentID): Promise { + const args: wasmlib.Argument[] = [ + { key: 'owner', value: owner, }, + ]; + const response = await this.callView(0x67ef8df4, args); + let result: BalanceOfResult = {}; + + let amount = response['amount']; + result.amount = BigInt(0); + if (amount) { + result.amount = amount.readBigUInt64LE(amount); + } + + return result; + } + + public async getApproved(tokenID: wasmlib.Hash): Promise { + const args: wasmlib.Argument[] = [ + { key: 'tokenID', value: tokenID, }, + ]; + const response = await this.callView(0xbe34b6ba, args); + let result: GetApprovedResult = {}; + + let approved = response['approved']; + result.approved = ''; + if (approved) { + result.approved = approved.toString(approved); + } + + return result; + } + + public async isApprovedForAll(operator: wasmlib.AgentID, owner: wasmlib.AgentID): Promise { + const args: wasmlib.Argument[] = [ + { key: 'operator', value: operator, }, + { key: 'owner', value: owner, }, + ]; + const response = await this.callView(0x3251b0f0, args); + let result: IsApprovedForAllResult = {}; + + let approval = response['approval']; + result.approval = false; + if (approval) { + result.approval = approval.readUInt8(approval)!=0; + } + + return result; + } + + public async name(): Promise { + const args: wasmlib.Argument[] = [ + ]; + const response = await this.callView(0x0df7da3a, args); + let result: NameResult = {}; + + let name = response['name']; + result.name = ''; + if (name) { + result.name = name.toString(name); + } + + return result; + } + + public async ownerOf(tokenID: wasmlib.Hash): Promise { + const args: wasmlib.Argument[] = [ + { key: 'tokenID', value: tokenID, }, + ]; + const response = await this.callView(0x1246f5ad, args); + let result: OwnerOfResult = {}; + + let owner = response['owner']; + result.owner = ''; + if (owner) { + result.owner = owner.toString(owner); + } + + return result; + } + + public async symbol(): Promise { + const args: wasmlib.Argument[] = [ + ]; + const response = await this.callView(0x3e93d19b, args); + let result: SymbolResult = {}; + + let symbol = response['symbol']; + result.symbol = ''; + if (symbol) { + result.symbol = symbol.toString(symbol); + } + + return result; + } + + public async tokenURI(tokenID: wasmlib.Hash): Promise { + const args: wasmlib.Argument[] = [ + { key: 'tokenID', value: tokenID, }, + ]; + const response = await this.callView(0x4e1a7397, args); + let result: TokenURIResult = {}; + + let tokenURI = response['tokenURI']; + result.tokenURI = ''; + if (tokenURI) { + result.tokenURI = tokenURI.toString(tokenURI); + } + + return result; + } +} diff --git a/contracts/wasm/erc721/go/erc721/consts.go b/contracts/wasm/erc721/go/erc721/consts.go new file mode 100644 index 0000000000..f6d90db059 --- /dev/null +++ b/contracts/wasm/erc721/go/erc721/consts.go @@ -0,0 +1,82 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package erc721 + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +const ( + ScName = "erc721" + ScDescription = "ERC-721 NFT PoC for IOTA Smart Contracts" + HScName = wasmlib.ScHname(0xd967c216) +) + +const ( + ParamApproval = "approval" + ParamApproved = "approved" + ParamData = "data" + ParamFrom = "from" + ParamName = "n" + ParamOperator = "operator" + ParamOwner = "owner" + ParamSymbol = "s" + ParamTo = "to" + ParamTokenID = "tokenID" +) + +const ( + ResultAmount = "amount" + ResultApproval = "approval" + ResultApproved = "approved" + ResultName = "name" + ResultOwner = "owner" + ResultSymbol = "symbol" + ResultTokenURI = "tokenURI" +) + +const ( + StateApprovedAccounts = "approvedAccounts" + StateApprovedOperators = "approvedOperators" + StateBalances = "balances" + StateName = "name" + StateOwners = "owners" + StateSymbol = "symbol" +) + +const ( + FuncApprove = "approve" + FuncBurn = "burn" + FuncInit = "init" + FuncMint = "mint" + FuncSafeTransferFrom = "safeTransferFrom" + FuncSetApprovalForAll = "setApprovalForAll" + FuncTransferFrom = "transferFrom" + ViewBalanceOf = "balanceOf" + ViewGetApproved = "getApproved" + ViewIsApprovedForAll = "isApprovedForAll" + ViewName = "name" + ViewOwnerOf = "ownerOf" + ViewSymbol = "symbol" + ViewTokenURI = "tokenURI" +) + +const ( + HFuncApprove = wasmlib.ScHname(0xa0661268) + HFuncBurn = wasmlib.ScHname(0x7bc1efb1) + HFuncInit = wasmlib.ScHname(0x1f44d644) + HFuncMint = wasmlib.ScHname(0xa29addcf) + HFuncSafeTransferFrom = wasmlib.ScHname(0x130ce158) + HFuncSetApprovalForAll = wasmlib.ScHname(0xb8d8c776) + HFuncTransferFrom = wasmlib.ScHname(0xd5e0a602) + HViewBalanceOf = wasmlib.ScHname(0x67ef8df4) + HViewGetApproved = wasmlib.ScHname(0xbe34b6ba) + HViewIsApprovedForAll = wasmlib.ScHname(0x3251b0f0) + HViewName = wasmlib.ScHname(0x0df7da3a) + HViewOwnerOf = wasmlib.ScHname(0x1246f5ad) + HViewSymbol = wasmlib.ScHname(0x3e93d19b) + HViewTokenURI = wasmlib.ScHname(0x4e1a7397) +) diff --git a/contracts/wasm/erc721/go/erc721/contract.go b/contracts/wasm/erc721/go/erc721/contract.go new file mode 100644 index 0000000000..258858e677 --- /dev/null +++ b/contracts/wasm/erc721/go/erc721/contract.go @@ -0,0 +1,173 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package erc721 + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +type ApproveCall struct { + Func *wasmlib.ScFunc + Params MutableApproveParams +} + +type BurnCall struct { + Func *wasmlib.ScFunc + Params MutableBurnParams +} + +type InitCall struct { + Func *wasmlib.ScInitFunc + Params MutableInitParams +} + +type MintCall struct { + Func *wasmlib.ScFunc + Params MutableMintParams +} + +type SafeTransferFromCall struct { + Func *wasmlib.ScFunc + Params MutableSafeTransferFromParams +} + +type SetApprovalForAllCall struct { + Func *wasmlib.ScFunc + Params MutableSetApprovalForAllParams +} + +type TransferFromCall struct { + Func *wasmlib.ScFunc + Params MutableTransferFromParams +} + +type BalanceOfCall struct { + Func *wasmlib.ScView + Params MutableBalanceOfParams + Results ImmutableBalanceOfResults +} + +type GetApprovedCall struct { + Func *wasmlib.ScView + Params MutableGetApprovedParams + Results ImmutableGetApprovedResults +} + +type IsApprovedForAllCall struct { + Func *wasmlib.ScView + Params MutableIsApprovedForAllParams + Results ImmutableIsApprovedForAllResults +} + +type NameCall struct { + Func *wasmlib.ScView + Results ImmutableNameResults +} + +type OwnerOfCall struct { + Func *wasmlib.ScView + Params MutableOwnerOfParams + Results ImmutableOwnerOfResults +} + +type SymbolCall struct { + Func *wasmlib.ScView + Results ImmutableSymbolResults +} + +type TokenURICall struct { + Func *wasmlib.ScView + Params MutableTokenURIParams + Results ImmutableTokenURIResults +} + +type Funcs struct{} + +var ScFuncs Funcs + +func (sc Funcs) Approve(ctx wasmlib.ScFuncCallContext) *ApproveCall { + f := &ApproveCall{Func: wasmlib.NewScFunc(ctx, HScName, HFuncApprove)} + f.Func.SetPtrs(&f.Params.id, nil) + return f +} + +func (sc Funcs) Burn(ctx wasmlib.ScFuncCallContext) *BurnCall { + f := &BurnCall{Func: wasmlib.NewScFunc(ctx, HScName, HFuncBurn)} + f.Func.SetPtrs(&f.Params.id, nil) + return f +} + +func (sc Funcs) Init(ctx wasmlib.ScFuncCallContext) *InitCall { + f := &InitCall{Func: wasmlib.NewScInitFunc(ctx, HScName, HFuncInit, keyMap[:], idxMap[:])} + f.Func.SetPtrs(&f.Params.id, nil) + return f +} + +func (sc Funcs) Mint(ctx wasmlib.ScFuncCallContext) *MintCall { + f := &MintCall{Func: wasmlib.NewScFunc(ctx, HScName, HFuncMint)} + f.Func.SetPtrs(&f.Params.id, nil) + return f +} + +func (sc Funcs) SafeTransferFrom(ctx wasmlib.ScFuncCallContext) *SafeTransferFromCall { + f := &SafeTransferFromCall{Func: wasmlib.NewScFunc(ctx, HScName, HFuncSafeTransferFrom)} + f.Func.SetPtrs(&f.Params.id, nil) + return f +} + +func (sc Funcs) SetApprovalForAll(ctx wasmlib.ScFuncCallContext) *SetApprovalForAllCall { + f := &SetApprovalForAllCall{Func: wasmlib.NewScFunc(ctx, HScName, HFuncSetApprovalForAll)} + f.Func.SetPtrs(&f.Params.id, nil) + return f +} + +func (sc Funcs) TransferFrom(ctx wasmlib.ScFuncCallContext) *TransferFromCall { + f := &TransferFromCall{Func: wasmlib.NewScFunc(ctx, HScName, HFuncTransferFrom)} + f.Func.SetPtrs(&f.Params.id, nil) + return f +} + +func (sc Funcs) BalanceOf(ctx wasmlib.ScViewCallContext) *BalanceOfCall { + f := &BalanceOfCall{Func: wasmlib.NewScView(ctx, HScName, HViewBalanceOf)} + f.Func.SetPtrs(&f.Params.id, &f.Results.id) + return f +} + +func (sc Funcs) GetApproved(ctx wasmlib.ScViewCallContext) *GetApprovedCall { + f := &GetApprovedCall{Func: wasmlib.NewScView(ctx, HScName, HViewGetApproved)} + f.Func.SetPtrs(&f.Params.id, &f.Results.id) + return f +} + +func (sc Funcs) IsApprovedForAll(ctx wasmlib.ScViewCallContext) *IsApprovedForAllCall { + f := &IsApprovedForAllCall{Func: wasmlib.NewScView(ctx, HScName, HViewIsApprovedForAll)} + f.Func.SetPtrs(&f.Params.id, &f.Results.id) + return f +} + +func (sc Funcs) Name(ctx wasmlib.ScViewCallContext) *NameCall { + f := &NameCall{Func: wasmlib.NewScView(ctx, HScName, HViewName)} + f.Func.SetPtrs(nil, &f.Results.id) + return f +} + +func (sc Funcs) OwnerOf(ctx wasmlib.ScViewCallContext) *OwnerOfCall { + f := &OwnerOfCall{Func: wasmlib.NewScView(ctx, HScName, HViewOwnerOf)} + f.Func.SetPtrs(&f.Params.id, &f.Results.id) + return f +} + +func (sc Funcs) Symbol(ctx wasmlib.ScViewCallContext) *SymbolCall { + f := &SymbolCall{Func: wasmlib.NewScView(ctx, HScName, HViewSymbol)} + f.Func.SetPtrs(nil, &f.Results.id) + return f +} + +func (sc Funcs) TokenURI(ctx wasmlib.ScViewCallContext) *TokenURICall { + f := &TokenURICall{Func: wasmlib.NewScView(ctx, HScName, HViewTokenURI)} + f.Func.SetPtrs(&f.Params.id, &f.Results.id) + return f +} diff --git a/contracts/wasm/erc721/go/erc721/erc721.go b/contracts/wasm/erc721/go/erc721/erc721.go new file mode 100644 index 0000000000..afe42dff96 --- /dev/null +++ b/contracts/wasm/erc721/go/erc721/erc721.go @@ -0,0 +1,225 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +package erc721 + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +// Follows ERC-721 standard as closely as possible +// https//eips.Ethereum.Org/EIPS/eip-721 +// Notable changes w.R.T. ERC-721 +// - tokenID is Hash instead of int256 +// - balance amounts are Uint64 instead of int256 +// - all address accounts are replaced with AgentID accounts +// - for consistency and to reduce confusion +// use 'approved' when it is an AgentID +// use 'approval' when it is a Bool + +// set the required base URI, to which the base58 encoded token ID will be concatenated +const baseURI = "my/special/base/uri/" + +var zero = wasmlib.ScAgentID{} + +/////////////////////////// HELPER FUNCTIONS //////////////////////////// + +func approve(state MutableErc721State, owner, approved wasmlib.ScAgentID, tokenID wasmlib.ScHash) { + state.ApprovedAccounts().GetAgentID(tokenID).SetValue(approved) + Erc721Events{}.Approval(approved, owner, tokenID) +} + +// checks if caller is owner, or one of its delegated operators +func canOperate(state MutableErc721State, caller, owner wasmlib.ScAgentID) bool { + if caller == owner { + return true + } + + operators := state.ApprovedOperators().GetOperators(owner) + return operators.GetBool(caller).Value() +} + +// checks if caller is owner, or one of its delegated operators, or approved account for tokenID +func canTransfer(state MutableErc721State, caller, owner wasmlib.ScAgentID, tokenID wasmlib.ScHash) bool { + if canOperate(state, caller, owner) { + return true + } + + controller := state.ApprovedAccounts().GetAgentID(tokenID) + return controller.Value() == caller +} + +// common code for safeTransferFrom and transferFrom +func transfer(ctx wasmlib.ScFuncContext, state MutableErc721State, from, to wasmlib.ScAgentID, tokenID wasmlib.ScHash) { + tokenOwner := state.Owners().GetAgentID(tokenID) + ctx.Require(tokenOwner.Exists(), "tokenID does not exist") + + owner := tokenOwner.Value() + ctx.Require(canTransfer(state, ctx.Caller(), owner, tokenID), + "not owner, operator, or approved") + + ctx.Require(owner == from, "from is not owner") + // TODO ctx.Require(to == , "invalid 'to' agentid") + + nftCountFrom := state.Balances().GetUint64(from) + nftCountTo := state.Balances().GetUint64(to) + + nftCountFrom.SetValue(nftCountFrom.Value() - 1) + nftCountTo.SetValue(nftCountTo.Value() + 1) + + tokenOwner.SetValue(to) + + // TODO should probably clear this entry, but for now just set to zero + approve(state, owner, zero, tokenID) + + Erc721Events{}.Transfer(from, to, tokenID) +} + +/////////////////////////// SC FUNCS //////////////////////////// + +// Gives permission to to to transfer tokenID token to another account. +// The approval is cleared when the token is transferred. +func funcApprove(ctx wasmlib.ScFuncContext, f *ApproveContext) { + tokenID := f.Params.TokenID().Value() + tokenOwner := f.State.Owners().GetAgentID(tokenID) + ctx.Require(tokenOwner.Exists(), "tokenID does not exist") + owner := tokenOwner.Value() + ctx.Require(canOperate(f.State, ctx.Caller(), owner), "not owner or operator") + approved := f.Params.Approved().Value() + ctx.Require(owner != approved, "approved equals owner") + approve(f.State, owner, approved, tokenID) +} + +// Destroys tokenID. The approval is cleared when the token is burned. +func funcBurn(ctx wasmlib.ScFuncContext, f *BurnContext) { + tokenID := f.Params.TokenID().Value() + owner := f.State.Owners().GetAgentID(tokenID).Value() + ctx.Require(owner != zero, "tokenID does not exist") + ctx.Require(ctx.Caller() == owner, "caller is not owner") + + approve(f.State, owner, zero, tokenID) + + balance := f.State.Balances().GetUint64(owner) + balance.SetValue(balance.Value() - 1) + // TODO clear this instead of setting to zero + f.State.Owners().GetAgentID(tokenID).SetValue(zero) + + f.Events.Transfer(owner, zero, tokenID) +} + +// Initializes the contract by setting a name and a symbol to the token collection. +func funcInit(ctx wasmlib.ScFuncContext, f *InitContext) { + name := f.Params.Name().Value() + symbol := f.Params.Symbol().Value() + + f.State.Name().SetValue(name) + f.State.Symbol().SetValue(symbol) + + f.Events.Init(name, symbol) +} + +// Mints tokenID and transfers it to caller as new owner. +func funcMint(ctx wasmlib.ScFuncContext, f *MintContext) { + tokenID := f.Params.TokenID().Value() + tokenOwner := f.State.Owners().GetAgentID(tokenID) + ctx.Require(!tokenOwner.Exists(), "tokenID already minted") + + owner := ctx.Caller() + tokenOwner.SetValue(owner) + balance := f.State.Balances().GetUint64(owner) + balance.SetValue(balance.Value() + 1) + + f.Events.Transfer(zero, owner, tokenID) + //if !owner.IsAddress() { + // // TODO interpret to as SC address and call its onERC721Received() func + //} +} + +// Safely transfers tokenID token from from to to, checking first that contract +// recipients are aware of the ERC721 protocol to prevent tokens from being forever locked. +func funcSafeTransferFrom(ctx wasmlib.ScFuncContext, f *SafeTransferFromContext) { + from := f.Params.From().Value() + to := f.Params.To().Value() + tokenID := f.Params.TokenID().Value() + transfer(ctx, f.State, from, to, tokenID) + //if !to.IsAddress() { + // // TODO interpret to as SC address and call its onERC721Received() func + //} +} + +// Approve or remove operator as an operator for the caller. +func funcSetApprovalForAll(ctx wasmlib.ScFuncContext, f *SetApprovalForAllContext) { + owner := ctx.Caller() + operator := f.Params.Operator().Value() + ctx.Require(owner != operator, "owner equals operator") + + approval := f.Params.Approval().Value() + approvalsByCaller := f.State.ApprovedOperators().GetOperators(owner) + approvalsByCaller.GetBool(operator).SetValue(approval) + + f.Events.ApprovalForAll(approval, operator, owner) +} + +// Transfers tokenID token from from to to. +func funcTransferFrom(ctx wasmlib.ScFuncContext, f *TransferFromContext) { + from := f.Params.From().Value() + to := f.Params.To().Value() + tokenID := f.Params.TokenID().Value() + transfer(ctx, f.State, from, to, tokenID) +} + +/////////////////////////// SC VIEWS //////////////////////////// + +// Returns the number of tokens in owner's account if the owner exists. +func viewBalanceOf(ctx wasmlib.ScViewContext, f *BalanceOfContext) { + owner := f.Params.Owner().Value() + nftCount := f.State.Balances().GetUint64(owner) + if nftCount.Exists() { + f.Results.Amount().SetValue(nftCount.Value()) + } +} + +// Returns the approved account for tokenID token if there is one. +func viewGetApproved(ctx wasmlib.ScViewContext, f *GetApprovedContext) { + tokenID := f.Params.TokenID().Value() + approved := f.State.ApprovedAccounts().GetAgentID(tokenID).Value() + if approved != zero { + f.Results.Approved().SetValue(approved) + } +} + +// Returns if the operator is allowed to manage all the assets of owner. +func viewIsApprovedForAll(ctx wasmlib.ScViewContext, f *IsApprovedForAllContext) { + owner := f.Params.Owner().Value() + operator := f.Params.Operator().Value() + operators := f.State.ApprovedOperators().GetOperators(owner) + approval := operators.GetBool(operator) + if approval.Exists() { + f.Results.Approval().SetValue(approval.Value()) + } +} + +// Returns the token collection name. +func viewName(ctx wasmlib.ScViewContext, f *NameContext) { + f.Results.Name().SetValue(f.State.Name().Value()) +} + +// Returns the owner of the tokenID token if the token exists. +func viewOwnerOf(ctx wasmlib.ScViewContext, f *OwnerOfContext) { + tokenID := f.Params.TokenID().Value() + owner := f.State.Owners().GetAgentID(tokenID) + if owner.Exists() { + f.Results.Owner().SetValue(owner.Value()) + } +} + +// Returns the token collection symbol. +func viewSymbol(ctx wasmlib.ScViewContext, f *SymbolContext) { + f.Results.Symbol().SetValue(f.State.Symbol().Value()) +} + +// Returns the Uniform Resource Identifier (URI) for tokenID token if the token exists. +func viewTokenURI(ctx wasmlib.ScViewContext, f *TokenURIContext) { + tokenID := f.Params.TokenID() + if tokenID.Exists() { + f.Results.TokenURI().SetValue(baseURI + tokenID.String()) + } +} diff --git a/contracts/wasm/erc721/go/erc721/events.go b/contracts/wasm/erc721/go/erc721/events.go new file mode 100644 index 0000000000..ab863646b5 --- /dev/null +++ b/contracts/wasm/erc721/go/erc721/events.go @@ -0,0 +1,52 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +//nolint:gocritic +package erc721 + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +type Erc721Events struct{} + +func (e Erc721Events) Approval(approved wasmlib.ScAgentID, owner wasmlib.ScAgentID, tokenID wasmlib.ScHash) { + wasmlib.NewEventEncoder("erc721.approval"). + AgentID(approved). + AgentID(owner). + Hash(tokenID). + Emit() +} + +func (e Erc721Events) ApprovalForAll(approval bool, operator wasmlib.ScAgentID, owner wasmlib.ScAgentID) { + wasmlib.NewEventEncoder("erc721.approvalForAll"). + Bool(approval). + AgentID(operator). + AgentID(owner). + Emit() +} + +func (e Erc721Events) Init(name string, symbol string) { + wasmlib.NewEventEncoder("erc721.init"). + String(name). + String(symbol). + Emit() +} + +func (e Erc721Events) Mint(balance uint64, owner wasmlib.ScAgentID, tokenID wasmlib.ScHash) { + wasmlib.NewEventEncoder("erc721.mint"). + Uint64(balance). + AgentID(owner). + Hash(tokenID). + Emit() +} + +func (e Erc721Events) Transfer(from wasmlib.ScAgentID, to wasmlib.ScAgentID, tokenID wasmlib.ScHash) { + wasmlib.NewEventEncoder("erc721.transfer"). + AgentID(from). + AgentID(to). + Hash(tokenID). + Emit() +} diff --git a/contracts/wasm/erc721/go/erc721/keys.go b/contracts/wasm/erc721/go/erc721/keys.go new file mode 100644 index 0000000000..e9a054932e --- /dev/null +++ b/contracts/wasm/erc721/go/erc721/keys.go @@ -0,0 +1,68 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package erc721 + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +const ( + IdxParamApproval = 0 + IdxParamApproved = 1 + IdxParamData = 2 + IdxParamFrom = 3 + IdxParamName = 4 + IdxParamOperator = 5 + IdxParamOwner = 6 + IdxParamSymbol = 7 + IdxParamTo = 8 + IdxParamTokenID = 9 + + IdxResultAmount = 10 + IdxResultApproval = 11 + IdxResultApproved = 12 + IdxResultName = 13 + IdxResultOwner = 14 + IdxResultSymbol = 15 + IdxResultTokenURI = 16 + + IdxStateApprovedAccounts = 17 + IdxStateApprovedOperators = 18 + IdxStateBalances = 19 + IdxStateName = 20 + IdxStateOwners = 21 + IdxStateSymbol = 22 +) + +const keyMapLen = 23 + +var keyMap = [keyMapLen]wasmlib.Key{ + ParamApproval, + ParamApproved, + ParamData, + ParamFrom, + ParamName, + ParamOperator, + ParamOwner, + ParamSymbol, + ParamTo, + ParamTokenID, + ResultAmount, + ResultApproval, + ResultApproved, + ResultName, + ResultOwner, + ResultSymbol, + ResultTokenURI, + StateApprovedAccounts, + StateApprovedOperators, + StateBalances, + StateName, + StateOwners, + StateSymbol, +} + +var idxMap [keyMapLen]wasmlib.Key32 diff --git a/contracts/wasm/erc721/go/erc721/lib.go b/contracts/wasm/erc721/go/erc721/lib.go new file mode 100644 index 0000000000..e7c65d5026 --- /dev/null +++ b/contracts/wasm/erc721/go/erc721/lib.go @@ -0,0 +1,345 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package erc721 + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +func OnLoad() { + exports := wasmlib.NewScExports() + exports.AddFunc(FuncApprove, funcApproveThunk) + exports.AddFunc(FuncBurn, funcBurnThunk) + exports.AddFunc(FuncInit, funcInitThunk) + exports.AddFunc(FuncMint, funcMintThunk) + exports.AddFunc(FuncSafeTransferFrom, funcSafeTransferFromThunk) + exports.AddFunc(FuncSetApprovalForAll, funcSetApprovalForAllThunk) + exports.AddFunc(FuncTransferFrom, funcTransferFromThunk) + exports.AddView(ViewBalanceOf, viewBalanceOfThunk) + exports.AddView(ViewGetApproved, viewGetApprovedThunk) + exports.AddView(ViewIsApprovedForAll, viewIsApprovedForAllThunk) + exports.AddView(ViewName, viewNameThunk) + exports.AddView(ViewOwnerOf, viewOwnerOfThunk) + exports.AddView(ViewSymbol, viewSymbolThunk) + exports.AddView(ViewTokenURI, viewTokenURIThunk) + + for i, key := range keyMap { + idxMap[i] = key.KeyID() + } +} + +type ApproveContext struct { + Events Erc721Events + Params ImmutableApproveParams + State MutableErc721State +} + +func funcApproveThunk(ctx wasmlib.ScFuncContext) { + ctx.Log("erc721.funcApprove") + f := &ApproveContext{ + Params: ImmutableApproveParams{ + id: wasmlib.OBJ_ID_PARAMS, + }, + State: MutableErc721State{ + id: wasmlib.OBJ_ID_STATE, + }, + } + ctx.Require(f.Params.Approved().Exists(), "missing mandatory approved") + ctx.Require(f.Params.TokenID().Exists(), "missing mandatory tokenID") + funcApprove(ctx, f) + ctx.Log("erc721.funcApprove ok") +} + +type BurnContext struct { + Events Erc721Events + Params ImmutableBurnParams + State MutableErc721State +} + +func funcBurnThunk(ctx wasmlib.ScFuncContext) { + ctx.Log("erc721.funcBurn") + f := &BurnContext{ + Params: ImmutableBurnParams{ + id: wasmlib.OBJ_ID_PARAMS, + }, + State: MutableErc721State{ + id: wasmlib.OBJ_ID_STATE, + }, + } + ctx.Require(f.Params.TokenID().Exists(), "missing mandatory tokenID") + funcBurn(ctx, f) + ctx.Log("erc721.funcBurn ok") +} + +type InitContext struct { + Events Erc721Events + Params ImmutableInitParams + State MutableErc721State +} + +func funcInitThunk(ctx wasmlib.ScFuncContext) { + ctx.Log("erc721.funcInit") + f := &InitContext{ + Params: ImmutableInitParams{ + id: wasmlib.OBJ_ID_PARAMS, + }, + State: MutableErc721State{ + id: wasmlib.OBJ_ID_STATE, + }, + } + ctx.Require(f.Params.Name().Exists(), "missing mandatory name") + ctx.Require(f.Params.Symbol().Exists(), "missing mandatory symbol") + funcInit(ctx, f) + ctx.Log("erc721.funcInit ok") +} + +type MintContext struct { + Events Erc721Events + Params ImmutableMintParams + State MutableErc721State +} + +func funcMintThunk(ctx wasmlib.ScFuncContext) { + ctx.Log("erc721.funcMint") + f := &MintContext{ + Params: ImmutableMintParams{ + id: wasmlib.OBJ_ID_PARAMS, + }, + State: MutableErc721State{ + id: wasmlib.OBJ_ID_STATE, + }, + } + ctx.Require(f.Params.TokenID().Exists(), "missing mandatory tokenID") + funcMint(ctx, f) + ctx.Log("erc721.funcMint ok") +} + +type SafeTransferFromContext struct { + Events Erc721Events + Params ImmutableSafeTransferFromParams + State MutableErc721State +} + +func funcSafeTransferFromThunk(ctx wasmlib.ScFuncContext) { + ctx.Log("erc721.funcSafeTransferFrom") + f := &SafeTransferFromContext{ + Params: ImmutableSafeTransferFromParams{ + id: wasmlib.OBJ_ID_PARAMS, + }, + State: MutableErc721State{ + id: wasmlib.OBJ_ID_STATE, + }, + } + ctx.Require(f.Params.From().Exists(), "missing mandatory from") + ctx.Require(f.Params.To().Exists(), "missing mandatory to") + ctx.Require(f.Params.TokenID().Exists(), "missing mandatory tokenID") + funcSafeTransferFrom(ctx, f) + ctx.Log("erc721.funcSafeTransferFrom ok") +} + +type SetApprovalForAllContext struct { + Events Erc721Events + Params ImmutableSetApprovalForAllParams + State MutableErc721State +} + +func funcSetApprovalForAllThunk(ctx wasmlib.ScFuncContext) { + ctx.Log("erc721.funcSetApprovalForAll") + f := &SetApprovalForAllContext{ + Params: ImmutableSetApprovalForAllParams{ + id: wasmlib.OBJ_ID_PARAMS, + }, + State: MutableErc721State{ + id: wasmlib.OBJ_ID_STATE, + }, + } + ctx.Require(f.Params.Approval().Exists(), "missing mandatory approval") + ctx.Require(f.Params.Operator().Exists(), "missing mandatory operator") + funcSetApprovalForAll(ctx, f) + ctx.Log("erc721.funcSetApprovalForAll ok") +} + +type TransferFromContext struct { + Events Erc721Events + Params ImmutableTransferFromParams + State MutableErc721State +} + +func funcTransferFromThunk(ctx wasmlib.ScFuncContext) { + ctx.Log("erc721.funcTransferFrom") + f := &TransferFromContext{ + Params: ImmutableTransferFromParams{ + id: wasmlib.OBJ_ID_PARAMS, + }, + State: MutableErc721State{ + id: wasmlib.OBJ_ID_STATE, + }, + } + ctx.Require(f.Params.From().Exists(), "missing mandatory from") + ctx.Require(f.Params.To().Exists(), "missing mandatory to") + ctx.Require(f.Params.TokenID().Exists(), "missing mandatory tokenID") + funcTransferFrom(ctx, f) + ctx.Log("erc721.funcTransferFrom ok") +} + +type BalanceOfContext struct { + Params ImmutableBalanceOfParams + Results MutableBalanceOfResults + State ImmutableErc721State +} + +func viewBalanceOfThunk(ctx wasmlib.ScViewContext) { + ctx.Log("erc721.viewBalanceOf") + f := &BalanceOfContext{ + Params: ImmutableBalanceOfParams{ + id: wasmlib.OBJ_ID_PARAMS, + }, + Results: MutableBalanceOfResults{ + id: wasmlib.OBJ_ID_RESULTS, + }, + State: ImmutableErc721State{ + id: wasmlib.OBJ_ID_STATE, + }, + } + ctx.Require(f.Params.Owner().Exists(), "missing mandatory owner") + viewBalanceOf(ctx, f) + ctx.Log("erc721.viewBalanceOf ok") +} + +type GetApprovedContext struct { + Params ImmutableGetApprovedParams + Results MutableGetApprovedResults + State ImmutableErc721State +} + +func viewGetApprovedThunk(ctx wasmlib.ScViewContext) { + ctx.Log("erc721.viewGetApproved") + f := &GetApprovedContext{ + Params: ImmutableGetApprovedParams{ + id: wasmlib.OBJ_ID_PARAMS, + }, + Results: MutableGetApprovedResults{ + id: wasmlib.OBJ_ID_RESULTS, + }, + State: ImmutableErc721State{ + id: wasmlib.OBJ_ID_STATE, + }, + } + ctx.Require(f.Params.TokenID().Exists(), "missing mandatory tokenID") + viewGetApproved(ctx, f) + ctx.Log("erc721.viewGetApproved ok") +} + +type IsApprovedForAllContext struct { + Params ImmutableIsApprovedForAllParams + Results MutableIsApprovedForAllResults + State ImmutableErc721State +} + +func viewIsApprovedForAllThunk(ctx wasmlib.ScViewContext) { + ctx.Log("erc721.viewIsApprovedForAll") + f := &IsApprovedForAllContext{ + Params: ImmutableIsApprovedForAllParams{ + id: wasmlib.OBJ_ID_PARAMS, + }, + Results: MutableIsApprovedForAllResults{ + id: wasmlib.OBJ_ID_RESULTS, + }, + State: ImmutableErc721State{ + id: wasmlib.OBJ_ID_STATE, + }, + } + ctx.Require(f.Params.Operator().Exists(), "missing mandatory operator") + ctx.Require(f.Params.Owner().Exists(), "missing mandatory owner") + viewIsApprovedForAll(ctx, f) + ctx.Log("erc721.viewIsApprovedForAll ok") +} + +type NameContext struct { + Results MutableNameResults + State ImmutableErc721State +} + +func viewNameThunk(ctx wasmlib.ScViewContext) { + ctx.Log("erc721.viewName") + f := &NameContext{ + Results: MutableNameResults{ + id: wasmlib.OBJ_ID_RESULTS, + }, + State: ImmutableErc721State{ + id: wasmlib.OBJ_ID_STATE, + }, + } + viewName(ctx, f) + ctx.Log("erc721.viewName ok") +} + +type OwnerOfContext struct { + Params ImmutableOwnerOfParams + Results MutableOwnerOfResults + State ImmutableErc721State +} + +func viewOwnerOfThunk(ctx wasmlib.ScViewContext) { + ctx.Log("erc721.viewOwnerOf") + f := &OwnerOfContext{ + Params: ImmutableOwnerOfParams{ + id: wasmlib.OBJ_ID_PARAMS, + }, + Results: MutableOwnerOfResults{ + id: wasmlib.OBJ_ID_RESULTS, + }, + State: ImmutableErc721State{ + id: wasmlib.OBJ_ID_STATE, + }, + } + ctx.Require(f.Params.TokenID().Exists(), "missing mandatory tokenID") + viewOwnerOf(ctx, f) + ctx.Log("erc721.viewOwnerOf ok") +} + +type SymbolContext struct { + Results MutableSymbolResults + State ImmutableErc721State +} + +func viewSymbolThunk(ctx wasmlib.ScViewContext) { + ctx.Log("erc721.viewSymbol") + f := &SymbolContext{ + Results: MutableSymbolResults{ + id: wasmlib.OBJ_ID_RESULTS, + }, + State: ImmutableErc721State{ + id: wasmlib.OBJ_ID_STATE, + }, + } + viewSymbol(ctx, f) + ctx.Log("erc721.viewSymbol ok") +} + +type TokenURIContext struct { + Params ImmutableTokenURIParams + Results MutableTokenURIResults + State ImmutableErc721State +} + +func viewTokenURIThunk(ctx wasmlib.ScViewContext) { + ctx.Log("erc721.viewTokenURI") + f := &TokenURIContext{ + Params: ImmutableTokenURIParams{ + id: wasmlib.OBJ_ID_PARAMS, + }, + Results: MutableTokenURIResults{ + id: wasmlib.OBJ_ID_RESULTS, + }, + State: ImmutableErc721State{ + id: wasmlib.OBJ_ID_STATE, + }, + } + ctx.Require(f.Params.TokenID().Exists(), "missing mandatory tokenID") + viewTokenURI(ctx, f) + ctx.Log("erc721.viewTokenURI ok") +} diff --git a/contracts/wasm/erc721/go/erc721/params.go b/contracts/wasm/erc721/go/erc721/params.go new file mode 100644 index 0000000000..da0baa3669 --- /dev/null +++ b/contracts/wasm/erc721/go/erc721/params.go @@ -0,0 +1,274 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package erc721 + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +type ImmutableApproveParams struct { + id int32 +} + +func (s ImmutableApproveParams) Approved() wasmlib.ScImmutableAgentID { + return wasmlib.NewScImmutableAgentID(s.id, idxMap[IdxParamApproved]) +} + +func (s ImmutableApproveParams) TokenID() wasmlib.ScImmutableHash { + return wasmlib.NewScImmutableHash(s.id, idxMap[IdxParamTokenID]) +} + +type MutableApproveParams struct { + id int32 +} + +func (s MutableApproveParams) Approved() wasmlib.ScMutableAgentID { + return wasmlib.NewScMutableAgentID(s.id, idxMap[IdxParamApproved]) +} + +func (s MutableApproveParams) TokenID() wasmlib.ScMutableHash { + return wasmlib.NewScMutableHash(s.id, idxMap[IdxParamTokenID]) +} + +type ImmutableBurnParams struct { + id int32 +} + +func (s ImmutableBurnParams) TokenID() wasmlib.ScImmutableHash { + return wasmlib.NewScImmutableHash(s.id, idxMap[IdxParamTokenID]) +} + +type MutableBurnParams struct { + id int32 +} + +func (s MutableBurnParams) TokenID() wasmlib.ScMutableHash { + return wasmlib.NewScMutableHash(s.id, idxMap[IdxParamTokenID]) +} + +type ImmutableInitParams struct { + id int32 +} + +func (s ImmutableInitParams) Name() wasmlib.ScImmutableString { + return wasmlib.NewScImmutableString(s.id, idxMap[IdxParamName]) +} + +func (s ImmutableInitParams) Symbol() wasmlib.ScImmutableString { + return wasmlib.NewScImmutableString(s.id, idxMap[IdxParamSymbol]) +} + +type MutableInitParams struct { + id int32 +} + +func (s MutableInitParams) Name() wasmlib.ScMutableString { + return wasmlib.NewScMutableString(s.id, idxMap[IdxParamName]) +} + +func (s MutableInitParams) Symbol() wasmlib.ScMutableString { + return wasmlib.NewScMutableString(s.id, idxMap[IdxParamSymbol]) +} + +type ImmutableMintParams struct { + id int32 +} + +func (s ImmutableMintParams) TokenID() wasmlib.ScImmutableHash { + return wasmlib.NewScImmutableHash(s.id, idxMap[IdxParamTokenID]) +} + +type MutableMintParams struct { + id int32 +} + +func (s MutableMintParams) TokenID() wasmlib.ScMutableHash { + return wasmlib.NewScMutableHash(s.id, idxMap[IdxParamTokenID]) +} + +type ImmutableSafeTransferFromParams struct { + id int32 +} + +func (s ImmutableSafeTransferFromParams) Data() wasmlib.ScImmutableBytes { + return wasmlib.NewScImmutableBytes(s.id, idxMap[IdxParamData]) +} + +func (s ImmutableSafeTransferFromParams) From() wasmlib.ScImmutableAgentID { + return wasmlib.NewScImmutableAgentID(s.id, idxMap[IdxParamFrom]) +} + +func (s ImmutableSafeTransferFromParams) To() wasmlib.ScImmutableAgentID { + return wasmlib.NewScImmutableAgentID(s.id, idxMap[IdxParamTo]) +} + +func (s ImmutableSafeTransferFromParams) TokenID() wasmlib.ScImmutableHash { + return wasmlib.NewScImmutableHash(s.id, idxMap[IdxParamTokenID]) +} + +type MutableSafeTransferFromParams struct { + id int32 +} + +func (s MutableSafeTransferFromParams) Data() wasmlib.ScMutableBytes { + return wasmlib.NewScMutableBytes(s.id, idxMap[IdxParamData]) +} + +func (s MutableSafeTransferFromParams) From() wasmlib.ScMutableAgentID { + return wasmlib.NewScMutableAgentID(s.id, idxMap[IdxParamFrom]) +} + +func (s MutableSafeTransferFromParams) To() wasmlib.ScMutableAgentID { + return wasmlib.NewScMutableAgentID(s.id, idxMap[IdxParamTo]) +} + +func (s MutableSafeTransferFromParams) TokenID() wasmlib.ScMutableHash { + return wasmlib.NewScMutableHash(s.id, idxMap[IdxParamTokenID]) +} + +type ImmutableSetApprovalForAllParams struct { + id int32 +} + +func (s ImmutableSetApprovalForAllParams) Approval() wasmlib.ScImmutableBool { + return wasmlib.NewScImmutableBool(s.id, idxMap[IdxParamApproval]) +} + +func (s ImmutableSetApprovalForAllParams) Operator() wasmlib.ScImmutableAgentID { + return wasmlib.NewScImmutableAgentID(s.id, idxMap[IdxParamOperator]) +} + +type MutableSetApprovalForAllParams struct { + id int32 +} + +func (s MutableSetApprovalForAllParams) Approval() wasmlib.ScMutableBool { + return wasmlib.NewScMutableBool(s.id, idxMap[IdxParamApproval]) +} + +func (s MutableSetApprovalForAllParams) Operator() wasmlib.ScMutableAgentID { + return wasmlib.NewScMutableAgentID(s.id, idxMap[IdxParamOperator]) +} + +type ImmutableTransferFromParams struct { + id int32 +} + +func (s ImmutableTransferFromParams) From() wasmlib.ScImmutableAgentID { + return wasmlib.NewScImmutableAgentID(s.id, idxMap[IdxParamFrom]) +} + +func (s ImmutableTransferFromParams) To() wasmlib.ScImmutableAgentID { + return wasmlib.NewScImmutableAgentID(s.id, idxMap[IdxParamTo]) +} + +func (s ImmutableTransferFromParams) TokenID() wasmlib.ScImmutableHash { + return wasmlib.NewScImmutableHash(s.id, idxMap[IdxParamTokenID]) +} + +type MutableTransferFromParams struct { + id int32 +} + +func (s MutableTransferFromParams) From() wasmlib.ScMutableAgentID { + return wasmlib.NewScMutableAgentID(s.id, idxMap[IdxParamFrom]) +} + +func (s MutableTransferFromParams) To() wasmlib.ScMutableAgentID { + return wasmlib.NewScMutableAgentID(s.id, idxMap[IdxParamTo]) +} + +func (s MutableTransferFromParams) TokenID() wasmlib.ScMutableHash { + return wasmlib.NewScMutableHash(s.id, idxMap[IdxParamTokenID]) +} + +type ImmutableBalanceOfParams struct { + id int32 +} + +func (s ImmutableBalanceOfParams) Owner() wasmlib.ScImmutableAgentID { + return wasmlib.NewScImmutableAgentID(s.id, idxMap[IdxParamOwner]) +} + +type MutableBalanceOfParams struct { + id int32 +} + +func (s MutableBalanceOfParams) Owner() wasmlib.ScMutableAgentID { + return wasmlib.NewScMutableAgentID(s.id, idxMap[IdxParamOwner]) +} + +type ImmutableGetApprovedParams struct { + id int32 +} + +func (s ImmutableGetApprovedParams) TokenID() wasmlib.ScImmutableHash { + return wasmlib.NewScImmutableHash(s.id, idxMap[IdxParamTokenID]) +} + +type MutableGetApprovedParams struct { + id int32 +} + +func (s MutableGetApprovedParams) TokenID() wasmlib.ScMutableHash { + return wasmlib.NewScMutableHash(s.id, idxMap[IdxParamTokenID]) +} + +type ImmutableIsApprovedForAllParams struct { + id int32 +} + +func (s ImmutableIsApprovedForAllParams) Operator() wasmlib.ScImmutableAgentID { + return wasmlib.NewScImmutableAgentID(s.id, idxMap[IdxParamOperator]) +} + +func (s ImmutableIsApprovedForAllParams) Owner() wasmlib.ScImmutableAgentID { + return wasmlib.NewScImmutableAgentID(s.id, idxMap[IdxParamOwner]) +} + +type MutableIsApprovedForAllParams struct { + id int32 +} + +func (s MutableIsApprovedForAllParams) Operator() wasmlib.ScMutableAgentID { + return wasmlib.NewScMutableAgentID(s.id, idxMap[IdxParamOperator]) +} + +func (s MutableIsApprovedForAllParams) Owner() wasmlib.ScMutableAgentID { + return wasmlib.NewScMutableAgentID(s.id, idxMap[IdxParamOwner]) +} + +type ImmutableOwnerOfParams struct { + id int32 +} + +func (s ImmutableOwnerOfParams) TokenID() wasmlib.ScImmutableHash { + return wasmlib.NewScImmutableHash(s.id, idxMap[IdxParamTokenID]) +} + +type MutableOwnerOfParams struct { + id int32 +} + +func (s MutableOwnerOfParams) TokenID() wasmlib.ScMutableHash { + return wasmlib.NewScMutableHash(s.id, idxMap[IdxParamTokenID]) +} + +type ImmutableTokenURIParams struct { + id int32 +} + +func (s ImmutableTokenURIParams) TokenID() wasmlib.ScImmutableHash { + return wasmlib.NewScImmutableHash(s.id, idxMap[IdxParamTokenID]) +} + +type MutableTokenURIParams struct { + id int32 +} + +func (s MutableTokenURIParams) TokenID() wasmlib.ScMutableHash { + return wasmlib.NewScMutableHash(s.id, idxMap[IdxParamTokenID]) +} diff --git a/contracts/wasm/erc721/go/erc721/results.go b/contracts/wasm/erc721/go/erc721/results.go new file mode 100644 index 0000000000..ac16050ca7 --- /dev/null +++ b/contracts/wasm/erc721/go/erc721/results.go @@ -0,0 +1,122 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package erc721 + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +type ImmutableBalanceOfResults struct { + id int32 +} + +func (s ImmutableBalanceOfResults) Amount() wasmlib.ScImmutableUint64 { + return wasmlib.NewScImmutableUint64(s.id, idxMap[IdxResultAmount]) +} + +type MutableBalanceOfResults struct { + id int32 +} + +func (s MutableBalanceOfResults) Amount() wasmlib.ScMutableUint64 { + return wasmlib.NewScMutableUint64(s.id, idxMap[IdxResultAmount]) +} + +type ImmutableGetApprovedResults struct { + id int32 +} + +func (s ImmutableGetApprovedResults) Approved() wasmlib.ScImmutableAgentID { + return wasmlib.NewScImmutableAgentID(s.id, idxMap[IdxResultApproved]) +} + +type MutableGetApprovedResults struct { + id int32 +} + +func (s MutableGetApprovedResults) Approved() wasmlib.ScMutableAgentID { + return wasmlib.NewScMutableAgentID(s.id, idxMap[IdxResultApproved]) +} + +type ImmutableIsApprovedForAllResults struct { + id int32 +} + +func (s ImmutableIsApprovedForAllResults) Approval() wasmlib.ScImmutableBool { + return wasmlib.NewScImmutableBool(s.id, idxMap[IdxResultApproval]) +} + +type MutableIsApprovedForAllResults struct { + id int32 +} + +func (s MutableIsApprovedForAllResults) Approval() wasmlib.ScMutableBool { + return wasmlib.NewScMutableBool(s.id, idxMap[IdxResultApproval]) +} + +type ImmutableNameResults struct { + id int32 +} + +func (s ImmutableNameResults) Name() wasmlib.ScImmutableString { + return wasmlib.NewScImmutableString(s.id, idxMap[IdxResultName]) +} + +type MutableNameResults struct { + id int32 +} + +func (s MutableNameResults) Name() wasmlib.ScMutableString { + return wasmlib.NewScMutableString(s.id, idxMap[IdxResultName]) +} + +type ImmutableOwnerOfResults struct { + id int32 +} + +func (s ImmutableOwnerOfResults) Owner() wasmlib.ScImmutableAgentID { + return wasmlib.NewScImmutableAgentID(s.id, idxMap[IdxResultOwner]) +} + +type MutableOwnerOfResults struct { + id int32 +} + +func (s MutableOwnerOfResults) Owner() wasmlib.ScMutableAgentID { + return wasmlib.NewScMutableAgentID(s.id, idxMap[IdxResultOwner]) +} + +type ImmutableSymbolResults struct { + id int32 +} + +func (s ImmutableSymbolResults) Symbol() wasmlib.ScImmutableString { + return wasmlib.NewScImmutableString(s.id, idxMap[IdxResultSymbol]) +} + +type MutableSymbolResults struct { + id int32 +} + +func (s MutableSymbolResults) Symbol() wasmlib.ScMutableString { + return wasmlib.NewScMutableString(s.id, idxMap[IdxResultSymbol]) +} + +type ImmutableTokenURIResults struct { + id int32 +} + +func (s ImmutableTokenURIResults) TokenURI() wasmlib.ScImmutableString { + return wasmlib.NewScImmutableString(s.id, idxMap[IdxResultTokenURI]) +} + +type MutableTokenURIResults struct { + id int32 +} + +func (s MutableTokenURIResults) TokenURI() wasmlib.ScMutableString { + return wasmlib.NewScMutableString(s.id, idxMap[IdxResultTokenURI]) +} diff --git a/contracts/wasm/erc721/go/erc721/state.go b/contracts/wasm/erc721/go/erc721/state.go new file mode 100644 index 0000000000..c3ad62781b --- /dev/null +++ b/contracts/wasm/erc721/go/erc721/state.go @@ -0,0 +1,136 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package erc721 + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +type MapHashToImmutableAgentID struct { + objID int32 +} + +func (m MapHashToImmutableAgentID) GetAgentID(key wasmlib.ScHash) wasmlib.ScImmutableAgentID { + return wasmlib.NewScImmutableAgentID(m.objID, key.KeyID()) +} + +type MapAgentIDToImmutableOperators struct { + objID int32 +} + +func (m MapAgentIDToImmutableOperators) GetOperators(key wasmlib.ScAgentID) ImmutableOperators { + subID := wasmlib.GetObjectID(m.objID, key.KeyID(), wasmlib.TYPE_MAP) + return ImmutableOperators{objID: subID} +} + +type MapAgentIDToImmutableUint64 struct { + objID int32 +} + +func (m MapAgentIDToImmutableUint64) GetUint64(key wasmlib.ScAgentID) wasmlib.ScImmutableUint64 { + return wasmlib.NewScImmutableUint64(m.objID, key.KeyID()) +} + +type ImmutableErc721State struct { + id int32 +} + +func (s ImmutableErc721State) ApprovedAccounts() MapHashToImmutableAgentID { + mapID := wasmlib.GetObjectID(s.id, idxMap[IdxStateApprovedAccounts], wasmlib.TYPE_MAP) + return MapHashToImmutableAgentID{objID: mapID} +} + +func (s ImmutableErc721State) ApprovedOperators() MapAgentIDToImmutableOperators { + mapID := wasmlib.GetObjectID(s.id, idxMap[IdxStateApprovedOperators], wasmlib.TYPE_MAP) + return MapAgentIDToImmutableOperators{objID: mapID} +} + +func (s ImmutableErc721State) Balances() MapAgentIDToImmutableUint64 { + mapID := wasmlib.GetObjectID(s.id, idxMap[IdxStateBalances], wasmlib.TYPE_MAP) + return MapAgentIDToImmutableUint64{objID: mapID} +} + +func (s ImmutableErc721State) Name() wasmlib.ScImmutableString { + return wasmlib.NewScImmutableString(s.id, idxMap[IdxStateName]) +} + +func (s ImmutableErc721State) Owners() MapHashToImmutableAgentID { + mapID := wasmlib.GetObjectID(s.id, idxMap[IdxStateOwners], wasmlib.TYPE_MAP) + return MapHashToImmutableAgentID{objID: mapID} +} + +func (s ImmutableErc721State) Symbol() wasmlib.ScImmutableString { + return wasmlib.NewScImmutableString(s.id, idxMap[IdxStateSymbol]) +} + +type MapHashToMutableAgentID struct { + objID int32 +} + +func (m MapHashToMutableAgentID) Clear() { + wasmlib.Clear(m.objID) +} + +func (m MapHashToMutableAgentID) GetAgentID(key wasmlib.ScHash) wasmlib.ScMutableAgentID { + return wasmlib.NewScMutableAgentID(m.objID, key.KeyID()) +} + +type MapAgentIDToMutableOperators struct { + objID int32 +} + +func (m MapAgentIDToMutableOperators) Clear() { + wasmlib.Clear(m.objID) +} + +func (m MapAgentIDToMutableOperators) GetOperators(key wasmlib.ScAgentID) MutableOperators { + subID := wasmlib.GetObjectID(m.objID, key.KeyID(), wasmlib.TYPE_MAP) + return MutableOperators{objID: subID} +} + +type MapAgentIDToMutableUint64 struct { + objID int32 +} + +func (m MapAgentIDToMutableUint64) Clear() { + wasmlib.Clear(m.objID) +} + +func (m MapAgentIDToMutableUint64) GetUint64(key wasmlib.ScAgentID) wasmlib.ScMutableUint64 { + return wasmlib.NewScMutableUint64(m.objID, key.KeyID()) +} + +type MutableErc721State struct { + id int32 +} + +func (s MutableErc721State) ApprovedAccounts() MapHashToMutableAgentID { + mapID := wasmlib.GetObjectID(s.id, idxMap[IdxStateApprovedAccounts], wasmlib.TYPE_MAP) + return MapHashToMutableAgentID{objID: mapID} +} + +func (s MutableErc721State) ApprovedOperators() MapAgentIDToMutableOperators { + mapID := wasmlib.GetObjectID(s.id, idxMap[IdxStateApprovedOperators], wasmlib.TYPE_MAP) + return MapAgentIDToMutableOperators{objID: mapID} +} + +func (s MutableErc721State) Balances() MapAgentIDToMutableUint64 { + mapID := wasmlib.GetObjectID(s.id, idxMap[IdxStateBalances], wasmlib.TYPE_MAP) + return MapAgentIDToMutableUint64{objID: mapID} +} + +func (s MutableErc721State) Name() wasmlib.ScMutableString { + return wasmlib.NewScMutableString(s.id, idxMap[IdxStateName]) +} + +func (s MutableErc721State) Owners() MapHashToMutableAgentID { + mapID := wasmlib.GetObjectID(s.id, idxMap[IdxStateOwners], wasmlib.TYPE_MAP) + return MapHashToMutableAgentID{objID: mapID} +} + +func (s MutableErc721State) Symbol() wasmlib.ScMutableString { + return wasmlib.NewScMutableString(s.id, idxMap[IdxStateSymbol]) +} diff --git a/contracts/wasm/erc721/go/erc721/typedefs.go b/contracts/wasm/erc721/go/erc721/typedefs.go new file mode 100644 index 0000000000..b9f771d048 --- /dev/null +++ b/contracts/wasm/erc721/go/erc721/typedefs.go @@ -0,0 +1,34 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +package erc721 + +import "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + +type MapAgentIDToImmutableBool struct { + objID int32 +} + +func (m MapAgentIDToImmutableBool) GetBool(key wasmlib.ScAgentID) wasmlib.ScImmutableBool { + return wasmlib.NewScImmutableBool(m.objID, key.KeyID()) +} + +type ImmutableOperators = MapAgentIDToImmutableBool + +type MapAgentIDToMutableBool struct { + objID int32 +} + +func (m MapAgentIDToMutableBool) Clear() { + wasmlib.Clear(m.objID) +} + +func (m MapAgentIDToMutableBool) GetBool(key wasmlib.ScAgentID) wasmlib.ScMutableBool { + return wasmlib.NewScMutableBool(m.objID, key.KeyID()) +} + +type MutableOperators = MapAgentIDToMutableBool diff --git a/contracts/wasm/erc721/go/main.go b/contracts/wasm/erc721/go/main.go new file mode 100644 index 0000000000..b863c75bb9 --- /dev/null +++ b/contracts/wasm/erc721/go/main.go @@ -0,0 +1,24 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +// +build wasm + +package main + +import "github.com/iotaledger/wasp/packages/vm/wasmclient" + +import "github.com/iotaledger/wasp/contracts/wasm/erc721/go/erc721" + +func main() { +} + +//export on_load +func onLoad() { + h := &wasmclient.WasmVMHost{} + h.ConnectWasmHost() + erc721.OnLoad() +} diff --git a/contracts/wasm/erc721/schema.yaml b/contracts/wasm/erc721/schema.yaml new file mode 100644 index 0000000000..28fa9d7b6a --- /dev/null +++ b/contracts/wasm/erc721/schema.yaml @@ -0,0 +1,95 @@ +name: Erc721 +description: ERC-721 NFT PoC for IOTA Smart Contracts +events: + init: + name: String + symbol: String + approval: + owner: AgentID + approved: AgentID + tokenID: Hash + approvalForAll: + owner: AgentID + operator: AgentID + approval: Bool + mint: + balance: Uint64 + owner: AgentID + tokenID: Hash + transfer: + from: AgentID + to: AgentID + tokenID: Hash +structs: { } +typedefs: + Operators: map[AgentID]Bool // approval status of each operator +state: + name: String + symbol: String + owners: map[Hash]AgentID // 1:1 mapping of owners to token IDs + approvedAccounts: map[Hash]AgentID // approved token controller agents + balances: map[AgentID]Uint64 // number of tokens held by owners + approvedOperators: map[AgentID]Operators // approved operators per owner +funcs: + approve: + params: + approved: AgentID // target account + tokenID: Hash // token ID + burn: + params: + tokenID: Hash // token ID + init: + params: + name=n: String // creator/owner of the initial supply + symbol=s: String // initial token supply + mint: + params: + tokenID: Hash // New token id + safeTransferFrom: + params: + from: AgentID // from account + to: AgentID // to account, which is SC + tokenID: Hash // token ID + data: Bytes? // extra data to pass to SC + setApprovalForAll: + params: + operator: AgentID // target operator of account + approval: Bool + transferFrom: + params: + from: AgentID // from account + to: AgentID // to account + tokenID: Hash // token ID +views: + balanceOf: + params: + owner: AgentID // account owner + results: + amount: Uint64 //amount of tokens (owner) + getApproved: + params: + tokenID: Hash + results: + approved: AgentID + isApprovedForAll: + params: + owner: AgentID + operator: AgentID + results: + approval: Bool + name: + results: + name: String + ownerOf: + params: + tokenID: Hash + results: + owner: AgentID + symbol: + results: + symbol: String + tokenURI: + params: + tokenID: Hash + results: + tokenURI: String diff --git a/contracts/wasm/erc721/src/consts.rs b/contracts/wasm/erc721/src/consts.rs new file mode 100644 index 0000000000..69c5bce108 --- /dev/null +++ b/contracts/wasm/erc721/src/consts.rs @@ -0,0 +1,70 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] + +use wasmlib::*; + +pub const SC_NAME : &str = "erc721"; +pub const SC_DESCRIPTION : &str = "ERC-721 NFT PoC for IOTA Smart Contracts"; +pub const HSC_NAME : ScHname = ScHname(0xd967c216); + +pub const PARAM_APPROVAL : &str = "approval"; +pub const PARAM_APPROVED : &str = "approved"; +pub const PARAM_DATA : &str = "data"; +pub const PARAM_FROM : &str = "from"; +pub const PARAM_NAME : &str = "n"; +pub const PARAM_OPERATOR : &str = "operator"; +pub const PARAM_OWNER : &str = "owner"; +pub const PARAM_SYMBOL : &str = "s"; +pub const PARAM_TO : &str = "to"; +pub const PARAM_TOKEN_ID : &str = "tokenID"; + +pub const RESULT_AMOUNT : &str = "amount"; +pub const RESULT_APPROVAL : &str = "approval"; +pub const RESULT_APPROVED : &str = "approved"; +pub const RESULT_NAME : &str = "name"; +pub const RESULT_OWNER : &str = "owner"; +pub const RESULT_SYMBOL : &str = "symbol"; +pub const RESULT_TOKEN_URI : &str = "tokenURI"; + +pub const STATE_APPROVED_ACCOUNTS : &str = "approvedAccounts"; +pub const STATE_APPROVED_OPERATORS : &str = "approvedOperators"; +pub const STATE_BALANCES : &str = "balances"; +pub const STATE_NAME : &str = "name"; +pub const STATE_OWNERS : &str = "owners"; +pub const STATE_SYMBOL : &str = "symbol"; + +pub const FUNC_APPROVE : &str = "approve"; +pub const FUNC_BURN : &str = "burn"; +pub const FUNC_INIT : &str = "init"; +pub const FUNC_MINT : &str = "mint"; +pub const FUNC_SAFE_TRANSFER_FROM : &str = "safeTransferFrom"; +pub const FUNC_SET_APPROVAL_FOR_ALL : &str = "setApprovalForAll"; +pub const FUNC_TRANSFER_FROM : &str = "transferFrom"; +pub const VIEW_BALANCE_OF : &str = "balanceOf"; +pub const VIEW_GET_APPROVED : &str = "getApproved"; +pub const VIEW_IS_APPROVED_FOR_ALL : &str = "isApprovedForAll"; +pub const VIEW_NAME : &str = "name"; +pub const VIEW_OWNER_OF : &str = "ownerOf"; +pub const VIEW_SYMBOL : &str = "symbol"; +pub const VIEW_TOKEN_URI : &str = "tokenURI"; + +pub const HFUNC_APPROVE : ScHname = ScHname(0xa0661268); +pub const HFUNC_BURN : ScHname = ScHname(0x7bc1efb1); +pub const HFUNC_INIT : ScHname = ScHname(0x1f44d644); +pub const HFUNC_MINT : ScHname = ScHname(0xa29addcf); +pub const HFUNC_SAFE_TRANSFER_FROM : ScHname = ScHname(0x130ce158); +pub const HFUNC_SET_APPROVAL_FOR_ALL : ScHname = ScHname(0xb8d8c776); +pub const HFUNC_TRANSFER_FROM : ScHname = ScHname(0xd5e0a602); +pub const HVIEW_BALANCE_OF : ScHname = ScHname(0x67ef8df4); +pub const HVIEW_GET_APPROVED : ScHname = ScHname(0xbe34b6ba); +pub const HVIEW_IS_APPROVED_FOR_ALL : ScHname = ScHname(0x3251b0f0); +pub const HVIEW_NAME : ScHname = ScHname(0x0df7da3a); +pub const HVIEW_OWNER_OF : ScHname = ScHname(0x1246f5ad); +pub const HVIEW_SYMBOL : ScHname = ScHname(0x3e93d19b); +pub const HVIEW_TOKEN_URI : ScHname = ScHname(0x4e1a7397); diff --git a/contracts/wasm/erc721/src/contract.rs b/contracts/wasm/erc721/src/contract.rs new file mode 100644 index 0000000000..4f23b4c652 --- /dev/null +++ b/contracts/wasm/erc721/src/contract.rs @@ -0,0 +1,227 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] + +use std::ptr; + +use wasmlib::*; + +use crate::consts::*; +use crate::params::*; +use crate::results::*; + +pub struct ApproveCall { + pub func: ScFunc, + pub params: MutableApproveParams, +} + +pub struct BurnCall { + pub func: ScFunc, + pub params: MutableBurnParams, +} + +pub struct InitCall { + pub func: ScInitFunc, + pub params: MutableInitParams, +} + +pub struct MintCall { + pub func: ScFunc, + pub params: MutableMintParams, +} + +pub struct SafeTransferFromCall { + pub func: ScFunc, + pub params: MutableSafeTransferFromParams, +} + +pub struct SetApprovalForAllCall { + pub func: ScFunc, + pub params: MutableSetApprovalForAllParams, +} + +pub struct TransferFromCall { + pub func: ScFunc, + pub params: MutableTransferFromParams, +} + +pub struct BalanceOfCall { + pub func: ScView, + pub params: MutableBalanceOfParams, + pub results: ImmutableBalanceOfResults, +} + +pub struct GetApprovedCall { + pub func: ScView, + pub params: MutableGetApprovedParams, + pub results: ImmutableGetApprovedResults, +} + +pub struct IsApprovedForAllCall { + pub func: ScView, + pub params: MutableIsApprovedForAllParams, + pub results: ImmutableIsApprovedForAllResults, +} + +pub struct NameCall { + pub func: ScView, + pub results: ImmutableNameResults, +} + +pub struct OwnerOfCall { + pub func: ScView, + pub params: MutableOwnerOfParams, + pub results: ImmutableOwnerOfResults, +} + +pub struct SymbolCall { + pub func: ScView, + pub results: ImmutableSymbolResults, +} + +pub struct TokenURICall { + pub func: ScView, + pub params: MutableTokenURIParams, + pub results: ImmutableTokenURIResults, +} + +pub struct ScFuncs { +} + +impl ScFuncs { + pub fn approve(_ctx: & dyn ScFuncCallContext) -> ApproveCall { + let mut f = ApproveCall { + func: ScFunc::new(HSC_NAME, HFUNC_APPROVE), + params: MutableApproveParams { id: 0 }, + }; + f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); + f + } + + pub fn burn(_ctx: & dyn ScFuncCallContext) -> BurnCall { + let mut f = BurnCall { + func: ScFunc::new(HSC_NAME, HFUNC_BURN), + params: MutableBurnParams { id: 0 }, + }; + f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); + f + } + + pub fn init(_ctx: & dyn ScFuncCallContext) -> InitCall { + let mut f = InitCall { + func: ScInitFunc::new(HSC_NAME, HFUNC_INIT), + params: MutableInitParams { id: 0 }, + }; + f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); + f + } + + pub fn mint(_ctx: & dyn ScFuncCallContext) -> MintCall { + let mut f = MintCall { + func: ScFunc::new(HSC_NAME, HFUNC_MINT), + params: MutableMintParams { id: 0 }, + }; + f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); + f + } + + pub fn safe_transfer_from(_ctx: & dyn ScFuncCallContext) -> SafeTransferFromCall { + let mut f = SafeTransferFromCall { + func: ScFunc::new(HSC_NAME, HFUNC_SAFE_TRANSFER_FROM), + params: MutableSafeTransferFromParams { id: 0 }, + }; + f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); + f + } + + pub fn set_approval_for_all(_ctx: & dyn ScFuncCallContext) -> SetApprovalForAllCall { + let mut f = SetApprovalForAllCall { + func: ScFunc::new(HSC_NAME, HFUNC_SET_APPROVAL_FOR_ALL), + params: MutableSetApprovalForAllParams { id: 0 }, + }; + f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); + f + } + + pub fn transfer_from(_ctx: & dyn ScFuncCallContext) -> TransferFromCall { + let mut f = TransferFromCall { + func: ScFunc::new(HSC_NAME, HFUNC_TRANSFER_FROM), + params: MutableTransferFromParams { id: 0 }, + }; + f.func.set_ptrs(&mut f.params.id, ptr::null_mut()); + f + } + + pub fn balance_of(_ctx: & dyn ScViewCallContext) -> BalanceOfCall { + let mut f = BalanceOfCall { + func: ScView::new(HSC_NAME, HVIEW_BALANCE_OF), + params: MutableBalanceOfParams { id: 0 }, + results: ImmutableBalanceOfResults { id: 0 }, + }; + f.func.set_ptrs(&mut f.params.id, &mut f.results.id); + f + } + + pub fn get_approved(_ctx: & dyn ScViewCallContext) -> GetApprovedCall { + let mut f = GetApprovedCall { + func: ScView::new(HSC_NAME, HVIEW_GET_APPROVED), + params: MutableGetApprovedParams { id: 0 }, + results: ImmutableGetApprovedResults { id: 0 }, + }; + f.func.set_ptrs(&mut f.params.id, &mut f.results.id); + f + } + + pub fn is_approved_for_all(_ctx: & dyn ScViewCallContext) -> IsApprovedForAllCall { + let mut f = IsApprovedForAllCall { + func: ScView::new(HSC_NAME, HVIEW_IS_APPROVED_FOR_ALL), + params: MutableIsApprovedForAllParams { id: 0 }, + results: ImmutableIsApprovedForAllResults { id: 0 }, + }; + f.func.set_ptrs(&mut f.params.id, &mut f.results.id); + f + } + + pub fn name(_ctx: & dyn ScViewCallContext) -> NameCall { + let mut f = NameCall { + func: ScView::new(HSC_NAME, HVIEW_NAME), + results: ImmutableNameResults { id: 0 }, + }; + f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); + f + } + + pub fn owner_of(_ctx: & dyn ScViewCallContext) -> OwnerOfCall { + let mut f = OwnerOfCall { + func: ScView::new(HSC_NAME, HVIEW_OWNER_OF), + params: MutableOwnerOfParams { id: 0 }, + results: ImmutableOwnerOfResults { id: 0 }, + }; + f.func.set_ptrs(&mut f.params.id, &mut f.results.id); + f + } + + pub fn symbol(_ctx: & dyn ScViewCallContext) -> SymbolCall { + let mut f = SymbolCall { + func: ScView::new(HSC_NAME, HVIEW_SYMBOL), + results: ImmutableSymbolResults { id: 0 }, + }; + f.func.set_ptrs(ptr::null_mut(), &mut f.results.id); + f + } + + pub fn token_uri(_ctx: & dyn ScViewCallContext) -> TokenURICall { + let mut f = TokenURICall { + func: ScView::new(HSC_NAME, HVIEW_TOKEN_URI), + params: MutableTokenURIParams { id: 0 }, + results: ImmutableTokenURIResults { id: 0 }, + }; + f.func.set_ptrs(&mut f.params.id, &mut f.results.id); + f + } +} diff --git a/contracts/wasm/erc721/src/erc721.rs b/contracts/wasm/erc721/src/erc721.rs new file mode 100644 index 0000000000..c72e2046ba --- /dev/null +++ b/contracts/wasm/erc721/src/erc721.rs @@ -0,0 +1,224 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +use wasmlib::*; + +use crate::*; +use crate::typedefs::*; + +// Follows ERC-721 standard as closely as possible +// https://eips.ethereum.org/EIPS/eip-721 +// Notable changes w.r.t. ERC-721: +// - tokenID is Hash instead of int256 +// - balance amounts are Uint64 instead of int256 +// - all address accounts are replaced with AgentID accounts +// - for consistency and to reduce confusion: +// use 'approved' when it is an AgentID +// use 'approval' when it is a Bool + +// set the required base URI, to which the base58 encoded token ID will be concatenated +const BASE_URI: &str = "my/special/base/uri/"; + +/////////////////////////// HELPER FUNCTIONS //////////////////////////// + +fn approve(state: MutableErc721State, owner: &ScAgentID, approved: &ScAgentID, token_id: &ScHash) { + state.approved_accounts().get_agent_id(token_id).set_value(approved); + Erc721Events {}.approval(approved, owner, token_id); +} + +// checks if caller is owner, or one of its delegated operators +fn can_operate(state: MutableErc721State, caller: &ScAgentID, owner: &ScAgentID) -> bool { + if *caller == *owner { + return true; + } + + let operators = state.approved_operators().get_operators(owner); + operators.get_bool(&caller).value() +} + +// checks if caller is owner, or one of its delegated operators, or approved account for tokenID +fn can_transfer(state: MutableErc721State, caller: &ScAgentID, owner: &ScAgentID, token_id: &ScHash) -> bool { + if can_operate(state, caller, owner) { + return true; + } + + let controller = state.approved_accounts().get_agent_id(token_id); + controller.value() == *caller +} + +// common code for safeTransferFrom and transferFrom +fn transfer(ctx: &ScFuncContext, state: MutableErc721State, from: &ScAgentID, to: &ScAgentID, token_id: &ScHash) { + let token_owner = state.owners().get_agent_id(token_id); + ctx.require(token_owner.exists(), "tokenID does not exist"); + + let owner = token_owner.value(); + ctx.require(can_transfer(state, &ctx.caller(), &owner, token_id), + "not owner, operator, or approved"); + + ctx.require(owner == *from, "from is not owner"); + //TODO: ctx.require(to == , "invalid 'to' agentid"); + + let nft_count_from = state.balances().get_uint64(from); + let nft_count_to = state.balances().get_uint64(to); + + nft_count_from.set_value(nft_count_from.value() - 1); + nft_count_to.set_value(nft_count_to.value() + 1); + + token_owner.set_value(to); + + //TODO should probably clear this entry, but for now just set to zero + approve(state, &owner, &ScAgentID::ZERO, token_id); + + Erc721Events {}.transfer(from, to, token_id); +} + +/////////////////////////// SC FUNCS //////////////////////////// + +// Gives permission to to to transfer tokenID token to another account. +// The approval is cleared when the token is transferred. +pub fn func_approve(ctx: &ScFuncContext, f: &ApproveContext) { + let token_id = f.params.token_id().value(); + let token_owner = f.state.owners().get_agent_id(&token_id); + ctx.require(token_owner.exists(), "tokenID does not exist"); + let owner = token_owner.value(); + ctx.require(can_operate(f.state, &ctx.caller(), &owner), "not owner or operator"); + let approved = f.params.approved().value(); + ctx.require(owner != approved, "approved equals owner"); + approve(f.state, &owner, &approved, &token_id); +} + +// Destroys tokenID. The approval is cleared when the token is burned. +pub fn func_burn(ctx: &ScFuncContext, f: &BurnContext) { + let token_id = f.params.token_id().value(); + let owner = f.state.owners().get_agent_id(&token_id).value(); + ctx.require(owner != ScAgentID::ZERO, "tokenID does not exist"); + ctx.require(ctx.caller() == owner, "caller is not owner"); + + approve(f.state, &owner, &ScAgentID::ZERO, &token_id); + + let balance = f.state.balances().get_uint64(&owner); + balance.set_value(balance.value() - 1); + //TODO clear this instead of setting to zero + f.state.owners().get_agent_id(&token_id).set_value(&ScAgentID::ZERO); + + f.events.transfer(&owner, &ScAgentID::ZERO, &token_id); +} + +// Initializes the contract by setting a name and a symbol to the token collection. +pub fn func_init(_ctx: &ScFuncContext, f: &InitContext) { + let name = f.params.name().value(); + let symbol = f.params.symbol().value(); + + f.state.name().set_value(&name); + f.state.symbol().set_value(&symbol); + + f.events.init(&name, &symbol); +} + +// Mints tokenID and transfers it to caller as new owner. +pub fn func_mint(ctx: &ScFuncContext, f: &MintContext) { + let token_id = f.params.token_id().value(); + let token_owner = f.state.owners().get_agent_id(&token_id); + ctx.require(!token_owner.exists(), "tokenID already minted"); + + let owner = ctx.caller(); + token_owner.set_value(&owner); + let balance = f.state.balances().get_uint64(&owner); + balance.set_value(balance.value() + 1); + + f.events.transfer(&ScAgentID::ZERO, &owner, &token_id); + if !owner.is_address() { + //TODO interpret to as SC address and call its onERC721Received() function + } +} + +// Safely transfers tokenID token from from to to, checking first that contract +// recipients are aware of the ERC721 protocol to prevent tokens from being forever locked. +pub fn func_safe_transfer_from(ctx: &ScFuncContext, f: &SafeTransferFromContext) { + let from = f.params.from().value(); + let to = f.params.to().value(); + let token_id = f.params.token_id().value(); + transfer(&ctx, f.state, &from, &to, &token_id); + if !to.is_address() { + //TODO interpret to as SC address and call its onERC721Received() function + } +} + +// Approve or remove operator as an operator for the caller. +pub fn func_set_approval_for_all(ctx: &ScFuncContext, f: &SetApprovalForAllContext) { + let owner = ctx.caller(); + let operator = f.params.operator().value(); + ctx.require(owner != operator, "owner equals operator"); + + let approval = f.params.approval().value(); + let approvals_by_caller = f.state.approved_operators().get_operators(&owner); + approvals_by_caller.get_bool(&operator).set_value(approval); + + f.events.approval_for_all(approval, &operator, &owner); +} + +// Transfers tokenID token from from to to. +pub fn func_transfer_from(ctx: &ScFuncContext, f: &TransferFromContext) { + let from = f.params.from().value(); + let to = f.params.to().value(); + let token_id = f.params.token_id().value(); + transfer(ctx, f.state, &from, &to, &token_id); +} + +/////////////////////////// SC VIEWS //////////////////////////// + +// Returns the number of tokens in owner's account if the owner exists. +pub fn view_balance_of(_ctx: &ScViewContext, f: &BalanceOfContext) { + let owner = f.params.owner().value(); + let nft_count = f.state.balances().get_uint64(&owner); + if nft_count.exists() { + f.results.amount().set_value(nft_count.value()); + } +} + +// Returns the approved account for tokenID token if there is one. +pub fn view_get_approved(_ctx: &ScViewContext, f: &GetApprovedContext) { + let token_id = f.params.token_id().value(); + let approved = f.state.approved_accounts().get_agent_id(&token_id).value(); + if approved != ScAgentID::ZERO { + f.results.approved().set_value(&approved); + } +} + +// Returns if the operator is allowed to manage all the assets of owner. +pub fn view_is_approved_for_all(_ctx: &ScViewContext, f: &IsApprovedForAllContext) { + let owner = f.params.owner().value(); + let operator = f.params.operator().value(); + let operators = f.state.approved_operators().get_operators(&owner); + let approval = operators.get_bool(&operator); + if approval.exists() { + f.results.approval().set_value(approval.value()); + } +} + +// Returns the token collection name. +pub fn view_name(_ctx: &ScViewContext, f: &NameContext) { + f.results.name().set_value(&f.state.name().value()); +} + +// Returns the owner of the tokenID token if the token exists. +pub fn view_owner_of(_ctx: &ScViewContext, f: &OwnerOfContext) { + let token_id = f.params.token_id().value(); + let owner = f.state.owners().get_agent_id(&token_id); + if owner.exists() { + f.results.owner().set_value(&owner.value()); + } +} + +// Returns the token collection symbol. +pub fn view_symbol(_ctx: &ScViewContext, f: &SymbolContext) { + f.results.symbol().set_value(&f.state.symbol().value()); +} + +// Returns the Uniform Resource Identifier (URI) for tokenID token if the token exists. +pub fn view_token_uri(_ctx: &ScViewContext, f: &TokenURIContext) { + let token_id = f.params.token_id(); + if token_id.exists() { + f.results.token_uri().set_value(&(BASE_URI.to_owned() + &token_id.to_string())); + } +} diff --git a/contracts/wasm/erc721/src/events.rs b/contracts/wasm/erc721/src/events.rs new file mode 100644 index 0000000000..5d13ded8be --- /dev/null +++ b/contracts/wasm/erc721/src/events.rs @@ -0,0 +1,55 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] + +use wasmlib::*; + +pub struct Erc721Events { +} + +impl Erc721Events { + + pub fn approval(&self, approved: &ScAgentID, owner: &ScAgentID, token_id: &ScHash) { + let mut encoder = EventEncoder::new("erc721.approval"); + encoder.agent_id(&approved); + encoder.agent_id(&owner); + encoder.hash(&token_id); + encoder.emit(); + } + + pub fn approval_for_all(&self, approval: bool, operator: &ScAgentID, owner: &ScAgentID) { + let mut encoder = EventEncoder::new("erc721.approvalForAll"); + encoder.bool(approval); + encoder.agent_id(&operator); + encoder.agent_id(&owner); + encoder.emit(); + } + + pub fn init(&self, name: &str, symbol: &str) { + let mut encoder = EventEncoder::new("erc721.init"); + encoder.string(&name); + encoder.string(&symbol); + encoder.emit(); + } + + pub fn mint(&self, balance: u64, owner: &ScAgentID, token_id: &ScHash) { + let mut encoder = EventEncoder::new("erc721.mint"); + encoder.uint64(balance); + encoder.agent_id(&owner); + encoder.hash(&token_id); + encoder.emit(); + } + + pub fn transfer(&self, from: &ScAgentID, to: &ScAgentID, token_id: &ScHash) { + let mut encoder = EventEncoder::new("erc721.transfer"); + encoder.agent_id(&from); + encoder.agent_id(&to); + encoder.hash(&token_id); + encoder.emit(); + } +} diff --git a/contracts/wasm/erc721/src/keys.rs b/contracts/wasm/erc721/src/keys.rs new file mode 100644 index 0000000000..a806243367 --- /dev/null +++ b/contracts/wasm/erc721/src/keys.rs @@ -0,0 +1,74 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] + +use wasmlib::*; + +use crate::*; + +pub(crate) const IDX_PARAM_APPROVAL : usize = 0; +pub(crate) const IDX_PARAM_APPROVED : usize = 1; +pub(crate) const IDX_PARAM_DATA : usize = 2; +pub(crate) const IDX_PARAM_FROM : usize = 3; +pub(crate) const IDX_PARAM_NAME : usize = 4; +pub(crate) const IDX_PARAM_OPERATOR : usize = 5; +pub(crate) const IDX_PARAM_OWNER : usize = 6; +pub(crate) const IDX_PARAM_SYMBOL : usize = 7; +pub(crate) const IDX_PARAM_TO : usize = 8; +pub(crate) const IDX_PARAM_TOKEN_ID : usize = 9; + +pub(crate) const IDX_RESULT_AMOUNT : usize = 10; +pub(crate) const IDX_RESULT_APPROVAL : usize = 11; +pub(crate) const IDX_RESULT_APPROVED : usize = 12; +pub(crate) const IDX_RESULT_NAME : usize = 13; +pub(crate) const IDX_RESULT_OWNER : usize = 14; +pub(crate) const IDX_RESULT_SYMBOL : usize = 15; +pub(crate) const IDX_RESULT_TOKEN_URI : usize = 16; + +pub(crate) const IDX_STATE_APPROVED_ACCOUNTS : usize = 17; +pub(crate) const IDX_STATE_APPROVED_OPERATORS : usize = 18; +pub(crate) const IDX_STATE_BALANCES : usize = 19; +pub(crate) const IDX_STATE_NAME : usize = 20; +pub(crate) const IDX_STATE_OWNERS : usize = 21; +pub(crate) const IDX_STATE_SYMBOL : usize = 22; + +pub const KEY_MAP_LEN: usize = 23; + +pub const KEY_MAP: [&str; KEY_MAP_LEN] = [ + PARAM_APPROVAL, + PARAM_APPROVED, + PARAM_DATA, + PARAM_FROM, + PARAM_NAME, + PARAM_OPERATOR, + PARAM_OWNER, + PARAM_SYMBOL, + PARAM_TO, + PARAM_TOKEN_ID, + RESULT_AMOUNT, + RESULT_APPROVAL, + RESULT_APPROVED, + RESULT_NAME, + RESULT_OWNER, + RESULT_SYMBOL, + RESULT_TOKEN_URI, + STATE_APPROVED_ACCOUNTS, + STATE_APPROVED_OPERATORS, + STATE_BALANCES, + STATE_NAME, + STATE_OWNERS, + STATE_SYMBOL, +]; + +pub static mut IDX_MAP: [Key32; KEY_MAP_LEN] = [Key32(0); KEY_MAP_LEN]; + +pub fn idx_map(idx: usize) -> Key32 { + unsafe { + IDX_MAP[idx] + } +} diff --git a/contracts/wasm/erc721/src/lib.rs b/contracts/wasm/erc721/src/lib.rs new file mode 100644 index 0000000000..265dc28357 --- /dev/null +++ b/contracts/wasm/erc721/src/lib.rs @@ -0,0 +1,375 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] +#![allow(unused_imports)] + +use erc721::*; +use wasmlib::*; +use wasmlib::host::*; + +use crate::consts::*; +use crate::events::*; +use crate::keys::*; +use crate::params::*; +use crate::results::*; +use crate::state::*; + +mod consts; +mod contract; +mod events; +mod keys; +mod params; +mod results; +mod state; +mod typedefs; +mod erc721; + +#[no_mangle] +fn on_load() { + let exports = ScExports::new(); + exports.add_func(FUNC_APPROVE, func_approve_thunk); + exports.add_func(FUNC_BURN, func_burn_thunk); + exports.add_func(FUNC_INIT, func_init_thunk); + exports.add_func(FUNC_MINT, func_mint_thunk); + exports.add_func(FUNC_SAFE_TRANSFER_FROM, func_safe_transfer_from_thunk); + exports.add_func(FUNC_SET_APPROVAL_FOR_ALL, func_set_approval_for_all_thunk); + exports.add_func(FUNC_TRANSFER_FROM, func_transfer_from_thunk); + exports.add_view(VIEW_BALANCE_OF, view_balance_of_thunk); + exports.add_view(VIEW_GET_APPROVED, view_get_approved_thunk); + exports.add_view(VIEW_IS_APPROVED_FOR_ALL, view_is_approved_for_all_thunk); + exports.add_view(VIEW_NAME, view_name_thunk); + exports.add_view(VIEW_OWNER_OF, view_owner_of_thunk); + exports.add_view(VIEW_SYMBOL, view_symbol_thunk); + exports.add_view(VIEW_TOKEN_URI, view_token_uri_thunk); + + unsafe { + for i in 0..KEY_MAP_LEN { + IDX_MAP[i] = get_key_id_from_string(KEY_MAP[i]); + } + } +} + +pub struct ApproveContext { + events: Erc721Events, + params: ImmutableApproveParams, + state: MutableErc721State, +} + +fn func_approve_thunk(ctx: &ScFuncContext) { + ctx.log("erc721.funcApprove"); + let f = ApproveContext { + events: Erc721Events {}, + params: ImmutableApproveParams { + id: OBJ_ID_PARAMS, + }, + state: MutableErc721State { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.approved().exists(), "missing mandatory approved"); + ctx.require(f.params.token_id().exists(), "missing mandatory tokenID"); + func_approve(ctx, &f); + ctx.log("erc721.funcApprove ok"); +} + +pub struct BurnContext { + events: Erc721Events, + params: ImmutableBurnParams, + state: MutableErc721State, +} + +fn func_burn_thunk(ctx: &ScFuncContext) { + ctx.log("erc721.funcBurn"); + let f = BurnContext { + events: Erc721Events {}, + params: ImmutableBurnParams { + id: OBJ_ID_PARAMS, + }, + state: MutableErc721State { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.token_id().exists(), "missing mandatory tokenID"); + func_burn(ctx, &f); + ctx.log("erc721.funcBurn ok"); +} + +pub struct InitContext { + events: Erc721Events, + params: ImmutableInitParams, + state: MutableErc721State, +} + +fn func_init_thunk(ctx: &ScFuncContext) { + ctx.log("erc721.funcInit"); + let f = InitContext { + events: Erc721Events {}, + params: ImmutableInitParams { + id: OBJ_ID_PARAMS, + }, + state: MutableErc721State { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.name().exists(), "missing mandatory name"); + ctx.require(f.params.symbol().exists(), "missing mandatory symbol"); + func_init(ctx, &f); + ctx.log("erc721.funcInit ok"); +} + +pub struct MintContext { + events: Erc721Events, + params: ImmutableMintParams, + state: MutableErc721State, +} + +fn func_mint_thunk(ctx: &ScFuncContext) { + ctx.log("erc721.funcMint"); + let f = MintContext { + events: Erc721Events {}, + params: ImmutableMintParams { + id: OBJ_ID_PARAMS, + }, + state: MutableErc721State { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.token_id().exists(), "missing mandatory tokenID"); + func_mint(ctx, &f); + ctx.log("erc721.funcMint ok"); +} + +pub struct SafeTransferFromContext { + events: Erc721Events, + params: ImmutableSafeTransferFromParams, + state: MutableErc721State, +} + +fn func_safe_transfer_from_thunk(ctx: &ScFuncContext) { + ctx.log("erc721.funcSafeTransferFrom"); + let f = SafeTransferFromContext { + events: Erc721Events {}, + params: ImmutableSafeTransferFromParams { + id: OBJ_ID_PARAMS, + }, + state: MutableErc721State { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.from().exists(), "missing mandatory from"); + ctx.require(f.params.to().exists(), "missing mandatory to"); + ctx.require(f.params.token_id().exists(), "missing mandatory tokenID"); + func_safe_transfer_from(ctx, &f); + ctx.log("erc721.funcSafeTransferFrom ok"); +} + +pub struct SetApprovalForAllContext { + events: Erc721Events, + params: ImmutableSetApprovalForAllParams, + state: MutableErc721State, +} + +fn func_set_approval_for_all_thunk(ctx: &ScFuncContext) { + ctx.log("erc721.funcSetApprovalForAll"); + let f = SetApprovalForAllContext { + events: Erc721Events {}, + params: ImmutableSetApprovalForAllParams { + id: OBJ_ID_PARAMS, + }, + state: MutableErc721State { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.approval().exists(), "missing mandatory approval"); + ctx.require(f.params.operator().exists(), "missing mandatory operator"); + func_set_approval_for_all(ctx, &f); + ctx.log("erc721.funcSetApprovalForAll ok"); +} + +pub struct TransferFromContext { + events: Erc721Events, + params: ImmutableTransferFromParams, + state: MutableErc721State, +} + +fn func_transfer_from_thunk(ctx: &ScFuncContext) { + ctx.log("erc721.funcTransferFrom"); + let f = TransferFromContext { + events: Erc721Events {}, + params: ImmutableTransferFromParams { + id: OBJ_ID_PARAMS, + }, + state: MutableErc721State { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.from().exists(), "missing mandatory from"); + ctx.require(f.params.to().exists(), "missing mandatory to"); + ctx.require(f.params.token_id().exists(), "missing mandatory tokenID"); + func_transfer_from(ctx, &f); + ctx.log("erc721.funcTransferFrom ok"); +} + +pub struct BalanceOfContext { + params: ImmutableBalanceOfParams, + results: MutableBalanceOfResults, + state: ImmutableErc721State, +} + +fn view_balance_of_thunk(ctx: &ScViewContext) { + ctx.log("erc721.viewBalanceOf"); + let f = BalanceOfContext { + params: ImmutableBalanceOfParams { + id: OBJ_ID_PARAMS, + }, + results: MutableBalanceOfResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableErc721State { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.owner().exists(), "missing mandatory owner"); + view_balance_of(ctx, &f); + ctx.log("erc721.viewBalanceOf ok"); +} + +pub struct GetApprovedContext { + params: ImmutableGetApprovedParams, + results: MutableGetApprovedResults, + state: ImmutableErc721State, +} + +fn view_get_approved_thunk(ctx: &ScViewContext) { + ctx.log("erc721.viewGetApproved"); + let f = GetApprovedContext { + params: ImmutableGetApprovedParams { + id: OBJ_ID_PARAMS, + }, + results: MutableGetApprovedResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableErc721State { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.token_id().exists(), "missing mandatory tokenID"); + view_get_approved(ctx, &f); + ctx.log("erc721.viewGetApproved ok"); +} + +pub struct IsApprovedForAllContext { + params: ImmutableIsApprovedForAllParams, + results: MutableIsApprovedForAllResults, + state: ImmutableErc721State, +} + +fn view_is_approved_for_all_thunk(ctx: &ScViewContext) { + ctx.log("erc721.viewIsApprovedForAll"); + let f = IsApprovedForAllContext { + params: ImmutableIsApprovedForAllParams { + id: OBJ_ID_PARAMS, + }, + results: MutableIsApprovedForAllResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableErc721State { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.operator().exists(), "missing mandatory operator"); + ctx.require(f.params.owner().exists(), "missing mandatory owner"); + view_is_approved_for_all(ctx, &f); + ctx.log("erc721.viewIsApprovedForAll ok"); +} + +pub struct NameContext { + results: MutableNameResults, + state: ImmutableErc721State, +} + +fn view_name_thunk(ctx: &ScViewContext) { + ctx.log("erc721.viewName"); + let f = NameContext { + results: MutableNameResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableErc721State { + id: OBJ_ID_STATE, + }, + }; + view_name(ctx, &f); + ctx.log("erc721.viewName ok"); +} + +pub struct OwnerOfContext { + params: ImmutableOwnerOfParams, + results: MutableOwnerOfResults, + state: ImmutableErc721State, +} + +fn view_owner_of_thunk(ctx: &ScViewContext) { + ctx.log("erc721.viewOwnerOf"); + let f = OwnerOfContext { + params: ImmutableOwnerOfParams { + id: OBJ_ID_PARAMS, + }, + results: MutableOwnerOfResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableErc721State { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.token_id().exists(), "missing mandatory tokenID"); + view_owner_of(ctx, &f); + ctx.log("erc721.viewOwnerOf ok"); +} + +pub struct SymbolContext { + results: MutableSymbolResults, + state: ImmutableErc721State, +} + +fn view_symbol_thunk(ctx: &ScViewContext) { + ctx.log("erc721.viewSymbol"); + let f = SymbolContext { + results: MutableSymbolResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableErc721State { + id: OBJ_ID_STATE, + }, + }; + view_symbol(ctx, &f); + ctx.log("erc721.viewSymbol ok"); +} + +pub struct TokenURIContext { + params: ImmutableTokenURIParams, + results: MutableTokenURIResults, + state: ImmutableErc721State, +} + +fn view_token_uri_thunk(ctx: &ScViewContext) { + ctx.log("erc721.viewTokenURI"); + let f = TokenURIContext { + params: ImmutableTokenURIParams { + id: OBJ_ID_PARAMS, + }, + results: MutableTokenURIResults { + id: OBJ_ID_RESULTS, + }, + state: ImmutableErc721State { + id: OBJ_ID_STATE, + }, + }; + ctx.require(f.params.token_id().exists(), "missing mandatory tokenID"); + view_token_uri(ctx, &f); + ctx.log("erc721.viewTokenURI ok"); +} diff --git a/contracts/wasm/erc721/src/params.rs b/contracts/wasm/erc721/src/params.rs new file mode 100644 index 0000000000..3f9b03d32a --- /dev/null +++ b/contracts/wasm/erc721/src/params.rs @@ -0,0 +1,352 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] +#![allow(unused_imports)] + +use wasmlib::*; +use wasmlib::host::*; + +use crate::*; +use crate::keys::*; +use crate::typedefs::*; + +#[derive(Clone, Copy)] +pub struct ImmutableApproveParams { + pub(crate) id: i32, +} + +impl ImmutableApproveParams { + pub fn approved(&self) -> ScImmutableAgentID { + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_APPROVED)) + } + + pub fn token_id(&self) -> ScImmutableHash { + ScImmutableHash::new(self.id, idx_map(IDX_PARAM_TOKEN_ID)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableApproveParams { + pub(crate) id: i32, +} + +impl MutableApproveParams { + pub fn approved(&self) -> ScMutableAgentID { + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_APPROVED)) + } + + pub fn token_id(&self) -> ScMutableHash { + ScMutableHash::new(self.id, idx_map(IDX_PARAM_TOKEN_ID)) + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableBurnParams { + pub(crate) id: i32, +} + +impl ImmutableBurnParams { + pub fn token_id(&self) -> ScImmutableHash { + ScImmutableHash::new(self.id, idx_map(IDX_PARAM_TOKEN_ID)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableBurnParams { + pub(crate) id: i32, +} + +impl MutableBurnParams { + pub fn token_id(&self) -> ScMutableHash { + ScMutableHash::new(self.id, idx_map(IDX_PARAM_TOKEN_ID)) + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableInitParams { + pub(crate) id: i32, +} + +impl ImmutableInitParams { + pub fn name(&self) -> ScImmutableString { + ScImmutableString::new(self.id, idx_map(IDX_PARAM_NAME)) + } + + pub fn symbol(&self) -> ScImmutableString { + ScImmutableString::new(self.id, idx_map(IDX_PARAM_SYMBOL)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableInitParams { + pub(crate) id: i32, +} + +impl MutableInitParams { + pub fn name(&self) -> ScMutableString { + ScMutableString::new(self.id, idx_map(IDX_PARAM_NAME)) + } + + pub fn symbol(&self) -> ScMutableString { + ScMutableString::new(self.id, idx_map(IDX_PARAM_SYMBOL)) + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableMintParams { + pub(crate) id: i32, +} + +impl ImmutableMintParams { + pub fn token_id(&self) -> ScImmutableHash { + ScImmutableHash::new(self.id, idx_map(IDX_PARAM_TOKEN_ID)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableMintParams { + pub(crate) id: i32, +} + +impl MutableMintParams { + pub fn token_id(&self) -> ScMutableHash { + ScMutableHash::new(self.id, idx_map(IDX_PARAM_TOKEN_ID)) + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableSafeTransferFromParams { + pub(crate) id: i32, +} + +impl ImmutableSafeTransferFromParams { + pub fn data(&self) -> ScImmutableBytes { + ScImmutableBytes::new(self.id, idx_map(IDX_PARAM_DATA)) + } + + pub fn from(&self) -> ScImmutableAgentID { + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_FROM)) + } + + pub fn to(&self) -> ScImmutableAgentID { + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_TO)) + } + + pub fn token_id(&self) -> ScImmutableHash { + ScImmutableHash::new(self.id, idx_map(IDX_PARAM_TOKEN_ID)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableSafeTransferFromParams { + pub(crate) id: i32, +} + +impl MutableSafeTransferFromParams { + pub fn data(&self) -> ScMutableBytes { + ScMutableBytes::new(self.id, idx_map(IDX_PARAM_DATA)) + } + + pub fn from(&self) -> ScMutableAgentID { + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_FROM)) + } + + pub fn to(&self) -> ScMutableAgentID { + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_TO)) + } + + pub fn token_id(&self) -> ScMutableHash { + ScMutableHash::new(self.id, idx_map(IDX_PARAM_TOKEN_ID)) + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableSetApprovalForAllParams { + pub(crate) id: i32, +} + +impl ImmutableSetApprovalForAllParams { + pub fn approval(&self) -> ScImmutableBool { + ScImmutableBool::new(self.id, idx_map(IDX_PARAM_APPROVAL)) + } + + pub fn operator(&self) -> ScImmutableAgentID { + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_OPERATOR)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableSetApprovalForAllParams { + pub(crate) id: i32, +} + +impl MutableSetApprovalForAllParams { + pub fn approval(&self) -> ScMutableBool { + ScMutableBool::new(self.id, idx_map(IDX_PARAM_APPROVAL)) + } + + pub fn operator(&self) -> ScMutableAgentID { + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_OPERATOR)) + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableTransferFromParams { + pub(crate) id: i32, +} + +impl ImmutableTransferFromParams { + pub fn from(&self) -> ScImmutableAgentID { + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_FROM)) + } + + pub fn to(&self) -> ScImmutableAgentID { + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_TO)) + } + + pub fn token_id(&self) -> ScImmutableHash { + ScImmutableHash::new(self.id, idx_map(IDX_PARAM_TOKEN_ID)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableTransferFromParams { + pub(crate) id: i32, +} + +impl MutableTransferFromParams { + pub fn from(&self) -> ScMutableAgentID { + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_FROM)) + } + + pub fn to(&self) -> ScMutableAgentID { + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_TO)) + } + + pub fn token_id(&self) -> ScMutableHash { + ScMutableHash::new(self.id, idx_map(IDX_PARAM_TOKEN_ID)) + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableBalanceOfParams { + pub(crate) id: i32, +} + +impl ImmutableBalanceOfParams { + pub fn owner(&self) -> ScImmutableAgentID { + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableBalanceOfParams { + pub(crate) id: i32, +} + +impl MutableBalanceOfParams { + pub fn owner(&self) -> ScMutableAgentID { + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableGetApprovedParams { + pub(crate) id: i32, +} + +impl ImmutableGetApprovedParams { + pub fn token_id(&self) -> ScImmutableHash { + ScImmutableHash::new(self.id, idx_map(IDX_PARAM_TOKEN_ID)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableGetApprovedParams { + pub(crate) id: i32, +} + +impl MutableGetApprovedParams { + pub fn token_id(&self) -> ScMutableHash { + ScMutableHash::new(self.id, idx_map(IDX_PARAM_TOKEN_ID)) + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableIsApprovedForAllParams { + pub(crate) id: i32, +} + +impl ImmutableIsApprovedForAllParams { + pub fn operator(&self) -> ScImmutableAgentID { + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_OPERATOR)) + } + + pub fn owner(&self) -> ScImmutableAgentID { + ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableIsApprovedForAllParams { + pub(crate) id: i32, +} + +impl MutableIsApprovedForAllParams { + pub fn operator(&self) -> ScMutableAgentID { + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_OPERATOR)) + } + + pub fn owner(&self) -> ScMutableAgentID { + ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableOwnerOfParams { + pub(crate) id: i32, +} + +impl ImmutableOwnerOfParams { + pub fn token_id(&self) -> ScImmutableHash { + ScImmutableHash::new(self.id, idx_map(IDX_PARAM_TOKEN_ID)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableOwnerOfParams { + pub(crate) id: i32, +} + +impl MutableOwnerOfParams { + pub fn token_id(&self) -> ScMutableHash { + ScMutableHash::new(self.id, idx_map(IDX_PARAM_TOKEN_ID)) + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableTokenURIParams { + pub(crate) id: i32, +} + +impl ImmutableTokenURIParams { + pub fn token_id(&self) -> ScImmutableHash { + ScImmutableHash::new(self.id, idx_map(IDX_PARAM_TOKEN_ID)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableTokenURIParams { + pub(crate) id: i32, +} + +impl MutableTokenURIParams { + pub fn token_id(&self) -> ScMutableHash { + ScMutableHash::new(self.id, idx_map(IDX_PARAM_TOKEN_ID)) + } +} diff --git a/contracts/wasm/erc721/src/results.rs b/contracts/wasm/erc721/src/results.rs new file mode 100644 index 0000000000..7a62221715 --- /dev/null +++ b/contracts/wasm/erc721/src/results.rs @@ -0,0 +1,170 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] +#![allow(unused_imports)] + +use wasmlib::*; +use wasmlib::host::*; + +use crate::*; +use crate::keys::*; +use crate::typedefs::*; + +#[derive(Clone, Copy)] +pub struct ImmutableBalanceOfResults { + pub(crate) id: i32, +} + +impl ImmutableBalanceOfResults { + pub fn amount(&self) -> ScImmutableUint64 { + ScImmutableUint64::new(self.id, idx_map(IDX_RESULT_AMOUNT)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableBalanceOfResults { + pub(crate) id: i32, +} + +impl MutableBalanceOfResults { + pub fn amount(&self) -> ScMutableUint64 { + ScMutableUint64::new(self.id, idx_map(IDX_RESULT_AMOUNT)) + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableGetApprovedResults { + pub(crate) id: i32, +} + +impl ImmutableGetApprovedResults { + pub fn approved(&self) -> ScImmutableAgentID { + ScImmutableAgentID::new(self.id, idx_map(IDX_RESULT_APPROVED)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableGetApprovedResults { + pub(crate) id: i32, +} + +impl MutableGetApprovedResults { + pub fn approved(&self) -> ScMutableAgentID { + ScMutableAgentID::new(self.id, idx_map(IDX_RESULT_APPROVED)) + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableIsApprovedForAllResults { + pub(crate) id: i32, +} + +impl ImmutableIsApprovedForAllResults { + pub fn approval(&self) -> ScImmutableBool { + ScImmutableBool::new(self.id, idx_map(IDX_RESULT_APPROVAL)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableIsApprovedForAllResults { + pub(crate) id: i32, +} + +impl MutableIsApprovedForAllResults { + pub fn approval(&self) -> ScMutableBool { + ScMutableBool::new(self.id, idx_map(IDX_RESULT_APPROVAL)) + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableNameResults { + pub(crate) id: i32, +} + +impl ImmutableNameResults { + pub fn name(&self) -> ScImmutableString { + ScImmutableString::new(self.id, idx_map(IDX_RESULT_NAME)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableNameResults { + pub(crate) id: i32, +} + +impl MutableNameResults { + pub fn name(&self) -> ScMutableString { + ScMutableString::new(self.id, idx_map(IDX_RESULT_NAME)) + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableOwnerOfResults { + pub(crate) id: i32, +} + +impl ImmutableOwnerOfResults { + pub fn owner(&self) -> ScImmutableAgentID { + ScImmutableAgentID::new(self.id, idx_map(IDX_RESULT_OWNER)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableOwnerOfResults { + pub(crate) id: i32, +} + +impl MutableOwnerOfResults { + pub fn owner(&self) -> ScMutableAgentID { + ScMutableAgentID::new(self.id, idx_map(IDX_RESULT_OWNER)) + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableSymbolResults { + pub(crate) id: i32, +} + +impl ImmutableSymbolResults { + pub fn symbol(&self) -> ScImmutableString { + ScImmutableString::new(self.id, idx_map(IDX_RESULT_SYMBOL)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableSymbolResults { + pub(crate) id: i32, +} + +impl MutableSymbolResults { + pub fn symbol(&self) -> ScMutableString { + ScMutableString::new(self.id, idx_map(IDX_RESULT_SYMBOL)) + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableTokenURIResults { + pub(crate) id: i32, +} + +impl ImmutableTokenURIResults { + pub fn token_uri(&self) -> ScImmutableString { + ScImmutableString::new(self.id, idx_map(IDX_RESULT_TOKEN_URI)) + } +} + +#[derive(Clone, Copy)] +pub struct MutableTokenURIResults { + pub(crate) id: i32, +} + +impl MutableTokenURIResults { + pub fn token_uri(&self) -> ScMutableString { + ScMutableString::new(self.id, idx_map(IDX_RESULT_TOKEN_URI)) + } +} diff --git a/contracts/wasm/erc721/src/state.rs b/contracts/wasm/erc721/src/state.rs new file mode 100644 index 0000000000..134d226129 --- /dev/null +++ b/contracts/wasm/erc721/src/state.rs @@ -0,0 +1,160 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] +#![allow(unused_imports)] + +use wasmlib::*; +use wasmlib::host::*; + +use crate::*; +use crate::keys::*; +use crate::typedefs::*; + +pub struct MapHashToImmutableAgentID { + pub(crate) obj_id: i32, +} + +impl MapHashToImmutableAgentID { + pub fn get_agent_id(&self, key: &ScHash) -> ScImmutableAgentID { + ScImmutableAgentID::new(self.obj_id, key.get_key_id()) + } +} + +pub struct MapAgentIDToImmutableOperators { + pub(crate) obj_id: i32, +} + +impl MapAgentIDToImmutableOperators { + pub fn get_operators(&self, key: &ScAgentID) -> ImmutableOperators { + let sub_id = get_object_id(self.obj_id, key.get_key_id(), TYPE_MAP); + ImmutableOperators { obj_id: sub_id } + } +} + +pub struct MapAgentIDToImmutableUint64 { + pub(crate) obj_id: i32, +} + +impl MapAgentIDToImmutableUint64 { + pub fn get_uint64(&self, key: &ScAgentID) -> ScImmutableUint64 { + ScImmutableUint64::new(self.obj_id, key.get_key_id()) + } +} + +#[derive(Clone, Copy)] +pub struct ImmutableErc721State { + pub(crate) id: i32, +} + +impl ImmutableErc721State { + pub fn approved_accounts(&self) -> MapHashToImmutableAgentID { + let map_id = get_object_id(self.id, idx_map(IDX_STATE_APPROVED_ACCOUNTS), TYPE_MAP); + MapHashToImmutableAgentID { obj_id: map_id } + } + + pub fn approved_operators(&self) -> MapAgentIDToImmutableOperators { + let map_id = get_object_id(self.id, idx_map(IDX_STATE_APPROVED_OPERATORS), TYPE_MAP); + MapAgentIDToImmutableOperators { obj_id: map_id } + } + + pub fn balances(&self) -> MapAgentIDToImmutableUint64 { + let map_id = get_object_id(self.id, idx_map(IDX_STATE_BALANCES), TYPE_MAP); + MapAgentIDToImmutableUint64 { obj_id: map_id } + } + + pub fn name(&self) -> ScImmutableString { + ScImmutableString::new(self.id, idx_map(IDX_STATE_NAME)) + } + + pub fn owners(&self) -> MapHashToImmutableAgentID { + let map_id = get_object_id(self.id, idx_map(IDX_STATE_OWNERS), TYPE_MAP); + MapHashToImmutableAgentID { obj_id: map_id } + } + + pub fn symbol(&self) -> ScImmutableString { + ScImmutableString::new(self.id, idx_map(IDX_STATE_SYMBOL)) + } +} + +pub struct MapHashToMutableAgentID { + pub(crate) obj_id: i32, +} + +impl MapHashToMutableAgentID { + pub fn clear(&self) { + clear(self.obj_id); + } + + pub fn get_agent_id(&self, key: &ScHash) -> ScMutableAgentID { + ScMutableAgentID::new(self.obj_id, key.get_key_id()) + } +} + +pub struct MapAgentIDToMutableOperators { + pub(crate) obj_id: i32, +} + +impl MapAgentIDToMutableOperators { + pub fn clear(&self) { + clear(self.obj_id); + } + + pub fn get_operators(&self, key: &ScAgentID) -> MutableOperators { + let sub_id = get_object_id(self.obj_id, key.get_key_id(), TYPE_MAP); + MutableOperators { obj_id: sub_id } + } +} + +pub struct MapAgentIDToMutableUint64 { + pub(crate) obj_id: i32, +} + +impl MapAgentIDToMutableUint64 { + pub fn clear(&self) { + clear(self.obj_id); + } + + pub fn get_uint64(&self, key: &ScAgentID) -> ScMutableUint64 { + ScMutableUint64::new(self.obj_id, key.get_key_id()) + } +} + +#[derive(Clone, Copy)] +pub struct MutableErc721State { + pub(crate) id: i32, +} + +impl MutableErc721State { + pub fn approved_accounts(&self) -> MapHashToMutableAgentID { + let map_id = get_object_id(self.id, idx_map(IDX_STATE_APPROVED_ACCOUNTS), TYPE_MAP); + MapHashToMutableAgentID { obj_id: map_id } + } + + pub fn approved_operators(&self) -> MapAgentIDToMutableOperators { + let map_id = get_object_id(self.id, idx_map(IDX_STATE_APPROVED_OPERATORS), TYPE_MAP); + MapAgentIDToMutableOperators { obj_id: map_id } + } + + pub fn balances(&self) -> MapAgentIDToMutableUint64 { + let map_id = get_object_id(self.id, idx_map(IDX_STATE_BALANCES), TYPE_MAP); + MapAgentIDToMutableUint64 { obj_id: map_id } + } + + pub fn name(&self) -> ScMutableString { + ScMutableString::new(self.id, idx_map(IDX_STATE_NAME)) + } + + pub fn owners(&self) -> MapHashToMutableAgentID { + let map_id = get_object_id(self.id, idx_map(IDX_STATE_OWNERS), TYPE_MAP); + MapHashToMutableAgentID { obj_id: map_id } + } + + pub fn symbol(&self) -> ScMutableString { + ScMutableString::new(self.id, idx_map(IDX_STATE_SYMBOL)) + } +} diff --git a/contracts/wasm/erc721/src/typedefs.rs b/contracts/wasm/erc721/src/typedefs.rs new file mode 100644 index 0000000000..33eacd20c5 --- /dev/null +++ b/contracts/wasm/erc721/src/typedefs.rs @@ -0,0 +1,39 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +#![allow(dead_code)] + +use wasmlib::*; +use wasmlib::host::*; + +pub struct MapAgentIDToImmutableBool { + pub(crate) obj_id: i32, +} + +impl MapAgentIDToImmutableBool { + pub fn get_bool(&self, key: &ScAgentID) -> ScImmutableBool { + ScImmutableBool::new(self.obj_id, key.get_key_id()) + } +} + +pub type ImmutableOperators = MapAgentIDToImmutableBool; + +pub struct MapAgentIDToMutableBool { + pub(crate) obj_id: i32, +} + +impl MapAgentIDToMutableBool { + pub fn clear(&self) { + clear(self.obj_id); + } + + pub fn get_bool(&self, key: &ScAgentID) -> ScMutableBool { + ScMutableBool::new(self.obj_id, key.get_key_id()) + } +} + +pub type MutableOperators = MapAgentIDToMutableBool; diff --git a/contracts/wasm/erc721/test/erc721_bg.wasm b/contracts/wasm/erc721/test/erc721_bg.wasm new file mode 100644 index 0000000000000000000000000000000000000000..64d2d2e6e5928935d0f0b3bc19f924868d924703 GIT binary patch literal 39563 zcmdVD3w&K=neV@D`;zRWU4=r^3uWzXkraAKZ%JBEvZ^fdQy^hP~Et z#pmV4<-B-m)_VP>{=Us4>t5;wc}+gfS$&sN?1c~b-}0lfA2dZ%f*|y~$P1f`#i=c! z=lgsLVOU_bJozf}->Zbhg3rIA>Qz`Om8`(`%U&2og+fSUI(c58c8oyFpjZr={9=KB z#W1Y+RME;~h|musHSxVdiSAM4N0ItBg@qstNP2>S8jtd*nNdA$fLa0*#UufNQ40P} z|3xnDD-G_raNA(-7Vl`KHurAZ=AGR12H#8l z%BkzNoY~iPR`=`QaN1=TUcT`j|4m=?zu-UMzt_Kq?~Vuj`49MSe!#!kKkiizQt)Aa z%B#QazulkHK76Zxwf{}9_*wtc{>!G`?SGW&Z~HCtUiUfw1+V!lzxnIGqw*WoAl~a= z@d7W62WpjhUeFWtBwqTj{`#mV_2O^%H9zswa(t6NkWSB@arS)X&>Q>HOLwJj?ym(Y z16Xkyj115xNc?rP6YpiM0i#9zR#lDC`#*osYY)6Nt$yky(LgoSe8FC2((;}f72d4$ zcru3$9V(qghGa4EF0Oe4>G8Yvr2a03^G62K7x!0c1?Ea0`ocl4pCM~r)RRO>A->V4 zwuhpw0MdmG5y_TSo_^m-j)24n>5D@W4{Cvf`w6-wu;@ka8 z#)D09B?RY*Pc4x8Nwl6ca2Atr-L4uF`pg?@W)1Kjzh?9LYc$(KUo?c)K;U|?NCSGV zpWVu?sVu(FuNLSuJLpNmY=_ucwTkZq$|Q{c+^1$VP^q$QT1c3Nduo0fj-(H;Vg1!2 zTXfKE9b3)VBQ<}Q*4-YITl|XE0dp|a8F)#tVgMI9gED12S{S(K9zKP1VE!wKZG_P4Ya@KBvyEWeMP0%)mGSI4p4YV& zL~p_~%LUIlR5i9Pf~&^kxRgHX_Oe>2udgUvi;_S$+ntnz@30bp`E>8FaYKKN%^Cp( z4{4{w2*tFVk+J8tujZW&QlMz<0X*RLAltO`iX^;r7yAY!Yu`uMl%&X>z!N2A0)jw< zEYcs@CDcIy<0lNW30Y_3gk;@>*{0is`O=s+$fku7gd;uf^C5Z-Z*1C#GI6)(_PS1$ z4H#>nPjR0J0-T6M4P`lrvOz|or3!mh5^a`2NJgS1N1^~-uGn6PXu&JHBAjUt4J*Yu zy%+Pr{Cu!Fy=Q}I>Dge6n++C{5)+8BGA0Nd6ZjxJ|6ivTcy%4Z_~9{5KdUvA%t|Uy zy0MQpz>+1T`!gYp%*yiRe$-7wRXmbZL>}cetwp8E)t2;et&Mb4Yqm7?{WW0r(kG~~ zFB7c^C{6scW~=5g2Zu!XFG*Itke!J?<0s{{5^xM`@~I_q>!yEI!W4PtXFzE+qV=?n z5;bzju`9Y>f8WSb#^ZMDy1}jX; zbgQJJUjl|h$7@kfYp@ojo>Zz?DXq?0rVqnfM%gNUOc^noGJ4i)o>1n|tVYjzvnQ2# zJgd>O-t1{*ewo$iS#S2NGEZeSde)omzlY2-S&g3cX4k4_lrO=iXT8~t%3Ph*=vi-e zLu1X&%BVyG+|-!4MH!W-=0IcS4rNrLn%f#P_b8(h)!f~fxmOvLsOHO!nfsMdiE0iu zX1=S8N>uYeW9DIHRHB;4lzAx2=vl9MLYYUi8a?aHo>b=XtVYjzv!|8$WmcnSz1g$M zJeAexS#P!{``~@+Cm^tT($+nX9uJJ?qVGR_2DRM$dY)Ta>vetI@OG z><(oPWHox$o86<#ZCQ<;^=9`fb9YvwXT90|%6vJi(X-y{yUHBQYV@o(d!Vt#sd%Tz zi0;J;8Xxwo5Y>67l41DAA}bMWV}T|&)8l8O>Ryl-dfwwPx**{wULos z%q(6kV>3t7mb%I0j3-~~flg!-;L9|aObr$c_U4|4P7e>DQ6q8Wk}3<7fTHL_5h zaZN$ohJRuztsvEHmTTRb2`1VwnE?|t+Sn}FY>q$%4ECTiV9eMkIbgAGRhZ3#5*A^q zp=WfFQ!IvuBLdoIM38j}Gke9l$oR<(k;X34w^@6rC8PanQzKbuyOXAui7aFtG@XUJ zl2ZuE*Q;W2Hd$S*lrd{99!R%hfQ)0H#Md6@?q$-{zixJ|Ral&ov?j4(+ZjOxM=@c} z`Nf>`1JSR>bTkFkFvWd-b*kf(f|xQKsLPm|#EL`PR8i_woVf-8gS9IGb2vFhO9>bg zFN`=@z!=1LI_{YdH%v>WU^}Nzfn~B?Og1H%#^d+cBWj;a0XDb~?^=*YE!gvbNTA&1#;B0xhI;oGR&VB_wh`W6OQGnEg1R&PY zpjr-lD92AFAOMUoLsITv;CboS_MQ#m%GILW;c~hcAK2;{PU55t9pd$qI~_b%oP#@^ z2dj;t7cVU&CFJEC(ht1vAg1((4#I_$v;~;2U*)Y6#5VjW4nzo%A! zHLt$~DHLdFhz>2w{M@xksTvT5sc7MHU_%4DogVjl{i&2M$;U`8cFBk9$<<+3u$;wCv}D(FQiY@hnqMFgK26(5m|C|@_gqgN?p z^yUP5Wm;20-a^QcQJWKBf($E3GZv4AU?*+hr+hprnm45_HZb0WW*z-tKGs{fJlx=N|)5P)@^cP8wv^@ z7TcYS(%r>I6w;1RfswNX)EMyG$)+aVrchc*86P>s5F0D`sTN96%NYS;WF=Q9oDKd2q5?cMGC? z2?~7CbwD~g7)TqU&K|Na$^y=`ST~!dhabLSR1f52X1i=kZ4)MWKQU}6rQDPmXW^PD zO<4R%w`FwU7L%EC@{iyp&Bwr zq1BIP%(Au^35=b`h5ZJb6%~>Y7Yr42gD2`#EAls+)vq8%07OOt#=Gd7O>+;_O1VShU^@iYf)U!Yy#ON+4x(X4{k3w!pbn@4nGeDWGJ|n?2SipawW0|i+WaB? znHivw&^CfWVvArDyax8VT5y&E;s|Y>)QaqLxOTR*f*zH0;{C_$T+X@S@3&tmn41Qk|Y zqpDXQ8y-o;`-o5Rsv8$Omh(oHYFZmHog=r{4O+QLiqkC=q0yuRBcxV5trqAs4~2oz z;iNAcYvTQRj|}OPIcO%q0faa=rze=ZoC9HIUKh>#BbN&~R)&i)#16H_Hk ztjW1@@P0bduPnkcvH*P^rKek&*oS$l<6<=$myunleq0d0C=io^)hMK%1I;n2i;(HO z3Y*bTYKgakIy~C!(W;1krpkmWMtj-edw>a~t80h+C<7J z)JVDoyh{^NdU%7YR5!TbEQc@K`RBtIqRS`n@K!ym5mR&0OK>ZyMT#TB)RJ+~RC-zZ zCZpNem{xRw*yBr~^P)7aYn7MIQZc2}L=ZX0U-;XT*OC6kH6#7$FDmPXNPpxu(jRG4@!$P|YyO>gk)-F4OtbWeJ4q!WWWQ!u7Q}&#BCQv!c-wvQc(4w8pII9GG>5~cQlBFN!-9z6cScK&{v6s`J!C- zf%z3a5`W^+YZU{g+My5^jK&Hxmt$OQ&fi#~Wm(#c5)onWQXFa|3f4zeH0H1Jl7?|5 zK#`T`j2gat>L1oj3H$)bTyIEp%T1OyN4!q9YLN4LG&Cz#%B+4*Do=)+!viStg$cX$ z0KA7WY1meCl-*!KHkj;c;DM#a1~aD5hhrVjH=N;y!GO=&N!gO98%YV6Q1DA-%%V0X z1~91mYbB72ftQ52dE}$FKy6ZSsFk*MHk5XN^=p>;R(Xe=k$_^ujEGLn=!t}E#xbi5 z(#oe5KL|H!3qY)3oKbdH!EaLNvjeF!4~0S$OForS;VQ2^30HHrg&yb%Gp8$|26Lj# zJz{sECcv9&tN016jw0<0rc3%N{u;R(TMYvmM~w{_=!yvg0(>^0EH({D{LQa6Yd}Vt!=qWa z!YrVYPS!=pg`L$IgB;c5Tr=J8iqb@y$V=ZOCFDjVR~BNRq{J*kM^*D2;w;pP^qq)y z=gl^tJ;SWbhRN9Hh|FQXPz^x4pmjhB<75OUOA?t8+?5p!NaNw;gl{68kW72f2&Y9S zv4k;x&w^BJMc9;v7%f&SMpM^2;iH>diC+OY9YpIZPe*lvjpljm_+I&R07Uq+DeQp~ z8AI+Th%p4F2i|{>0}UIxjSv6-W*_GELbzMN*3U0pGgJp}eq;;mhlW=wU0e z>0=H$Oye7{t5}#My6ojr$|*O87t+19H7UFdEh?C!-3D(wK)Asft`Tv&qYDxu5^N%* zsl5EJ5pZEdA379u-on1d1xA(If%wQb7p);z1BKjJ-WtxbxQ(66fI1CZWhkP8IG{+$ zl#wE%F{GtcFwZ^N9FK5&*UUQk4JKz2?+BsZY+xXq6zY{s93Sd6QR`_s7wT2#|H@Er zkcWERjO@jQxs-3B2kuu6jhTvO#!T-Ro+pSYuS@Nu3T)n;+}f-v^3n55&dNc2YDxS>C; z3DyKfg*bVRYyRAghe%NMZRv^NJBx=|zzkR7X)whMCQ#~IE*hwL>81TsjxYFO=!J** z$D0LV7@#c8l7Ee+pk#@$2S zel6i}<%F!$u!3Kw(ba}nBg!ivaQK*4rH6seMD9Nrw|Hg23y>>WS#fo8^{o~&rmheM zzE|XK<-gKBDX!+4{-NtPUS)7}>?f?0{&sRjvLA9yJJLtMe^R`)rX!nl4!8NIaw|S< z)_Vf7kBY1JzR3ohdKGC|tvj#UPtYWqHDRK7zcBW@aT9?Vv_9nJ$Ryt|v-Y)HNP_Xu z9`yDbc4R%OH3Yz;9%MzKR1SoG!NMv;DyM?qTRuR5vIaFkx%OZg58sZLEyAsg(4vAc zfjiWM`!#w@Xp+|k&s!_Gd-%Rk+qgMt7pzVAT1SjjuVKu^TuDD$z_ugp^Z`8{&7nMI z4}mBUMGx76FrAq<>G3ik#t+WUdb@DEph6ASIPWn!1mdJY78(b0LOXNX7ZO3H7x5Tb z^rZSn91 zlE_GkyDb5?+^BZJZR|`eTIGptdj{~iJ{7wAQM}^iX^YZr>Ebvb%6dUM zHNE=J877WJDX8xjMri3zzdA}G=cVyhm;a{n$n8A;pv#AO{%>49%JV-^K28gH{^!b1 zON)8_e=6USmh${_$`jIxFG+0vx9uZeNt^QgyOodA<~;u~<)gHc=Rc`@DQ(H~cPd{@ zTl4(ql`p4LEbpZ=;*a~HQZ^Y0$^(YY%rLQ-iS4_gI0dPBPiG`OaHTS`xMt|1K!^mN zANC}A4@*`JV}Wloqhd2(6s4+4!da|a+sXhEjWt-qV$iz21~V1X8R?T(Iq~+J!1rZO z-pwUN{A1cD*g)xiu75B={3S8!K_BpC!psj75tn@D_&PuR^gCGOvGMz;v+FJ@K8N(9 zUVr>H?XM-RGTy*>v@c2Brs1Dvt%n;PA|KUgSNq(a!8�xg4XWC*WFgH%0R%n%B*& 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 literal 0 HcmV?d00001 diff --git a/contracts/wasm/erc721/test/erc721_test.go b/contracts/wasm/erc721/test/erc721_test.go new file mode 100644 index 0000000000..2b83d472ed --- /dev/null +++ b/contracts/wasm/erc721/test/erc721_test.go @@ -0,0 +1,208 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +package test + +import ( + "testing" + + "github.com/iotaledger/wasp/contracts/wasm/erc721/go/erc721" + "github.com/iotaledger/wasp/packages/vm/wasmlib/go/wasmlib" + "github.com/iotaledger/wasp/packages/vm/wasmsolo" + "github.com/stretchr/testify/require" +) + +func TestDeploy(t *testing.T) { + ctx := setup(t) + require.NoError(t, ctx.ContractExists(erc721.ScName)) +} + +func TestMint(t *testing.T) { + ctx := setup(t) + owner := ctx.NewSoloAgent() + tokenID := wasmlib.NewScHashFromBytes(owner.ScAgentID().Bytes()[:32]) + mint(ctx, owner, tokenID) + require.NoError(t, ctx.Err) +} + +func TestApprove(t *testing.T) { + ctx := setup(t) + owner := ctx.NewSoloAgent() + tokenID := wasmlib.NewScHashFromBytes(owner.ScAgentID().Bytes()[:32]) + mint(ctx, owner, tokenID) + require.NoError(t, ctx.Err) + + require.Nil(t, getApproved(t, ctx, tokenID)) + + approve(ctx, owner, owner, tokenID) + require.Error(t, ctx.Err) + + approved := getApproved(t, ctx, tokenID) + require.Nil(t, approved) + + friend1 := ctx.NewSoloAgent() + approve(ctx, owner, friend1, tokenID) + require.NoError(t, ctx.Err) + + approved = getApproved(t, ctx, tokenID) + require.NotNil(t, approved) + require.EqualValues(t, *approved, friend1.ScAgentID()) +} + +func TestApproveAll(t *testing.T) { + ctx := setup(t) + owner := ctx.NewSoloAgent() + tokenID := wasmlib.NewScHashFromBytes(owner.ScAgentID().Bytes()[:32]) + mint(ctx, owner, tokenID) + require.NoError(t, ctx.Err) + + friend1 := ctx.NewSoloAgent() + require.False(t, isApprovedForAll(t, ctx, owner, friend1)) + + friend2 := ctx.NewSoloAgent() + require.False(t, isApprovedForAll(t, ctx, owner, friend2)) + + // approve friend1 + setApprovalForAll(ctx, owner, friend1, true) + require.NoError(t, ctx.Err) + + require.True(t, isApprovedForAll(t, ctx, owner, friend1)) + require.False(t, isApprovedForAll(t, ctx, owner, friend2)) + + // approve friend2 + setApprovalForAll(ctx, owner, friend2, true) + require.NoError(t, ctx.Err) + + require.True(t, isApprovedForAll(t, ctx, owner, friend1)) + require.True(t, isApprovedForAll(t, ctx, owner, friend2)) + + // unapprove friend1 + setApprovalForAll(ctx, owner, friend1, false) + require.NoError(t, ctx.Err) + + require.False(t, isApprovedForAll(t, ctx, owner, friend1)) + require.True(t, isApprovedForAll(t, ctx, owner, friend2)) + + // unapprove friend2 + setApprovalForAll(ctx, owner, friend2, false) + require.NoError(t, ctx.Err) + + require.False(t, isApprovedForAll(t, ctx, owner, friend1)) + require.False(t, isApprovedForAll(t, ctx, owner, friend2)) +} + +func TestTransferFrom(t *testing.T) { + ctx := setup(t) + owner := ctx.NewSoloAgent() + tokenID := wasmlib.NewScHashFromBytes(owner.ScAgentID().Bytes()[:32]) + mint(ctx, owner, tokenID) + require.NoError(t, ctx.Err) + + // verify current ownership + currentOwner := ownerOf(t, ctx, tokenID) + require.EqualValues(t, owner.ScAgentID(), currentOwner) + + // no one approved for token + require.Nil(t, getApproved(t, ctx, tokenID)) + + friend1 := ctx.NewSoloAgent() + + // try to transfer without approval, should fail + transferFrom(ctx, friend1, owner, friend1, tokenID) + require.Error(t, ctx.Err) + + // verify current ownership has not changed + currentOwner = ownerOf(t, ctx, tokenID) + require.EqualValues(t, owner.ScAgentID(), currentOwner) + + // have owner himself transfer token, should succeed + transferFrom(ctx, owner, owner, friend1, tokenID) + require.NoError(t, ctx.Err) + + // verify new owner + currentOwner = ownerOf(t, ctx, tokenID) + require.EqualValues(t, friend1.ScAgentID(), currentOwner) + + // have previous try to transfer token back, should fail + transferFrom(ctx, owner, friend1, owner, tokenID) + require.Error(t, ctx.Err) + + // verify new owner is still owner + currentOwner = ownerOf(t, ctx, tokenID) + require.EqualValues(t, friend1.ScAgentID(), currentOwner) + + // have new owner transfer token back, should succeed + transferFrom(ctx, friend1, friend1, owner, tokenID) + require.NoError(t, ctx.Err) + + // verify ownership has returned to first owner + currentOwner = ownerOf(t, ctx, tokenID) + require.EqualValues(t, owner.ScAgentID(), currentOwner) +} + +func setup(t *testing.T) *wasmsolo.SoloContext { + init := erc721.ScFuncs.Init(nil) + init.Params.Name().SetValue("My Valuable NFT") + init.Params.Symbol().SetValue("MVNFT") + ctx := wasmsolo.NewSoloContext(t, erc721.ScName, erc721.OnLoad, init.Func) + require.NoError(t, ctx.Err) + return ctx +} + +func approve(ctx *wasmsolo.SoloContext, owner, approved *wasmsolo.SoloAgent, tokenID wasmlib.ScHash) { + f := erc721.ScFuncs.Approve(ctx.Sign(owner)) + f.Params.Approved().SetValue(approved.ScAgentID()) + f.Params.TokenID().SetValue(tokenID) + f.Func.TransferIotas(1).Post() +} + +func getApproved(t *testing.T, ctx *wasmsolo.SoloContext, tokenID wasmlib.ScHash) *wasmlib.ScAgentID { + v := erc721.ScFuncs.GetApproved(ctx) + v.Params.TokenID().SetValue(tokenID) + v.Func.Call() + require.NoError(t, ctx.Err) + approved := v.Results.Approved() + if !approved.Exists() { + return nil + } + ret := approved.Value() + return &ret +} + +func isApprovedForAll(t *testing.T, ctx *wasmsolo.SoloContext, owner, friend *wasmsolo.SoloAgent) bool { + v := erc721.ScFuncs.IsApprovedForAll(ctx) + v.Params.Owner().SetValue(owner.ScAgentID()) + v.Params.Operator().SetValue(friend.ScAgentID()) + v.Func.Call() + require.NoError(t, ctx.Err) + return v.Results.Approval().Value() +} + +func mint(ctx *wasmsolo.SoloContext, owner *wasmsolo.SoloAgent, tokenID wasmlib.ScHash) { + f := erc721.ScFuncs.Mint(ctx.Sign(owner)) + f.Params.TokenID().SetValue(tokenID) + f.Func.TransferIotas(1).Post() +} + +func ownerOf(t *testing.T, ctx *wasmsolo.SoloContext, tokenID wasmlib.ScHash) wasmlib.ScAgentID { + v := erc721.ScFuncs.OwnerOf(ctx) + v.Params.TokenID().SetValue(tokenID) + v.Func.Call() + require.NoError(t, ctx.Err) + return v.Results.Owner().Value() +} + +func setApprovalForAll(ctx *wasmsolo.SoloContext, owner, operator *wasmsolo.SoloAgent, approval bool) { + f := erc721.ScFuncs.SetApprovalForAll(ctx.Sign(owner)) + f.Params.Operator().SetValue(operator.ScAgentID()) + f.Params.Approval().SetValue(approval) + f.Func.TransferIotas(1).Post() +} + +func transferFrom(ctx *wasmsolo.SoloContext, sender, from, to *wasmsolo.SoloAgent, tokenID wasmlib.ScHash) { + f := erc721.ScFuncs.TransferFrom(ctx.Sign(sender)) + f.Params.From().SetValue(from.ScAgentID()) + f.Params.To().SetValue(to.ScAgentID()) + f.Params.TokenID().SetValue(tokenID) + f.Func.TransferIotas(1).Post() +} diff --git a/contracts/wasm/erc721/ts/erc721/consts.ts b/contracts/wasm/erc721/ts/erc721/consts.ts new file mode 100644 index 0000000000..443f42c825 --- /dev/null +++ b/contracts/wasm/erc721/ts/erc721/consts.ts @@ -0,0 +1,68 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "wasmlib"; + +export const ScName = "erc721"; +export const ScDescription = "ERC-721 NFT PoC for IOTA Smart Contracts"; +export const HScName = new wasmlib.ScHname(0xd967c216); + +export const ParamApproval = "approval"; +export const ParamApproved = "approved"; +export const ParamData = "data"; +export const ParamFrom = "from"; +export const ParamName = "n"; +export const ParamOperator = "operator"; +export const ParamOwner = "owner"; +export const ParamSymbol = "s"; +export const ParamTo = "to"; +export const ParamTokenID = "tokenID"; + +export const ResultAmount = "amount"; +export const ResultApproval = "approval"; +export const ResultApproved = "approved"; +export const ResultName = "name"; +export const ResultOwner = "owner"; +export const ResultSymbol = "symbol"; +export const ResultTokenURI = "tokenURI"; + +export const StateApprovedAccounts = "approvedAccounts"; +export const StateApprovedOperators = "approvedOperators"; +export const StateBalances = "balances"; +export const StateName = "name"; +export const StateOwners = "owners"; +export const StateSymbol = "symbol"; + +export const FuncApprove = "approve"; +export const FuncBurn = "burn"; +export const FuncInit = "init"; +export const FuncMint = "mint"; +export const FuncSafeTransferFrom = "safeTransferFrom"; +export const FuncSetApprovalForAll = "setApprovalForAll"; +export const FuncTransferFrom = "transferFrom"; +export const ViewBalanceOf = "balanceOf"; +export const ViewGetApproved = "getApproved"; +export const ViewIsApprovedForAll = "isApprovedForAll"; +export const ViewName = "name"; +export const ViewOwnerOf = "ownerOf"; +export const ViewSymbol = "symbol"; +export const ViewTokenURI = "tokenURI"; + +export const HFuncApprove = new wasmlib.ScHname(0xa0661268); +export const HFuncBurn = new wasmlib.ScHname(0x7bc1efb1); +export const HFuncInit = new wasmlib.ScHname(0x1f44d644); +export const HFuncMint = new wasmlib.ScHname(0xa29addcf); +export const HFuncSafeTransferFrom = new wasmlib.ScHname(0x130ce158); +export const HFuncSetApprovalForAll = new wasmlib.ScHname(0xb8d8c776); +export const HFuncTransferFrom = new wasmlib.ScHname(0xd5e0a602); +export const HViewBalanceOf = new wasmlib.ScHname(0x67ef8df4); +export const HViewGetApproved = new wasmlib.ScHname(0xbe34b6ba); +export const HViewIsApprovedForAll = new wasmlib.ScHname(0x3251b0f0); +export const HViewName = new wasmlib.ScHname(0x0df7da3a); +export const HViewOwnerOf = new wasmlib.ScHname(0x1246f5ad); +export const HViewSymbol = new wasmlib.ScHname(0x3e93d19b); +export const HViewTokenURI = new wasmlib.ScHname(0x4e1a7397); diff --git a/contracts/wasm/erc721/ts/erc721/contract.ts b/contracts/wasm/erc721/ts/erc721/contract.ts new file mode 100644 index 0000000000..4f33962168 --- /dev/null +++ b/contracts/wasm/erc721/ts/erc721/contract.ts @@ -0,0 +1,252 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "wasmlib"; +import * as sc from "./index"; + +export class ApproveCall { + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncApprove); + params: sc.MutableApproveParams = new sc.MutableApproveParams(); +} + +export class ApproveContext { + events: sc.Erc721Events = new sc.Erc721Events(); + params: sc.ImmutableApproveParams = new sc.ImmutableApproveParams(); + state: sc.MutableErc721State = new sc.MutableErc721State(); +} + +export class BurnCall { + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncBurn); + params: sc.MutableBurnParams = new sc.MutableBurnParams(); +} + +export class BurnContext { + events: sc.Erc721Events = new sc.Erc721Events(); + params: sc.ImmutableBurnParams = new sc.ImmutableBurnParams(); + state: sc.MutableErc721State = new sc.MutableErc721State(); +} + +export class InitCall { + func: wasmlib.ScInitFunc = new wasmlib.ScInitFunc(sc.HScName, sc.HFuncInit); + params: sc.MutableInitParams = new sc.MutableInitParams(); +} + +export class InitContext { + events: sc.Erc721Events = new sc.Erc721Events(); + params: sc.ImmutableInitParams = new sc.ImmutableInitParams(); + state: sc.MutableErc721State = new sc.MutableErc721State(); +} + +export class MintCall { + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncMint); + params: sc.MutableMintParams = new sc.MutableMintParams(); +} + +export class MintContext { + events: sc.Erc721Events = new sc.Erc721Events(); + params: sc.ImmutableMintParams = new sc.ImmutableMintParams(); + state: sc.MutableErc721State = new sc.MutableErc721State(); +} + +export class SafeTransferFromCall { + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncSafeTransferFrom); + params: sc.MutableSafeTransferFromParams = new sc.MutableSafeTransferFromParams(); +} + +export class SafeTransferFromContext { + events: sc.Erc721Events = new sc.Erc721Events(); + params: sc.ImmutableSafeTransferFromParams = new sc.ImmutableSafeTransferFromParams(); + state: sc.MutableErc721State = new sc.MutableErc721State(); +} + +export class SetApprovalForAllCall { + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncSetApprovalForAll); + params: sc.MutableSetApprovalForAllParams = new sc.MutableSetApprovalForAllParams(); +} + +export class SetApprovalForAllContext { + events: sc.Erc721Events = new sc.Erc721Events(); + params: sc.ImmutableSetApprovalForAllParams = new sc.ImmutableSetApprovalForAllParams(); + state: sc.MutableErc721State = new sc.MutableErc721State(); +} + +export class TransferFromCall { + func: wasmlib.ScFunc = new wasmlib.ScFunc(sc.HScName, sc.HFuncTransferFrom); + params: sc.MutableTransferFromParams = new sc.MutableTransferFromParams(); +} + +export class TransferFromContext { + events: sc.Erc721Events = new sc.Erc721Events(); + params: sc.ImmutableTransferFromParams = new sc.ImmutableTransferFromParams(); + state: sc.MutableErc721State = new sc.MutableErc721State(); +} + +export class BalanceOfCall { + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewBalanceOf); + params: sc.MutableBalanceOfParams = new sc.MutableBalanceOfParams(); + results: sc.ImmutableBalanceOfResults = new sc.ImmutableBalanceOfResults(); +} + +export class BalanceOfContext { + params: sc.ImmutableBalanceOfParams = new sc.ImmutableBalanceOfParams(); + results: sc.MutableBalanceOfResults = new sc.MutableBalanceOfResults(); + state: sc.ImmutableErc721State = new sc.ImmutableErc721State(); +} + +export class GetApprovedCall { + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewGetApproved); + params: sc.MutableGetApprovedParams = new sc.MutableGetApprovedParams(); + results: sc.ImmutableGetApprovedResults = new sc.ImmutableGetApprovedResults(); +} + +export class GetApprovedContext { + params: sc.ImmutableGetApprovedParams = new sc.ImmutableGetApprovedParams(); + results: sc.MutableGetApprovedResults = new sc.MutableGetApprovedResults(); + state: sc.ImmutableErc721State = new sc.ImmutableErc721State(); +} + +export class IsApprovedForAllCall { + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewIsApprovedForAll); + params: sc.MutableIsApprovedForAllParams = new sc.MutableIsApprovedForAllParams(); + results: sc.ImmutableIsApprovedForAllResults = new sc.ImmutableIsApprovedForAllResults(); +} + +export class IsApprovedForAllContext { + params: sc.ImmutableIsApprovedForAllParams = new sc.ImmutableIsApprovedForAllParams(); + results: sc.MutableIsApprovedForAllResults = new sc.MutableIsApprovedForAllResults(); + state: sc.ImmutableErc721State = new sc.ImmutableErc721State(); +} + +export class NameCall { + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewName); + results: sc.ImmutableNameResults = new sc.ImmutableNameResults(); +} + +export class NameContext { + results: sc.MutableNameResults = new sc.MutableNameResults(); + state: sc.ImmutableErc721State = new sc.ImmutableErc721State(); +} + +export class OwnerOfCall { + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewOwnerOf); + params: sc.MutableOwnerOfParams = new sc.MutableOwnerOfParams(); + results: sc.ImmutableOwnerOfResults = new sc.ImmutableOwnerOfResults(); +} + +export class OwnerOfContext { + params: sc.ImmutableOwnerOfParams = new sc.ImmutableOwnerOfParams(); + results: sc.MutableOwnerOfResults = new sc.MutableOwnerOfResults(); + state: sc.ImmutableErc721State = new sc.ImmutableErc721State(); +} + +export class SymbolCall { + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewSymbol); + results: sc.ImmutableSymbolResults = new sc.ImmutableSymbolResults(); +} + +export class SymbolContext { + results: sc.MutableSymbolResults = new sc.MutableSymbolResults(); + state: sc.ImmutableErc721State = new sc.ImmutableErc721State(); +} + +export class TokenURICall { + func: wasmlib.ScView = new wasmlib.ScView(sc.HScName, sc.HViewTokenURI); + params: sc.MutableTokenURIParams = new sc.MutableTokenURIParams(); + results: sc.ImmutableTokenURIResults = new sc.ImmutableTokenURIResults(); +} + +export class TokenURIContext { + params: sc.ImmutableTokenURIParams = new sc.ImmutableTokenURIParams(); + results: sc.MutableTokenURIResults = new sc.MutableTokenURIResults(); + state: sc.ImmutableErc721State = new sc.ImmutableErc721State(); +} + +export class ScFuncs { + static approve(ctx: wasmlib.ScFuncCallContext): ApproveCall { + let f = new ApproveCall(); + f.func.setPtrs(f.params, null); + return f; + } + + static burn(ctx: wasmlib.ScFuncCallContext): BurnCall { + let f = new BurnCall(); + f.func.setPtrs(f.params, null); + return f; + } + + static init(ctx: wasmlib.ScFuncCallContext): InitCall { + let f = new InitCall(); + f.func.setPtrs(f.params, null); + return f; + } + + static mint(ctx: wasmlib.ScFuncCallContext): MintCall { + let f = new MintCall(); + f.func.setPtrs(f.params, null); + return f; + } + + static safeTransferFrom(ctx: wasmlib.ScFuncCallContext): SafeTransferFromCall { + let f = new SafeTransferFromCall(); + f.func.setPtrs(f.params, null); + return f; + } + + static setApprovalForAll(ctx: wasmlib.ScFuncCallContext): SetApprovalForAllCall { + let f = new SetApprovalForAllCall(); + f.func.setPtrs(f.params, null); + return f; + } + + static transferFrom(ctx: wasmlib.ScFuncCallContext): TransferFromCall { + let f = new TransferFromCall(); + f.func.setPtrs(f.params, null); + return f; + } + + static balanceOf(ctx: wasmlib.ScViewCallContext): BalanceOfCall { + let f = new BalanceOfCall(); + f.func.setPtrs(f.params, f.results); + return f; + } + + static getApproved(ctx: wasmlib.ScViewCallContext): GetApprovedCall { + let f = new GetApprovedCall(); + f.func.setPtrs(f.params, f.results); + return f; + } + + static isApprovedForAll(ctx: wasmlib.ScViewCallContext): IsApprovedForAllCall { + let f = new IsApprovedForAllCall(); + f.func.setPtrs(f.params, f.results); + return f; + } + + static name(ctx: wasmlib.ScViewCallContext): NameCall { + let f = new NameCall(); + f.func.setPtrs(null, f.results); + return f; + } + + static ownerOf(ctx: wasmlib.ScViewCallContext): OwnerOfCall { + let f = new OwnerOfCall(); + f.func.setPtrs(f.params, f.results); + return f; + } + + static symbol(ctx: wasmlib.ScViewCallContext): SymbolCall { + let f = new SymbolCall(); + f.func.setPtrs(null, f.results); + return f; + } + + static tokenURI(ctx: wasmlib.ScViewCallContext): TokenURICall { + let f = new TokenURICall(); + f.func.setPtrs(f.params, f.results); + return f; + } +} diff --git a/contracts/wasm/erc721/ts/erc721/erc721.ts b/contracts/wasm/erc721/ts/erc721/erc721.ts new file mode 100644 index 0000000000..f0f7ca9e5d --- /dev/null +++ b/contracts/wasm/erc721/ts/erc721/erc721.ts @@ -0,0 +1,223 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +import * as wasmlib from "wasmlib"; +import * as sc from "./index"; + +// Follows ERC-721 standard as closely as possible +// https://eips.ethereum.org/EIPS/eip-721 +// Notable changes w.r.t. ERC-721: +// - tokenID is Hash instead of int256 +// - balance amounts are Uint64 instead of int256 +// - all address accounts are replaced with AgentID accounts +// - for consistency and to reduce confusion: +// use 'approved' when it is an AgentID +// use 'approval' when it is a Bool + +// set the required base URI, to which the base58 encoded token ID will be concatenated +const BASE_URI = "my/special/base/uri/"; +const ZERO = new wasmlib.ScAgentID() + +/////////////////////////// HELPER FUNCTIONS //////////////////////////// + +function approve(state: sc.MutableErc721State, owner: wasmlib.ScAgentID, approved: wasmlib.ScAgentID, tokenID: wasmlib.ScHash): void { + state.approvedAccounts().getAgentID(tokenID).setValue(approved); + new sc.Erc721Events().approval(approved, owner, tokenID); +} + +// checks if caller is owner, or one of its delegated operators +function canOperate(state: sc.MutableErc721State, caller: wasmlib.ScAgentID, owner: wasmlib.ScAgentID): boolean { + if (caller == owner) { + return true; + } + + let operators = state.approvedOperators().getOperators(owner); + return operators.getBool(caller).value(); +} + +// checks if caller is owner, or one of its delegated operators, or approved account for tokenID +function canTransfer(state: sc.MutableErc721State, caller: wasmlib.ScAgentID, owner: wasmlib.ScAgentID, tokenID: wasmlib.ScHash): boolean { + if (canOperate(state, caller, owner)) { + return true; + } + + let controller = state.approvedAccounts().getAgentID(tokenID); + return controller.value() == caller; +} + +// common code for safeTransferFrom and transferFrom +function transfer(ctx: wasmlib.ScFuncContext, state: sc.MutableErc721State, from: wasmlib.ScAgentID, to: wasmlib.ScAgentID, tokenID: wasmlib.ScHash): void { + let tokenOwner = state.owners().getAgentID(tokenID); + ctx.require(tokenOwner.exists(), "tokenID does not exist"); + + let owner = tokenOwner.value(); + ctx.require(canTransfer(state, ctx.caller(), owner, tokenID), + "not owner, operator, or approved"); + + ctx.require(owner == from, "from is not owner"); + //TODO: ctx.require(to == , "invalid 'to' agentid"); + + let nftCountFrom = state.balances().getUint64(from); + let nftCountTo = state.balances().getUint64(to); + + nftCountFrom.setValue(nftCountFrom.value() - 1); + nftCountTo.setValue(nftCountTo.value() + 1); + + tokenOwner.setValue(to); + + //TODO should probably clear this entry, but for now just set to zero + approve(state, owner, ZERO, tokenID); + + new sc.Erc721Events().transfer(from, to, tokenID); +} + +/////////////////////////// SC FUNCS //////////////////////////// + +// Gives permission to to to transfer tokenID token to another account. +// The approval is cleared when the token is transferred. +export function funcApprove(ctx: wasmlib.ScFuncContext, f: sc.ApproveContext): void { + let tokenID = f.params.tokenID().value(); + let tokenOwner = f.state.owners().getAgentID(tokenID); + ctx.require(tokenOwner.exists(), "tokenID does not exist"); + let owner = tokenOwner.value(); + ctx.require(canOperate(f.state, ctx.caller(), owner), "not owner or operator"); + let approved = f.params.approved().value(); + ctx.require(owner != approved, "approved equals owner"); + approve(f.state, owner, approved, tokenID); +} + +// Destroys tokenID. The approval is cleared when the token is burned. +export function funcBurn(ctx: wasmlib.ScFuncContext, f: sc.BurnContext): void { + let tokenID = f.params.tokenID().value(); + let owner = f.state.owners().getAgentID(tokenID).value(); + ctx.require(owner != ZERO, "tokenID does not exist"); + ctx.require(ctx.caller() == owner, "caller is not owner"); + + approve(f.state, owner, ZERO, tokenID); + + let balance = f.state.balances().getUint64(owner); + balance.setValue(balance.value() - 1); + //TODO clear this instead of setting to zero + f.state.owners().getAgentID(tokenID).setValue(ZERO); + + f.events.transfer(owner, ZERO, tokenID); +} + +// Initializes the contract by setting a name and a symbol to the token collection. +export function funcInit(ctx: wasmlib.ScFuncContext, f: sc.InitContext): void { + let name = f.params.name().value(); + let symbol = f.params.symbol().value(); + + f.state.name().setValue(name); + f.state.symbol().setValue(symbol); + + f.events.init(name, symbol); +} + +// Mints tokenID and transfers it to caller as new owner. +export function funcMint(ctx: wasmlib.ScFuncContext, f: sc.MintContext): void { + let tokenID = f.params.tokenID().value(); + let tokenOwner = f.state.owners().getAgentID(tokenID); + ctx.require(!tokenOwner.exists(), "tokenID already minted"); + + let owner = ctx.caller(); + tokenOwner.setValue(owner); + let balance = f.state.balances().getUint64(owner); + balance.setValue(balance.value() + 1); + + f.events.transfer(ZERO, owner, tokenID); + if (!owner.isAddress()) { + //TODO interpret to as SC address and call its onERC721Received() function + } +} + +// Safely transfers tokenID token from from to to, checking first that contract +// recipients are aware of the ERC721 protocol to prevent tokens from being forever locked. +export function funcSafeTransferFrom(ctx: wasmlib.ScFuncContext, f: sc.SafeTransferFromContext): void { + let from = f.params.from().value(); + let to = f.params.to().value(); + let tokenID = f.params.tokenID().value(); + transfer(ctx, f.state, from, to, tokenID); + if (!to.isAddress()) { + //TODO interpret to as SC address and call its onERC721Received() function + } +} + +// Approve or remove operator as an operator for the caller. +export function funcSetApprovalForAll(ctx: wasmlib.ScFuncContext, f: sc.SetApprovalForAllContext): void { + let owner = ctx.caller(); + let operator = f.params.operator().value(); + ctx.require(owner != operator, "owner equals operator"); + + let approval = f.params.approval().value(); + let approvalsByCaller = f.state.approvedOperators().getOperators(owner); + approvalsByCaller.getBool(operator).setValue(approval); + + f.events.approvalForAll(approval, operator, owner); +} + +// Transfers tokenID token from from to to. +export function funcTransferFrom(ctx: wasmlib.ScFuncContext, f: sc.TransferFromContext): void { + let from = f.params.from().value(); + let to = f.params.to().value(); + let tokenID = f.params.tokenID().value(); + transfer(ctx, f.state, from, to, tokenID); +} + +/////////////////////////// SC VIEWS //////////////////////////// + +// Returns the number of tokens in owner's account if the owner exists. +export function viewBalanceOf(ctx: wasmlib.ScViewContext, f: sc.BalanceOfContext): void { + let owner = f.params.owner().value(); + let nftCount = f.state.balances().getUint64(owner); + if (nftCount.exists()) { + f.results.amount().setValue(nftCount.value()); + } +} + +// Returns the approved account for tokenID token if there is one. +export function viewGetApproved(ctx: wasmlib.ScViewContext, f: sc.GetApprovedContext): void { + let tokenID = f.params.tokenID().value(); + let approved = f.state.approvedAccounts().getAgentID(tokenID).value(); + if (approved != ZERO) { + f.results.approved().setValue(approved); + } +} + +// Returns if the operator is allowed to manage all the assets of owner. +export function viewIsApprovedForAll(ctx: wasmlib.ScViewContext, f: sc.IsApprovedForAllContext): void { + let owner = f.params.owner().value(); + let operator = f.params.operator().value(); + let operators = f.state.approvedOperators().getOperators(owner); + let approval = operators.getBool(operator); + if (approval.exists()) { + f.results.approval().setValue(approval.value()); + } +} + +// Returns the token collection name. +export function viewName(ctx: wasmlib.ScViewContext, f: sc.NameContext): void { + f.results.name().setValue(f.state.name().value()); +} + +// Returns the owner of the tokenID token if the token exists. +export function viewOwnerOf(ctx: wasmlib.ScViewContext, f: sc.OwnerOfContext): void { + let tokenID = f.params.tokenID().value(); + let owner = f.state.owners().getAgentID(tokenID); + if (owner.exists()) { + f.results.owner().setValue(owner.value()); + } +} + +// Returns the token collection symbol. +export function viewSymbol(ctx: wasmlib.ScViewContext, f: sc.SymbolContext): void { + f.results.symbol().setValue(f.state.symbol().value()); +} + +// Returns the Uniform Resource Identifier (URI) for tokenID token if the token exists. +export function viewTokenURI(ctx: wasmlib.ScViewContext, f: sc.TokenURIContext): void { + let tokenID = f.params.tokenID(); + if (tokenID.exists()) { + f.results.tokenURI().setValue(BASE_URI + tokenID.toString()); + } +} diff --git a/contracts/wasm/erc721/ts/erc721/events.ts b/contracts/wasm/erc721/ts/erc721/events.ts new file mode 100644 index 0000000000..6407257600 --- /dev/null +++ b/contracts/wasm/erc721/ts/erc721/events.ts @@ -0,0 +1,50 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "wasmlib"; + +export class Erc721Events { + + approval(approved: wasmlib.ScAgentID, owner: wasmlib.ScAgentID, tokenID: wasmlib.ScHash): void { + new wasmlib.EventEncoder("erc721.approval"). + agentID(approved). + agentID(owner). + hash(tokenID). + emit(); + } + + approvalForAll(approval: bool, operator: wasmlib.ScAgentID, owner: wasmlib.ScAgentID): void { + new wasmlib.EventEncoder("erc721.approvalForAll"). + bool(approval). + agentID(operator). + agentID(owner). + emit(); + } + + init(name: string, symbol: string): void { + new wasmlib.EventEncoder("erc721.init"). + string(name). + string(symbol). + emit(); + } + + mint(balance: u64, owner: wasmlib.ScAgentID, tokenID: wasmlib.ScHash): void { + new wasmlib.EventEncoder("erc721.mint"). + uint64(balance). + agentID(owner). + hash(tokenID). + emit(); + } + + transfer(from: wasmlib.ScAgentID, to: wasmlib.ScAgentID, tokenID: wasmlib.ScHash): void { + new wasmlib.EventEncoder("erc721.transfer"). + agentID(from). + agentID(to). + hash(tokenID). + emit(); + } +} diff --git a/contracts/wasm/erc721/ts/erc721/index.ts b/contracts/wasm/erc721/ts/erc721/index.ts new file mode 100644 index 0000000000..11f170837f --- /dev/null +++ b/contracts/wasm/erc721/ts/erc721/index.ts @@ -0,0 +1,18 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +export * from "./erc721"; + +export * from "./consts"; +export * from "./contract"; +export * from "./events"; +export * from "./keys"; +export * from "./lib"; +export * from "./params"; +export * from "./results"; +export * from "./state"; +export * from "./typedefs"; diff --git a/contracts/wasm/erc721/ts/erc721/keys.ts b/contracts/wasm/erc721/ts/erc721/keys.ts new file mode 100644 index 0000000000..d7fc649be8 --- /dev/null +++ b/contracts/wasm/erc721/ts/erc721/keys.ts @@ -0,0 +1,63 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "wasmlib"; +import * as sc from "./index"; + +export const IdxParamApproval = 0; +export const IdxParamApproved = 1; +export const IdxParamData = 2; +export const IdxParamFrom = 3; +export const IdxParamName = 4; +export const IdxParamOperator = 5; +export const IdxParamOwner = 6; +export const IdxParamSymbol = 7; +export const IdxParamTo = 8; +export const IdxParamTokenID = 9; + +export const IdxResultAmount = 10; +export const IdxResultApproval = 11; +export const IdxResultApproved = 12; +export const IdxResultName = 13; +export const IdxResultOwner = 14; +export const IdxResultSymbol = 15; +export const IdxResultTokenURI = 16; + +export const IdxStateApprovedAccounts = 17; +export const IdxStateApprovedOperators = 18; +export const IdxStateBalances = 19; +export const IdxStateName = 20; +export const IdxStateOwners = 21; +export const IdxStateSymbol = 22; + +export let keyMap: string[] = [ + sc.ParamApproval, + sc.ParamApproved, + sc.ParamData, + sc.ParamFrom, + sc.ParamName, + sc.ParamOperator, + sc.ParamOwner, + sc.ParamSymbol, + sc.ParamTo, + sc.ParamTokenID, + sc.ResultAmount, + sc.ResultApproval, + sc.ResultApproved, + sc.ResultName, + sc.ResultOwner, + sc.ResultSymbol, + sc.ResultTokenURI, + sc.StateApprovedAccounts, + sc.StateApprovedOperators, + sc.StateBalances, + sc.StateName, + sc.StateOwners, + sc.StateSymbol, +]; + +export let idxMap: wasmlib.Key32[] = new Array(keyMap.length); diff --git a/contracts/wasm/erc721/ts/erc721/lib.ts b/contracts/wasm/erc721/ts/erc721/lib.ts new file mode 100644 index 0000000000..466cdfc6cc --- /dev/null +++ b/contracts/wasm/erc721/ts/erc721/lib.ts @@ -0,0 +1,186 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "wasmlib"; +import * as sc from "./index"; + +export function on_call(index: i32): void { + return wasmlib.onCall(index); +} + +export function on_load(): void { + let exports = new wasmlib.ScExports(); + exports.addFunc(sc.FuncApprove, funcApproveThunk); + exports.addFunc(sc.FuncBurn, funcBurnThunk); + exports.addFunc(sc.FuncInit, funcInitThunk); + exports.addFunc(sc.FuncMint, funcMintThunk); + exports.addFunc(sc.FuncSafeTransferFrom, funcSafeTransferFromThunk); + exports.addFunc(sc.FuncSetApprovalForAll, funcSetApprovalForAllThunk); + exports.addFunc(sc.FuncTransferFrom, funcTransferFromThunk); + exports.addView(sc.ViewBalanceOf, viewBalanceOfThunk); + exports.addView(sc.ViewGetApproved, viewGetApprovedThunk); + exports.addView(sc.ViewIsApprovedForAll, viewIsApprovedForAllThunk); + exports.addView(sc.ViewName, viewNameThunk); + exports.addView(sc.ViewOwnerOf, viewOwnerOfThunk); + exports.addView(sc.ViewSymbol, viewSymbolThunk); + exports.addView(sc.ViewTokenURI, viewTokenURIThunk); + + for (let i = 0; i < sc.keyMap.length; i++) { + sc.idxMap[i] = wasmlib.Key32.fromString(sc.keyMap[i]); + } +} + +function funcApproveThunk(ctx: wasmlib.ScFuncContext): void { + ctx.log("erc721.funcApprove"); + let f = new sc.ApproveContext(); + f.params.mapID = wasmlib.OBJ_ID_PARAMS; + f.state.mapID = wasmlib.OBJ_ID_STATE; + ctx.require(f.params.approved().exists(), "missing mandatory approved"); + ctx.require(f.params.tokenID().exists(), "missing mandatory tokenID"); + sc.funcApprove(ctx, f); + ctx.log("erc721.funcApprove ok"); +} + +function funcBurnThunk(ctx: wasmlib.ScFuncContext): void { + ctx.log("erc721.funcBurn"); + let f = new sc.BurnContext(); + f.params.mapID = wasmlib.OBJ_ID_PARAMS; + f.state.mapID = wasmlib.OBJ_ID_STATE; + ctx.require(f.params.tokenID().exists(), "missing mandatory tokenID"); + sc.funcBurn(ctx, f); + ctx.log("erc721.funcBurn ok"); +} + +function funcInitThunk(ctx: wasmlib.ScFuncContext): void { + ctx.log("erc721.funcInit"); + let f = new sc.InitContext(); + f.params.mapID = wasmlib.OBJ_ID_PARAMS; + f.state.mapID = wasmlib.OBJ_ID_STATE; + ctx.require(f.params.name().exists(), "missing mandatory name"); + ctx.require(f.params.symbol().exists(), "missing mandatory symbol"); + sc.funcInit(ctx, f); + ctx.log("erc721.funcInit ok"); +} + +function funcMintThunk(ctx: wasmlib.ScFuncContext): void { + ctx.log("erc721.funcMint"); + let f = new sc.MintContext(); + f.params.mapID = wasmlib.OBJ_ID_PARAMS; + f.state.mapID = wasmlib.OBJ_ID_STATE; + ctx.require(f.params.tokenID().exists(), "missing mandatory tokenID"); + sc.funcMint(ctx, f); + ctx.log("erc721.funcMint ok"); +} + +function funcSafeTransferFromThunk(ctx: wasmlib.ScFuncContext): void { + ctx.log("erc721.funcSafeTransferFrom"); + let f = new sc.SafeTransferFromContext(); + f.params.mapID = wasmlib.OBJ_ID_PARAMS; + f.state.mapID = wasmlib.OBJ_ID_STATE; + ctx.require(f.params.from().exists(), "missing mandatory from"); + ctx.require(f.params.to().exists(), "missing mandatory to"); + ctx.require(f.params.tokenID().exists(), "missing mandatory tokenID"); + sc.funcSafeTransferFrom(ctx, f); + ctx.log("erc721.funcSafeTransferFrom ok"); +} + +function funcSetApprovalForAllThunk(ctx: wasmlib.ScFuncContext): void { + ctx.log("erc721.funcSetApprovalForAll"); + let f = new sc.SetApprovalForAllContext(); + f.params.mapID = wasmlib.OBJ_ID_PARAMS; + f.state.mapID = wasmlib.OBJ_ID_STATE; + ctx.require(f.params.approval().exists(), "missing mandatory approval"); + ctx.require(f.params.operator().exists(), "missing mandatory operator"); + sc.funcSetApprovalForAll(ctx, f); + ctx.log("erc721.funcSetApprovalForAll ok"); +} + +function funcTransferFromThunk(ctx: wasmlib.ScFuncContext): void { + ctx.log("erc721.funcTransferFrom"); + let f = new sc.TransferFromContext(); + f.params.mapID = wasmlib.OBJ_ID_PARAMS; + f.state.mapID = wasmlib.OBJ_ID_STATE; + ctx.require(f.params.from().exists(), "missing mandatory from"); + ctx.require(f.params.to().exists(), "missing mandatory to"); + ctx.require(f.params.tokenID().exists(), "missing mandatory tokenID"); + sc.funcTransferFrom(ctx, f); + ctx.log("erc721.funcTransferFrom ok"); +} + +function viewBalanceOfThunk(ctx: wasmlib.ScViewContext): void { + ctx.log("erc721.viewBalanceOf"); + let f = new sc.BalanceOfContext(); + f.params.mapID = wasmlib.OBJ_ID_PARAMS; + f.results.mapID = wasmlib.OBJ_ID_RESULTS; + f.state.mapID = wasmlib.OBJ_ID_STATE; + ctx.require(f.params.owner().exists(), "missing mandatory owner"); + sc.viewBalanceOf(ctx, f); + ctx.log("erc721.viewBalanceOf ok"); +} + +function viewGetApprovedThunk(ctx: wasmlib.ScViewContext): void { + ctx.log("erc721.viewGetApproved"); + let f = new sc.GetApprovedContext(); + f.params.mapID = wasmlib.OBJ_ID_PARAMS; + f.results.mapID = wasmlib.OBJ_ID_RESULTS; + f.state.mapID = wasmlib.OBJ_ID_STATE; + ctx.require(f.params.tokenID().exists(), "missing mandatory tokenID"); + sc.viewGetApproved(ctx, f); + ctx.log("erc721.viewGetApproved ok"); +} + +function viewIsApprovedForAllThunk(ctx: wasmlib.ScViewContext): void { + ctx.log("erc721.viewIsApprovedForAll"); + let f = new sc.IsApprovedForAllContext(); + f.params.mapID = wasmlib.OBJ_ID_PARAMS; + f.results.mapID = wasmlib.OBJ_ID_RESULTS; + f.state.mapID = wasmlib.OBJ_ID_STATE; + ctx.require(f.params.operator().exists(), "missing mandatory operator"); + ctx.require(f.params.owner().exists(), "missing mandatory owner"); + sc.viewIsApprovedForAll(ctx, f); + ctx.log("erc721.viewIsApprovedForAll ok"); +} + +function viewNameThunk(ctx: wasmlib.ScViewContext): void { + ctx.log("erc721.viewName"); + let f = new sc.NameContext(); + f.results.mapID = wasmlib.OBJ_ID_RESULTS; + f.state.mapID = wasmlib.OBJ_ID_STATE; + sc.viewName(ctx, f); + ctx.log("erc721.viewName ok"); +} + +function viewOwnerOfThunk(ctx: wasmlib.ScViewContext): void { + ctx.log("erc721.viewOwnerOf"); + let f = new sc.OwnerOfContext(); + f.params.mapID = wasmlib.OBJ_ID_PARAMS; + f.results.mapID = wasmlib.OBJ_ID_RESULTS; + f.state.mapID = wasmlib.OBJ_ID_STATE; + ctx.require(f.params.tokenID().exists(), "missing mandatory tokenID"); + sc.viewOwnerOf(ctx, f); + ctx.log("erc721.viewOwnerOf ok"); +} + +function viewSymbolThunk(ctx: wasmlib.ScViewContext): void { + ctx.log("erc721.viewSymbol"); + let f = new sc.SymbolContext(); + f.results.mapID = wasmlib.OBJ_ID_RESULTS; + f.state.mapID = wasmlib.OBJ_ID_STATE; + sc.viewSymbol(ctx, f); + ctx.log("erc721.viewSymbol ok"); +} + +function viewTokenURIThunk(ctx: wasmlib.ScViewContext): void { + ctx.log("erc721.viewTokenURI"); + let f = new sc.TokenURIContext(); + f.params.mapID = wasmlib.OBJ_ID_PARAMS; + f.results.mapID = wasmlib.OBJ_ID_RESULTS; + f.state.mapID = wasmlib.OBJ_ID_STATE; + ctx.require(f.params.tokenID().exists(), "missing mandatory tokenID"); + sc.viewTokenURI(ctx, f); + ctx.log("erc721.viewTokenURI ok"); +} diff --git a/contracts/wasm/erc721/ts/erc721/params.ts b/contracts/wasm/erc721/ts/erc721/params.ts new file mode 100644 index 0000000000..92eaed30f6 --- /dev/null +++ b/contracts/wasm/erc721/ts/erc721/params.ts @@ -0,0 +1,225 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "wasmlib"; +import * as sc from "./index"; + +export class ImmutableApproveParams extends wasmlib.ScMapID { + approved(): wasmlib.ScImmutableAgentID { + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamApproved]); + } + + tokenID(): wasmlib.ScImmutableHash { + return new wasmlib.ScImmutableHash(this.mapID, sc.idxMap[sc.IdxParamTokenID]); + } +} + +export class MutableApproveParams extends wasmlib.ScMapID { + approved(): wasmlib.ScMutableAgentID { + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamApproved]); + } + + tokenID(): wasmlib.ScMutableHash { + return new wasmlib.ScMutableHash(this.mapID, sc.idxMap[sc.IdxParamTokenID]); + } +} + +export class ImmutableBurnParams extends wasmlib.ScMapID { + tokenID(): wasmlib.ScImmutableHash { + return new wasmlib.ScImmutableHash(this.mapID, sc.idxMap[sc.IdxParamTokenID]); + } +} + +export class MutableBurnParams extends wasmlib.ScMapID { + tokenID(): wasmlib.ScMutableHash { + return new wasmlib.ScMutableHash(this.mapID, sc.idxMap[sc.IdxParamTokenID]); + } +} + +export class ImmutableInitParams extends wasmlib.ScMapID { + name(): wasmlib.ScImmutableString { + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamName]); + } + + symbol(): wasmlib.ScImmutableString { + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxParamSymbol]); + } +} + +export class MutableInitParams extends wasmlib.ScMapID { + name(): wasmlib.ScMutableString { + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamName]); + } + + symbol(): wasmlib.ScMutableString { + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxParamSymbol]); + } +} + +export class ImmutableMintParams extends wasmlib.ScMapID { + tokenID(): wasmlib.ScImmutableHash { + return new wasmlib.ScImmutableHash(this.mapID, sc.idxMap[sc.IdxParamTokenID]); + } +} + +export class MutableMintParams extends wasmlib.ScMapID { + tokenID(): wasmlib.ScMutableHash { + return new wasmlib.ScMutableHash(this.mapID, sc.idxMap[sc.IdxParamTokenID]); + } +} + +export class ImmutableSafeTransferFromParams extends wasmlib.ScMapID { + data(): wasmlib.ScImmutableBytes { + return new wasmlib.ScImmutableBytes(this.mapID, sc.idxMap[sc.IdxParamData]); + } + + from(): wasmlib.ScImmutableAgentID { + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamFrom]); + } + + to(): wasmlib.ScImmutableAgentID { + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamTo]); + } + + tokenID(): wasmlib.ScImmutableHash { + return new wasmlib.ScImmutableHash(this.mapID, sc.idxMap[sc.IdxParamTokenID]); + } +} + +export class MutableSafeTransferFromParams extends wasmlib.ScMapID { + data(): wasmlib.ScMutableBytes { + return new wasmlib.ScMutableBytes(this.mapID, sc.idxMap[sc.IdxParamData]); + } + + from(): wasmlib.ScMutableAgentID { + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamFrom]); + } + + to(): wasmlib.ScMutableAgentID { + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamTo]); + } + + tokenID(): wasmlib.ScMutableHash { + return new wasmlib.ScMutableHash(this.mapID, sc.idxMap[sc.IdxParamTokenID]); + } +} + +export class ImmutableSetApprovalForAllParams extends wasmlib.ScMapID { + approval(): wasmlib.ScImmutableBool { + return new wasmlib.ScImmutableBool(this.mapID, sc.idxMap[sc.IdxParamApproval]); + } + + operator(): wasmlib.ScImmutableAgentID { + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOperator]); + } +} + +export class MutableSetApprovalForAllParams extends wasmlib.ScMapID { + approval(): wasmlib.ScMutableBool { + return new wasmlib.ScMutableBool(this.mapID, sc.idxMap[sc.IdxParamApproval]); + } + + operator(): wasmlib.ScMutableAgentID { + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOperator]); + } +} + +export class ImmutableTransferFromParams extends wasmlib.ScMapID { + from(): wasmlib.ScImmutableAgentID { + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamFrom]); + } + + to(): wasmlib.ScImmutableAgentID { + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamTo]); + } + + tokenID(): wasmlib.ScImmutableHash { + return new wasmlib.ScImmutableHash(this.mapID, sc.idxMap[sc.IdxParamTokenID]); + } +} + +export class MutableTransferFromParams extends wasmlib.ScMapID { + from(): wasmlib.ScMutableAgentID { + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamFrom]); + } + + to(): wasmlib.ScMutableAgentID { + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamTo]); + } + + tokenID(): wasmlib.ScMutableHash { + return new wasmlib.ScMutableHash(this.mapID, sc.idxMap[sc.IdxParamTokenID]); + } +} + +export class ImmutableBalanceOfParams extends wasmlib.ScMapID { + owner(): wasmlib.ScImmutableAgentID { + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); + } +} + +export class MutableBalanceOfParams extends wasmlib.ScMapID { + owner(): wasmlib.ScMutableAgentID { + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); + } +} + +export class ImmutableGetApprovedParams extends wasmlib.ScMapID { + tokenID(): wasmlib.ScImmutableHash { + return new wasmlib.ScImmutableHash(this.mapID, sc.idxMap[sc.IdxParamTokenID]); + } +} + +export class MutableGetApprovedParams extends wasmlib.ScMapID { + tokenID(): wasmlib.ScMutableHash { + return new wasmlib.ScMutableHash(this.mapID, sc.idxMap[sc.IdxParamTokenID]); + } +} + +export class ImmutableIsApprovedForAllParams extends wasmlib.ScMapID { + operator(): wasmlib.ScImmutableAgentID { + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOperator]); + } + + owner(): wasmlib.ScImmutableAgentID { + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); + } +} + +export class MutableIsApprovedForAllParams extends wasmlib.ScMapID { + operator(): wasmlib.ScMutableAgentID { + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOperator]); + } + + owner(): wasmlib.ScMutableAgentID { + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); + } +} + +export class ImmutableOwnerOfParams extends wasmlib.ScMapID { + tokenID(): wasmlib.ScImmutableHash { + return new wasmlib.ScImmutableHash(this.mapID, sc.idxMap[sc.IdxParamTokenID]); + } +} + +export class MutableOwnerOfParams extends wasmlib.ScMapID { + tokenID(): wasmlib.ScMutableHash { + return new wasmlib.ScMutableHash(this.mapID, sc.idxMap[sc.IdxParamTokenID]); + } +} + +export class ImmutableTokenURIParams extends wasmlib.ScMapID { + tokenID(): wasmlib.ScImmutableHash { + return new wasmlib.ScImmutableHash(this.mapID, sc.idxMap[sc.IdxParamTokenID]); + } +} + +export class MutableTokenURIParams extends wasmlib.ScMapID { + tokenID(): wasmlib.ScMutableHash { + return new wasmlib.ScMutableHash(this.mapID, sc.idxMap[sc.IdxParamTokenID]); + } +} diff --git a/contracts/wasm/erc721/ts/erc721/results.ts b/contracts/wasm/erc721/ts/erc721/results.ts new file mode 100644 index 0000000000..34f4237014 --- /dev/null +++ b/contracts/wasm/erc721/ts/erc721/results.ts @@ -0,0 +1,93 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "wasmlib"; +import * as sc from "./index"; + +export class ImmutableBalanceOfResults extends wasmlib.ScMapID { + amount(): wasmlib.ScImmutableUint64 { + return new wasmlib.ScImmutableUint64(this.mapID, sc.idxMap[sc.IdxResultAmount]); + } +} + +export class MutableBalanceOfResults extends wasmlib.ScMapID { + amount(): wasmlib.ScMutableUint64 { + return new wasmlib.ScMutableUint64(this.mapID, sc.idxMap[sc.IdxResultAmount]); + } +} + +export class ImmutableGetApprovedResults extends wasmlib.ScMapID { + approved(): wasmlib.ScImmutableAgentID { + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxResultApproved]); + } +} + +export class MutableGetApprovedResults extends wasmlib.ScMapID { + approved(): wasmlib.ScMutableAgentID { + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxResultApproved]); + } +} + +export class ImmutableIsApprovedForAllResults extends wasmlib.ScMapID { + approval(): wasmlib.ScImmutableBool { + return new wasmlib.ScImmutableBool(this.mapID, sc.idxMap[sc.IdxResultApproval]); + } +} + +export class MutableIsApprovedForAllResults extends wasmlib.ScMapID { + approval(): wasmlib.ScMutableBool { + return new wasmlib.ScMutableBool(this.mapID, sc.idxMap[sc.IdxResultApproval]); + } +} + +export class ImmutableNameResults extends wasmlib.ScMapID { + name(): wasmlib.ScImmutableString { + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxResultName]); + } +} + +export class MutableNameResults extends wasmlib.ScMapID { + name(): wasmlib.ScMutableString { + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxResultName]); + } +} + +export class ImmutableOwnerOfResults extends wasmlib.ScMapID { + owner(): wasmlib.ScImmutableAgentID { + return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxResultOwner]); + } +} + +export class MutableOwnerOfResults extends wasmlib.ScMapID { + owner(): wasmlib.ScMutableAgentID { + return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxResultOwner]); + } +} + +export class ImmutableSymbolResults extends wasmlib.ScMapID { + symbol(): wasmlib.ScImmutableString { + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxResultSymbol]); + } +} + +export class MutableSymbolResults extends wasmlib.ScMapID { + symbol(): wasmlib.ScMutableString { + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxResultSymbol]); + } +} + +export class ImmutableTokenURIResults extends wasmlib.ScMapID { + tokenURI(): wasmlib.ScImmutableString { + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxResultTokenURI]); + } +} + +export class MutableTokenURIResults extends wasmlib.ScMapID { + tokenURI(): wasmlib.ScMutableString { + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxResultTokenURI]); + } +} diff --git a/contracts/wasm/erc721/ts/erc721/state.ts b/contracts/wasm/erc721/ts/erc721/state.ts new file mode 100644 index 0000000000..d85b7c9295 --- /dev/null +++ b/contracts/wasm/erc721/ts/erc721/state.ts @@ -0,0 +1,155 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "wasmlib"; +import * as sc from "./index"; + +export class MapHashToImmutableAgentID { + objID: i32; + + constructor(objID: i32) { + this.objID = objID; + } + + getAgentID(key: wasmlib.ScHash): wasmlib.ScImmutableAgentID { + return new wasmlib.ScImmutableAgentID(this.objID, key.getKeyID()); + } +} + +export class MapAgentIDToImmutableOperators { + objID: i32; + + constructor(objID: i32) { + this.objID = objID; + } + + getOperators(key: wasmlib.ScAgentID): sc.ImmutableOperators { + let subID = wasmlib.getObjectID(this.objID, key.getKeyID(), wasmlib.TYPE_MAP); + return new sc.ImmutableOperators(subID); + } +} + +export class MapAgentIDToImmutableUint64 { + objID: i32; + + constructor(objID: i32) { + this.objID = objID; + } + + getUint64(key: wasmlib.ScAgentID): wasmlib.ScImmutableUint64 { + return new wasmlib.ScImmutableUint64(this.objID, key.getKeyID()); + } +} + +export class ImmutableErc721State extends wasmlib.ScMapID { + approvedAccounts(): sc.MapHashToImmutableAgentID { + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateApprovedAccounts], wasmlib.TYPE_MAP); + return new sc.MapHashToImmutableAgentID(mapID); + } + + approvedOperators(): sc.MapAgentIDToImmutableOperators { + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateApprovedOperators], wasmlib.TYPE_MAP); + return new sc.MapAgentIDToImmutableOperators(mapID); + } + + balances(): sc.MapAgentIDToImmutableUint64 { + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateBalances], wasmlib.TYPE_MAP); + return new sc.MapAgentIDToImmutableUint64(mapID); + } + + name(): wasmlib.ScImmutableString { + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxStateName]); + } + + owners(): sc.MapHashToImmutableAgentID { + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateOwners], wasmlib.TYPE_MAP); + return new sc.MapHashToImmutableAgentID(mapID); + } + + symbol(): wasmlib.ScImmutableString { + return new wasmlib.ScImmutableString(this.mapID, sc.idxMap[sc.IdxStateSymbol]); + } +} + +export class MapHashToMutableAgentID { + objID: i32; + + constructor(objID: i32) { + this.objID = objID; + } + + clear(): void { + wasmlib.clear(this.objID); + } + + getAgentID(key: wasmlib.ScHash): wasmlib.ScMutableAgentID { + return new wasmlib.ScMutableAgentID(this.objID, key.getKeyID()); + } +} + +export class MapAgentIDToMutableOperators { + objID: i32; + + constructor(objID: i32) { + this.objID = objID; + } + + clear(): void { + wasmlib.clear(this.objID); + } + + getOperators(key: wasmlib.ScAgentID): sc.MutableOperators { + let subID = wasmlib.getObjectID(this.objID, key.getKeyID(), wasmlib.TYPE_MAP); + return new sc.MutableOperators(subID); + } +} + +export class MapAgentIDToMutableUint64 { + objID: i32; + + constructor(objID: i32) { + this.objID = objID; + } + + clear(): void { + wasmlib.clear(this.objID); + } + + getUint64(key: wasmlib.ScAgentID): wasmlib.ScMutableUint64 { + return new wasmlib.ScMutableUint64(this.objID, key.getKeyID()); + } +} + +export class MutableErc721State extends wasmlib.ScMapID { + approvedAccounts(): sc.MapHashToMutableAgentID { + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateApprovedAccounts], wasmlib.TYPE_MAP); + return new sc.MapHashToMutableAgentID(mapID); + } + + approvedOperators(): sc.MapAgentIDToMutableOperators { + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateApprovedOperators], wasmlib.TYPE_MAP); + return new sc.MapAgentIDToMutableOperators(mapID); + } + + balances(): sc.MapAgentIDToMutableUint64 { + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateBalances], wasmlib.TYPE_MAP); + return new sc.MapAgentIDToMutableUint64(mapID); + } + + name(): wasmlib.ScMutableString { + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxStateName]); + } + + owners(): sc.MapHashToMutableAgentID { + let mapID = wasmlib.getObjectID(this.mapID, sc.idxMap[sc.IdxStateOwners], wasmlib.TYPE_MAP); + return new sc.MapHashToMutableAgentID(mapID); + } + + symbol(): wasmlib.ScMutableString { + return new wasmlib.ScMutableString(this.mapID, sc.idxMap[sc.IdxStateSymbol]); + } +} diff --git a/contracts/wasm/erc721/ts/erc721/tsconfig.json b/contracts/wasm/erc721/ts/erc721/tsconfig.json new file mode 100644 index 0000000000..6fb4265c72 --- /dev/null +++ b/contracts/wasm/erc721/ts/erc721/tsconfig.json @@ -0,0 +1,4 @@ +{ + "extends": "assemblyscript/std/assembly.json", + "include": ["./*.ts"] +} diff --git a/contracts/wasm/erc721/ts/erc721/typedefs.ts b/contracts/wasm/erc721/ts/erc721/typedefs.ts new file mode 100644 index 0000000000..a058931ce3 --- /dev/null +++ b/contracts/wasm/erc721/ts/erc721/typedefs.ts @@ -0,0 +1,43 @@ +// Copyright 2020 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +// (Re-)generated by schema tool +// >>>> DO NOT CHANGE THIS FILE! <<<< +// Change the json schema instead + +import * as wasmlib from "wasmlib"; +import * as sc from "./index"; + +export class MapAgentIDToImmutableBool { + objID: i32; + + constructor(objID: i32) { + this.objID = objID; + } + + getBool(key: wasmlib.ScAgentID): wasmlib.ScImmutableBool { + return new wasmlib.ScImmutableBool(this.objID, key.getKeyID()); + } +} + +export class ImmutableOperators extends MapAgentIDToImmutableBool { +}; + +export class MapAgentIDToMutableBool { + objID: i32; + + constructor(objID: i32) { + this.objID = objID; + } + + clear(): void { + wasmlib.clear(this.objID); + } + + getBool(key: wasmlib.ScAgentID): wasmlib.ScMutableBool { + return new wasmlib.ScMutableBool(this.objID, key.getKeyID()); + } +} + +export class MutableOperators extends MapAgentIDToMutableBool { +}; From 0f851c7878c7c4597a31d2e1e49c39407f5ccf41 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Fri, 3 Dec 2021 12:58:07 -0800 Subject: [PATCH 176/198] Fixed non-deterministic ordering of arguments in client code --- .../frontend/src/lib/wasp_client/binary_models/off_ledger.ts | 1 + .../frontend/src/lib/wasp_client/binary_models/on_ledger.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/contracts/wasm/fairroulette/frontend/src/lib/wasp_client/binary_models/off_ledger.ts b/contracts/wasm/fairroulette/frontend/src/lib/wasp_client/binary_models/off_ledger.ts index c05eeef18a..cd9e674287 100644 --- a/contracts/wasm/fairroulette/frontend/src/lib/wasp_client/binary_models/off_ledger.ts +++ b/contracts/wasm/fairroulette/frontend/src/lib/wasp_client/binary_models/off_ledger.ts @@ -71,6 +71,7 @@ export class OffLedger { buffer.writeUInt32LE(req.arguments.length || 0); if (req.arguments) { + req.arguments.sort((lhs,rhs)=> lhs.key.localeCompare(rhs.key)); for (const arg of req.arguments) { const keyBuffer = Buffer.from(arg.key); diff --git a/contracts/wasm/fairroulette/frontend/src/lib/wasp_client/binary_models/on_ledger.ts b/contracts/wasm/fairroulette/frontend/src/lib/wasp_client/binary_models/on_ledger.ts index f4fac899aa..968bbaac3b 100644 --- a/contracts/wasm/fairroulette/frontend/src/lib/wasp_client/binary_models/on_ledger.ts +++ b/contracts/wasm/fairroulette/frontend/src/lib/wasp_client/binary_models/on_ledger.ts @@ -42,6 +42,7 @@ export class OnLedger { buffer.writeUInt32LE(req.arguments.length || 0); if (req.arguments) { + req.arguments.sort((lhs,rhs)=> lhs.key.localeCompare(rhs.key)); for (const arg of req.arguments) { const keyBuffer = Buffer.from(arg.key); From af08ef62f1e603fbad86a58da69d1cd368b8f160 Mon Sep 17 00:00:00 2001 From: Phyloiota <77154511+Phyloiota@users.noreply.github.com> Date: Sat, 4 Dec 2021 09:01:19 +0800 Subject: [PATCH 177/198] Update governance.md typo / gives a wrong meaning --- .../docs/guide/core_concepts/core_contracts/governance.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/docs/guide/core_concepts/core_contracts/governance.md b/documentation/docs/guide/core_concepts/core_contracts/governance.md index 09e75a56d1..d850994e3b 100644 --- a/documentation/docs/guide/core_concepts/core_contracts/governance.md +++ b/documentation/docs/guide/core_concepts/core_contracts/governance.md @@ -40,7 +40,7 @@ Adds an address to the list of identities that constitute the state controller, ### removeAllowedStateControllerAddress -Removes an address to the list of identities that constitute the state controller, this change will only become effective once `rotateStateController` is called +Removes an address from the list of identities that constitute the state controller, this change will only become effective once `rotateStateController` is called ### delegateChainOwnership From f575eb5a6fdace44523561cfc674fda97550d100 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Sun, 5 Dec 2021 18:15:53 -0800 Subject: [PATCH 178/198] Implemented deleting of values (exists() == false) --- contracts/wasm/dividend/test/dividend_bg.wasm | Bin 32303 -> 32303 bytes .../go/donatewithfeedback/structs.go | 4 + .../wasm/donatewithfeedback/src/structs.rs | 4 + .../test/donatewithfeedback_bg.wasm | Bin 36517 -> 36517 bytes .../ts/donatewithfeedback/structs.ts | 4 + contracts/wasm/erc20/test/erc20_bg.wasm | Bin 35497 -> 35497 bytes contracts/wasm/erc721/client/app.ts | 30 -- contracts/wasm/erc721/client/events.ts | 108 ------ contracts/wasm/erc721/client/service.ts | 212 ------------ contracts/wasm/erc721/go/erc721/lib.go | 1 - contracts/wasm/erc721/schema.yaml | 2 +- contracts/wasm/erc721/src/lib.rs | 1 - contracts/wasm/erc721/test/erc721_bg.wasm | Bin 39563 -> 39491 bytes contracts/wasm/erc721/ts/erc721/erc721.ts | 16 +- contracts/wasm/erc721/ts/erc721/lib.ts | 1 - .../fairauction/go/fairauction/structs.go | 8 + contracts/wasm/fairauction/src/structs.rs | 8 + .../wasm/fairauction/test/fairauction_bg.wasm | Bin 42692 -> 42692 bytes .../fairauction/ts/fairauction/structs.ts | 8 + .../fairroulette/go/fairroulette/structs.go | 4 + contracts/wasm/fairroulette/src/structs.rs | 4 + .../fairroulette/test/fairroulette_bg.wasm | Bin 40086 -> 40086 bytes .../fairroulette/ts/fairroulette/structs.ts | 4 + .../wasm/inccounter/test/inccounter_bg.wasm | Bin 37007 -> 37007 bytes contracts/wasm/testcore/test/testcore_bg.wasm | Bin 53154 -> 53154 bytes .../wasm/testwasmlib/test/testwasmlib_bg.wasm | Bin 41300 -> 41300 bytes .../wasm/timestamp/test/timestamp_bg.wasm | Bin 28155 -> 28155 bytes .../tokenregistry/go/tokenregistry/structs.go | 4 + contracts/wasm/tokenregistry/src/structs.rs | 4 + .../tokenregistry/test/tokenregistry_bg.wasm | Bin 32026 -> 32026 bytes .../tokenregistry/ts/tokenregistry/structs.ts | 4 + .../test/example_tutorial_bg.wasm | Bin 16802 -> 16802 bytes .../sbtests/sbtestsc/testcore_bg.wasm | Bin 53154 -> 53154 bytes packages/vm/wasmclient/host.go | 8 +- packages/vm/wasmhost/kvstorehost.go | 5 + packages/vm/wasmhost/wasmvm.go | 7 + packages/vm/wasmlib/go/wasmlib/host.go | 5 + packages/vm/wasmlib/go/wasmlib/inithost.go | 4 + packages/vm/wasmlib/go/wasmlib/mutable.go | 72 ++++ packages/vm/wasmlib/src/host.rs | 19 +- packages/vm/wasmlib/src/mutable.rs | 90 +++++ packages/vm/wasmlib/ts/wasmlib/host.ts | 15 +- packages/vm/wasmlib/ts/wasmlib/immutable.ts | 155 +++++---- packages/vm/wasmlib/ts/wasmlib/mutable.ts | 321 +++++++++++------- packages/vm/wasmproc/scdict.go | 12 + packages/vm/wasmproc/scsandbox.go | 4 + tools/cluster/tests/wasm/inccounter_bg.wasm | Bin 37007 -> 37007 bytes tools/schema/generator/gotemplates/structs.go | 8 + tools/schema/generator/rstemplates/structs.go | 8 + tools/schema/generator/tstemplates/structs.go | 8 + 50 files changed, 606 insertions(+), 566 deletions(-) delete mode 100644 contracts/wasm/erc721/client/app.ts delete mode 100644 contracts/wasm/erc721/client/events.ts delete mode 100644 contracts/wasm/erc721/client/service.ts diff --git a/contracts/wasm/dividend/test/dividend_bg.wasm b/contracts/wasm/dividend/test/dividend_bg.wasm index a5d425d168cd0f18e38082ef9e2b83908b0e7276..b80b9d3f3840af2c9692fbbbe032b9d52fa8ec15 100644 GIT binary patch delta 498 zcmZ4ghjINM#t9W%!Ko!ql_jag3>*`)e9Y?~qcsD!Bco%IBd-9HBeOe;1CW#K$nUtI z2dG3y04x~?mSn+{-2C4sj74Ha#{q^cT?PgvR$c}LMg=AXW=94`1_8#&xq$(UjFa~T zsxvioZhjtkk5%|hJJ=D7jtW_hGl1G0CvX`~~D9Nd+cHi7dw_Aoh*!$x4x- z!Y{gkY;h#B2YPODR(u+eycn-7&H%KU(Ts@)Xn(CEH&72xmLrP* z!)D=xG?2oo!~&qM*NNYmWf&dniyh_5xTP2r7&Mr`1dAgN(AD)oSN}_u0=ilNHK?$HJt~Jo#&O&*YD}I*eSCuR!}u$JY|Y7a zIn_)HSSJ6@v6AHm3V;A35c2>rFNgyKAU@yZpxkt(Ue?LGbJcizSp^upfPx^bwRurq GFFycm-G##d delta 498 zcmZ4ghjINM#t9W%?x`hCl_jag3_KIF|6j0}_a z1*$WB=-&K1@E)u1oi4B=7#$U|96Ny892 bool { exists(self.obj_id, self.key_id, TYPE_BYTES) } diff --git a/contracts/wasm/donatewithfeedback/test/donatewithfeedback_bg.wasm b/contracts/wasm/donatewithfeedback/test/donatewithfeedback_bg.wasm index 4e68cc1c4cd25cdb8af36614a35242e4c1cb995e..7f50ea8a95dc00eba97317c0c5397f81f38a273c 100644 GIT binary patch delta 632 zcmX|7O=uHA6rP!#)YVOJn-mkpq|@S0O=NfTQn z(3rN8bU+VUkU+5rh2mc9K^i;>7A)vRRM3OqL2u$oi*JhUz&E^a-p}{Vo1S9RQ>cfrY5&4t8H}3YE$Y;&c(x?(q>p1rr(& zASRW6Q#PgYOz%$isq7B*-sOSUqbq6@gaf}+{G%+*zMm+z+_xC`t@ML}LCAr}Dy~k* z&uJ^N`aMBA7;n=Ip$T?^Csve3DsJMchi|4Zd;?lg_NpG7cG&g%fj6}`_qlrQ=toohC5CI4+Sh|t1d8BwH+=99m zA>=k9gjnS>81Itb^P|o4SaA$l6tM|0FGq$J*aeS-LOi@4AJn0U4G2RKJc@f|ArJCH TVTZ4?$s{N7MIq`oir>tCZZxZ$ delta 608 zcmYL_L1a?7W8V$?pU0Q8RA3i*92xJZ-^6lh+8eo8 zP+5fI+)F;oXiz(E76pyybMCQxlRq!V^O65nXe?bT&HP^JDSV_Vp9&K+#gh};g#KQQ zK1Q#Tliw+Ftay_m%f%JJH@HmQekh-pW_mSYvQvz)C}}rIlSilC@fSk=o{EQcx=;&9 y+eteV&{Ay3bLEWhmS(cEL`u;{`4D(zsFVp0^_a}2s{$!R>hd!>A9UO0ALd_e#;9EY diff --git a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/structs.ts b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/structs.ts index 595c11292f..91ecb4b41c 100644 --- a/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/structs.ts +++ b/contracts/wasm/donatewithfeedback/ts/donatewithfeedback/structs.ts @@ -64,6 +64,10 @@ export class MutableDonation { this.keyID = keyID; } + delete(): void { + wasmlib.delKey(this.objID, this.keyID, wasmlib.TYPE_BYTES); + } + exists(): boolean { return wasmlib.exists(this.objID, this.keyID, wasmlib.TYPE_BYTES); } diff --git a/contracts/wasm/erc20/test/erc20_bg.wasm b/contracts/wasm/erc20/test/erc20_bg.wasm index 1626bfaa7ad2f6119e4d6cc429d75a52f5570d87..4ba488aa6c8e58aa1d0bff9dce738a7e2c6a1437 100644 GIT binary patch delta 295 zcmZ2Em1*TvrU@+*XA4cN7vH${x)&qE=2q{+%)(px4=^}tE3i0nWH~+nv6u93j`sh@ z$jC4`Do{p_f!mSMG0u@!fXR`?oy7sjNp|FSY?%mDC?vqJc}n08R*56M2N<$+85opU zc^MQK6_^y59T^-M1Q;i$goiLPPTm==&NQcQ^P}(&%s}4dXj4YU&73ieY{I7|08J5B zU~-hma{K_Y`pJaNvPng3K&vNY9058oG}E35NKMV233Se8{aimLpaFIHQb2NMeh*NY zTER*I25vqEh_e)cwgcUCzd(VVNuPN$V?_|-k|`*@PeU15FWE zU~-hma_j)H|MYK`O)6poT0J4-2+)C{nf6RTYHIdOpmR3s=lU@L4XDeP0+KWHdw|N+ z3RVg*a`Q1joTUJ?9q6X}1q$p;pP4o@Rs=Cl-d$P2bcAiPY1Ka78SDZKUJMLitTj2H WGMZP0Lx8~*D3TAv5}T@5@&f>=(p2aG diff --git a/contracts/wasm/erc721/client/app.ts b/contracts/wasm/erc721/client/app.ts deleted file mode 100644 index 910cf4cc20..0000000000 --- a/contracts/wasm/erc721/client/app.ts +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -import * as wasmlib from "./wasmlib" -import * as events from "./events" -import * as service from "./service" - -let erc721Service: service.Erc721Service; - -export function subscribeToErc721Events(): void { - - erc721Service.on('erc721_approval', (event: events.EventApproval) => { - }); - - erc721Service.on('erc721_approvalForAll', (event: events.EventApprovalForAll) => { - }); - - erc721Service.on('erc721_init', (event: events.EventInit) => { - }); - - erc721Service.on('erc721_mint', (event: events.EventMint) => { - }); - - erc721Service.on('erc721_transfer', (event: events.EventTransfer) => { - }); -} diff --git a/contracts/wasm/erc721/client/events.ts b/contracts/wasm/erc721/client/events.ts deleted file mode 100644 index 65935b6188..0000000000 --- a/contracts/wasm/erc721/client/events.ts +++ /dev/null @@ -1,108 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -import * as wasmlib from "./wasmlib" -import * as service from "./service" - - -export interface EventApproval { - timestamp: wasmlib.Int32; - approved: wasmlib.AgentID; - owner: wasmlib.AgentID; - tokenID: wasmlib.Hash; -} - -export interface EventApprovalForAll { - timestamp: wasmlib.Int32; - approval: wasmlib.Bool; - operator: wasmlib.AgentID; - owner: wasmlib.AgentID; -} - -export interface EventInit { - timestamp: wasmlib.Int32; - name: wasmlib.String; - symbol: wasmlib.String; -} - -export interface EventMint { - timestamp: wasmlib.Int32; - balance: wasmlib.Uint64; - owner: wasmlib.AgentID; - tokenID: wasmlib.Hash; -} - -export interface EventTransfer { - timestamp: wasmlib.Int32; - from: wasmlib.AgentID; - to: wasmlib.AgentID; - tokenID: wasmlib.Hash; -} - -export interface Erc721Events { - erc721_approval: (event: EventApproval) => void; - erc721_approvalForAll: (event: EventApprovalForAll) => void; - erc721_init: (event: EventInit) => void; - erc721_mint: (event: EventMint) => void; - erc721_transfer: (event: EventTransfer) => void; -} - -export function handleVmMessage(message: string[]): void { - const messageHandlers: wasmlib.MessageHandlers = { - 'erc721.approval': (index) => { - const evt: EventApproval = { - timestamp: Number(message[++index]), - approved: message[++index], - owner: message[++index], - tokenID: message[++index], - }; - this.emitter.emit('erc721_approval', evt); - }, - 'erc721.approvalForAll': (index) => { - const evt: EventApprovalForAll = { - timestamp: Number(message[++index]), - approval: message[++index][0]!='0', - operator: message[++index], - owner: message[++index], - }; - this.emitter.emit('erc721_approvalForAll', evt); - }, - 'erc721.init': (index) => { - const evt: EventInit = { - timestamp: Number(message[++index]), - name: message[++index], - symbol: message[++index], - }; - this.emitter.emit('erc721_init', evt); - }, - 'erc721.mint': (index) => { - const evt: EventMint = { - timestamp: Number(message[++index]), - balance: BigInt(message[++index]), - owner: message[++index], - tokenID: message[++index], - }; - this.emitter.emit('erc721_mint', evt); - }, - 'erc721.transfer': (index) => { - const evt: EventTransfer = { - timestamp: Number(message[++index]), - from: message[++index], - to: message[++index], - tokenID: message[++index], - }; - this.emitter.emit('erc721_transfer', evt); - }, - }; - - const topicIndex = 3; - const topic = message[topicIndex]; - - if (typeof messageHandlers[topic] != 'undefined') { - messageHandlers[topic](topicIndex); - } -} diff --git a/contracts/wasm/erc721/client/service.ts b/contracts/wasm/erc721/client/service.ts deleted file mode 100644 index 688443213f..0000000000 --- a/contracts/wasm/erc721/client/service.ts +++ /dev/null @@ -1,212 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -import * as wasmlib from "./wasmlib" -import * as events from "./events" - -export interface BalanceOfResult { - amount: wasmlib.Uint64; -} - -export interface GetApprovedResult { - approved: wasmlib.AgentID; -} - -export interface IsApprovedForAllResult { - approval: wasmlib.Bool; -} - -export interface NameResult { - name: wasmlib.String; -} - -export interface OwnerOfResult { - owner: wasmlib.AgentID; -} - -export interface SymbolResult { - symbol: wasmlib.String; -} - -export interface TokenURIResult { - tokenURI: wasmlib.String; -} - -export class Erc721Service extends wasmlib.Service { - - constructor(client: BasicClient, chainId: string) { - super(client, chainId, 0xd967c216); - } - - public async approve(approved: wasmlib.AgentID, tokenID: wasmlib.Hash): Promise { - const args: wasmlib.Argument[] = [ - { key: 'approved', value: approved, }, - { key: 'tokenID', value: tokenID, }, - ]; - await this.postRequest(0xa0661268, args); - } - - public async burn(tokenID: wasmlib.Hash): Promise { - const args: wasmlib.Argument[] = [ - { key: 'tokenID', value: tokenID, }, - ]; - await this.postRequest(0x7bc1efb1, args); - } - - public async init(name: wasmlib.String, symbol: wasmlib.String): Promise { - const args: wasmlib.Argument[] = [ - { key: 'name', value: name, }, - { key: 'symbol', value: symbol, }, - ]; - await this.postRequest(0x1f44d644, args); - } - - public async mint(tokenID: wasmlib.Hash): Promise { - const args: wasmlib.Argument[] = [ - { key: 'tokenID', value: tokenID, }, - ]; - await this.postRequest(0xa29addcf, args); - } - - public async safeTransferFrom(data: wasmlib.Bytes, from: wasmlib.AgentID, to: wasmlib.AgentID, tokenID: wasmlib.Hash): Promise { - const args: wasmlib.Argument[] = [ - { key: 'data', value: data, }, - { key: 'from', value: from, }, - { key: 'to', value: to, }, - { key: 'tokenID', value: tokenID, }, - ]; - await this.postRequest(0x130ce158, args); - } - - public async setApprovalForAll(approval: wasmlib.Bool, operator: wasmlib.AgentID): Promise { - const args: wasmlib.Argument[] = [ - { key: 'approval', value: approval, }, - { key: 'operator', value: operator, }, - ]; - await this.postRequest(0xb8d8c776, args); - } - - public async transferFrom(from: wasmlib.AgentID, to: wasmlib.AgentID, tokenID: wasmlib.Hash): Promise { - const args: wasmlib.Argument[] = [ - { key: 'from', value: from, }, - { key: 'to', value: to, }, - { key: 'tokenID', value: tokenID, }, - ]; - await this.postRequest(0xd5e0a602, args); - } - - public async balanceOf(owner: wasmlib.AgentID): Promise { - const args: wasmlib.Argument[] = [ - { key: 'owner', value: owner, }, - ]; - const response = await this.callView(0x67ef8df4, args); - let result: BalanceOfResult = {}; - - let amount = response['amount']; - result.amount = BigInt(0); - if (amount) { - result.amount = amount.readBigUInt64LE(amount); - } - - return result; - } - - public async getApproved(tokenID: wasmlib.Hash): Promise { - const args: wasmlib.Argument[] = [ - { key: 'tokenID', value: tokenID, }, - ]; - const response = await this.callView(0xbe34b6ba, args); - let result: GetApprovedResult = {}; - - let approved = response['approved']; - result.approved = ''; - if (approved) { - result.approved = approved.toString(approved); - } - - return result; - } - - public async isApprovedForAll(operator: wasmlib.AgentID, owner: wasmlib.AgentID): Promise { - const args: wasmlib.Argument[] = [ - { key: 'operator', value: operator, }, - { key: 'owner', value: owner, }, - ]; - const response = await this.callView(0x3251b0f0, args); - let result: IsApprovedForAllResult = {}; - - let approval = response['approval']; - result.approval = false; - if (approval) { - result.approval = approval.readUInt8(approval)!=0; - } - - return result; - } - - public async name(): Promise { - const args: wasmlib.Argument[] = [ - ]; - const response = await this.callView(0x0df7da3a, args); - let result: NameResult = {}; - - let name = response['name']; - result.name = ''; - if (name) { - result.name = name.toString(name); - } - - return result; - } - - public async ownerOf(tokenID: wasmlib.Hash): Promise { - const args: wasmlib.Argument[] = [ - { key: 'tokenID', value: tokenID, }, - ]; - const response = await this.callView(0x1246f5ad, args); - let result: OwnerOfResult = {}; - - let owner = response['owner']; - result.owner = ''; - if (owner) { - result.owner = owner.toString(owner); - } - - return result; - } - - public async symbol(): Promise { - const args: wasmlib.Argument[] = [ - ]; - const response = await this.callView(0x3e93d19b, args); - let result: SymbolResult = {}; - - let symbol = response['symbol']; - result.symbol = ''; - if (symbol) { - result.symbol = symbol.toString(symbol); - } - - return result; - } - - public async tokenURI(tokenID: wasmlib.Hash): Promise { - const args: wasmlib.Argument[] = [ - { key: 'tokenID', value: tokenID, }, - ]; - const response = await this.callView(0x4e1a7397, args); - let result: TokenURIResult = {}; - - let tokenURI = response['tokenURI']; - result.tokenURI = ''; - if (tokenURI) { - result.tokenURI = tokenURI.toString(tokenURI); - } - - return result; - } -} diff --git a/contracts/wasm/erc721/go/erc721/lib.go b/contracts/wasm/erc721/go/erc721/lib.go index e7c65d5026..60498f3a9e 100644 --- a/contracts/wasm/erc721/go/erc721/lib.go +++ b/contracts/wasm/erc721/go/erc721/lib.go @@ -47,7 +47,6 @@ func funcApproveThunk(ctx wasmlib.ScFuncContext) { id: wasmlib.OBJ_ID_STATE, }, } - ctx.Require(f.Params.Approved().Exists(), "missing mandatory approved") ctx.Require(f.Params.TokenID().Exists(), "missing mandatory tokenID") funcApprove(ctx, f) ctx.Log("erc721.funcApprove ok") diff --git a/contracts/wasm/erc721/schema.yaml b/contracts/wasm/erc721/schema.yaml index 28fa9d7b6a..450632f03a 100644 --- a/contracts/wasm/erc721/schema.yaml +++ b/contracts/wasm/erc721/schema.yaml @@ -33,7 +33,7 @@ state: funcs: approve: params: - approved: AgentID // target account + approved: AgentID? // target account, clear approval when not present tokenID: Hash // token ID burn: params: diff --git a/contracts/wasm/erc721/src/lib.rs b/contracts/wasm/erc721/src/lib.rs index 265dc28357..c1ab699f72 100644 --- a/contracts/wasm/erc721/src/lib.rs +++ b/contracts/wasm/erc721/src/lib.rs @@ -71,7 +71,6 @@ fn func_approve_thunk(ctx: &ScFuncContext) { id: OBJ_ID_STATE, }, }; - ctx.require(f.params.approved().exists(), "missing mandatory approved"); ctx.require(f.params.token_id().exists(), "missing mandatory tokenID"); func_approve(ctx, &f); ctx.log("erc721.funcApprove ok"); diff --git a/contracts/wasm/erc721/test/erc721_bg.wasm b/contracts/wasm/erc721/test/erc721_bg.wasm index 64d2d2e6e5928935d0f0b3bc19f924868d924703..eed00a49a6406abdf207d1396d84429dc7a6b366 100644 GIT binary patch delta 6810 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 dM?XCc@4UG@@7BHREWw;c>;g#HLO}q7olD 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 x3dJA$ , "invalid 'to' agentid"); let nftCountFrom = state.balances().getUint64(from); @@ -82,7 +82,7 @@ export function funcApprove(ctx: wasmlib.ScFuncContext, f: sc.ApproveContext): v let owner = tokenOwner.value(); ctx.require(canOperate(f.state, ctx.caller(), owner), "not owner or operator"); let approved = f.params.approved().value(); - ctx.require(owner != approved, "approved equals owner"); + ctx.require(!owner.equals(approved), "approved equals owner"); approve(f.state, owner, approved, tokenID); } @@ -90,8 +90,8 @@ export function funcApprove(ctx: wasmlib.ScFuncContext, f: sc.ApproveContext): v export function funcBurn(ctx: wasmlib.ScFuncContext, f: sc.BurnContext): void { let tokenID = f.params.tokenID().value(); let owner = f.state.owners().getAgentID(tokenID).value(); - ctx.require(owner != ZERO, "tokenID does not exist"); - ctx.require(ctx.caller() == owner, "caller is not owner"); + ctx.require(!owner.equals(ZERO), "tokenID does not exist"); + ctx.require(ctx.caller().equals(owner), "caller is not owner"); approve(f.state, owner, ZERO, tokenID); @@ -147,7 +147,7 @@ export function funcSafeTransferFrom(ctx: wasmlib.ScFuncContext, f: sc.SafeTrans export function funcSetApprovalForAll(ctx: wasmlib.ScFuncContext, f: sc.SetApprovalForAllContext): void { let owner = ctx.caller(); let operator = f.params.operator().value(); - ctx.require(owner != operator, "owner equals operator"); + ctx.require(!owner.equals(operator), "owner equals operator"); let approval = f.params.approval().value(); let approvalsByCaller = f.state.approvedOperators().getOperators(owner); @@ -179,7 +179,7 @@ export function viewBalanceOf(ctx: wasmlib.ScViewContext, f: sc.BalanceOfContext export function viewGetApproved(ctx: wasmlib.ScViewContext, f: sc.GetApprovedContext): void { let tokenID = f.params.tokenID().value(); let approved = f.state.approvedAccounts().getAgentID(tokenID).value(); - if (approved != ZERO) { + if (!approved.equals(ZERO)) { f.results.approved().setValue(approved); } } diff --git a/contracts/wasm/erc721/ts/erc721/lib.ts b/contracts/wasm/erc721/ts/erc721/lib.ts index 466cdfc6cc..ba6a48b663 100644 --- a/contracts/wasm/erc721/ts/erc721/lib.ts +++ b/contracts/wasm/erc721/ts/erc721/lib.ts @@ -39,7 +39,6 @@ function funcApproveThunk(ctx: wasmlib.ScFuncContext): void { let f = new sc.ApproveContext(); f.params.mapID = wasmlib.OBJ_ID_PARAMS; f.state.mapID = wasmlib.OBJ_ID_STATE; - ctx.require(f.params.approved().exists(), "missing mandatory approved"); ctx.require(f.params.tokenID().exists(), "missing mandatory tokenID"); sc.funcApprove(ctx, f); ctx.log("erc721.funcApprove ok"); diff --git a/contracts/wasm/fairauction/go/fairauction/structs.go b/contracts/wasm/fairauction/go/fairauction/structs.go index 681e9506d2..ef4c7a49d2 100644 --- a/contracts/wasm/fairauction/go/fairauction/structs.go +++ b/contracts/wasm/fairauction/go/fairauction/structs.go @@ -75,6 +75,10 @@ type MutableAuction struct { keyID wasmlib.Key32 } +func (o MutableAuction) Delete() { + wasmlib.DelKey(o.objID, o.keyID, wasmlib.TYPE_BYTES) +} + func (o MutableAuction) Exists() bool { return wasmlib.Exists(o.objID, o.keyID, wasmlib.TYPE_BYTES) } @@ -129,6 +133,10 @@ type MutableBid struct { keyID wasmlib.Key32 } +func (o MutableBid) Delete() { + wasmlib.DelKey(o.objID, o.keyID, wasmlib.TYPE_BYTES) +} + func (o MutableBid) Exists() bool { return wasmlib.Exists(o.objID, o.keyID, wasmlib.TYPE_BYTES) } diff --git a/contracts/wasm/fairauction/src/structs.rs b/contracts/wasm/fairauction/src/structs.rs index 56084a4539..a59feab046 100644 --- a/contracts/wasm/fairauction/src/structs.rs +++ b/contracts/wasm/fairauction/src/structs.rs @@ -82,6 +82,10 @@ pub struct MutableAuction { } impl MutableAuction { + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_BYTES); + } + pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_BYTES) } @@ -141,6 +145,10 @@ pub struct MutableBid { } impl MutableBid { + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_BYTES); + } + pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_BYTES) } diff --git a/contracts/wasm/fairauction/test/fairauction_bg.wasm b/contracts/wasm/fairauction/test/fairauction_bg.wasm index cdfc3829f98d5c898b97cc38a2eb117b6e37df52..86bf39de8770c3bc2aed99c8ae8fa241c58ce144 100644 GIT binary patch delta 1234 zcmZWoT})h65I%GE?sDO>a>^nsODPu~aA~Eah25nz7!I@>ZJLJAKDFwDEVizpOGUSY zT9LAiuq=h`(DZ?ABQ|LpBl2?-sZG=HurWkzY@#tfXzhbGCgNW-hD4*zS;TGhCNp=w znK|FgnL9Uqho|rGiL=R6Ve<8oy5FquqSOU%oebc$Jg*;5NC>n+cs8)orv{ocoC z!35dzqPPVr4wak^EN2g7qg8ZzrM?}yaC5^^n8H}YFxgI@vS0Bhrekbe)_%4}e)e?AZ+k8LppLhD_x( z20zG$5dPIs4s%$3uoOa8;GkcJ%Xs`q28vbS;mQZ=0z}JuH7!_Kk7tZr7gx3_m`)ne?jC zR_?JzJAu~j9q!f9B^It_tjg|WCYao`NhX;99PK^?fcLu}&~v{b>Tfi`Ech(?BzJoD7f^KbgvM z)3yKMws!S>53YNv(8ER7CU9`*Q9RJ!>KguULvJSWN`Ejr@t^yP__t$L&Z#9E)meV6 z#iiC0Xtu&7KN}`ykC?);fi0PSo`NYWHt?Go^{K&m(zR!{l`tA8_<24}^|UnT^7&z@ z(I<y>iz6MBnip>)rUUU{F*AxXsq6XDp$1H8Z^tK_ zA7OO(d0Al6G6-g5AaVT*l_52?CKMIwpJ0Bjo2(TAoGw0kuOg3}YLNsta#h?ETdx`G z&UZwe$LdQ=*m<1|^Ug1zIk_F5y$~w@!!Fof##kSTn`8rDC%Xn0&%aSP?GP+TXe&uE z$+QF8@iuSEK{44>o<|<_0Et18uK+y?J8?QG@%m&nFVgYu`fF{n+F7IvwvXahNxarq I7rqgH10I-PF#rGn delta 1227 zcmZWoZ%kWN6u;;8wLExK-sl3QjPW3m6%m&W+5!uP%eH1NW|?e>$u^Tkip(0;PP8N7 z#6g#g(gEEm*@u-Go!N&)9PpM+m&NqMiy`7N5*K4)RK7Sr2>uC)Uo`5uMTVI-Ip>|< zx##}Qx#yj0-Q(6hK5;IUDNempn)+yr+ZjF!zET@w4m(p6AYqCIz-{>o*NG=mAt%rY-$!l}>V8=iWYGT-;ycEc4k=a5W+2u-H^d}<9V{3K54({i;-UTjSy+ff0+CW z{s?(?1*RKv37W$HNdUqd7VQ6d)`BRHS>AM4BdV`=KSS5a+w%~>{CUqVD9UmD%5r2f zt||CgA#~y29Tji`D-M-Gml-(ZSK%_AJQ{)-{PO5qaK$`$?4g4g0-a7!zZuOkQLF<# zA9`7RkR(t^;8v(wU6o)Hfu&Ftw~}baXPcX zP1pXH+idPz0oV1%lUn20-2bBM!Q=kralG0e-01di{hRsCq?tF6wNZ}wx7%EDG=ci6 zyTn)LsT7Z%!Scbaxmuosj2R#NUAB4P>@4Z}p}JDpOz`tU>gXAv(ZvhHLZROk8M=fo z4DUzB@YZdQ>RT_|qQdljj9!7kPk9Z7@lfxFV9*IXuFT@)G=FaU@)EPM&bwt@R z(oStVGvYCr80;05F|CZo)yoy7O@QbWMIwHILNyA#J<>s;1&Q6nbRZEd0c~?GbS+*u zWV0#kdLrGb%aLb(t{SWz0-R}2Fk*W}6j5=Y!x|*=M^G9 bool { exists(self.obj_id, self.key_id, TYPE_BYTES) } diff --git a/contracts/wasm/fairroulette/test/fairroulette_bg.wasm b/contracts/wasm/fairroulette/test/fairroulette_bg.wasm index b91b1a18e00425bbf7e284e69a0b4a0ecc68f7f2..17d1f25531ba3fae033de40d38a99104f0b44a94 100644 GIT binary patch delta 731 zcmZWmO=uHA6rP!E>)JFVo3%|qlWv1ejnVi+6{(j@(KIde&}c8l7}{#2i=dX!1hiF8 zF(zO((+vty3SJ@vL5G%BixyP86jZP$@#hePLcNO?@ol6EI`F-j?|pA)zxSrJKuQaw za95kPYquQ_UkzaKFt}P*Iw;{%XEEa*Z z0dYk<;(LQgKzbwXq*`QZ*EDypag5oQ zXeaqr;MSAdF?`S!tB7lcRkIE8S}cm8A{dX$H63!TVAZM8dBf_u&L72fLkAk5Bpj^B10+i6zAB}jG-N|lcv5ZLenE2VuC}DwIfSt>qcI_2y=qN%c4R8WB zcm>Wr_A;B1R-hsTY$u=tH`_^A8AJ3`) delta 733 zcmZWmT}V_x6rMACt!wMD_j*$oYW1$Xcxy+uI+~HDonN57kQq`ihYNE!hUcvVBO56QRZk?f=GIp zn@vw)2|g~xV+B$9Ulb=htBSCj%#r&TTOzwWc5abaI|!*RauE|uYC0HUL?b*CIShoq zi`3GOIpIFK1@J;c^rku|TXkw6R-+NXieM~e+_5oNj;(quc7fx0$riJ*oRnL-_5cxM zUDJy3N>&9-U?x`KXW5S&hvNnh_KxD59`@d*#%p=G!lZv5%5$y{m2tbj$(WGW|J7z} z{-Hlqxi(c3wo=9CaGDO2wkpAbmG^1UZarU*9aIkPrs$v}-ivWA9;lFBVJ|H~!=ucJ zpDeMMg0{ZJ75Li+&c0wM&xJk|l`|L^K7sM=a6=*1@Wv50cHcJA>A=LysTW8FPuEd( zbyB*;UwUn91(kDWo}dys`+XhE^2>=$JUXt@&s6k{_fS4|@x1O+H4-9(Y(tbId|XdH zqK{SnGTG?WFd-KpbVR8nxFk2Yo?zTc`KevZv%j~6l;33+YorbJXNX$9lH3U!`PW3B Z_xc8n9K_rJ!h=}jSMgjYKBaECe*wW|(g6Sf diff --git a/contracts/wasm/fairroulette/ts/fairroulette/structs.ts b/contracts/wasm/fairroulette/ts/fairroulette/structs.ts index a871d08ff9..a0c749f141 100644 --- a/contracts/wasm/fairroulette/ts/fairroulette/structs.ts +++ b/contracts/wasm/fairroulette/ts/fairroulette/structs.ts @@ -58,6 +58,10 @@ export class MutableBet { this.keyID = keyID; } + delete(): void { + wasmlib.delKey(this.objID, this.keyID, wasmlib.TYPE_BYTES); + } + exists(): boolean { return wasmlib.exists(this.objID, this.keyID, wasmlib.TYPE_BYTES); } diff --git a/contracts/wasm/inccounter/test/inccounter_bg.wasm b/contracts/wasm/inccounter/test/inccounter_bg.wasm index 024b43f447e2d6b1bb10c172e7b2f9b7cf5ce49a..c577e6e18ff82836a7db21ef397eef2f2517bb33 100644 GIT binary patch delta 506 zcmeBQ$ke}(X+qz`r9u-s#W!xZVdPlOxSdgFJEPj>-;7I@85uS&RGr4e(J=7k{$USA4~=+0U8dH zi~~!uU`lRw49aF;Z+BHZWAy6}K@mZZ<8k0P5MCSNf5iNuPOgV(p>H<@I`#QyWrbL)ZlvTp1V` zDu7r5h++H{K(^*&xw>}7pOcr>?Pu!dn4Dg3B`XFL1_4GO76)RG77zgOB`5EzPv?!{ S6kzZI@~VMYYxA>)mHYrD2#yK> delta 512 zcmeBQ$ke}(X+qz`r9u-s#W!xZVdU7(sI#3>Z8_uS-;7I@85uV(RGr4eai;$OgCn;9 z<7Rt}FkztJG;3xdj?H~QK_LOg$qRjxIp%;=$OAb%eo7p>K^#FK$IMTWsi%K(q~9*# zI}?Cn+6pX=99fPX6M^hA6E>^)KVY(Ek{$USA4~=+0U8dH zi~~!uU`lRw49aF5-Tr*0;2+x0<$B7BZC0L;scGe~MkeEc^-NI&lRiM~N)Q86bAg zq|Hkc-Pj}<9P5i6<;z^*j(pSxQV9$emW<1cKo{J|OalgveU=FmkW-RV0OUN)SH*Xx=XT_;D??`OKsK3TfK zN>-Es0vLgm7!Zpi@g*kr)jCez+@Qw0fhu{UC;Qc<%Vuy2Ft`H6 U@_|?ah++KsK(^-QXALX)0SLH|DF6Tf diff --git a/contracts/wasm/testcore/test/testcore_bg.wasm b/contracts/wasm/testcore/test/testcore_bg.wasm index 3e3b0e36e1d1f622fd284dc35ff2ba95cbca46e9..9a28dcaa4f6408c39bc1482dcf928305afd35a3d 100644 GIT binary patch delta 862 zcmZ8fT}YEr7(VB0x{)&{-_R`rKa)^NohzL|1RWuWx(KvT3hJWF8i8TPCN-T{P4gn< zlpqM^@MpSRBuB+^ie3a=2nAhe7uLKGylaXVK}0=A8x0RU&v~Es@P5yG&ijRi451-I z?~6mV4K3BJEe#KexzC?BB^PPd4h^!iLFV3}%|X_-ECX!aMTxvoF?*anjf$LW3GG#M ziSSIF@zWk2n?O7gm5%Fgvb97Q;)HJGW)B}!2l236xxdRO5z9?S!QT|iUrnoN*uFd} zqsTGuEcl(*W#1lKBA!x0j-_Q1o$5?CaKed|3g){)si^Z6vXA33;HyHJoNHZG)xD4Z zXmb%*<-peN;ZbG#IU+(&W^h{Xuhn|hX)d}=o`xf0(chD-`kzPDqW`L#YCA{aw$ok- zE(*-jg!mq~3`b{271O5CBd$of?%{D2uZ_#r&JtWvjy)@6+S23!x3x(T57uj22lIi5 zxYSjzt*Cw-Dc!xDM7}_L?W)w`s&gB>lAZ5HM1FToGH*!9%jey9)6v6^mtH)rXng$v zT-x80OYn@;%`A9JKhJ=V#lwwOB0u#vtFcrMJV2EkC{CwQxjxjPp7iE0HnA~$WRGpa z8cN@fOeV~u9rM^2wwcT+u_YzW+K**tD6Ga*GGd~6B;zpQl;7c5ItFX~CvPRCtQoza zF{eQe&i$lfH&&93pMY2ZBTxj~7Uc_ddWU8u=b?On9Z2dh;$lEdy!SG)CGzLbl$JrO zMFA&Jt^}6SF5o0!1C+xl(LLWtH^ugRA=nX9%=h@-9{0rxkeP`&^EYi)a#2;`Gs>|7 PFe?pI0&Y3F@H_i25_t?b delta 860 zcmZ8fT}V_x7@e6_*K#+n-1RRaZ%OEqx^4LrM9>J5)k9#3Qcw?N#u6B2tWv8hR;wAL zOi6;Uy5!&LgEA!R&&v7`_z+|iNDr1m?}_;kRMZ)DY4O52bIvz>^L;bl4fss~zp3l# z-m^6grA-Yr_lULIlQk*lX|j(sFHj#l?PJ9ow0=W+*@}}=d985j2>TWkX;;?u&0vIZ ztHJn57w;Q^el#XCulA?tOT#cnjX0j@;=h%S49jh!ZaE&y$NL2o zG3K5EPrIENOJfn@$|vM-ypPCu@2QlN&1Wd8ZL}1D zbG=h^QGE4YL`6qy3DaMoM_iF|!^I;?hsI@7TOO_`haTrJy?=ML(5P7TRqKnp8?w~v&HB3B0Zw+WkaoK=bwV&P)9{HZi<7&HgjT(w#4Y@LFz+kl!#<#!tAO1WAN&ufD<^b3_j&g0EK`JQ29l|K37Z2 zME6_{czTQ1ws=oiMV#SmaAnwGEwgFlyvo8ccF{fK(2C(KJLlwL6(44*4wBVWjg-OF Q0U1El`=RY}F#IRwA0;^kRsaA1 diff --git a/contracts/wasm/testwasmlib/test/testwasmlib_bg.wasm b/contracts/wasm/testwasmlib/test/testwasmlib_bg.wasm index 9206e2a67919b62299aeeb56b16a1b8666cbdb8f..e0a86ea725852de1483f97c81840acf4a7c7ec55 100644 GIT binary patch delta 774 zcmZ8dUr1A76#vfMt=y*V>b?7uBwaNy*`!`7>7V2NE1K!{mwbRkMo`1cUBgpl?5qv zKb>hv54&exo`>2wC__gX4wYdrBYwe!dH_7D&J)YpH1Vuv&d5QyA*AN@^ujV%)3CyvE>9Cn;agh)01x01U_b_Y)UQ z7K{A`wcwFpkEb$GVnzpJExYQN4!WdUIO9wKoCsb4Ku6ev8$pM(j6%7_CAFBNM_n|) zWAG_+Kq-ee2FBI6sk?P)OV8)95bDD~=-6h@|GQF76hfUcJ^y9!DE-F~ekQAL$Ou^n zt{Z&a%-0a-Z;ryK@ZWj`>U4I;faUDO?SQ(rQ?6vuApO1RZQnLO1yk=rHR4f!nqIfx zrSfP*xx<(E*|MoQ}ijmJ&3$tIvfrtw;cc*B1{9XwxOqcLuv=!S%93&kdc`cz9 zYq8M^xndk-_73#N+EIzgqASKhD&#Q{?}V6m7uSIP-JH<&*l5u)S~TUj@nH8qwRTHw zB;{0sCgS%*FY$>np)mVi#(`hw4xL6RO#B{uYr{)PA1HV@9d3$S6?Tp>HcapkHtQng z?YQ(f3g56hd9taVYV!c0fuNcN9kbT(NiqzpXi2pZd#il8%F!ynNVSr_l=3#O+7#A9 W9gWoHqv#~m5M+Xj;1(kN-0>IkGU^-v delta 765 zcmZ9JPe@cz6vpp)PWiui;~QrtOL}QwqE;JAGRvD3B`sVegNr7#aNreFdMxflu(a?>slf>uRsTvYZwNfRG@zkAMix%ZxP-qO6bG_S>O z#}j4o8{X-sr>P`Iy$Q-uLyq>(sueoxBEct(Ind#r0%zRU!TRzA@JD$Hyyr=Rd%U2U z@t)JLXcaBBM5?u|uN2F4#~TNhzRp6;Smdmbb*4iWSn`)0XIYK-{}2%mckKod71f`QS zEjek&PsVxf${>YR>(ysu#I`<=Nse9f8?#&O#UxwsAKJC;+*D7*_D`@8@)=8Z51aSC zr}%itZ%o;~8x^eg_BN$5p^t@mRD6NELmp1toW$_ttt{nXQv9L6nrjA}u#OBo*Vq+4 zz+VQd@(DNS);`q|ZX@l*7)K*bG^k!h+=PbrM&0>Em~a>qM$D^sw*PZWHrxt0$D(+O zzeYR2qeDuk;vGVgyd<3_ev?k>_t48Cmo9`TfE( zpPhTSIToZwejKX-->vcI8h6EQr!8I$2IF<5jYYa>#|hLV>iOH~LGtqQ{b1$$VqKhq RAA)?)dOm@;R;l0!)r9?ko;KPO>AvP4X`6gBwt{H|<7E3dugS5o X5xg}_0t~JU3=H`|EU~#Qu9P1DmD)E@ diff --git a/contracts/wasm/tokenregistry/go/tokenregistry/structs.go b/contracts/wasm/tokenregistry/go/tokenregistry/structs.go index 71c0207191..7dbf217c6f 100644 --- a/contracts/wasm/tokenregistry/go/tokenregistry/structs.go +++ b/contracts/wasm/tokenregistry/go/tokenregistry/structs.go @@ -63,6 +63,10 @@ type MutableToken struct { keyID wasmlib.Key32 } +func (o MutableToken) Delete() { + wasmlib.DelKey(o.objID, o.keyID, wasmlib.TYPE_BYTES) +} + func (o MutableToken) Exists() bool { return wasmlib.Exists(o.objID, o.keyID, wasmlib.TYPE_BYTES) } diff --git a/contracts/wasm/tokenregistry/src/structs.rs b/contracts/wasm/tokenregistry/src/structs.rs index ce49529d2f..d5dd0a4c6b 100644 --- a/contracts/wasm/tokenregistry/src/structs.rs +++ b/contracts/wasm/tokenregistry/src/structs.rs @@ -69,6 +69,10 @@ pub struct MutableToken { } impl MutableToken { + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_BYTES); + } + pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_BYTES) } diff --git a/contracts/wasm/tokenregistry/test/tokenregistry_bg.wasm b/contracts/wasm/tokenregistry/test/tokenregistry_bg.wasm index 2a352906655d2346b884b9557e4c8eb6818b7fd3..27eecf21ae665db991bfc2bf1888784b538f89af 100644 GIT binary patch delta 396 zcmbRBi*eR3#tHQkrwQ@%WaJl@xTlslRhFa{GjMNQAjHVg#yE{pYZ{~K=3R_abQu{p z`|B@dWMtU<)nJnZBg5nsp2k4V9nXG7;X54%7#y_~SR6UB96LIJ>@yvk>%9K~6;H19 zl>w5oK;-7_zCtV#ciIjxWa%<6D6#S~C@?B8DKI-SI5G$@PJS2|!pJz;EJ&ScOZ(>d zpbAFeIbA@b#1)tvC9)i6fQ;SJwfR->K^EZ!Kr?{$F*+(_Ii3NrkF;;z7h%pQ{0XEA zSw~OTW{#*3R-hANDY| zFzGW-ewNiX`AfFJWS-m<*&Jp823H0Kh6*5-0Ad(_1(2;dIWxPO@yg_<+19e0Kt2dC s0x=g5bAvcQ0OIpZw#`XrTEQ}TS&ka-3KjtdFQDKuAlBI2o7>9|034uilmGw# delta 398 zcmbRBi*eR3#tHQkrwQ@%WaJl@1gDlbRhFa{GjMENAjHTqjZteFqiP%D=3R_abQu{o z`|B@dWMtg@)nJnZBje;1p2k4V9nXG7;T7!%7#y_~SR6UB9It@bGuk)TdH(|{o?PoI z10-jG$j#e*g;*rcbRJ;H(q&*!V&!E}U{qjIV0L71WDsDO{4g+tkzuk~kUG-5lC?YF&7e_d-BJebfz!NlcRFgc)u_UFn9qamjSWH m$!ySOSP){P{q(=H}kqUVZ>o2XRyY diff --git a/contracts/wasm/tokenregistry/ts/tokenregistry/structs.ts b/contracts/wasm/tokenregistry/ts/tokenregistry/structs.ts index 0a3c3af58c..e7617740b3 100644 --- a/contracts/wasm/tokenregistry/ts/tokenregistry/structs.ts +++ b/contracts/wasm/tokenregistry/ts/tokenregistry/structs.ts @@ -70,6 +70,10 @@ export class MutableToken { this.keyID = keyID; } + delete(): void { + wasmlib.delKey(this.objID, this.keyID, wasmlib.TYPE_BYTES); + } + exists(): boolean { return wasmlib.exists(this.objID, this.keyID, wasmlib.TYPE_BYTES); } diff --git a/documentation/tutorial-examples/test/example_tutorial_bg.wasm b/documentation/tutorial-examples/test/example_tutorial_bg.wasm index 1b1051f5422a09c40684da0f211c16144065f4ee..ad488b5f96aed522cd5bbdfde37517613da9a981 100644 GIT binary patch delta 193 zcmZ3~%($qTaYFILE}@Be;v47WsxUH6=2HF0$gug3YA1&^1GgiiW0E7U0FxuLJBtI5 zlkCXvxTo;|gQJiDSTYVQ$$}}l`G8(zz^(}2m%#@m1_D-$zDhRKB{wm|lJ6L}!} zyoo4~d}^WrR+kGTYfMcU88>e-4PXRHFq@|V$t?5#AkrcUC~?*zkQvC4x3OYm*c@f! G!3qHReKRls delta 193 zcmZ3~%($qTaYFILE}@Be;v47WsxUH4=2HF0$hi5BYA1&^Bex@?W0E7U0FxuLJBtI5 zlkCXvxTo;|gQJiDSTYVQ$$}}l`G8(zz^(}2m%#@m1_D-$zD#>s^ywm|lJ6L}!} zyoo4~d}^WrR+kGTYfMcU88&Y+4PXRHFq@|V$t?5#AkrcUC~?*zkQvC4x3OYm+#F@& G!3qHSn=>>3 diff --git a/packages/vm/core/testcore/sbtests/sbtestsc/testcore_bg.wasm b/packages/vm/core/testcore/sbtests/sbtestsc/testcore_bg.wasm index 3e3b0e36e1d1f622fd284dc35ff2ba95cbca46e9..9a28dcaa4f6408c39bc1482dcf928305afd35a3d 100644 GIT binary patch delta 862 zcmZ8fT}YEr7(VB0x{)&{-_R`rKa)^NohzL|1RWuWx(KvT3hJWF8i8TPCN-T{P4gn< zlpqM^@MpSRBuB+^ie3a=2nAhe7uLKGylaXVK}0=A8x0RU&v~Es@P5yG&ijRi451-I z?~6mV4K3BJEe#KexzC?BB^PPd4h^!iLFV3}%|X_-ECX!aMTxvoF?*anjf$LW3GG#M ziSSIF@zWk2n?O7gm5%Fgvb97Q;)HJGW)B}!2l236xxdRO5z9?S!QT|iUrnoN*uFd} zqsTGuEcl(*W#1lKBA!x0j-_Q1o$5?CaKed|3g){)si^Z6vXA33;HyHJoNHZG)xD4Z zXmb%*<-peN;ZbG#IU+(&W^h{Xuhn|hX)d}=o`xf0(chD-`kzPDqW`L#YCA{aw$ok- zE(*-jg!mq~3`b{271O5CBd$of?%{D2uZ_#r&JtWvjy)@6+S23!x3x(T57uj22lIi5 zxYSjzt*Cw-Dc!xDM7}_L?W)w`s&gB>lAZ5HM1FToGH*!9%jey9)6v6^mtH)rXng$v zT-x80OYn@;%`A9JKhJ=V#lwwOB0u#vtFcrMJV2EkC{CwQxjxjPp7iE0HnA~$WRGpa z8cN@fOeV~u9rM^2wwcT+u_YzW+K**tD6Ga*GGd~6B;zpQl;7c5ItFX~CvPRCtQoza zF{eQe&i$lfH&&93pMY2ZBTxj~7Uc_ddWU8u=b?On9Z2dh;$lEdy!SG)CGzLbl$JrO zMFA&Jt^}6SF5o0!1C+xl(LLWtH^ugRA=nX9%=h@-9{0rxkeP`&^EYi)a#2;`Gs>|7 PFe?pI0&Y3F@H_i25_t?b delta 860 zcmZ8fT}V_x7@e6_*K#+n-1RRaZ%OEqx^4LrM9>J5)k9#3Qcw?N#u6B2tWv8hR;wAL zOi6;Uy5!&LgEA!R&&v7`_z+|iNDr1m?}_;kRMZ)DY4O52bIvz>^L;bl4fss~zp3l# z-m^6grA-Yr_lULIlQk*lX|j(sFHj#l?PJ9ow0=W+*@}}=d985j2>TWkX;;?u&0vIZ ztHJn57w;Q^el#XCulA?tOT#cnjX0j@;=h%S49jh!ZaE&y$NL2o zG3K5EPrIENOJfn@$|vM-ypPCu@2QlN&1Wd8ZL}1D zbG=h^QGE4YL`6qy3DaMoM_iF|!^I;?hsI@7TOO_`haTrJy?=ML(5P7TRqKnp8?w~v&HB3B0Zw+WkaoK=bwV&P)9{HZi<7&HgjT(w#4Y@LFz+kl!#<#!tAO1WAN&ufD<^b3_j&g0EK`JQ29l|K37Z2 zME6_{czTQ1ws=oiMV#SmaAnwGEwgFlyvo8ccF{fK(2C(KJLlwL6(44*4wBVWjg-OF Q0U1El`=RY}F#IRwA0;^kRsaA1 diff --git a/packages/vm/wasmclient/host.go b/packages/vm/wasmclient/host.go index e01ed094f5..aaf31ba17d 100644 --- a/packages/vm/wasmclient/host.go +++ b/packages/vm/wasmclient/host.go @@ -73,8 +73,14 @@ func (w *WasmVMHost) CallFunc(objID, keyID int32, params []byte) []byte { return result } +func (w *WasmVMHost) DelKey(objID, keyID, typeID int32) { + // size -1 means delete + // this removes the need for a separate hostDelete function + hostSetBytes(objID, keyID, typeID, nil, -1) +} + func (w *WasmVMHost) Exists(objID, keyID, typeID int32) bool { - // negative length (-1) means only test for existence + // size -1 means only test for existence // returned size -1 indicates keyID not found (or error) // this removes the need for a separate hostExists function return hostGetBytes(objID, keyID, typeID, nil, -1) >= 0 diff --git a/packages/vm/wasmhost/kvstorehost.go b/packages/vm/wasmhost/kvstorehost.go index bf6103409c..98a2cd25da 100644 --- a/packages/vm/wasmhost/kvstorehost.go +++ b/packages/vm/wasmhost/kvstorehost.go @@ -52,6 +52,7 @@ var TypeSizes = [...]int{0, 33, 37, 1, 0, 33, 32, 32, 4, 1, 2, 4, 8, 0, 34, 0} type HostObject interface { CallFunc(keyID int32, params []byte) []byte + DelKey(keyID, typeID int32) Exists(keyID, typeID int32) bool GetBytes(keyID, typeID int32) []byte GetObjectID(keyID, typeID int32) int32 @@ -80,6 +81,10 @@ func (h *KvStoreHost) CallFunc(objID, keyID int32, params []byte) []byte { return h.FindObject(objID).CallFunc(keyID, params) } +func (h *KvStoreHost) DelKey(objID, keyID, typeID int32) { + h.FindObject(objID).DelKey(keyID, typeID) +} + func (h *KvStoreHost) Exists(objID, keyID, typeID int32) bool { return h.FindObject(objID).Exists(keyID, typeID) } diff --git a/packages/vm/wasmhost/wasmvm.go b/packages/vm/wasmhost/wasmvm.go index 7c87d02b99..57055f451a 100644 --- a/packages/vm/wasmhost/wasmvm.go +++ b/packages/vm/wasmhost/wasmvm.go @@ -206,6 +206,13 @@ func (vm *WasmVMBase) HostSetBytes(objID, keyID, typeID, stringRef, size int32) host := vm.getKvStore(0) host.TraceAllf("HostSetBytes(o%d,k%d,t%d,r%d,s%d)", objID, keyID, typeID, stringRef, size) + + // delete key ? + if size < 0 { + host.DelKey(objID, keyID, typeID) + return + } + bytes := vm.impl.VMGetBytes(stringRef, size) host.SetBytes(objID, keyID, typeID, bytes) } diff --git a/packages/vm/wasmlib/go/wasmlib/host.go b/packages/vm/wasmlib/go/wasmlib/host.go index 99dd45795d..8955e1401a 100644 --- a/packages/vm/wasmlib/go/wasmlib/host.go +++ b/packages/vm/wasmlib/go/wasmlib/host.go @@ -46,6 +46,7 @@ type ( AddFunc(f ScFuncContextFunction) []ScFuncContextFunction AddView(v ScViewContextFunction) []ScViewContextFunction CallFunc(objID, keyID int32, params []byte) []byte + DelKey(objID, keyID, typeID int32) Exists(objID, keyID, typeID int32) bool GetBytes(objID, keyID, typeID int32) []byte GetKeyIDFromBytes(bytes []byte) int32 @@ -81,6 +82,10 @@ func Clear(objID int32) { SetBytes(objID, KeyLength, TYPE_INT32, zero[:]) } +func DelKey(objID int32, keyID Key32, typeID int32) { + host.DelKey(objID, int32(keyID), typeID) +} + func Exists(objID int32, keyID Key32, typeID int32) bool { return host.Exists(objID, int32(keyID), typeID) } diff --git a/packages/vm/wasmlib/go/wasmlib/inithost.go b/packages/vm/wasmlib/go/wasmlib/inithost.go index 5dd36b5856..8b34c0b1fa 100644 --- a/packages/vm/wasmlib/go/wasmlib/inithost.go +++ b/packages/vm/wasmlib/go/wasmlib/inithost.go @@ -34,6 +34,10 @@ func (h InitHost) CallFunc(objID, keyID int32, params []byte) []byte { return nil } +func (h InitHost) DelKey(objID, keyID, typeID int32) { + Panic("InitHost::DelKey") +} + func (h InitHost) Exists(objID, keyID, typeID int32) bool { if objID == int32(KeyParams) { _, exists := h.params[keyID] diff --git a/packages/vm/wasmlib/go/wasmlib/mutable.go b/packages/vm/wasmlib/go/wasmlib/mutable.go index 5fa2237590..e9c8f909e2 100644 --- a/packages/vm/wasmlib/go/wasmlib/mutable.go +++ b/packages/vm/wasmlib/go/wasmlib/mutable.go @@ -21,6 +21,10 @@ func NewScMutableAddress(objID int32, keyID Key32) ScMutableAddress { return ScMutableAddress{objID: objID, keyID: keyID} } +func (o ScMutableAddress) Delete() { + DelKey(o.objID, o.keyID, TYPE_ADDRESS) +} + func (o ScMutableAddress) Exists() bool { return Exists(o.objID, o.keyID, TYPE_ADDRESS) } @@ -70,6 +74,10 @@ func NewScMutableAgentID(objID int32, keyID Key32) ScMutableAgentID { return ScMutableAgentID{objID: objID, keyID: keyID} } +func (o ScMutableAgentID) Delete() { + DelKey(o.objID, o.keyID, TYPE_AGENT_ID) +} + func (o ScMutableAgentID) Exists() bool { return Exists(o.objID, o.keyID, TYPE_AGENT_ID) } @@ -119,6 +127,10 @@ func NewScMutableBool(objID int32, keyID Key32) ScMutableBool { return ScMutableBool{objID: objID, keyID: keyID} } +func (o ScMutableBool) Delete() { + DelKey(o.objID, o.keyID, TYPE_BOOL) +} + func (o ScMutableBool) Exists() bool { return Exists(o.objID, o.keyID, TYPE_BOOL) } @@ -176,6 +188,10 @@ func NewScMutableBytes(objID int32, keyID Key32) ScMutableBytes { return ScMutableBytes{objID: objID, keyID: keyID} } +func (o ScMutableBytes) Delete() { + DelKey(o.objID, o.keyID, TYPE_BYTES) +} + func (o ScMutableBytes) Exists() bool { return Exists(o.objID, o.keyID, TYPE_BYTES) } @@ -225,6 +241,10 @@ func NewScMutableChainID(objID int32, keyID Key32) ScMutableChainID { return ScMutableChainID{objID: objID, keyID: keyID} } +func (o ScMutableChainID) Delete() { + DelKey(o.objID, o.keyID, TYPE_CHAIN_ID) +} + func (o ScMutableChainID) Exists() bool { return Exists(o.objID, o.keyID, TYPE_CHAIN_ID) } @@ -274,6 +294,10 @@ func NewScMutableColor(objID int32, keyID Key32) ScMutableColor { return ScMutableColor{objID: objID, keyID: keyID} } +func (o ScMutableColor) Delete() { + DelKey(o.objID, o.keyID, TYPE_COLOR) +} + func (o ScMutableColor) Exists() bool { return Exists(o.objID, o.keyID, TYPE_COLOR) } @@ -323,6 +347,10 @@ func NewScMutableHash(objID int32, keyID Key32) ScMutableHash { return ScMutableHash{objID: objID, keyID: keyID} } +func (o ScMutableHash) Delete() { + DelKey(o.objID, o.keyID, TYPE_HASH) +} + func (o ScMutableHash) Exists() bool { return Exists(o.objID, o.keyID, TYPE_HASH) } @@ -372,6 +400,10 @@ func NewScMutableHname(objID int32, keyID Key32) ScMutableHname { return ScMutableHname{objID: objID, keyID: keyID} } +func (o ScMutableHname) Delete() { + DelKey(o.objID, o.keyID, TYPE_HNAME) +} + func (o ScMutableHname) Exists() bool { return Exists(o.objID, o.keyID, TYPE_HNAME) } @@ -421,6 +453,10 @@ func NewScMutableInt8(objID int32, keyID Key32) ScMutableInt8 { return ScMutableInt8{objID: objID, keyID: keyID} } +func (o ScMutableInt8) Delete() { + DelKey(o.objID, o.keyID, TYPE_INT8) +} + func (o ScMutableInt8) Exists() bool { return Exists(o.objID, o.keyID, TYPE_INT8) } @@ -473,6 +509,10 @@ func NewScMutableInt16(objID int32, keyID Key32) ScMutableInt16 { return ScMutableInt16{objID: objID, keyID: keyID} } +func (o ScMutableInt16) Delete() { + DelKey(o.objID, o.keyID, TYPE_INT16) +} + func (o ScMutableInt16) Exists() bool { return Exists(o.objID, o.keyID, TYPE_INT16) } @@ -525,6 +565,10 @@ func NewScMutableInt32(objID int32, keyID Key32) ScMutableInt32 { return ScMutableInt32{objID: objID, keyID: keyID} } +func (o ScMutableInt32) Delete() { + DelKey(o.objID, o.keyID, TYPE_INT32) +} + func (o ScMutableInt32) Exists() bool { return Exists(o.objID, o.keyID, TYPE_INT32) } @@ -577,6 +621,10 @@ func NewScMutableInt64(objID int32, keyID Key32) ScMutableInt64 { return ScMutableInt64{objID: objID, keyID: keyID} } +func (o ScMutableInt64) Delete() { + DelKey(o.objID, o.keyID, TYPE_INT64) +} + func (o ScMutableInt64) Exists() bool { return Exists(o.objID, o.keyID, TYPE_INT64) } @@ -851,6 +899,10 @@ func NewScMutableRequestID(objID int32, keyID Key32) ScMutableRequestID { return ScMutableRequestID{objID: objID, keyID: keyID} } +func (o ScMutableRequestID) Delete() { + DelKey(o.objID, o.keyID, TYPE_REQUEST_ID) +} + func (o ScMutableRequestID) Exists() bool { return Exists(o.objID, o.keyID, TYPE_REQUEST_ID) } @@ -900,6 +952,10 @@ func NewScMutableString(objID int32, keyID Key32) ScMutableString { return ScMutableString{objID: objID, keyID: keyID} } +func (o ScMutableString) Delete() { + DelKey(o.objID, o.keyID, TYPE_STRING) +} + func (o ScMutableString) Exists() bool { return Exists(o.objID, o.keyID, TYPE_STRING) } @@ -953,6 +1009,10 @@ func NewScMutableUint8(objID int32, keyID Key32) ScMutableUint8 { return ScMutableUint8{objID: objID, keyID: keyID} } +func (o ScMutableUint8) Delete() { + DelKey(o.objID, o.keyID, TYPE_INT8) +} + func (o ScMutableUint8) Exists() bool { return Exists(o.objID, o.keyID, TYPE_INT8) } @@ -1005,6 +1065,10 @@ func NewScMutableUint16(objID int32, keyID Key32) ScMutableUint16 { return ScMutableUint16{objID: objID, keyID: keyID} } +func (o ScMutableUint16) Delete() { + DelKey(o.objID, o.keyID, TYPE_INT16) +} + func (o ScMutableUint16) Exists() bool { return Exists(o.objID, o.keyID, TYPE_INT16) } @@ -1057,6 +1121,10 @@ func NewScMutableUint32(objID int32, keyID Key32) ScMutableUint32 { return ScMutableUint32{objID: objID, keyID: keyID} } +func (o ScMutableUint32) Delete() { + DelKey(o.objID, o.keyID, TYPE_INT32) +} + func (o ScMutableUint32) Exists() bool { return Exists(o.objID, o.keyID, TYPE_INT32) } @@ -1109,6 +1177,10 @@ func NewScMutableUint64(objID int32, keyID Key32) ScMutableUint64 { return ScMutableUint64{objID: objID, keyID: keyID} } +func (o ScMutableUint64) Delete() { + DelKey(o.objID, o.keyID, TYPE_INT64) +} + func (o ScMutableUint64) Exists() bool { return Exists(o.objID, o.keyID, TYPE_INT64) } diff --git a/packages/vm/wasmlib/src/host.rs b/packages/vm/wasmlib/src/host.rs index 4c39fd3f5a..72cac67eea 100644 --- a/packages/vm/wasmlib/src/host.rs +++ b/packages/vm/wasmlib/src/host.rs @@ -45,12 +45,12 @@ extern { // Copy the value data bytes of type stored in the host container object , // under key , into the pre-allocated which can hold len bytes. // Returns the actual length of the value data bytes on the host. - pub fn hostGetBytes(obj_id: i32, key_id: i32, type_id: i32, buffer: *const u8, len: i32) -> i32; + pub fn hostGetBytes(obj_id: i32, key_id: i32, type_id: i32, buffer: *const u8, size: i32) -> i32; // Retrieve the key id associated with the data bytes of length . // A negative length indicates a bytes key, positive indicates a string key // We discern between the two for better readable logging purposes - pub fn hostGetKeyID(key: *const u8, len: i32) -> i32; + pub fn hostGetKeyID(key: *const u8, size: i32) -> i32; // Retrieve the id of the container sub-object of type stored in // the host container object , under key . @@ -58,7 +58,7 @@ extern { // copy the value data bytes of type from the // into the host container object , under key . - pub fn hostSetBytes(obj_id: i32, key_id: i32, type_id: i32, buffer: *const u8, len: i32); + pub fn hostSetBytes(obj_id: i32, key_id: i32, type_id: i32, buffer: *const u8, size: i32); } pub fn call_func(obj_id: i32, key_id: Key32, params: &[u8]) -> Vec { @@ -93,10 +93,19 @@ pub fn clear(obj_id: i32) { set_bytes(obj_id, KEY_LENGTH, TYPE_INT32, &0_i32.to_le_bytes()) } +// Delete the value with the specified key and type from the specified container object. +pub fn del_key(obj_id: i32, key_id: Key32, type_id: i32) { + unsafe { + // size -1 means delete + // this removes the need for a separate hostDelete function + hostSetBytes(obj_id, key_id.0, type_id, std::ptr::null_mut(), -1); + } +} + // Check if the specified container object contains a value with the specified key and type. pub fn exists(obj_id: i32, key_id: Key32, type_id: i32) -> bool { unsafe { - // negative length (-1) means only test for existence + // size -1 means only test for existence // returned size -1 indicates keyID not found (or error) // this removes the need for a separate hostExists function hostGetBytes(obj_id, key_id.0, type_id, std::ptr::null_mut(), -1) >= 0 @@ -120,7 +129,7 @@ pub fn get_bytes(obj_id: i32, key_id: Key32, type_id: i32) -> Vec { } } - // allocate a sufficient length byte array in Wasm memory + // allocate a sufficiently sized byte array in Wasm memory // and let the host copy the actual data bytes into this Wasm byte array let mut result = vec![0_u8; size as usize]; hostGetBytes(obj_id, key_id.0, type_id, result.as_mut_ptr(), size); diff --git a/packages/vm/wasmlib/src/mutable.rs b/packages/vm/wasmlib/src/mutable.rs index 9c0625eef3..8ffaca21b0 100644 --- a/packages/vm/wasmlib/src/mutable.rs +++ b/packages/vm/wasmlib/src/mutable.rs @@ -24,6 +24,11 @@ impl ScMutableAddress { ScMutableAddress { obj_id, key_id } } + // delete value from host container + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_ADDRESS); + } + // check if value exists in host container pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_ADDRESS) @@ -88,6 +93,11 @@ impl ScMutableAgentID { ScMutableAgentID { obj_id, key_id } } + // delete value from host container + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_AGENT_ID) + } + // check if value exists in host container pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_AGENT_ID) @@ -152,6 +162,11 @@ impl ScMutableBool { ScMutableBool { obj_id, key_id } } + // delete value from host container + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_BOOL) + } + // check if value exists in host container pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_BOOL) @@ -218,6 +233,11 @@ impl ScMutableBytes { ScMutableBytes { obj_id, key_id } } + // delete value from host container + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_BYTES) + } + // check if value exists in host container pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_BYTES) @@ -282,6 +302,11 @@ impl ScMutableChainID { ScMutableChainID { obj_id, key_id } } + // delete value from host container + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_CHAIN_ID) + } + // check if value exists in host container pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_CHAIN_ID) @@ -346,6 +371,11 @@ impl ScMutableColor { ScMutableColor { obj_id, key_id } } + // delete value from host container + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_COLOR) + } + // check if value exists in host container pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_COLOR) @@ -410,6 +440,11 @@ impl ScMutableHash { ScMutableHash { obj_id, key_id } } + // delete value from host container + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_HASH) + } + // check if value exists in host container pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_HASH) @@ -474,6 +509,11 @@ impl ScMutableHname { ScMutableHname { obj_id, key_id } } + // delete value from host container + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_HNAME) + } + // check if value exists in host container pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_HNAME) @@ -538,6 +578,11 @@ impl ScMutableInt8 { ScMutableInt8 { obj_id, key_id } } + // delete value from host container + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_INT8) + } + // check if value exists in host container pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_INT8) @@ -604,6 +649,11 @@ impl ScMutableInt16 { ScMutableInt16 { obj_id, key_id } } + // delete value from host container + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_INT16) + } + // check if value exists in host container pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_INT16) @@ -669,6 +719,11 @@ impl ScMutableInt32 { ScMutableInt32 { obj_id, key_id } } + // delete value from host container + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_INT32) + } + // check if value exists in host container pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_INT32) @@ -734,6 +789,11 @@ impl ScMutableInt64 { ScMutableInt64 { obj_id, key_id } } + // delete value from host container + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_INT64) + } + // check if value exists in host container pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_INT64) @@ -1074,6 +1134,11 @@ impl ScMutableRequestID { ScMutableRequestID { obj_id, key_id } } + // delete value from host container + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_REQUEST_ID) + } + // check if value exists in host container pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_REQUEST_ID) @@ -1138,6 +1203,11 @@ impl ScMutableString { ScMutableString { obj_id, key_id } } + // delete value from host container + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_STRING) + } + // check if value exists in host container pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_STRING) @@ -1203,6 +1273,11 @@ impl ScMutableUint8 { ScMutableUint8 { obj_id, key_id } } + // delete value from host container + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_INT8) + } + // check if value exists in host container pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_INT8) @@ -1269,6 +1344,11 @@ impl ScMutableUint16 { ScMutableUint16 { obj_id, key_id } } + // delete value from host container + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_INT16) + } + // check if value exists in host container pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_INT16) @@ -1334,6 +1414,11 @@ impl ScMutableUint32 { ScMutableUint32 { obj_id, key_id } } + // delete value from host container + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_INT32) + } + // check if value exists in host container pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_INT32) @@ -1399,6 +1484,11 @@ impl ScMutableUint64 { ScMutableUint64 { obj_id, key_id } } + // delete value from host container + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_INT64) + } + // check if value exists in host container pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_INT64) diff --git a/packages/vm/wasmlib/ts/wasmlib/host.ts b/packages/vm/wasmlib/ts/wasmlib/host.ts index 3d8b8f6806..a830b80eb0 100644 --- a/packages/vm/wasmlib/ts/wasmlib/host.ts +++ b/packages/vm/wasmlib/ts/wasmlib/host.ts @@ -87,7 +87,14 @@ export function callFunc(objID: i32, keyID: Key32, params: u8[]): u8[] { // Removes all its sub-objects as well. export function clear(objID: i32): void { // special key "length" is used with integer value zero - setBytes(objID, keys.KEY_LENGTH, TYPE_INT32, Convert.fromI32(0)) + setBytes(objID, keys.KEY_LENGTH, TYPE_INT32, Convert.fromI32(0)); +} + +// Delete the value with the specified key and type from the specified container object. +export function delKey(objID: i32, keyID: Key32, typeID: i32): void { + // size -1 means delete + // this removes the need for a separate hostDelete function + hostSetBytes(objID, keyID.keyID, typeID, 0, -1); } // Check if the specified container object contains a value with the specified key and type. @@ -161,12 +168,12 @@ export function getObjectID(objID: i32, keyID: Key32, typeID: i32): i32 { // Direct logging of informational text to host log export function log(text: string): void { - setBytes(1, keys.KEY_LOG, TYPE_STRING, Convert.fromString(text)) + setBytes(1, keys.KEY_LOG, TYPE_STRING, Convert.fromString(text)); } // Direct logging of error to host log, followed by panicking out of the Wasm code export function panic(text: string): void { - setBytes(1, keys.KEY_PANIC, TYPE_STRING, Convert.fromString(text)) + setBytes(1, keys.KEY_PANIC, TYPE_STRING, Convert.fromString(text)); } // Store the provided value bytes of specified type in the specified container object @@ -178,5 +185,5 @@ export function setBytes(objID: i32, keyID: Key32, typeID: i32, value: u8[]): vo // Direct logging of debug trace text to host log export function trace(text: string): void { - setBytes(1, keys.KEY_TRACE, TYPE_STRING, Convert.fromString(text)) + setBytes(1, keys.KEY_TRACE, TYPE_STRING, Convert.fromString(text)); } diff --git a/packages/vm/wasmlib/ts/wasmlib/immutable.ts b/packages/vm/wasmlib/ts/wasmlib/immutable.ts index 3c11983d60..78519b84cd 100644 --- a/packages/vm/wasmlib/ts/wasmlib/immutable.ts +++ b/packages/vm/wasmlib/ts/wasmlib/immutable.ts @@ -7,7 +7,6 @@ import { base58Encode } from "./context"; import {Convert} from "./convert"; import {ScAddress,ScAgentID,ScChainID,ScColor,ScHash,ScHname,ScRequestID} from "./hashtypes"; import * as host from "./host"; -import {callFunc, exists, getBytes, getLength, getObjectID} from "./host"; import {Key32,MapKey} from "./keys"; // value proxy for immutable ScAddress in host container @@ -22,7 +21,7 @@ export class ScImmutableAddress { // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_ADDRESS); + return host.exists(this.objID, this.keyID, host.TYPE_ADDRESS); } // human-readable string representation @@ -32,7 +31,7 @@ export class ScImmutableAddress { // get value from host container value(): ScAddress { - return ScAddress.fromBytes(getBytes(this.objID, this.keyID, host.TYPE_ADDRESS)); + return ScAddress.fromBytes(host.getBytes(this.objID, this.keyID, host.TYPE_ADDRESS)); } } @@ -53,7 +52,7 @@ export class ScImmutableAddressArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -71,7 +70,7 @@ export class ScImmutableAgentID { // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_AGENT_ID); + return host.exists(this.objID, this.keyID, host.TYPE_AGENT_ID); } // human-readable string representation @@ -81,7 +80,7 @@ export class ScImmutableAgentID { // get value from host container value(): ScAgentID { - return ScAgentID.fromBytes(getBytes(this.objID, this.keyID, host.TYPE_AGENT_ID)); + return ScAgentID.fromBytes(host.getBytes(this.objID, this.keyID, host.TYPE_AGENT_ID)); } } @@ -102,7 +101,7 @@ export class ScImmutableAgentIDArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -120,7 +119,7 @@ export class ScImmutableBool { // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_BOOL); + return host.exists(this.objID, this.keyID, host.TYPE_BOOL); } // human-readable string representation @@ -130,7 +129,7 @@ export class ScImmutableBool { // get value from host container value(): boolean { - let bytes = getBytes(this.objID, this.keyID, host.TYPE_BOOL); + let bytes = host.getBytes(this.objID, this.keyID, host.TYPE_BOOL); return bytes[0] != 0; } } @@ -152,7 +151,7 @@ export class ScImmutableBoolArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -170,7 +169,7 @@ export class ScImmutableBytes { // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_BYTES); + return host.exists(this.objID, this.keyID, host.TYPE_BYTES); } // human-readable string representation @@ -180,7 +179,7 @@ export class ScImmutableBytes { // get value from host container value(): u8[] { - return getBytes(this.objID, this.keyID, host.TYPE_BYTES); + return host.getBytes(this.objID, this.keyID, host.TYPE_BYTES); } } @@ -201,7 +200,7 @@ export class ScImmutableBytesArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -219,7 +218,7 @@ export class ScImmutableChainID { // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_CHAIN_ID); + return host.exists(this.objID, this.keyID, host.TYPE_CHAIN_ID); } // human-readable string representation @@ -229,7 +228,7 @@ export class ScImmutableChainID { // get value from host container value(): ScChainID { - return ScChainID.fromBytes(getBytes(this.objID, this.keyID, host.TYPE_CHAIN_ID)); + return ScChainID.fromBytes(host.getBytes(this.objID, this.keyID, host.TYPE_CHAIN_ID)); } } @@ -250,7 +249,7 @@ export class ScImmutableChainIDArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -268,7 +267,7 @@ export class ScImmutableColor { // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_COLOR); + return host.exists(this.objID, this.keyID, host.TYPE_COLOR); } // human-readable string representation @@ -278,7 +277,7 @@ export class ScImmutableColor { // get value from host container value(): ScColor { - return ScColor.fromBytes(getBytes(this.objID, this.keyID, host.TYPE_COLOR)); + return ScColor.fromBytes(host.getBytes(this.objID, this.keyID, host.TYPE_COLOR)); } } @@ -299,7 +298,7 @@ export class ScImmutableColorArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -317,7 +316,7 @@ export class ScImmutableHash { // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_HASH); + return host.exists(this.objID, this.keyID, host.TYPE_HASH); } // human-readable string representation @@ -327,7 +326,7 @@ export class ScImmutableHash { // get value from host container value(): ScHash { - return ScHash.fromBytes(getBytes(this.objID, this.keyID, host.TYPE_HASH)); + return ScHash.fromBytes(host.getBytes(this.objID, this.keyID, host.TYPE_HASH)); } } @@ -348,7 +347,7 @@ export class ScImmutableHashArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -366,7 +365,7 @@ export class ScImmutableHname { // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_HNAME); + return host.exists(this.objID, this.keyID, host.TYPE_HNAME); } // human-readable string representation @@ -376,7 +375,7 @@ export class ScImmutableHname { // get value from host container value(): ScHname { - return ScHname.fromBytes(getBytes(this.objID, this.keyID, host.TYPE_HNAME)); + return ScHname.fromBytes(host.getBytes(this.objID, this.keyID, host.TYPE_HNAME)); } } @@ -397,7 +396,7 @@ export class ScImmutableHnameArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -415,7 +414,7 @@ export class ScImmutableInt8 { // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_INT8); + return host.exists(this.objID, this.keyID, host.TYPE_INT8); } // human-readable string representation @@ -425,7 +424,7 @@ export class ScImmutableInt8 { // get value from host container value(): i8 { - let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT8); + let bytes = host.getBytes(this.objID, this.keyID, host.TYPE_INT8); return bytes[0] as i8; } } @@ -447,7 +446,7 @@ export class ScImmutableInt8Array { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -465,7 +464,7 @@ export class ScImmutableInt16 { // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_INT16); + return host.exists(this.objID, this.keyID, host.TYPE_INT16); } // human-readable string representation @@ -475,7 +474,7 @@ export class ScImmutableInt16 { // get value from host container value(): i16 { - let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT16); + let bytes = host.getBytes(this.objID, this.keyID, host.TYPE_INT16); return Convert.toI16(bytes); } } @@ -497,7 +496,7 @@ export class ScImmutableInt16Array { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -515,7 +514,7 @@ export class ScImmutableInt32 { // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_INT32); + return host.exists(this.objID, this.keyID, host.TYPE_INT32); } // human-readable string representation @@ -525,7 +524,7 @@ export class ScImmutableInt32 { // get value from host container value(): i32 { - let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT32); + let bytes = host.getBytes(this.objID, this.keyID, host.TYPE_INT32); return Convert.toI32(bytes); } } @@ -547,7 +546,7 @@ export class ScImmutableInt32Array { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -565,7 +564,7 @@ export class ScImmutableInt64 { // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_INT64); + return host.exists(this.objID, this.keyID, host.TYPE_INT64); } // human-readable string representation @@ -575,7 +574,7 @@ export class ScImmutableInt64 { // get value from host container value(): i64 { - let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT64); + let bytes = host.getBytes(this.objID, this.keyID, host.TYPE_INT64); return Convert.toI64(bytes); } } @@ -597,7 +596,7 @@ export class ScImmutableInt64Array { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -612,7 +611,7 @@ export class ScImmutableMap { } callFunc(keyID: Key32, params: u8[]): u8[] { - return callFunc(this.objID, keyID, params); + return host.callFunc(this.objID, keyID, params); } // get value proxy for immutable ScAddress field specified by key @@ -622,7 +621,7 @@ export class ScImmutableMap { // get array proxy for ScImmutableAddressArray specified by key getAddressArray(key: MapKey): ScImmutableAddressArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_ADDRESS | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_ADDRESS | host.TYPE_ARRAY); return new ScImmutableAddressArray(arrID); } @@ -633,7 +632,7 @@ export class ScImmutableMap { // get array proxy for ScImmutableAgentIDArray specified by key getAgentIDArray(key: MapKey): ScImmutableAgentIDArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_AGENT_ID | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_AGENT_ID | host.TYPE_ARRAY); return new ScImmutableAgentIDArray(arrID); } @@ -644,7 +643,7 @@ export class ScImmutableMap { // get array proxy for ScImmutableBoolArray specified by key getBoolArray(key: MapKey): ScImmutableBoolArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_BOOL | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_BOOL | host.TYPE_ARRAY); return new ScImmutableBoolArray(arrID); } @@ -655,7 +654,7 @@ export class ScImmutableMap { // get array proxy for ScImmutableBytesArray specified by key getBytesArray(key: MapKey): ScImmutableBytesArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_BYTES | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_BYTES | host.TYPE_ARRAY); return new ScImmutableBytesArray(arrID); } @@ -666,7 +665,7 @@ export class ScImmutableMap { // get array proxy for ScImmutableChainIDArray specified by key getChainIDArray(key: MapKey): ScImmutableChainIDArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_CHAIN_ID | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_CHAIN_ID | host.TYPE_ARRAY); return new ScImmutableChainIDArray(arrID); } @@ -677,7 +676,7 @@ export class ScImmutableMap { // get array proxy for ScImmutableColorArray specified by key getColorArray(key: MapKey): ScImmutableColorArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_COLOR | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_COLOR | host.TYPE_ARRAY); return new ScImmutableColorArray(arrID); } @@ -688,7 +687,7 @@ export class ScImmutableMap { // get array proxy for ScImmutableHashArray specified by key getHashArray(key: MapKey): ScImmutableHashArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_HASH | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_HASH | host.TYPE_ARRAY); return new ScImmutableHashArray(arrID); } @@ -699,7 +698,7 @@ export class ScImmutableMap { // get array proxy for ScImmutableHnameArray specified by key getHnameArray(key: MapKey): ScImmutableHnameArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_HNAME | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_HNAME | host.TYPE_ARRAY); return new ScImmutableHnameArray(arrID); } @@ -710,7 +709,7 @@ export class ScImmutableMap { // get array proxy for ScImmutableInt8Array specified by key getInt8Array(key: MapKey): ScImmutableInt8Array { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT8 | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_INT8 | host.TYPE_ARRAY); return new ScImmutableInt8Array(arrID); } @@ -721,7 +720,7 @@ export class ScImmutableMap { // get array proxy for ScImmutableInt16Array specified by key getInt16Array(key: MapKey): ScImmutableInt16Array { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT16 | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_INT16 | host.TYPE_ARRAY); return new ScImmutableInt16Array(arrID); } @@ -732,7 +731,7 @@ export class ScImmutableMap { // get array proxy for ScImmutableInt32Array specified by key getInt32Array(key: MapKey): ScImmutableInt32Array { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT32 | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_INT32 | host.TYPE_ARRAY); return new ScImmutableInt32Array(arrID); } @@ -743,19 +742,19 @@ export class ScImmutableMap { // get array proxy for ScImmutableInt64Array specified by key getInt64Array(key: MapKey): ScImmutableInt64Array { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT64 | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_INT64 | host.TYPE_ARRAY); return new ScImmutableInt64Array(arrID); } // get map proxy for ScImmutableMap specified by key getMap(key: MapKey): ScImmutableMap { - let mapID = getObjectID(this.objID, key.getKeyID(), host.TYPE_MAP); + let mapID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_MAP); return new ScImmutableMap(mapID); } // get array proxy for ScImmutableMapArray specified by key getMapArray(key: MapKey): ScImmutableMapArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_MAP | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_MAP | host.TYPE_ARRAY); return new ScImmutableMapArray(arrID); } @@ -766,7 +765,7 @@ export class ScImmutableMap { // get array proxy for ScImmutableRequestIDArray specified by key getRequestIDArray(key: MapKey): ScImmutableRequestIDArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_REQUEST_ID | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_REQUEST_ID | host.TYPE_ARRAY); return new ScImmutableRequestIDArray(arrID); } @@ -777,7 +776,7 @@ export class ScImmutableMap { // get array proxy for ScImmutableStringArray specified by key getStringArray(key: MapKey): ScImmutableStringArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_STRING | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_STRING | host.TYPE_ARRAY); return new ScImmutableStringArray(arrID); } @@ -788,7 +787,7 @@ export class ScImmutableMap { // get array proxy for ScImmutableUint8Array specified by key getUint8Array(key: MapKey): ScImmutableUint8Array { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT8 | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_INT8 | host.TYPE_ARRAY); return new ScImmutableUint8Array(arrID); } @@ -799,7 +798,7 @@ export class ScImmutableMap { // get array proxy for ScImmutableUint16Array specified by key getUint16Array(key: MapKey): ScImmutableUint16Array { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT16 | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_INT16 | host.TYPE_ARRAY); return new ScImmutableUint16Array(arrID); } @@ -810,7 +809,7 @@ export class ScImmutableMap { // get array proxy for ScImmutableUint32Array specified by key getUint32Array(key: MapKey): ScImmutableUint32Array { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT32 | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_INT32 | host.TYPE_ARRAY); return new ScImmutableUint32Array(arrID); } @@ -821,7 +820,7 @@ export class ScImmutableMap { // get array proxy for ScImmutableUint64Array specified by key getUint64Array(key: MapKey): ScImmutableUint64Array { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT64 | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_INT64 | host.TYPE_ARRAY); return new ScImmutableUint64Array(arrID); } @@ -842,13 +841,13 @@ export class ScImmutableMapArray { // get value proxy for item at index, index can be 0..length()-1 getMap(index: i32): ScImmutableMap { - let mapID = getObjectID(this.objID, new Key32(index), host.TYPE_MAP); + let mapID = host.getObjectID(this.objID, new Key32(index), host.TYPE_MAP); return new ScImmutableMap(mapID); } // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -864,7 +863,7 @@ export class ScImmutableRequestID { // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_REQUEST_ID); + return host.exists(this.objID, this.keyID, host.TYPE_REQUEST_ID); } // human-readable string representation @@ -874,7 +873,7 @@ export class ScImmutableRequestID { // get value from host container value(): ScRequestID { - return ScRequestID.fromBytes(getBytes(this.objID, this.keyID, host.TYPE_REQUEST_ID)); + return ScRequestID.fromBytes(host.getBytes(this.objID, this.keyID, host.TYPE_REQUEST_ID)); } } @@ -895,7 +894,7 @@ export class ScImmutableRequestIDArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -913,7 +912,7 @@ export class ScImmutableString { // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_STRING); + return host.exists(this.objID, this.keyID, host.TYPE_STRING); } // human-readable string representation @@ -923,7 +922,7 @@ export class ScImmutableString { // get value from host container value(): string { - let bytes = getBytes(this.objID, this.keyID, host.TYPE_STRING); + let bytes = host.getBytes(this.objID, this.keyID, host.TYPE_STRING); return Convert.toString(bytes); } } @@ -945,7 +944,7 @@ export class ScImmutableStringArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -963,7 +962,7 @@ export class ScImmutableUint8 { // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_INT8); + return host.exists(this.objID, this.keyID, host.TYPE_INT8); } // human-readable string representation @@ -973,7 +972,7 @@ export class ScImmutableUint8 { // get value from host container value(): u8 { - let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT8); + let bytes = host.getBytes(this.objID, this.keyID, host.TYPE_INT8); return bytes[0] as u8; } } @@ -995,7 +994,7 @@ export class ScImmutableUint8Array { // number of items in array length(): u32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -1013,7 +1012,7 @@ export class ScImmutableUint16 { // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_INT16); + return host.exists(this.objID, this.keyID, host.TYPE_INT16); } // human-readable string representation @@ -1023,7 +1022,7 @@ export class ScImmutableUint16 { // get value from host container value(): u16 { - let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT16); + let bytes = host.getBytes(this.objID, this.keyID, host.TYPE_INT16); return Convert.toI16(bytes) as u16; } } @@ -1045,7 +1044,7 @@ export class ScImmutableUint16Array { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -1063,7 +1062,7 @@ export class ScImmutableUint32 { // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_INT32); + return host.exists(this.objID, this.keyID, host.TYPE_INT32); } // human-readable string representation @@ -1073,7 +1072,7 @@ export class ScImmutableUint32 { // get value from host container value(): u32 { - let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT32); + let bytes = host.getBytes(this.objID, this.keyID, host.TYPE_INT32); return Convert.toI32(bytes) as u32; } } @@ -1095,7 +1094,7 @@ export class ScImmutableUint32Array { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -1113,7 +1112,7 @@ export class ScImmutableUint64 { // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_INT64); + return host.exists(this.objID, this.keyID, host.TYPE_INT64); } // human-readable string representation @@ -1123,7 +1122,7 @@ export class ScImmutableUint64 { // get value from host container value(): u64 { - let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT64); + let bytes = host.getBytes(this.objID, this.keyID, host.TYPE_INT64); return Convert.toI64(bytes) as u64; } } @@ -1145,6 +1144,6 @@ export class ScImmutableUint64Array { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } diff --git a/packages/vm/wasmlib/ts/wasmlib/mutable.ts b/packages/vm/wasmlib/ts/wasmlib/mutable.ts index 1943567016..6bb0923a10 100644 --- a/packages/vm/wasmlib/ts/wasmlib/mutable.ts +++ b/packages/vm/wasmlib/ts/wasmlib/mutable.ts @@ -7,7 +7,6 @@ import {base58Encode, ROOT} from "./context"; import {Convert} from "./convert"; import {ScAddress, ScAgentID, ScChainID, ScColor, ScHash, ScHname, ScRequestID} from "./hashtypes"; import * as host from "./host"; -import {callFunc, clear, exists, getBytes, getLength, getObjectID, setBytes} from "./host"; import { ScImmutableAddressArray, ScImmutableAgentIDArray, @@ -44,14 +43,19 @@ export class ScMutableAddress { this.keyID = keyID; } + // delete value from host container + delete(): void { + host.delKey(this.objID, this.keyID, host.TYPE_ADDRESS); + } + // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_ADDRESS); + return host.exists(this.objID, this.keyID, host.TYPE_ADDRESS); } // set value in host container setValue(val: ScAddress): void { - setBytes(this.objID, this.keyID, host.TYPE_ADDRESS, val.toBytes()); + host.setBytes(this.objID, this.keyID, host.TYPE_ADDRESS, val.toBytes()); } // human-readable string representation @@ -61,7 +65,7 @@ export class ScMutableAddress { // retrieve value from host container value(): ScAddress { - return ScAddress.fromBytes(getBytes(this.objID, this.keyID, host.TYPE_ADDRESS)); + return ScAddress.fromBytes(host.getBytes(this.objID, this.keyID, host.TYPE_ADDRESS)); } } @@ -77,7 +81,7 @@ export class ScMutableAddressArray { // empty the array clear(): void { - clear(this.objID); + host.clear(this.objID); } // get value proxy for item at index, index can be 0..length() @@ -93,7 +97,7 @@ export class ScMutableAddressArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -109,14 +113,19 @@ export class ScMutableAgentID { this.keyID = keyID; } + // delete value from host container + delete(): void { + host.delKey(this.objID, this.keyID, host.TYPE_AGENT_ID); + } + // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_AGENT_ID); + return host.exists(this.objID, this.keyID, host.TYPE_AGENT_ID); } // set value in host container setValue(val: ScAgentID): void { - setBytes(this.objID, this.keyID, host.TYPE_AGENT_ID, val.toBytes()); + host.setBytes(this.objID, this.keyID, host.TYPE_AGENT_ID, val.toBytes()); } // human-readable string representation @@ -126,7 +135,7 @@ export class ScMutableAgentID { // retrieve value from host container value(): ScAgentID { - return ScAgentID.fromBytes(getBytes(this.objID, this.keyID, host.TYPE_AGENT_ID)); + return ScAgentID.fromBytes(host.getBytes(this.objID, this.keyID, host.TYPE_AGENT_ID)); } } @@ -142,7 +151,7 @@ export class ScMutableAgentIDArray { // empty the array clear(): void { - clear(this.objID); + host.clear(this.objID); } // get value proxy for item at index, index can be 0..length() @@ -158,7 +167,7 @@ export class ScMutableAgentIDArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -174,15 +183,20 @@ export class ScMutableBool { this.keyID = keyID; } + // delete value from host container + delete(): void { + host.delKey(this.objID, this.keyID, host.TYPE_BOOL); + } + // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_BOOL); + return host.exists(this.objID, this.keyID, host.TYPE_BOOL); } // set value in host container setValue(val: boolean): void { let bytes: u8[] = [(val ? 1 : 0) as u8] - setBytes(this.objID, this.keyID, host.TYPE_BOOL, bytes); + host.setBytes(this.objID, this.keyID, host.TYPE_BOOL, bytes); } // human-readable string representation @@ -192,7 +206,7 @@ export class ScMutableBool { // retrieve value from host container value(): boolean { - let bytes = getBytes(this.objID, this.keyID, host.TYPE_BOOL); + let bytes = host.getBytes(this.objID, this.keyID, host.TYPE_BOOL); return bytes[0] != 0; } } @@ -209,7 +223,7 @@ export class ScMutableBoolArray { // empty the array clear(): void { - clear(this.objID); + host.clear(this.objID); } // get value proxy for item at index, index can be 0..length() @@ -225,7 +239,7 @@ export class ScMutableBoolArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -241,14 +255,19 @@ export class ScMutableBytes { this.keyID = keyID; } + // delete value from host container + delete(): void { + host.delKey(this.objID, this.keyID, host.TYPE_BYTES); + } + // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_BYTES); + return host.exists(this.objID, this.keyID, host.TYPE_BYTES); } // set value in host container setValue(val: u8[]): void { - setBytes(this.objID, this.keyID, host.TYPE_BYTES, val); + host.setBytes(this.objID, this.keyID, host.TYPE_BYTES, val); } // human-readable string representation @@ -258,7 +277,7 @@ export class ScMutableBytes { // retrieve value from host container value(): u8[] { - return getBytes(this.objID, this.keyID, host.TYPE_BYTES); + return host.getBytes(this.objID, this.keyID, host.TYPE_BYTES); } } @@ -274,7 +293,7 @@ export class ScMutableBytesArray { // empty the array clear(): void { - clear(this.objID); + host.clear(this.objID); } // get value proxy for item at index, index can be 0..length() @@ -290,7 +309,7 @@ export class ScMutableBytesArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -306,14 +325,19 @@ export class ScMutableChainID { this.keyID = keyID; } + // delete value from host container + delete(): void { + host.delKey(this.objID, this.keyID, host.TYPE_CHAIN_ID); + } + // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_CHAIN_ID); + return host.exists(this.objID, this.keyID, host.TYPE_CHAIN_ID); } // set value in host container setValue(val: ScChainID): void { - setBytes(this.objID, this.keyID, host.TYPE_CHAIN_ID, val.toBytes()); + host.setBytes(this.objID, this.keyID, host.TYPE_CHAIN_ID, val.toBytes()); } // human-readable string representation @@ -323,7 +347,7 @@ export class ScMutableChainID { // retrieve value from host container value(): ScChainID { - return ScChainID.fromBytes(getBytes(this.objID, this.keyID, host.TYPE_CHAIN_ID)); + return ScChainID.fromBytes(host.getBytes(this.objID, this.keyID, host.TYPE_CHAIN_ID)); } } @@ -339,7 +363,7 @@ export class ScMutableChainIDArray { // empty the array clear(): void { - clear(this.objID); + host.clear(this.objID); } // get value proxy for item at index, index can be 0..length() @@ -355,7 +379,7 @@ export class ScMutableChainIDArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -371,14 +395,19 @@ export class ScMutableColor { this.keyID = keyID; } + // delete value from host container + delete(): void { + host.delKey(this.objID, this.keyID, host.TYPE_COLOR); + } + // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_COLOR); + return host.exists(this.objID, this.keyID, host.TYPE_COLOR); } // set value in host container setValue(val: ScColor): void { - setBytes(this.objID, this.keyID, host.TYPE_COLOR, val.toBytes()); + host.setBytes(this.objID, this.keyID, host.TYPE_COLOR, val.toBytes()); } // human-readable string representation @@ -388,7 +417,7 @@ export class ScMutableColor { // retrieve value from host container value(): ScColor { - return ScColor.fromBytes(getBytes(this.objID, this.keyID, host.TYPE_COLOR)); + return ScColor.fromBytes(host.getBytes(this.objID, this.keyID, host.TYPE_COLOR)); } } @@ -404,7 +433,7 @@ export class ScMutableColorArray { // empty the array clear(): void { - clear(this.objID); + host.clear(this.objID); } // get value proxy for item at index, index can be 0..length() @@ -420,7 +449,7 @@ export class ScMutableColorArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -436,14 +465,19 @@ export class ScMutableHash { this.keyID = keyID; } + // delete value from host container + delete(): void { + host.delKey(this.objID, this.keyID, host.TYPE_HASH); + } + // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_HASH); + return host.exists(this.objID, this.keyID, host.TYPE_HASH); } // set value in host container setValue(val: ScHash): void { - setBytes(this.objID, this.keyID, host.TYPE_HASH, val.toBytes()); + host.setBytes(this.objID, this.keyID, host.TYPE_HASH, val.toBytes()); } // human-readable string representation @@ -453,7 +487,7 @@ export class ScMutableHash { // retrieve value from host container value(): ScHash { - return ScHash.fromBytes(getBytes(this.objID, this.keyID, host.TYPE_HASH)); + return ScHash.fromBytes(host.getBytes(this.objID, this.keyID, host.TYPE_HASH)); } } @@ -469,7 +503,7 @@ export class ScMutableHashArray { // empty the array clear(): void { - clear(this.objID); + host.clear(this.objID); } // get value proxy for item at index, index can be 0..length() @@ -485,7 +519,7 @@ export class ScMutableHashArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -501,14 +535,19 @@ export class ScMutableHname { this.keyID = keyID; } + // delete value from host container + delete(): void { + host.delKey(this.objID, this.keyID, host.TYPE_HNAME); + } + // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_HNAME); + return host.exists(this.objID, this.keyID, host.TYPE_HNAME); } // set value in host container setValue(val: ScHname): void { - setBytes(this.objID, this.keyID, host.TYPE_HNAME, val.toBytes()); + host.setBytes(this.objID, this.keyID, host.TYPE_HNAME, val.toBytes()); } // human-readable string representation @@ -518,7 +557,7 @@ export class ScMutableHname { // retrieve value from host container value(): ScHname { - return ScHname.fromBytes(getBytes(this.objID, this.keyID, host.TYPE_HNAME)); + return ScHname.fromBytes(host.getBytes(this.objID, this.keyID, host.TYPE_HNAME)); } } @@ -534,7 +573,7 @@ export class ScMutableHnameArray { // empty the array clear(): void { - clear(this.objID); + host.clear(this.objID); } // get value proxy for item at index, index can be 0..length() @@ -550,7 +589,7 @@ export class ScMutableHnameArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -566,15 +605,20 @@ export class ScMutableInt8 { this.keyID = keyID; } + // delete value from host container + delete(): void { + host.delKey(this.objID, this.keyID, host.TYPE_INT8); + } + // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_INT8); + return host.exists(this.objID, this.keyID, host.TYPE_INT8); } // set value in host container setValue(val: i8): void { let bytes: u8[] = [val as u8]; - setBytes(this.objID, this.keyID, host.TYPE_INT8, bytes); + host.setBytes(this.objID, this.keyID, host.TYPE_INT8, bytes); } // human-readable string representation @@ -584,7 +628,7 @@ export class ScMutableInt8 { // retrieve value from host container value(): i8 { - let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT8); + let bytes = host.getBytes(this.objID, this.keyID, host.TYPE_INT8); return bytes[0] as i8; } } @@ -601,7 +645,7 @@ export class ScMutableInt8Array { // empty the array clear(): void { - clear(this.objID); + host.clear(this.objID); } // get value proxy for item at index, index can be 0..length() @@ -617,7 +661,7 @@ export class ScMutableInt8Array { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -633,14 +677,19 @@ export class ScMutableInt16 { this.keyID = keyID; } + // delete value from host container + delete(): void { + host.delKey(this.objID, this.keyID, host.TYPE_INT16); + } + // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_INT16); + return host.exists(this.objID, this.keyID, host.TYPE_INT16); } // set value in host container setValue(val: i16): void { - setBytes(this.objID, this.keyID, host.TYPE_INT16, Convert.fromI16(val)); + host.setBytes(this.objID, this.keyID, host.TYPE_INT16, Convert.fromI16(val)); } // human-readable string representation @@ -650,7 +699,7 @@ export class ScMutableInt16 { // retrieve value from host container value(): i16 { - return Convert.toI16(getBytes(this.objID, this.keyID, host.TYPE_INT16)); + return Convert.toI16(host.getBytes(this.objID, this.keyID, host.TYPE_INT16)); } } @@ -666,7 +715,7 @@ export class ScMutableInt16Array { // empty the array clear(): void { - clear(this.objID); + host.clear(this.objID); } // get value proxy for item at index, index can be 0..length() @@ -682,7 +731,7 @@ export class ScMutableInt16Array { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -698,14 +747,19 @@ export class ScMutableInt32 { this.keyID = keyID; } + // delete value from host container + delete(): void { + host.delKey(this.objID, this.keyID, host.TYPE_INT32); + } + // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_INT32); + return host.exists(this.objID, this.keyID, host.TYPE_INT32); } // set value in host container setValue(val: i32): void { - setBytes(this.objID, this.keyID, host.TYPE_INT32, Convert.fromI32(val)); + host.setBytes(this.objID, this.keyID, host.TYPE_INT32, Convert.fromI32(val)); } // human-readable string representation @@ -715,7 +769,7 @@ export class ScMutableInt32 { // retrieve value from host container value(): i32 { - return Convert.toI32(getBytes(this.objID, this.keyID, host.TYPE_INT32)); + return Convert.toI32(host.getBytes(this.objID, this.keyID, host.TYPE_INT32)); } } @@ -731,7 +785,7 @@ export class ScMutableInt32Array { // empty the array clear(): void { - clear(this.objID); + host.clear(this.objID); } // get value proxy for item at index, index can be 0..length() @@ -747,7 +801,7 @@ export class ScMutableInt32Array { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -763,14 +817,19 @@ export class ScMutableInt64 { this.keyID = keyID; } + // delete value from host container + delete(): void { + host.delKey(this.objID, this.keyID, host.TYPE_INT64); + } + // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_INT64); + return host.exists(this.objID, this.keyID, host.TYPE_INT64); } // set value in host container setValue(val: i64): void { - setBytes(this.objID, this.keyID, host.TYPE_INT64, Convert.fromI64(val)); + host.setBytes(this.objID, this.keyID, host.TYPE_INT64, Convert.fromI64(val)); } // human-readable string representation @@ -780,7 +839,7 @@ export class ScMutableInt64 { // retrieve value from host container value(): i64 { - return Convert.toI64(getBytes(this.objID, this.keyID, host.TYPE_INT64)); + return Convert.toI64(host.getBytes(this.objID, this.keyID, host.TYPE_INT64)); } } @@ -796,7 +855,7 @@ export class ScMutableInt64Array { // empty the array clear(): void { - clear(this.objID); + host.clear(this.objID); } // get value proxy for item at index, index can be 0..length() @@ -812,7 +871,7 @@ export class ScMutableInt64Array { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -833,12 +892,12 @@ export class ScMutableMap { } callFunc(keyID: Key32, params: u8[]): u8[] { - return callFunc(this.objID, keyID, params); + return host.callFunc(this.objID, keyID, params); } // empty the map clear(): void { - clear(this.objID); + host.clear(this.objID); } // get value proxy for mutable ScAddress field specified by key @@ -848,7 +907,7 @@ export class ScMutableMap { // get array proxy for ScMutableAddressArray specified by key getAddressArray(key: MapKey): ScMutableAddressArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_ADDRESS | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_ADDRESS | host.TYPE_ARRAY); return new ScMutableAddressArray(arrID); } @@ -859,7 +918,7 @@ export class ScMutableMap { // get array proxy for ScMutableAgentIDArray specified by key getAgentIDArray(key: MapKey): ScMutableAgentIDArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_AGENT_ID | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_AGENT_ID | host.TYPE_ARRAY); return new ScMutableAgentIDArray(arrID); } @@ -870,7 +929,7 @@ export class ScMutableMap { // get array proxy for ScMutableBoolArray specified by key getBoolArray(key: MapKey): ScMutableBoolArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_BOOL | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_BOOL | host.TYPE_ARRAY); return new ScMutableBoolArray(arrID); } @@ -881,7 +940,7 @@ export class ScMutableMap { // get array proxy for ScMutableBytesArray specified by key getBytesArray(key: MapKey): ScMutableBytesArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_BYTES | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_BYTES | host.TYPE_ARRAY); return new ScMutableBytesArray(arrID); } @@ -892,7 +951,7 @@ export class ScMutableMap { // get array proxy for ScMutableChainIDArray specified by key getChainIDArray(key: MapKey): ScMutableChainIDArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_CHAIN_ID | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_CHAIN_ID | host.TYPE_ARRAY); return new ScMutableChainIDArray(arrID); } @@ -903,7 +962,7 @@ export class ScMutableMap { // get array proxy for ScMutableColorArray specified by key getColorArray(key: MapKey): ScMutableColorArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_COLOR | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_COLOR | host.TYPE_ARRAY); return new ScMutableColorArray(arrID); } @@ -914,7 +973,7 @@ export class ScMutableMap { // get array proxy for ScMutableHashArray specified by key getHashArray(key: MapKey): ScMutableHashArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_HASH | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_HASH | host.TYPE_ARRAY); return new ScMutableHashArray(arrID); } @@ -925,7 +984,7 @@ export class ScMutableMap { // get array proxy for ScMutableHnameArray specified by key getHnameArray(key: MapKey): ScMutableHnameArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_HNAME | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_HNAME | host.TYPE_ARRAY); return new ScMutableHnameArray(arrID); } @@ -936,7 +995,7 @@ export class ScMutableMap { // get array proxy for ScMutableInt8Array specified by key getInt8Array(key: MapKey): ScMutableInt8Array { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT8 | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_INT8 | host.TYPE_ARRAY); return new ScMutableInt8Array(arrID); } @@ -947,7 +1006,7 @@ export class ScMutableMap { // get array proxy for ScMutableInt16Array specified by key getInt16Array(key: MapKey): ScMutableInt16Array { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT16 | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_INT16 | host.TYPE_ARRAY); return new ScMutableInt16Array(arrID); } @@ -958,7 +1017,7 @@ export class ScMutableMap { // get array proxy for ScMutableInt32Array specified by key getInt32Array(key: MapKey): ScMutableInt32Array { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT32 | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_INT32 | host.TYPE_ARRAY); return new ScMutableInt32Array(arrID); } @@ -969,19 +1028,19 @@ export class ScMutableMap { // get array proxy for ScMutableInt64Array specified by key getInt64Array(key: MapKey): ScMutableInt64Array { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT64 | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_INT64 | host.TYPE_ARRAY); return new ScMutableInt64Array(arrID); } // get map proxy for ScMutableMap specified by key getMap(key: MapKey): ScMutableMap { - let mapID = getObjectID(this.objID, key.getKeyID(), host.TYPE_MAP); + let mapID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_MAP); return new ScMutableMap(mapID); } // get array proxy for ScMutableMapArray specified by key getMapArray(key: MapKey): ScMutableMapArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_MAP | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_MAP | host.TYPE_ARRAY); return new ScMutableMapArray(arrID); } @@ -992,7 +1051,7 @@ export class ScMutableMap { // get array proxy for ScMutableRequestIDArray specified by key getRequestIDArray(key: MapKey): ScMutableRequestIDArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_REQUEST_ID | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_REQUEST_ID | host.TYPE_ARRAY); return new ScMutableRequestIDArray(arrID); } @@ -1003,7 +1062,7 @@ export class ScMutableMap { // get array proxy for ScMutableStringArray specified by key getStringArray(key: MapKey): ScMutableStringArray { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_STRING | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_STRING | host.TYPE_ARRAY); return new ScMutableStringArray(arrID); } @@ -1014,7 +1073,7 @@ export class ScMutableMap { // get array proxy for ScMutableUint8Array specified by key getUint8Array(key: MapKey): ScMutableUint8Array { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT8 | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_INT8 | host.TYPE_ARRAY); return new ScMutableUint8Array(arrID); } @@ -1025,7 +1084,7 @@ export class ScMutableMap { // get array proxy for ScMutableUint16Array specified by key getUint16Array(key: MapKey): ScMutableUint16Array { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT16 | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_INT16 | host.TYPE_ARRAY); return new ScMutableUint16Array(arrID); } @@ -1036,7 +1095,7 @@ export class ScMutableMap { // get array proxy for ScMutableUint32Array specified by key getUint32Array(key: MapKey): ScMutableUint32Array { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT32 | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_INT32 | host.TYPE_ARRAY); return new ScMutableUint32Array(arrID); } @@ -1047,7 +1106,7 @@ export class ScMutableMap { // get array proxy for ScMutableUint64Array specified by key getUint64Array(key: MapKey): ScMutableUint64Array { - let arrID = getObjectID(this.objID, key.getKeyID(), host.TYPE_INT64 | host.TYPE_ARRAY); + let arrID = host.getObjectID(this.objID, key.getKeyID(), host.TYPE_INT64 | host.TYPE_ARRAY); return new ScMutableUint64Array(arrID); } @@ -1073,13 +1132,13 @@ export class ScMutableMapArray { // empty the array clear(): void { - clear(this.objID); + host.clear(this.objID); } // get value proxy for item at index, index can be 0..length() // when index equals length() a new item is appended getMap(index: i32): ScMutableMap { - let mapID = getObjectID(this.objID, new Key32(index), host.TYPE_MAP); + let mapID = host.getObjectID(this.objID, new Key32(index), host.TYPE_MAP); return new ScMutableMap(mapID); } @@ -1090,7 +1149,7 @@ export class ScMutableMapArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -1106,14 +1165,19 @@ export class ScMutableRequestID { this.keyID = keyID; } + // delete value from host container + delete(): void { + host.delKey(this.objID, this.keyID, host.TYPE_REQUEST_ID); + } + // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_REQUEST_ID); + return host.exists(this.objID, this.keyID, host.TYPE_REQUEST_ID); } // set value in host container setValue(val: ScRequestID): void { - setBytes(this.objID, this.keyID, host.TYPE_REQUEST_ID, val.toBytes()); + host.setBytes(this.objID, this.keyID, host.TYPE_REQUEST_ID, val.toBytes()); } // human-readable string representation @@ -1123,7 +1187,7 @@ export class ScMutableRequestID { // retrieve value from host container value(): ScRequestID { - return ScRequestID.fromBytes(getBytes(this.objID, this.keyID, host.TYPE_REQUEST_ID)); + return ScRequestID.fromBytes(host.getBytes(this.objID, this.keyID, host.TYPE_REQUEST_ID)); } } @@ -1139,7 +1203,7 @@ export class ScMutableRequestIDArray { // empty the array clear(): void { - clear(this.objID); + host.clear(this.objID); } // get value proxy for item at index, index can be 0..length() @@ -1155,7 +1219,7 @@ export class ScMutableRequestIDArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -1171,14 +1235,19 @@ export class ScMutableString { this.keyID = keyID; } + // delete value from host container + delete(): void { + host.delKey(this.objID, this.keyID, host.TYPE_STRING); + } + // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_STRING); + return host.exists(this.objID, this.keyID, host.TYPE_STRING); } // set value in host container setValue(val: string): void { - setBytes(this.objID, this.keyID, host.TYPE_STRING, Convert.fromString(val)); + host.setBytes(this.objID, this.keyID, host.TYPE_STRING, Convert.fromString(val)); } // human-readable string representation @@ -1188,7 +1257,7 @@ export class ScMutableString { // retrieve value from host container value(): string { - let bytes = getBytes(this.objID, this.keyID, host.TYPE_STRING); + let bytes = host.getBytes(this.objID, this.keyID, host.TYPE_STRING); return Convert.toString(bytes); } } @@ -1205,7 +1274,7 @@ export class ScMutableStringArray { // empty the array clear(): void { - clear(this.objID); + host.clear(this.objID); } // get value proxy for item at index, index can be 0..length() @@ -1221,7 +1290,7 @@ export class ScMutableStringArray { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -1237,15 +1306,20 @@ export class ScMutableUint8 { this.keyID = keyID; } + // delete value from host container + delete(): void { + host.delKey(this.objID, this.keyID, host.TYPE_INT8); + } + // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_INT8); + return host.exists(this.objID, this.keyID, host.TYPE_INT8); } // set value in host container setValue(val: u8): void { let bytes: u8[] = [val as u8]; - setBytes(this.objID, this.keyID, host.TYPE_INT8, bytes); + host.setBytes(this.objID, this.keyID, host.TYPE_INT8, bytes); } // human-readable string representation @@ -1255,7 +1329,7 @@ export class ScMutableUint8 { // retrieve value from host container value(): u8 { - let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT8); + let bytes = host.getBytes(this.objID, this.keyID, host.TYPE_INT8); return bytes[0] as u8; } } @@ -1272,7 +1346,7 @@ export class ScMutableUint8Array { // empty the array clear(): void { - clear(this.objID); + host.clear(this.objID); } // get value proxy for item at index, index can be 0..length() @@ -1288,7 +1362,7 @@ export class ScMutableUint8Array { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -1304,14 +1378,19 @@ export class ScMutableUint16 { this.keyID = keyID; } + // delete value from host container + delete(): void { + host.delKey(this.objID, this.keyID, host.TYPE_INT16); + } + // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_INT16); + return host.exists(this.objID, this.keyID, host.TYPE_INT16); } // set value in host container setValue(val: u16): void { - setBytes(this.objID, this.keyID, host.TYPE_INT16, Convert.fromI16(val)); + host.setBytes(this.objID, this.keyID, host.TYPE_INT16, Convert.fromI16(val)); } // human-readable string representation @@ -1321,7 +1400,7 @@ export class ScMutableUint16 { // retrieve value from host container value(): u16 { - let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT16); + let bytes = host.getBytes(this.objID, this.keyID, host.TYPE_INT16); return Convert.toI16(bytes) as u16; } } @@ -1338,7 +1417,7 @@ export class ScMutableUint16Array { // empty the array clear(): void { - clear(this.objID); + host.clear(this.objID); } // get value proxy for item at index, index can be 0..length() @@ -1354,7 +1433,7 @@ export class ScMutableUint16Array { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -1370,14 +1449,19 @@ export class ScMutableUint32 { this.keyID = keyID; } + // delete value from host container + delete(): void { + host.delKey(this.objID, this.keyID, host.TYPE_INT32); + } + // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_INT32); + return host.exists(this.objID, this.keyID, host.TYPE_INT32); } // set value in host container setValue(val: u32): void { - setBytes(this.objID, this.keyID, host.TYPE_INT32, Convert.fromI32(val)); + host.setBytes(this.objID, this.keyID, host.TYPE_INT32, Convert.fromI32(val)); } // human-readable string representation @@ -1387,7 +1471,7 @@ export class ScMutableUint32 { // retrieve value from host container value(): u32 { - let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT32); + let bytes = host.getBytes(this.objID, this.keyID, host.TYPE_INT32); return Convert.toI32(bytes) as u32; } } @@ -1404,7 +1488,7 @@ export class ScMutableUint32Array { // empty the array clear(): void { - clear(this.objID); + host.clear(this.objID); } // get value proxy for item at index, index can be 0..length() @@ -1420,7 +1504,7 @@ export class ScMutableUint32Array { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } @@ -1436,14 +1520,19 @@ export class ScMutableUint64 { this.keyID = keyID; } + // delete value from host container + delete(): void { + host.delKey(this.objID, this.keyID, host.TYPE_INT64); + } + // check if value exists in host container exists(): boolean { - return exists(this.objID, this.keyID, host.TYPE_INT64); + return host.exists(this.objID, this.keyID, host.TYPE_INT64); } // set value in host container setValue(val: u64): void { - setBytes(this.objID, this.keyID, host.TYPE_INT64, Convert.fromI64(val)); + host.setBytes(this.objID, this.keyID, host.TYPE_INT64, Convert.fromI64(val)); } // human-readable string representation @@ -1453,7 +1542,7 @@ export class ScMutableUint64 { // retrieve value from host container value(): u64 { - let bytes = getBytes(this.objID, this.keyID, host.TYPE_INT64); + let bytes = host.getBytes(this.objID, this.keyID, host.TYPE_INT64); return Convert.toI64(bytes) as u64; } } @@ -1470,7 +1559,7 @@ export class ScMutableUint64Array { // empty the array clear(): void { - clear(this.objID); + host.clear(this.objID); } // get value proxy for item at index, index can be 0..length() @@ -1486,6 +1575,6 @@ export class ScMutableUint64Array { // number of items in array length(): i32 { - return getLength(this.objID); + return host.getLength(this.objID); } } diff --git a/packages/vm/wasmproc/scdict.go b/packages/vm/wasmproc/scdict.go index 3808eb2298..73a770595d 100644 --- a/packages/vm/wasmproc/scdict.go +++ b/packages/vm/wasmproc/scdict.go @@ -114,6 +114,18 @@ func (o *ScDict) CallFunc(keyID int32, params []byte) []byte { return nil } +func (o *ScDict) DelKey(keyID, typeID int32) { + if keyID == wasmhost.KeyLength && (o.typeID&wasmhost.OBJTYPE_ARRAY) != 0 { + o.Panicf("DelKey: cannot delete array.length") + } + if o.typeID == (wasmhost.OBJTYPE_ARRAY | wasmhost.OBJTYPE_MAP) { + // TODO only delete map from array of map when it is empty? + // return uint32(keyID) <= uint32(len(o.objects)) + o.Panicf("DelKey: delete map from array of map") + } + o.kvStore.Del(o.key(keyID, typeID)) +} + func (o *ScDict) Exists(keyID, typeID int32) bool { if keyID == wasmhost.KeyLength && (o.typeID&wasmhost.OBJTYPE_ARRAY) != 0 { return true diff --git a/packages/vm/wasmproc/scsandbox.go b/packages/vm/wasmproc/scsandbox.go index 1671bbcbf5..d0b7311e5a 100644 --- a/packages/vm/wasmproc/scsandbox.go +++ b/packages/vm/wasmproc/scsandbox.go @@ -8,6 +8,10 @@ type ScSandboxObject struct { ScDict } +func (o *ScSandboxObject) DelKey(keyID, typeID int32) { + o.Panicf("DelKey: cannot delete predefined key") +} + func (o *ScSandboxObject) GetBytes(keyID, typeID int32) []byte { if keyID == wasmhost.KeyLength && (o.typeID&wasmhost.OBJTYPE_ARRAY) != 0 { return o.ScDict.GetBytes(keyID, typeID) diff --git a/tools/cluster/tests/wasm/inccounter_bg.wasm b/tools/cluster/tests/wasm/inccounter_bg.wasm index 024b43f447e2d6b1bb10c172e7b2f9b7cf5ce49a..c577e6e18ff82836a7db21ef397eef2f2517bb33 100644 GIT binary patch delta 506 zcmeBQ$ke}(X+qz`r9u-s#W!xZVdPlOxSdgFJEPj>-;7I@85uS&RGr4e(J=7k{$USA4~=+0U8dH zi~~!uU`lRw49aF;Z+BHZWAy6}K@mZZ<8k0P5MCSNf5iNuPOgV(p>H<@I`#QyWrbL)ZlvTp1V` zDu7r5h++H{K(^*&xw>}7pOcr>?Pu!dn4Dg3B`XFL1_4GO76)RG77zgOB`5EzPv?!{ S6kzZI@~VMYYxA>)mHYrD2#yK> delta 512 zcmeBQ$ke}(X+qz`r9u-s#W!xZVdU7(sI#3>Z8_uS-;7I@85uV(RGr4eai;$OgCn;9 z<7Rt}FkztJG;3xdj?H~QK_LOg$qRjxIp%;=$OAb%eo7p>K^#FK$IMTWsi%K(q~9*# zI}?Cn+6pX=99fPX6M^hA6E>^)KVY(Ek{$USA4~=+0U8dH zi~~!uU`lRw49aF5-Tr*0;2+x0<$B7BZC0L;scGe~MkeEc^-NI&lRiM~N)Q86bAg zq|Hkc-Pj}<9P5i6<;z^*j(pSxQV9$emW<1cKo{J|OalgveU=FmkW-RV0OUN)SH*Xx=XT_;D??`OKsK3TfK zN>-Es0vLgm7!Zpi@g*kr)jCez+@Qw0fhu{UC;Qc<%Vuy2Ft`H6 U@_|?ah++KsK(^-QXALX)0SLH|DF6Tf diff --git a/tools/schema/generator/gotemplates/structs.go b/tools/schema/generator/gotemplates/structs.go index ab36a555bd..af2a356a87 100644 --- a/tools/schema/generator/gotemplates/structs.go +++ b/tools/schema/generator/gotemplates/structs.go @@ -50,6 +50,7 @@ type $mut$StrName struct { objID int32 keyID wasmlib.Key32 } +$#if mut structMethodDelete func (o $mut$StrName) Exists() bool { return wasmlib.Exists(o.objID, o.keyID, wasmlib.TYPE_BYTES) @@ -59,6 +60,13 @@ $#if mut structMethodSetValue func (o $mut$StrName) Value() *$StrName { return New$StrName$+FromBytes(wasmlib.GetBytes(o.objID, o.keyID, wasmlib.TYPE_BYTES)) } +`, + // ******************************* + "structMethodDelete": ` + +func (o $mut$StrName) Delete() { + wasmlib.DelKey(o.objID, o.keyID, wasmlib.TYPE_BYTES) +} `, // ******************************* "structMethodSetValue": ` diff --git a/tools/schema/generator/rstemplates/structs.go b/tools/schema/generator/rstemplates/structs.go index 057cd29f86..4c74de9f0e 100644 --- a/tools/schema/generator/rstemplates/structs.go +++ b/tools/schema/generator/rstemplates/structs.go @@ -58,6 +58,7 @@ pub struct $mut$StrName { } impl $mut$StrName { +$#if mut structMethodDelete pub fn exists(&self) -> bool { exists(self.obj_id, self.key_id, TYPE_BYTES) } @@ -67,6 +68,13 @@ $#if mut structMethodSetValue $StrName::from_bytes(&get_bytes(self.obj_id, self.key_id, TYPE_BYTES)) } } +`, + // ******************************* + "structMethodDelete": ` + pub fn delete(&self) { + del_key(self.obj_id, self.key_id, TYPE_BYTES); + } + `, // ******************************* "structMethodSetValue": ` diff --git a/tools/schema/generator/tstemplates/structs.go b/tools/schema/generator/tstemplates/structs.go index 9cf18b8756..254d8b329d 100644 --- a/tools/schema/generator/tstemplates/structs.go +++ b/tools/schema/generator/tstemplates/structs.go @@ -54,6 +54,7 @@ export class $mut$StrName { this.objID = objID; this.keyID = keyID; } +$#if mut structMethodDelete exists(): boolean { return wasmlib.exists(this.objID, this.keyID, wasmlib.TYPE_BYTES); @@ -64,6 +65,13 @@ $#if mut structMethodSetValue return $StrName.fromBytes(wasmlib.getBytes(this.objID, this.keyID, wasmlib.TYPE_BYTES)); } } +`, + // ******************************* + "structMethodDelete": ` + + delete(): void { + wasmlib.delKey(this.objID, this.keyID, wasmlib.TYPE_BYTES); + } `, // ******************************* "structMethodSetValue": ` From 2873eb1483ed0806bbba9cafdd0c4b3de547f414 Mon Sep 17 00:00:00 2001 From: Karolis Petrauskas Date: Mon, 6 Dec 2021 13:54:28 +0200 Subject: [PATCH 179/198] Governance SC function renamed. --- packages/vm/core/governance/accessnodes.go | 14 +++++++------- .../governance/governanceimpl/accessnodesImpl.go | 16 ++++++++-------- .../vm/core/governance/governanceimpl/impl.go | 2 +- packages/vm/core/governance/interface.go | 14 +++++++------- packages/vm/core/testcore/governance_test.go | 4 ++-- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/packages/vm/core/governance/accessnodes.go b/packages/vm/core/governance/accessnodes.go index 467f5b543e..fbe626fb2e 100644 --- a/packages/vm/core/governance/accessnodes.go +++ b/packages/vm/core/governance/accessnodes.go @@ -112,7 +112,7 @@ func NewGetChainNodesResponseFromDict(d dict.Dict) *GetChainNodesResponse { // // CandidateNodeRequest // -type CandidateNodeRequest struct { +type AddCandidateNodeRequest struct { Candidate bool ForCommittee bool NodePubKey []byte @@ -120,13 +120,13 @@ type CandidateNodeRequest struct { AccessAPI string } -func (req CandidateNodeRequest) AsDict() dict.Dict { +func (req AddCandidateNodeRequest) AsDict() dict.Dict { d := dict.New() - d.Set(ParamCandidateNodeCandidate, codec.EncodeBool(req.Candidate)) - d.Set(ParamCandidateNodeForCommittee, codec.EncodeBool(req.ForCommittee)) - d.Set(ParamCandidateNodePubKey, req.NodePubKey) - d.Set(ParamCandidateNodeCertificate, req.Certificate) - d.Set(ParamCandidateNodeAccessAPI, codec.EncodeString(req.AccessAPI)) + d.Set(ParamAddCandidateNodeCandidate, codec.EncodeBool(req.Candidate)) + d.Set(ParamAddCandidateNodeForCommittee, codec.EncodeBool(req.ForCommittee)) + d.Set(ParamAddCandidateNodePubKey, req.NodePubKey) + d.Set(ParamAddCandidateNodeCertificate, req.Certificate) + d.Set(ParamAddCandidateNodeAccessAPI, codec.EncodeString(req.AccessAPI)) return d } diff --git a/packages/vm/core/governance/governanceimpl/accessnodesImpl.go b/packages/vm/core/governance/governanceimpl/accessnodesImpl.go index 1021af81d0..c2e5385f7a 100644 --- a/packages/vm/core/governance/governanceimpl/accessnodesImpl.go +++ b/packages/vm/core/governance/governanceimpl/accessnodesImpl.go @@ -45,7 +45,7 @@ func getChainNodesFuncHandler(ctx iscp.SandboxView) (dict.Dict, error) { // SC Command Function handler. // -// candidateNode( +// addCandidateNode( // candidate: bool = true // true, if we are adding the node as a candidate to access nodes. // forCommittee: bool = false // true, if we also want the node to become a validator. // nodePubKey: []byte // Public key of the node. @@ -53,22 +53,22 @@ func getChainNodesFuncHandler(ctx iscp.SandboxView) (dict.Dict, error) { // accessAPI: string = "" // Optional: API URL for the access node. // ) => () // -// It is possible that after executing `candidateNode(false, false, ...)` a node will stay +// It is possible that after executing `addCandidateNode(false, false, ...)` a node will stay // in the list of validators, and will be absent in the candidate or an access node set. // The node is removed from the list of access nodes immediately, but the validator rotation // must be initiated by the chain owner explicitly. // -func candidateNodeFuncHandler(ctx iscp.Sandbox) (dict.Dict, error) { +func addCandidateNodeFuncHandler(ctx iscp.Sandbox) (dict.Dict, error) { a := assert.NewAssert(ctx.Log()) params := kvdecoder.New(ctx.Params(), ctx.Log()) - paramCandidate := params.MustGetBool(governance.ParamCandidateNodeCandidate, true) + paramCandidate := params.MustGetBool(governance.ParamAddCandidateNodeCandidate, true) ani := governance.AccessNodeInfo{ - NodePubKey: params.MustGetBytes(governance.ParamCandidateNodePubKey), + NodePubKey: params.MustGetBytes(governance.ParamAddCandidateNodePubKey), ValidatorAddr: ctx.Request().SenderAddress().Bytes(), // Not from params, to have it validated. - Certificate: params.MustGetBytes(governance.ParamCandidateNodeCertificate), - ForCommittee: params.MustGetBool(governance.ParamCandidateNodeForCommittee, false), - AccessAPI: params.MustGetString(governance.ParamCandidateNodeAccessAPI, ""), + Certificate: params.MustGetBytes(governance.ParamAddCandidateNodeCertificate), + ForCommittee: params.MustGetBool(governance.ParamAddCandidateNodeForCommittee, false), + AccessAPI: params.MustGetString(governance.ParamAddCandidateNodeAccessAPI, ""), } a.Require(ani.ValidateCert(ctx), "certificate invalid") diff --git a/packages/vm/core/governance/governanceimpl/impl.go b/packages/vm/core/governance/governanceimpl/impl.go index 97a6fe23fb..c5e6a02f35 100644 --- a/packages/vm/core/governance/governanceimpl/impl.go +++ b/packages/vm/core/governance/governanceimpl/impl.go @@ -35,7 +35,7 @@ var Processor = governance.Contract.Processor(initialize, // access nodes. governance.FuncGetChainNodes.WithHandler(getChainNodesFuncHandler), - governance.FuncCandidateNode.WithHandler(candidateNodeFuncHandler), + governance.FuncAddCandidateNode.WithHandler(addCandidateNodeFuncHandler), governance.FuncChangeAccessNodes.WithHandler(changeAccessNodesFuncHandler), ) diff --git a/packages/vm/core/governance/interface.go b/packages/vm/core/governance/interface.go index 78528f6873..9cbce01a51 100644 --- a/packages/vm/core/governance/interface.go +++ b/packages/vm/core/governance/interface.go @@ -43,7 +43,7 @@ var ( // access nodes FuncGetChainNodes = coreutil.ViewFunc("getChainNodes") - FuncCandidateNode = coreutil.Func("candidateNode") + FuncAddCandidateNode = coreutil.Func("addCandidateNode") FuncChangeAccessNodes = coreutil.Func("changeAccessNodes") ) @@ -104,12 +104,12 @@ const ( ParamGetChainNodesAccessNodeCandidates = "c" ParamGetChainNodesAccessNodes = "a" - // access nodes: candidateNode - ParamCandidateNodeCandidate = "c" - ParamCandidateNodeForCommittee = "fc" - ParamCandidateNodePubKey = "pk" - ParamCandidateNodeCertificate = "cr" - ParamCandidateNodeAccessAPI = "a" + // access nodes: addCandidateNode + ParamAddCandidateNodeCandidate = "c" + ParamAddCandidateNodeForCommittee = "fc" + ParamAddCandidateNodePubKey = "pk" + ParamAddCandidateNodeCertificate = "cr" + ParamAddCandidateNodeAccessAPI = "a" // access nodes: changeAccessNodes ParamChangeAccessNodesActions = "a" diff --git a/packages/vm/core/testcore/governance_test.go b/packages/vm/core/testcore/governance_test.go index 5096d126fe..980850f56d 100644 --- a/packages/vm/core/testcore/governance_test.go +++ b/packages/vm/core/testcore/governance_test.go @@ -140,8 +140,8 @@ func TestAccessNodes(t *testing.T) { _, err = chain.PostRequestSync( solo.NewCallParamsFromDic( governance.Contract.Name, - governance.FuncCandidateNode.Name, - governance.CandidateNodeRequest{ + governance.FuncAddCandidateNode.Name, + governance.AddCandidateNodeRequest{ Candidate: true, ForCommittee: false, NodePubKey: node1KP.PublicKey.Bytes(), From c5cb8aa62de0180812b1b7ff3c212ebb5b936232 Mon Sep 17 00:00:00 2001 From: Karolis Petrauskas Date: Mon, 6 Dec 2021 18:11:37 +0200 Subject: [PATCH 180/198] Governance: split add and revoke functions for the access nodes. --- packages/vm/core/governance/accessnodes.go | 93 ++++++++++++------- .../governanceimpl/accessnodesImpl.go | 73 ++++++++------- .../vm/core/governance/governanceimpl/impl.go | 1 + packages/vm/core/governance/interface.go | 10 +- packages/vm/core/testcore/governance_test.go | 38 ++++++-- 5 files changed, 134 insertions(+), 81 deletions(-) diff --git a/packages/vm/core/governance/accessnodes.go b/packages/vm/core/governance/accessnodes.go index fbe626fb2e..39afeea870 100644 --- a/packages/vm/core/governance/accessnodes.go +++ b/packages/vm/core/governance/accessnodes.go @@ -5,12 +5,14 @@ package governance import ( "bytes" - "crypto/ed25519" + "github.com/iotaledger/goshimmer/packages/ledgerstate" + "github.com/iotaledger/hive.go/crypto/ed25519" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/kv/codec" "github.com/iotaledger/wasp/packages/kv/collections" "github.com/iotaledger/wasp/packages/kv/dict" + "github.com/iotaledger/wasp/packages/kv/kvdecoder" "github.com/iotaledger/wasp/packages/util" "golang.org/x/xerrors" ) @@ -61,7 +63,53 @@ func (a *AccessNodeInfo) Bytes() []byte { return w.Bytes() } -func (a *AccessNodeInfo) ValidateCert(ctx iscp.Sandbox) bool { +func NewAccessNodeInfoFromAddCandidateNodeParams(ctx iscp.Sandbox) *AccessNodeInfo { + params := kvdecoder.New(ctx.Params(), ctx.Log()) + ani := AccessNodeInfo{ + NodePubKey: params.MustGetBytes(ParamAccessNodeInfoPubKey), + ValidatorAddr: ctx.Request().SenderAddress().Bytes(), // Not from params, to have it validated. + Certificate: params.MustGetBytes(ParamAccessNodeInfoCertificate), + ForCommittee: params.MustGetBool(ParamAccessNodeInfoForCommittee, false), + AccessAPI: params.MustGetString(ParamAccessNodeInfoAccessAPI, ""), + } + return &ani +} + +func (a *AccessNodeInfo) ToAddCandidateNodeParams() dict.Dict { + d := dict.New() + d.Set(ParamAccessNodeInfoForCommittee, codec.EncodeBool(a.ForCommittee)) + d.Set(ParamAccessNodeInfoPubKey, a.NodePubKey) + d.Set(ParamAccessNodeInfoCertificate, a.Certificate) + d.Set(ParamAccessNodeInfoAccessAPI, codec.EncodeString(a.AccessAPI)) + return d +} + +func NewAccessNodeInfoFromRevokeAccessNodeParams(ctx iscp.Sandbox) *AccessNodeInfo { + params := kvdecoder.New(ctx.Params(), ctx.Log()) + ani := AccessNodeInfo{ + NodePubKey: params.MustGetBytes(ParamAccessNodeInfoPubKey), + ValidatorAddr: ctx.Request().SenderAddress().Bytes(), // Not from params, to have it validated. + Certificate: params.MustGetBytes(ParamAccessNodeInfoCertificate), + } + return &ani +} + +func (a *AccessNodeInfo) ToRevokeAccessNodeParams() dict.Dict { + d := dict.New() + d.Set(ParamAccessNodeInfoPubKey, a.NodePubKey) + d.Set(ParamAccessNodeInfoCertificate, a.Certificate) + return d +} + +func (a *AccessNodeInfo) AddCertificate(nodePrivKey ed25519.PrivateKey, ownerAddress ledgerstate.Address) *AccessNodeInfo { + certData := bytes.Buffer{} + certData.Write(a.NodePubKey) + certData.Write(ownerAddress.Bytes()) + a.Certificate = nodePrivKey.Sign(certData.Bytes()).Bytes() + return a +} + +func (a *AccessNodeInfo) ValidateCertificate(ctx iscp.Sandbox) bool { signedData := bytes.Buffer{} signedData.Write(a.NodePubKey) signedData.Write(a.ValidatorAddr) @@ -102,34 +150,17 @@ func NewGetChainNodesResponseFromDict(d dict.Dict) *GetChainNodesResponse { }) an := collections.NewMapReadOnly(d, ParamGetChainNodesAccessNodes) - an.MustIterate(func(pubKey, value []byte) bool { - res.AccessNodes = append(res.AccessNodes, ed25519.PublicKey(pubKey)) + an.MustIterate(func(pubKeyBin, value []byte) bool { + pubKey, _, err := ed25519.PublicKeyFromBytes(pubKeyBin) + if err != nil { + panic(xerrors.Errorf("failed to decode pub key: %v", err)) + } + res.AccessNodes = append(res.AccessNodes, pubKey) return true }) return &res } -// -// CandidateNodeRequest -// -type AddCandidateNodeRequest struct { - Candidate bool - ForCommittee bool - NodePubKey []byte - Certificate []byte - AccessAPI string -} - -func (req AddCandidateNodeRequest) AsDict() dict.Dict { - d := dict.New() - d.Set(ParamAddCandidateNodeCandidate, codec.EncodeBool(req.Candidate)) - d.Set(ParamAddCandidateNodeForCommittee, codec.EncodeBool(req.ForCommittee)) - d.Set(ParamAddCandidateNodePubKey, req.NodePubKey) - d.Set(ParamAddCandidateNodeCertificate, req.Certificate) - d.Set(ParamAddCandidateNodeAccessAPI, codec.EncodeString(req.AccessAPI)) - return d -} - // // ChangeAccessNodesRequest // @@ -143,27 +174,27 @@ const ( ) type ChangeAccessNodesRequest struct { - actions map[string]ChangeAccessNodeAction + actions map[ed25519.PublicKey]ChangeAccessNodeAction } func NewChangeAccessNodesRequest() *ChangeAccessNodesRequest { return &ChangeAccessNodesRequest{ - actions: make(map[string]ChangeAccessNodeAction), + actions: make(map[ed25519.PublicKey]ChangeAccessNodeAction), } } func (req *ChangeAccessNodesRequest) Remove(pubKey ed25519.PublicKey) *ChangeAccessNodesRequest { - req.actions[string(pubKey)] = ChangeAccessNodeActionRemove + req.actions[pubKey] = ChangeAccessNodeActionRemove return req } func (req *ChangeAccessNodesRequest) Accept(pubKey ed25519.PublicKey) *ChangeAccessNodesRequest { - req.actions[string(pubKey)] = ChangeAccessNodeActionAccept + req.actions[pubKey] = ChangeAccessNodeActionAccept return req } func (req *ChangeAccessNodesRequest) Drop(pubKey ed25519.PublicKey) *ChangeAccessNodesRequest { - req.actions[string(pubKey)] = ChangeAccessNodeActionDrop + req.actions[pubKey] = ChangeAccessNodeActionDrop return req } @@ -171,7 +202,7 @@ func (req *ChangeAccessNodesRequest) AsDict() dict.Dict { d := dict.New() actionsMap := collections.NewMap(d, ParamChangeAccessNodesActions) for pubKey, action := range req.actions { - actionsMap.MustSetAt([]byte(pubKey), []byte{byte(action)}) + actionsMap.MustSetAt(pubKey.Bytes(), []byte{byte(action)}) } return d } diff --git a/packages/vm/core/governance/governanceimpl/accessnodesImpl.go b/packages/vm/core/governance/governanceimpl/accessnodesImpl.go index c2e5385f7a..bded42eb38 100644 --- a/packages/vm/core/governance/governanceimpl/accessnodesImpl.go +++ b/packages/vm/core/governance/governanceimpl/accessnodesImpl.go @@ -6,7 +6,7 @@ // // State of the SC (the ChainNodes part): // -// VarAccessNodeCandidates: map[pubKey] => AccessNodeInfo // A set of Access Node Info. +// VarAccessNodeCandidates: map[pubKey] => AccessNodeInfo // A set of Access Node Info. // VarAccessNodes: map[pubKey] => byte[0] // A set of nodes. // VarValidatorNodes: pubKey[] // An ordered list of nodes. // @@ -17,16 +17,15 @@ import ( "github.com/iotaledger/wasp/packages/iscp/assert" "github.com/iotaledger/wasp/packages/kv/collections" "github.com/iotaledger/wasp/packages/kv/dict" - "github.com/iotaledger/wasp/packages/kv/kvdecoder" "github.com/iotaledger/wasp/packages/vm/core/governance" ) // SC Query Function handler. // -// getChainNodes() => ( -// accessNodeCandidates :: map(pubKey => AccessNodeInfo), -// accessNodes :: map(pubKey => ()) -// ) +// getChainNodes() => ( +// accessNodeCandidates :: map(pubKey => AccessNodeInfo), +// accessNodes :: map(pubKey => ()) +// ) // func getChainNodesFuncHandler(ctx iscp.SandboxView) (dict.Dict, error) { res := dict.New() @@ -44,43 +43,47 @@ func getChainNodesFuncHandler(ctx iscp.SandboxView) (dict.Dict, error) { } // SC Command Function handler. +// Can only be invoked by the access node owner (verified via the Certificate field). // -// addCandidateNode( -// candidate: bool = true // true, if we are adding the node as a candidate to access nodes. -// forCommittee: bool = false // true, if we also want the node to become a validator. -// nodePubKey: []byte // Public key of the node. -// certificate: []byte // Signature by the node over its publicKey||validatorAddress. -// accessAPI: string = "" // Optional: API URL for the access node. -// ) => () +// addCandidateNode( +// accessNodeInfo{NodePubKey, Certificate, ForCommittee, AccessAPI} +// ) => () +// +func addCandidateNodeFuncHandler(ctx iscp.Sandbox) (dict.Dict, error) { + a := assert.NewAssert(ctx.Log()) + + ani := governance.NewAccessNodeInfoFromAddCandidateNodeParams(ctx) + a.Require(ani.ValidateCertificate(ctx), "certificate invalid") + + accessNodeCandidates := collections.NewMap(ctx.State(), governance.VarAccessNodeCandidates) + accessNodeCandidates.MustSetAt(ani.NodePubKey, ani.Bytes()) + + return nil, nil +} + +// SC Command Function handler. +// Can only be invoked by the access node owner (verified via the Certificate field). +// +// revokeAccessNode( +// accessNodeInfo{NodePubKey, Certificate} +// ) => () // -// It is possible that after executing `addCandidateNode(false, false, ...)` a node will stay +// It is possible that after executing `revokeAccessNode(...)` a node will stay // in the list of validators, and will be absent in the candidate or an access node set. // The node is removed from the list of access nodes immediately, but the validator rotation // must be initiated by the chain owner explicitly. // -func addCandidateNodeFuncHandler(ctx iscp.Sandbox) (dict.Dict, error) { +func revokeAccessNodeFuncHandler(ctx iscp.Sandbox) (dict.Dict, error) { a := assert.NewAssert(ctx.Log()) - params := kvdecoder.New(ctx.Params(), ctx.Log()) - paramCandidate := params.MustGetBool(governance.ParamAddCandidateNodeCandidate, true) - ani := governance.AccessNodeInfo{ - NodePubKey: params.MustGetBytes(governance.ParamAddCandidateNodePubKey), - ValidatorAddr: ctx.Request().SenderAddress().Bytes(), // Not from params, to have it validated. - Certificate: params.MustGetBytes(governance.ParamAddCandidateNodeCertificate), - ForCommittee: params.MustGetBool(governance.ParamAddCandidateNodeForCommittee, false), - AccessAPI: params.MustGetString(governance.ParamAddCandidateNodeAccessAPI, ""), - } - a.Require(ani.ValidateCert(ctx), "certificate invalid") + ani := governance.NewAccessNodeInfoFromRevokeAccessNodeParams(ctx) + a.Require(ani.ValidateCertificate(ctx), "certificate invalid") + + accessNodeCandidates := collections.NewMap(ctx.State(), governance.VarAccessNodeCandidates) + accessNodeCandidates.MustDelAt(ani.NodePubKey) + accessNodes := collections.NewMap(ctx.State(), governance.VarAccessNodes) + accessNodes.MustDelAt(ani.NodePubKey) - if paramCandidate { - accessNodeCandidates := collections.NewMap(ctx.State(), governance.VarAccessNodeCandidates) - accessNodeCandidates.MustSetAt(ani.NodePubKey, ani.Bytes()) - } else { - accessNodeCandidates := collections.NewMap(ctx.State(), governance.VarAccessNodeCandidates) - accessNodeCandidates.MustDelAt(ani.NodePubKey) - accessNodes := collections.NewMap(ctx.State(), governance.VarAccessNodes) - accessNodes.MustDelAt(ani.NodePubKey) - } return nil, nil } @@ -88,7 +91,7 @@ func addCandidateNodeFuncHandler(ctx iscp.Sandbox) (dict.Dict, error) { // Can only be invoked by the chain owner. // // changeAccessNodes( -// actions: map(pubKey => ChangeAccessNodeAction) +// actions: map(pubKey => ChangeAccessNodeAction) // ) => () // func changeAccessNodesFuncHandler(ctx iscp.Sandbox) (dict.Dict, error) { diff --git a/packages/vm/core/governance/governanceimpl/impl.go b/packages/vm/core/governance/governanceimpl/impl.go index c5e6a02f35..26b260d12c 100644 --- a/packages/vm/core/governance/governanceimpl/impl.go +++ b/packages/vm/core/governance/governanceimpl/impl.go @@ -36,6 +36,7 @@ var Processor = governance.Contract.Processor(initialize, // access nodes. governance.FuncGetChainNodes.WithHandler(getChainNodesFuncHandler), governance.FuncAddCandidateNode.WithHandler(addCandidateNodeFuncHandler), + governance.FuncRevokeAccessNode.WithHandler(revokeAccessNodeFuncHandler), governance.FuncChangeAccessNodes.WithHandler(changeAccessNodesFuncHandler), ) diff --git a/packages/vm/core/governance/interface.go b/packages/vm/core/governance/interface.go index 9cbce01a51..9dc46f4be9 100644 --- a/packages/vm/core/governance/interface.go +++ b/packages/vm/core/governance/interface.go @@ -44,6 +44,7 @@ var ( // access nodes FuncGetChainNodes = coreutil.ViewFunc("getChainNodes") FuncAddCandidateNode = coreutil.Func("addCandidateNode") + FuncRevokeAccessNode = coreutil.Func("revokeAccessNode") FuncChangeAccessNodes = coreutil.Func("changeAccessNodes") ) @@ -105,11 +106,10 @@ const ( ParamGetChainNodesAccessNodes = "a" // access nodes: addCandidateNode - ParamAddCandidateNodeCandidate = "c" - ParamAddCandidateNodeForCommittee = "fc" - ParamAddCandidateNodePubKey = "pk" - ParamAddCandidateNodeCertificate = "cr" - ParamAddCandidateNodeAccessAPI = "a" + ParamAccessNodeInfoForCommittee = "f" + ParamAccessNodeInfoPubKey = "p" + ParamAccessNodeInfoCertificate = "c" + ParamAccessNodeInfoAccessAPI = "a" // access nodes: changeAccessNodes ParamChangeAccessNodesActions = "a" diff --git a/packages/vm/core/testcore/governance_test.go b/packages/vm/core/testcore/governance_test.go index 980850f56d..99e5c5330e 100644 --- a/packages/vm/core/testcore/governance_test.go +++ b/packages/vm/core/testcore/governance_test.go @@ -1,7 +1,6 @@ package testcore import ( - "bytes" "strings" "testing" @@ -134,20 +133,15 @@ func TestAccessNodes(t *testing.T) { // // Add a single access node candidate. - certData := bytes.Buffer{} - certData.Write(node1KP.PublicKey.Bytes()) - certData.Write(node1OwnerAddr.Bytes()) _, err = chain.PostRequestSync( solo.NewCallParamsFromDic( governance.Contract.Name, governance.FuncAddCandidateNode.Name, - governance.AddCandidateNodeRequest{ - Candidate: true, - ForCommittee: false, + (&governance.AccessNodeInfo{ NodePubKey: node1KP.PublicKey.Bytes(), - Certificate: node1KP.PrivateKey.Sign(certData.Bytes()).Bytes(), + ForCommittee: false, AccessAPI: "http://my-api/url", - }.AsDict(), + }).AddCertificate(node1KP.PrivateKey, node1OwnerAddr).ToAddCandidateNodeParams(), ).WithIotas(1), node1OwnerKP, // Sender should match data used to create the Cert field value. ) @@ -170,7 +164,7 @@ func TestAccessNodes(t *testing.T) { solo.NewCallParamsFromDic( governance.Contract.Name, governance.FuncChangeAccessNodes.Name, - governance.NewChangeAccessNodesRequest().Accept(node1KP.PublicKey[:]).AsDict(), + governance.NewChangeAccessNodesRequest().Accept(node1KP.PublicKey).AsDict(), ).WithIotas(1), chainKP, ) @@ -186,4 +180,28 @@ func TestAccessNodes(t *testing.T) { require.Equal(t, 1, len(getChainNodesResponse.AccessNodeCandidates)) // Candidate registered. require.Equal(t, "http://my-api/url", getChainNodesResponse.AccessNodeCandidates[0].AccessAPI) require.Equal(t, 1, len(getChainNodesResponse.AccessNodes)) + + // + // Revoke the access node (by the node owner). + _, err = chain.PostRequestSync( + solo.NewCallParamsFromDic( + governance.Contract.Name, + governance.FuncRevokeAccessNode.Name, + (&governance.AccessNodeInfo{ + NodePubKey: node1KP.PublicKey.Bytes(), + }).AddCertificate(node1KP.PrivateKey, node1OwnerAddr).ToAddCandidateNodeParams(), + ).WithIotas(1), + node1OwnerKP, // Sender should match data used to create the Cert field value. + ) + require.NoError(t, err) + + res, err = chain.CallView( + governance.Contract.Name, + governance.FuncGetChainNodes.Name, + governance.GetChainNodesRequest{}.AsDict(), + ) + require.NoError(t, err) + getChainNodesResponse = governance.NewGetChainNodesResponseFromDict(res) + require.Empty(t, getChainNodesResponse.AccessNodeCandidates) + require.Empty(t, getChainNodesResponse.AccessNodes) } From 247659a5537be5163970435ab554d39bf6fac314 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Mon, 6 Dec 2021 19:47:29 +0200 Subject: [PATCH 181/198] Nodeconn statistics webservices address altered --- packages/webapi/admapi/chainnodeconnmetrics.go | 4 ++-- packages/webapi/routes/routes.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/webapi/admapi/chainnodeconnmetrics.go b/packages/webapi/admapi/chainnodeconnmetrics.go index 0c819c5dde..cc7f442458 100644 --- a/packages/webapi/admapi/chainnodeconnmetrics.go +++ b/packages/webapi/admapi/chainnodeconnmetrics.go @@ -68,11 +68,11 @@ func addChainStatsEndpoints(adm echoswagger.ApiGroup, chainsProvider chains.Prov s := &chainStatsService{chainsProvider} - adm.GET(routes.GetChainsMetrics(), s.handleGetChainsStats). + adm.GET(routes.GetChainsNodeConnectionMetrics(), s.handleGetChainsStats). SetSummary("Get cummulative chains state statistics"). AddResponse(http.StatusOK, "Chains Stats", example, nil) - adm.GET(routes.GetChainMetrics(":chainID"), s.handleGetChainStats). + adm.GET(routes.GetChainNodeConnectionMetrics(":chainID"), s.handleGetChainStats). SetSummary("Get chain state statistics for the given chain ID"). AddParamPath("", "chainID", "ChainID (base58)"). AddResponse(http.StatusOK, "Chain Stats", chainExample, nil) diff --git a/packages/webapi/routes/routes.go b/packages/webapi/routes/routes.go index 181d63bece..1cbcc0e815 100644 --- a/packages/webapi/routes/routes.go +++ b/packages/webapi/routes/routes.go @@ -55,12 +55,12 @@ func GetCommitteeRecord(addr string) string { return "/adm/committeerecord/" + addr } -func GetChainsMetrics() string { - return "/adm/chain/metrics" +func GetChainsNodeConnectionMetrics() string { + return "/adm/chain/nodeconn/metrics" } -func GetChainMetrics(chainID string) string { - return "/adm/chain/" + chainID + "/metrics" +func GetChainNodeConnectionMetrics(chainID string) string { + return "/adm/chain/" + chainID + "/nodeconn/metrics" } func GetCommitteeForChain(chainID string) string { From 1410b43ea0ce15b74f385cf4f069c8bcf6ca4cd1 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Mon, 6 Dec 2021 19:50:26 +0200 Subject: [PATCH 182/198] CLI commands for metrics --- client/metrics.go | 64 ++++++++++++++++++++++++++++++ tools/wasp-cli/main.go | 2 + tools/wasp-cli/metrics/metrics.go | 24 +++++++++++ tools/wasp-cli/metrics/nodeconn.go | 42 ++++++++++++++++++++ 4 files changed, 132 insertions(+) create mode 100644 client/metrics.go create mode 100644 tools/wasp-cli/metrics/metrics.go create mode 100644 tools/wasp-cli/metrics/nodeconn.go diff --git a/client/metrics.go b/client/metrics.go new file mode 100644 index 0000000000..099b0ed893 --- /dev/null +++ b/client/metrics.go @@ -0,0 +1,64 @@ +package client + +import ( + "fmt" + "net/http" + + "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/webapi/model" + "github.com/iotaledger/wasp/packages/webapi/routes" +) + +const maxMessageLen = 80 + +// GetNodeConnectionMetrics fetches a connection to L1 metrics for all addresses +func (c *WaspClient) GetNodeConnectionMetrics() ([]string, [][]string, error) { + ncm := &model.NodeConnectionMetrics{} + if err := c.do(http.MethodGet, routes.GetChainsNodeConnectionMetrics(), nil, ncm); err != nil { + return nil, nil, err + } + subscribed := make([]string, len(ncm.Subscribed)) + for i := range subscribed { + subscribed[i] = string(ncm.Subscribed[i]) + } + return subscribed, makeNodeConnMetricsTable(&(ncm.NodeConnectionMessagesMetrics)), nil +} + +// GetNodeConnectionMetrics fetches a connection to L1 metrics by address +func (c *WaspClient) GetChainNodeConnectionMetrics(chID *iscp.ChainID) ([][]string, error) { + ncmm := &model.NodeConnectionMessagesMetrics{} + if err := c.do(http.MethodGet, routes.GetChainNodeConnectionMetrics(chID.Base58()), nil, ncmm); err != nil { + return nil, err + } + return makeNodeConnMetricsTable(ncmm), nil +} + +func makeNodeConnMetricsTable(ncmm *model.NodeConnectionMessagesMetrics) [][]string { + res := make([][]string, 8) + res[0] = makeNodeConnMetricsTableRow("Pull state", false, ncmm.OutPullState) + res[1] = makeNodeConnMetricsTableRow("Pull tx inclusion state", false, ncmm.OutPullTransactionInclusionState) + res[2] = makeNodeConnMetricsTableRow("Pull confirmed output", false, ncmm.OutPullConfirmedOutput) + res[3] = makeNodeConnMetricsTableRow("Post transaction", false, ncmm.OutPostTransaction) + res[4] = makeNodeConnMetricsTableRow("Transaction", true, ncmm.InTransaction) + res[5] = makeNodeConnMetricsTableRow("Inclusion state", true, ncmm.InInclusionState) + res[6] = makeNodeConnMetricsTableRow("Output", true, ncmm.InOutput) + res[7] = makeNodeConnMetricsTableRow("Unspent alias output", true, ncmm.InUnspentAliasOutput) + return res +} + +func makeNodeConnMetricsTableRow(name string, isIn bool, ncmm *model.NodeConnectionMessageMetrics) []string { + res := make([]string, 5) + res[0] = name + if isIn { + res[1] = "IN" + } else { + res[1] = "OUT" + } + res[2] = fmt.Sprintf("%v", ncmm.Total) + res[3] = fmt.Sprintf("%v", ncmm.LastEvent) + res[4] = ncmm.LastMessage + if len(res[4]) > maxMessageLen { + res[4] = res[4][:maxMessageLen] + } + return res +} diff --git a/tools/wasp-cli/main.go b/tools/wasp-cli/main.go index 2601c47169..9a63f02e89 100644 --- a/tools/wasp-cli/main.go +++ b/tools/wasp-cli/main.go @@ -9,6 +9,7 @@ import ( "github.com/iotaledger/wasp/tools/wasp-cli/config" "github.com/iotaledger/wasp/tools/wasp-cli/decode" "github.com/iotaledger/wasp/tools/wasp-cli/log" + "github.com/iotaledger/wasp/tools/wasp-cli/metrics" "github.com/iotaledger/wasp/tools/wasp-cli/peering" "github.com/iotaledger/wasp/tools/wasp-cli/wallet" "github.com/spf13/cobra" @@ -35,6 +36,7 @@ func init() { chain.Init(rootCmd) decode.Init(rootCmd) peering.Init(rootCmd) + metrics.Init(rootCmd) } func main() { diff --git a/tools/wasp-cli/metrics/metrics.go b/tools/wasp-cli/metrics/metrics.go new file mode 100644 index 0000000000..b14acd0388 --- /dev/null +++ b/tools/wasp-cli/metrics/metrics.go @@ -0,0 +1,24 @@ +package metrics + +import ( + "github.com/iotaledger/wasp/tools/wasp-cli/log" + "github.com/spf13/cobra" +) + +var metricsCmd = &cobra.Command{ + Use: "metrics ", + Short: "Show current value of collected metrics of some component", + Args: cobra.NoArgs, + Run: func(cmd *cobra.Command, args []string) { + log.Check(cmd.Help()) + }, +} + +var chainIDStr string + +func Init(rootCmd *cobra.Command) { + rootCmd.AddCommand(metricsCmd) + + metricsCmd.AddCommand(nodeconnMetricsCmd) + metricsCmd.PersistentFlags().StringVarP(&chainIDStr, "chain", "", "", "chain ID for which metrics should be displayed") +} diff --git a/tools/wasp-cli/metrics/nodeconn.go b/tools/wasp-cli/metrics/nodeconn.go new file mode 100644 index 0000000000..cd1d2200a9 --- /dev/null +++ b/tools/wasp-cli/metrics/nodeconn.go @@ -0,0 +1,42 @@ +package metrics + +import ( + "strings" + + "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/tools/wasp-cli/config" + "github.com/iotaledger/wasp/tools/wasp-cli/log" + "github.com/spf13/cobra" +) + +var nodeconnMetricsCmd = &cobra.Command{ + Use: "nodeconn", + Short: "Show current value of collected metrics of connection to L1", + Args: cobra.NoArgs, + Run: func(cmd *cobra.Command, args []string) { + client := config.WaspClient() + if chainIDStr == "" { + subscribed, msgMetrics, err := client.GetNodeConnectionMetrics() + log.Check(err) + log.Printf("Following chains subscribed to L1 events:\n") + for _, s := range subscribed { + log.Printf("\t%s\n", s) + } + printMessageMetrics(msgMetrics) + } else { + chid, err := iscp.ChainIDFromBase58(chainIDStr) + log.Check(err) + msgMetrics, err := client.GetChainNodeConnectionMetrics(chid) + log.Check(err) + printMessageMetrics(msgMetrics) + } + }, +} + +func printMessageMetrics(table [][]string) { + header := []string{"Message name", "", "Total", "Last time", "Last message"} + for i := range table { + table[i][4] = strings.Replace(table[i][4], "\n", " ", -1) + } + log.PrintTable(header, table) +} From d601211a5b7a3c08e4a90091859a6b8fcafa8de9 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Mon, 6 Dec 2021 20:24:15 -0800 Subject: [PATCH 183/198] Cleanup --- contracts/wasm/erc721/src/erc721.rs | 66 ++++++++++++------ contracts/wasm/erc721/test/erc721_bg.wasm | Bin 39491 -> 39689 bytes .../fairroulette/test/fairroulette_bg.wasm | Bin 40086 -> 40086 bytes contracts/wasm/testcore/test/testcore_bg.wasm | Bin 53154 -> 53153 bytes .../wasm/testwasmlib/test/testwasmlib_bg.wasm | Bin 41300 -> 41295 bytes contracts/wasm/timestamp/src/params.rs | 59 ---------------- .../wasm/timestamp/ts/timestamp/params.ts | 37 ---------- .../sbtests/sbtestsc/testcore_bg.wasm | Bin 53154 -> 53153 bytes packages/vm/wasmlib/go/wasmlib/context.go | 14 ---- packages/vm/wasmlib/src/context.rs | 17 +---- packages/vm/wasmlib/ts/wasmlib/context.ts | 15 ---- packages/vm/wasmproc/scdict.go | 10 ++- 12 files changed, 48 insertions(+), 170 deletions(-) delete mode 100644 contracts/wasm/timestamp/src/params.rs delete mode 100644 contracts/wasm/timestamp/ts/timestamp/params.ts diff --git a/contracts/wasm/erc721/src/erc721.rs b/contracts/wasm/erc721/src/erc721.rs index c72e2046ba..6dd4aeb73a 100644 --- a/contracts/wasm/erc721/src/erc721.rs +++ b/contracts/wasm/erc721/src/erc721.rs @@ -21,11 +21,6 @@ const BASE_URI: &str = "my/special/base/uri/"; /////////////////////////// HELPER FUNCTIONS //////////////////////////// -fn approve(state: MutableErc721State, owner: &ScAgentID, approved: &ScAgentID, token_id: &ScHash) { - state.approved_accounts().get_agent_id(token_id).set_value(approved); - Erc721Events {}.approval(approved, owner, token_id); -} - // checks if caller is owner, or one of its delegated operators fn can_operate(state: MutableErc721State, caller: &ScAgentID, owner: &ScAgentID) -> bool { if *caller == *owner { @@ -66,25 +61,46 @@ fn transfer(ctx: &ScFuncContext, state: MutableErc721State, from: &ScAgentID, to token_owner.set_value(to); - //TODO should probably clear this entry, but for now just set to zero - approve(state, &owner, &ScAgentID::ZERO, token_id); - Erc721Events {}.transfer(from, to, token_id); + let events = Erc721Events {}; + // remove approval if it exists + let current_approved = state.approved_accounts().get_agent_id(&token_id); + if current_approved.exists() { + current_approved.delete(); + events.approval(&ScAgentID::ZERO, &owner, &token_id); + } + + events.transfer(from, to, token_id); } /////////////////////////// SC FUNCS //////////////////////////// // Gives permission to to to transfer tokenID token to another account. -// The approval is cleared when the token is transferred. +// The approval is cleared when optional approval account is omitted. +// The approval will be cleared when the token is transferred. pub fn func_approve(ctx: &ScFuncContext, f: &ApproveContext) { let token_id = f.params.token_id().value(); let token_owner = f.state.owners().get_agent_id(&token_id); ctx.require(token_owner.exists(), "tokenID does not exist"); let owner = token_owner.value(); ctx.require(can_operate(f.state, &ctx.caller(), &owner), "not owner or operator"); - let approved = f.params.approved().value(); - ctx.require(owner != approved, "approved equals owner"); - approve(f.state, &owner, &approved, &token_id); + + let approved = f.params.approved(); + if !approved.exists() { + // remove approval if it exists + let current_approved = f.state.approved_accounts().get_agent_id(&token_id); + if current_approved.exists() { + current_approved.delete(); + f.events.approval(&ScAgentID::ZERO, &owner, &token_id); + } + return; + } + + let account = approved.value(); + ctx.require(owner != account, "approved equals owner"); + + f.state.approved_accounts().get_agent_id(&token_id).set_value(&account); + f.events.approval(&account, &owner, &token_id); } // Destroys tokenID. The approval is cleared when the token is burned. @@ -94,13 +110,17 @@ pub fn func_burn(ctx: &ScFuncContext, f: &BurnContext) { ctx.require(owner != ScAgentID::ZERO, "tokenID does not exist"); ctx.require(ctx.caller() == owner, "caller is not owner"); - approve(f.state, &owner, &ScAgentID::ZERO, &token_id); + // remove approval if it exists + let current_approved = f.state.approved_accounts().get_agent_id(&token_id); + if current_approved.exists() { + current_approved.delete(); + f.events.approval(&ScAgentID::ZERO, &owner, &token_id); + } let balance = f.state.balances().get_uint64(&owner); balance.set_value(balance.value() - 1); - //TODO clear this instead of setting to zero - f.state.owners().get_agent_id(&token_id).set_value(&ScAgentID::ZERO); + f.state.owners().get_agent_id(&token_id).delete(); f.events.transfer(&owner, &ScAgentID::ZERO, &token_id); } @@ -151,8 +171,8 @@ pub fn func_set_approval_for_all(ctx: &ScFuncContext, f: &SetApprovalForAllConte ctx.require(owner != operator, "owner equals operator"); let approval = f.params.approval().value(); - let approvals_by_caller = f.state.approved_operators().get_operators(&owner); - approvals_by_caller.get_bool(&operator).set_value(approval); + let operators_for_caller = f.state.approved_operators().get_operators(&owner); + operators_for_caller.get_bool(&operator).set_value(approval); f.events.approval_for_all(approval, &operator, &owner); } @@ -170,18 +190,18 @@ pub fn func_transfer_from(ctx: &ScFuncContext, f: &TransferFromContext) { // Returns the number of tokens in owner's account if the owner exists. pub fn view_balance_of(_ctx: &ScViewContext, f: &BalanceOfContext) { let owner = f.params.owner().value(); - let nft_count = f.state.balances().get_uint64(&owner); - if nft_count.exists() { - f.results.amount().set_value(nft_count.value()); + let balance = f.state.balances().get_uint64(&owner); + if balance.exists() { + f.results.amount().set_value(balance.value()); } } // Returns the approved account for tokenID token if there is one. pub fn view_get_approved(_ctx: &ScViewContext, f: &GetApprovedContext) { let token_id = f.params.token_id().value(); - let approved = f.state.approved_accounts().get_agent_id(&token_id).value(); - if approved != ScAgentID::ZERO { - f.results.approved().set_value(&approved); + let approved = f.state.approved_accounts().get_agent_id(&token_id); + if approved.exists() { + f.results.approved().set_value(&approved.value()); } } diff --git a/contracts/wasm/erc721/test/erc721_bg.wasm b/contracts/wasm/erc721/test/erc721_bg.wasm index eed00a49a6406abdf207d1396d84429dc7a6b366..fef684c1bfe17f19692bee9b53ae701b6e9fb9a6 100644 GIT binary patch delta 3638 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 delta 3567 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 Qhhz?Pm5|qZr>iRSf5SkEW&i*H diff --git a/contracts/wasm/fairroulette/test/fairroulette_bg.wasm b/contracts/wasm/fairroulette/test/fairroulette_bg.wasm index 17d1f25531ba3fae033de40d38a99104f0b44a94..ce7b3e910f9af19e6f78ea9220b8d1c6b5a8e352 100644 GIT binary patch delta 32 ncmbQXlWE#crVYp11ydLq7}OXT7$&d^Fn9pz)Xmr1_lp1krNRkv delta 32 ncmbQXlWE#crVYp11@jmg7}OXT7$&d^Fn9pz{LRRD3Aoh#g$e$TBJ&mS7an zV5t)z2#6>u2pF6J1ttiNs3<{jLk%ox6>pz?|bv)%U!BYojUtD zb#D9g3S-p@qwYv*jXqa*c{II4giDLnb+4f@4gVR7e-yfAh=r^nSfhW=YV>35-kxu= zC)kth_bhqZ&}*mfVQ;a;Y&ENAOW5md#@lRWuX~oVsyXZ(7XJ)e#`dxX_B}hvR$%d; zaj((o@3I=b_$0f#MxXU3ysgCF9KA+=pB3IVANPYSp>m$Sffe*wz&>R!vALMV{s-At zY|2VD=@k2h{f%9pdV+n3h4b{-?sxjWWf$N63;UUM?NI*~c-igK%^;hVt8uf^@6FTn zQoYpD_>Zi@RmwH9TK6-HagVu=Rq{mpZrb-#=k5#e=~MXw0l&_HKo0Y4y{Zz6bc+qk zu(a|R9q3#EIp=fngJO^|s?*T}O5i?tu z<*M`<7Bh(xS1GXv*1n6#zQJY(P*#UaWga6wRX9oznRa z%yL6MJ|jBP3%;49SD7DR4EL#|GuVhx<=3DLGcqw4h7Vd(_?Uwa1n_31bw10|r%x@` zp-V$CMYpre54^w!Df#tq9?76IViA`Mut-WJ#A0=1IuyGj^5Ps~-*RIIDJNoz#3mVW z6K`J6#X}?vsI*}WJb`gY0>lJNG7Vjs1_SHPzmVKvVZ-1}$3)PR8iWODl^~H^Dqy=* zz&1yCNq|>ZyD()gVwRVb;29j_rYDatnx7<6@$B+2 z%n7C4!LYhhcntb9X-i)+%QJ-B37Dm;M7z8pOMr$+u*@clh$ji~kOZ)cPsu`#kx4)b zQV7t$nCPooUeWV40WK z;gO%qA-3kxXf!>Y0cBPPdLsTLBtJ$LL?%YVC+LNYnqI`k9iDeT^FBuEMRSKl@m+^M zutQ>*H?47}cM1z0MquL2xDYJe`5yb_Q22}r1j^mrwi121EiNBKYk9~Xl$I^6(yx)9 zM(|@qp<#6hSnf(oue2B}q0&$0B=uy8v9a-FA@Drd05GbM>vJ>#SEo327A|9v{M?m+ zK(X%PwIrD8>S_{nv_XODpDYGI=17_<#EZLQ2MU_(+Hop{?#%Bb-Wd2Coko{&Q zzYQVlJm;_&hypz-m0D4OVHy4y5<{#NW0^9+sY)b5DaLTT!tFSmPMRj1N_B86YymOH z5#MR#GcZ`AGURmr2x(#B+jwcY#;-ea9QcK|NnZno_TDB*Jg#DEXZTRO6)S@{3=yv- zkVUK&kK3;WEKo{#QWK`sK{G6FuzG=_N&HICy)6s;Iy6E~)EKdZ}Zx7NbIjh3zRHsSvT# znq4zlx=OG>Ln$lHb}R{}981KcrH!ZDMs}|aK|qk+BOyXb(<>u1L9hz26c$?%lk6Dp z)TF*p9&zy#BA8YpO9o}4A>c3=_?_e46sd?^1m^&1a#FtIq{>2-lPVu&wvR&GWhjzq zP*nn`!4aQi3IRtvTJ%Ye_uDq*@PV>kB^}D=&<843F*$vpBmIr(sofDP!j!7SDyu6} zpRF+{$IMk}y-u7;_uFR9!a|+SnT5L1pil?9P@%4oXZ&EKlfy%a7dV`Vt8$Wq`xuT1 zm41}GsJ}8SqZ}oW31h)wq_t`{oT}Xoj$yw*NP(NY-sd9w4gZHZWxElUy8?C!1u4Z3 z!70b(SQC|1F7s$4i}B#zBEHJWXDuS$8o>66QC6plvy3A!yP&E_UKPMbR71IBLFZI; zh*+M=fC^LR-@mCAmqz=>}8@B-*V^s;XzB?ViFRs>L6?(z$- zK$JxNAv3I8plV~8Ph3zo%8O8H03Mg+9v0&g0beY*o9WBwh0>h11sRdyWWX9Ctw{3g zS*YgiTGJwgI1s$)>+M($^QTAeqr<1oj41G5)}e**8T@{dzPQ8RGx7_T4#8H7=lns| z+*puXZs=>bi-v*$**|Y@(hxJKHa9FCghAa;>t%Ez;y-T}rwc9;=kmRY3XFMS<^0?^ zW2(>K4I;bXVzytD7xYQn|2kpOyo5&M)n^fjJkxw`zF#aWC}qpV;erfYPZjh{TE2@Q z&qK6#x5z2z%Dxr%6!yXO`NFJ0wV=wp1@-Gu3ZzB6p5AL2oD4D0{4MSV-@y2D;wPQ=4Vo+b=7mWg$56dFM`1wWxv= zj`%JeqeAR7cJ0!EWi}CcN5P7GXm%bp(u26VsPm`;04UT=x+I#13HqdFLm$!tc*WHm zHIUtJKEljhD4%Jl8X}J||Aop}3IfMFM`V^uyjzrG(Nq;ggPFUqz=P73%=DzgU}N+} z$0OLf#vgmkVeF)s(Q7Q*DBkNei8YCyz4O@d#%p_b(Q`jydMPbLZ6??Ib)1?g7FUux zQoo{3JX3rL`OT~o#DHGHdk1fU)ndeit*@3gE>#MftPKHZcye7AJiB=|`zjBMSQta=a65J-? zb`xC6`Ea`(ID3aewS(pCpjQ5sR%V>Pa!;F;mRgzWtlTd5{3oqUZL{fKXQ>EYk`h#a ziymvg#bF1|CeBn_z}*!4JD4kI=@EP_txa{vL(FWm&ZE|m#CAxknrH#Z8dXRfKZ@}r zUcVe;S?1x!yi4aYc3PYroFm@6ERKCGKD?|~u))PxFjwOn>70-U$B`x?omXpTM6iSz zfM}LRbPCuf;H|Wh??!wz_uI@MXs*R0uV%!~T0|^@Qfn~AJDKy?VE%U%i-PYGD1s__ z5N())O-MXyrGp0;%=NUUEyC{!VYDgn!HzWE){GIA&nNyyUVJB^_VbiFdLjDD9%jU?3p&3!F<|p zhVI$k@XcT=7uc&$D`!eC%W1PDwHdNap5_%UL?T#7ons;9cOvWZ{HTx*ixHRi?%1lw zkpGAcrAfh2yk-tCdczbG@)Fx%pcslTWW}RL@;U;KQQ*j$8gJ_?&`>QI0N`<@bpIE6 z4SDtf3Y;+HLOqYWMZtiJG9_(^cIgGh28wLCwL#EEaL0IIyo5MUa#;hj z*b#BbK!1>Gnt^lC$Ac?Pgl16BaD#`^A7&}7jcc`?EzC)TQr|Fa!2e1bB(AoiWLg9@ zq$vgOk?^6Q5wtfz$a9SIRmLglISUZ?3?52&HaLQx0}lLl>a%?V;31!}!R@?9awnx^?Q)>euMK$ z1mA>A?YtR0hi?%l%5tMZrYBNI4@HmVNM#dG%-(3uMJI0PYWd!aZ*mNyRwV8 zyu5>rLHbfC4Tu}cEo|^WdGB(y!Acpps|{x0yBmBbiauc4Ek#xqdIoQ*{bJzIb)n9| z+45wZWRtGSEkOSu?6aQVaM}g|et*Dp`E}}}>*j3nUsrYNK3n(cPB+qps=ftNRFFfz zXvSDB2%S;OT&LpzI$&b+RsC|lpuU)FH#loi^`mKnh1BC0(G@xFYM=plkBXu04>m*X zABteb5Vk=4xuQ2}~ zc^XGf^J}4BUD4(Eh9;aXaM&?ps267-mE@t1!_REQ9=+rYKS9rX#C=!iww~0)b5|Fz z_r$)d)06)QYo%}v9~sF*M>%os>YU^=G=;E?sWGhwDbah36^3cTn4AF;Q2ALHAXZbH zgO`m19y-*GmS;IQ*ZD^?@!FVzsL(-8d_875ds<8y>%+BX?08&19b15FfdgIH!g8 z5ykXzxvWks8+Qvjt!#Wpu#+@CCuKLCaSbvyMr~6Aq@XWXd@pD zK?h%1zdAndhW$!kQFdM$<|~D_<=xoiY>&lc^+*;&u^y?}Bn42+9Z3&P*sMVWn zaO4UHTslcx4|(CXVg!QEZc7Y?Vza#xiLx&c_ia}d$UNEhWP&`|3jGk31gTDzL{<$2 zb{jWb*M<%i5J3fQQW6dYdK(-(w<3R)kY_7s$lPdG`h(?G=tBhUQ_$T5W=DRS2J%&V zsI(Hb{FAz@<%7JtJnixIO97B80i0UP;&2_v0*96MX!*-xE|ZLz3^hvjW271$l^276Hy+JaHZ(F&Ly(s?s+ z4$+8TDi@RQ>eTk9Tyt71nPO$Mti^N@`q+^AN{SE1FkoIMbH>3bcf#if-F`jWBUavC z#Ey%-xA(_~^T<0!Uclx0x#y$e;8Ei8s;sV$(j!G!IO!fL88Rs+q6;sbmoJr&YWkVC z#BEh068=hw4*G~!zp^m+$KuVZJh9|Xi=7a!-kBLZL6I!ML`RkJ8*y;bxr@HUGCqmN z@zA7RO8>A`b+tZ~g7}$zO-_f7ewL&Yqb+I-Pp*d<=0Uv}_X<&~7Q(IIB|?Gb(P zI86IiH;b`%S+R%KgB7ZUkgky>=icRuI_S8vSbtYa@Gn@4?-jfbQImR}Kd3Mw&up+% z3Ndsp1D}PuMVCBuDMPJYSRI9t(n?dcRGQ~uYihkuO^ zF$A?-lbAepEc?6IA+L#d_q%K_#c{fTEEz;KB`RKzEGNfEn)EVoHVz}OV=0pc44_Z` z@ZALi*SAu+kC{K8f<8E4Y& z_m)SU3aMuPz1dMMp||z-j*D6sdW)Tw+fnL8)h-^AXSDf=7&OgiH9=oeV^VXF5>2|y zzuJRMqGsA{$R6KLO9NX`(=)tSprbxQ1Zog<)3QbR^cZBE>!%OTK7h~n{3eb98}>n$ zXp@8mCv9SAb?=&9zZY=&wwGMv9)kSvTw z%md=H86DB<4jEW$bi(fv97G~v-37nXCcd0k}y7h@zFf&at zau*nhAVzQ@Mj}FtygqY4(IIL%6OU9dlaJC*^6>ozA~4k)eVf6k*(@&lUA@`NP;kXC z`m9U49ufzCH=OMfIrpthKCJjrtuW*f)#?!++}FK~4o6NfPX%t7H`<#MB4;T_Vka zvbsT)4uV=&+61+(JV+}+(Ars3VngK{ZNE}%3}%bc;LYuae^FJss;TiSs*nlntj4mkbC3Lxpfa#Lvzn!YXDJOSgV6IQOmbA#A6dsf1e&$bS)TZ8AdV#J(s z97UGS>4szI$vKJQlR5FIHc!r(mav6@ixiGy^n6&%m^%iUx3F-=e$Hw`j}@tVh8?F>@dg_pxo_@*DnHO zx+)Wlc8-JGX@lZ?Uh_CWlbveCyn-)N1BXR%&5dcK2rdJI9RP3xp-}MpnycXdXKFH{ z;3`Bs#;o~ckT&m~UztF^p(xfp`w)^65r3C=>#p^PIVem-2)F^LG~xr-HGgP z_X{8>+)xgSPajN&HhzAvM+nkKkSE$g&J)9H6=c3xQ0uiEyb`*ZY&i|2I0m@+1yNQ@ z;j6h;BBlVRGV3w2)kG;xAaNQy#ufKh`KR7G{XgAHG^&xCM{B#gqm8vFURQy5V5+ z;evrE2htbLcFqQ?7LI18M9ad7&cJnxMnn4R7me4CZxAmn8VB&39=QfETW~!g;vOyN z^fA7jA!9;Ypw7HfR)LgB@z&aR6W2dF&^qoo2vg>T_-RKP)!!D|A1%M+Wrkcy<&COs z)l7XbhVjD^EzoXQPbGa8a7tMhet$Yov2MBOcS_ZGK`Ni@K=|+rTpEMz zBZ;FNrj0Z?i;EcgMBh#)+KUd}L+*m#psMl?Roa>-3WhkfHtl-KuCe8=RB+2(Z3x=c zDZ;~crCEMPBs|$|5b{2L%*~Ir?yXr`X9EW9!2~Q%8T8Tyte`K#US2;JkJ)(SjWn1I z;nzI*9s5p9|NRoQPU7pY2>T_%g!=vk8(VQhz&36wBak~FslU^wiv;tC*irBEJ53Kq z$VwBW5E7S#-yI9KB-6c%`550Qa+iFOy9L!Ue)dtl0lJhw`+&SWs;^{E)rqc4OMH@1 zlr9f`^3!v=iEe`AZZjHFPXYmstfFS=!!Q|h*+sC#%a&!}I(}Jpx-5)PXQP<}n=v0k z-mk-gbSzlBjEr{UvP>5N3E#3r&-~wG&WE`Z5`m{7J1K;~oX_}IH1C&dQ#@-ZCZyoy zx`tL1;*o|(i`ERBr@mDnACj!5^5>rdc%D34%e`tTm6Ip$Zy;j7X_y7_rz~%9&DPP> zjDE_O0W=!_e(85l=;nKPG|!-CPuvz^(a@(dFEoFIKJLKN(<4PP-r>{yY7UiaY@Wn$FIS6ID>T-BLgnXW=^yf0<0e1gHF!NAZN%OD8k_ zJ%t?D8!C>F4c0w@F$i1&Y@(Mo0QrM3qp}YD88gIib5&ROl0fCjAxePn!IKd*q^-S^33|xm|lyExsIB| z_}WJUd*pz4eNA~>3fH^|_+Jb*VK|=GitJ~vKnT0}+265k;>fcpY@Yb>*_qz06>c1m z@uAqezH#PrN8;Sy*+>zwH79ChyaJprx^B(D=Z#@oH?Sgcdg}t5ifUe69bePY)CL2=4E&|yuSWEH z?LlPqov-a@hTC;sc{H$cPOCB)9;BS`bv*Wq= zNhzk5iMOwrrsd#1Nqn>89cGHHf2w2~M5m?!klHOx6%k|8OidSycU&CX-vZbeywZOQ z#E(s7=0?0(cx%Qz0e7)~XOg&OXF+_6J<$_`KK!+aT?vKv`f!+C#;^N&U z@ikfKk^rax8!s_#;_OY~1=rFv9n3u1Qs%R)#;iJMY)xnF#o{ar`^m3@=4|FLS|I KnuWD*&i?@JF9TBm delta 14036 zcmbta349bqy6@_qOcEv`or|0#J(H6|ZV3T-q$1~r7*Ig)Kv7v_f=V<3qLKjNP!59y z8X#N>ii&~;cY}gPh`Ui)4X7)tfb3fjJl2gavUse#|5w#LnGCxA-h1#%cURT-ef8CM zSJiCWVmz|Ns6COqOkbkAA~d~Im`m%d>mEa6nx+}rns0?G5^r%otFKz7f6SKYpRhao zy~ftDhuFg`an9%~=f2L~U~AZ;td6Z`&1~Lbc31y9Hn7S?>`yFqJKMyLbirE8D}CV6-Q7 zf5~QTWjB7${=q(CS0{hP{sP3Mdgng3dB0}8ZuvL+kzLej<7@g7aYVPqFVcO?Vm!h; z!peDq{Wk6Qx$}4X`P>SAuivM0jjL|1SC#`ux7e68ODm1mEseYU62t4_hefe5KIhom zO`1Pn*L<3*$Z}a><{uc(tf=&cbIr?)BE87c%(J4=nAh(;#t$E9(g0iG(?&!a7&y&t z#vHtz2D&{4P%I|VZgBak4l$n=t$8dqB3k$GWA8``KFxBKam@k|%T->M7LAorpINPY z!+@HLc@29NWnhekK4(^#Wte|t7^&8&mzr5ox(6M`93SIGC2s|Xey>}v;w_3-VT2{J z7LgKGP}s;kAPq4Z(Rvi~a8rrHmet*UODjpUg`;EP_+Ld&-XiV`vqsvSmqv$M?&yFh zND|>cBMD}nWmuWlu$V~_a21hQAjyA(W%Rd20-5-9wPpy+%nht~OmrBOCRYp*Va5EI zC~|j+SBnehr<4%AVPI{hyMMo9v}n?yn@7kuDOv*iv{8@~ngjJH2vHxXN6^Y!#GCG< zszzqHAr7w*74E?@nWa~n@1YOx3Q{dB$*A;cJV4&C$wRrpTKBmNEus%0`EMDjH-9<3bg zkrVoDC-mEP3di#E>S`B;%vH?tkU}CxM7!xL!W+d;6RY@k`8vsOjQf2Mna01w2>()i z9g)!UBPE3qu&_3KdNpY_Uob0TBzYVtNpFgBdH5;OH!`982qW%ji9E1GQ1+_D%0ALR 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 VnEb|m!$S$m!(4QRB{JVy^govX$5a3S diff --git a/contracts/wasm/testwasmlib/test/testwasmlib_bg.wasm b/contracts/wasm/testwasmlib/test/testwasmlib_bg.wasm index e0a86ea725852de1483f97c81840acf4a7c7ec55..ddfa98208d7851a01f246f1833c257a7ced90fa8 100644 GIT binary patch delta 6635 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 knJaDiZnxs`8ITohX5VfJK?8 z;6p_ToPzwQNNXXeXmG5Jkz$CT(At)Eb+vS9`?Olid%nI}pDt0`)%WfD6Nb=eo2)hG zo^$s8&i*@l?|XmNC4Si@N{j`|ZzaPpXi>p@kxo;3KBWyjZ7yj~pP<*sq8u`Ft%zv~ z!>|ky4ChCMK_Vao1;8dLfN7s#(4b&|fwiG;>t3eZH|`a$(JOHw)3mnSP_i)* zsW3#nsJ9LEF-^1Tl_8H(f^3?s!g3ciszPs+-gxHkYf@^}GIeJvArugtWhGWLf=SqP zMX7B}jS9e7Dc;hLi5m;IlN!8iMLeX8IGN62vO^CrSJ&(zwY|O5ND5e@-->jxU$p{^*7eEWY6PCc93l~#!Z{#!;~gYajyR76S_eHub`a9U&Ad=V)GJtRh1`QRjLT%3 zz9BfX7~-1_UIMGiTmbkCPp?!)#pleA{SD7(jYG?~-yX235~rn0~lVMRk^#@DXO@ z3T;3$VFw#iiGbsacnC7XF#7#IHGQ6@Nme}q50L;Z^@7?Wt@0j@r@*LH7y=TrEuB^g-YB!uOb~r%kxI%$KiPU+UBs7mQ@Peu2O9 zA#s;pUl6C~^uB`WuydVU|WkWH0lo8D7cq^YnRTtf;SuBn9=m$+Qp zeXjrUx%7@g#($%5phvR7C;6b8MD|z1efVZkYo0;oQmtkRzh^{Beh25OGsIIY%H8^o z{$q1@@*+>S>6iN#<@oF$=+5FI{Zaq&A^yr~sx?nCAfWJj5`bUzST~TqzG#4_@LM>* zQTU86m#6Ss4&;+XvDm5JNKWbB6^-z4PWnWD?SXUB!Kp8f#g6wza$K({_HjCWqUIl* z>wr$+B*(P(w%zXQ%bHGwrfrmxk9xYak>1p=zaCeTKgo4is}J+-9;dVdrWI+{vGFFt zwITKRdBl1_N#WcX>hH8ntw)Xe@m-yU>La~a@ToWSfZm=B-Qq&G^hVsWWx(L8UBC@K z&Bh*p8?pg6yMWET5jT^*Wk6}#g*;<;PH*V}xjIYxEiU2*z0oesqW!n=@Bi&LE$wfA z{=ZA6t54V*`JOpW`|MBfQF+3UeuUnnj}-UU!(uhDx6Yx-BAKt3$A(|%%6!TvYV9HO z*R$l%kXi4E6)OLbhV!n~clib#2bg!QNTd}CW>Q?GsW(;8thhdI6K{g*2%@ zD;?x{*Y;@IdcfIPa9+5S^g>#aMLJ&nV*RPtt;y;$mRWj!l^*BwS%)-mqLf*zUI>N% z0WFh;vq&!+zxD3De}3(;b(;&OtNZV9Ps+SoR&R|xhPv+7IKd@?gj@4oa_T4i5jUM0 zc#x|hilv!~qw_-*eMQfSkD!hE{`lg&r#P4m>~e+pYkVT@&?+ΠUYc#K|vFei!F= z7rHBPY3v`+dCi9|DW8CLe%HL=^c#pgEIsW`fcR$ygU!=az z3wbKy6CB}rj>_}rKXMtO&fHM8+^2_497)Z3CVo5h`iV8PJ<~pM4^27bT)a5H^PqD@ zn@L`4iz*99SIqScM#xT57h;=V_gD*|*7-8%W!DT@=$Am`@~?x!EqSP-5@+BQ2ss&+^ofwQ znFyKMp>z&XTyk+zn1Ax*W6TB=xs4wn%r<@Inh8+k(is=iZoOfV>azCeJeo? z&r|=p>TCkEEfq%OBtE&g-!b$jGwMZW2U#$aSOeJL|fo z^sGL9-3Q-mD?QEn#nDpM4r6Tpg0DN}7f-=-e5Ce^h8)I}~eJ_MNRP!DSK0cWXy zn}uzsBC=e4#4DwcXVd&8@)2ZVNY6In)Vo(l7tBNS-MSzJZBH$z!ExYl)xil(^N?7X0J!XM%3UNeL*$9<=J&E!O+9&&HzabE%b=%N^a z+ZR>YepZy8G?Ss5Qp`jMRvf0g$1wg^ZdQp$=r`H{Xj3F zLY%?sMP3<{CC(0f)O2r|-I&Py_u`s>>&Z)9Po9@BztEFwp`??9nr^uo!EyMOA+#;? z?kyFBNzRg5I8-eeh3Dno^Uyq!7orFV7#{E8zx9{(SDHAuE^lI%bQ7~2Y`O@~e`q>| z=fg`YfcwtU4;lAY-^4_J{!LDm)yw&L#_}0n{?~2Guk}ko{)!3;e|*1Z>;tzA7}xV| zA$Ce!1+-(mbDRkQN2?b06|AQpx~(|;Yu6dA`oL}R8b3px#c(~)?J@oa0*qSqf6O*m zwr*Kj9B$R6y(bjjd!KH(}0_8Tzx0bvgcOOJ@9o(Zc@+$f5fX diff --git a/contracts/wasm/timestamp/src/params.rs b/contracts/wasm/timestamp/src/params.rs deleted file mode 100644 index cbe28e2593..0000000000 --- a/contracts/wasm/timestamp/src/params.rs +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -#![allow(dead_code)] -#![allow(unused_imports)] - -use wasmlib::*; -use wasmlib::host::*; - -use crate::*; -use crate::keys::*; - -#[derive(Clone, Copy)] -pub struct ImmutableInitParams { - pub(crate) id: i32, -} - -impl ImmutableInitParams { - pub fn owner(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) - } -} - -#[derive(Clone, Copy)] -pub struct MutableInitParams { - pub(crate) id: i32, -} - -impl MutableInitParams { - pub fn owner(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) - } -} - -#[derive(Clone, Copy)] -pub struct ImmutableSetOwnerParams { - pub(crate) id: i32, -} - -impl ImmutableSetOwnerParams { - pub fn owner(&self) -> ScImmutableAgentID { - ScImmutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) - } -} - -#[derive(Clone, Copy)] -pub struct MutableSetOwnerParams { - pub(crate) id: i32, -} - -impl MutableSetOwnerParams { - pub fn owner(&self) -> ScMutableAgentID { - ScMutableAgentID::new(self.id, idx_map(IDX_PARAM_OWNER)) - } -} diff --git a/contracts/wasm/timestamp/ts/timestamp/params.ts b/contracts/wasm/timestamp/ts/timestamp/params.ts deleted file mode 100644 index a10b506919..0000000000 --- a/contracts/wasm/timestamp/ts/timestamp/params.ts +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2020 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -// (Re-)generated by schema tool -// >>>> DO NOT CHANGE THIS FILE! <<<< -// Change the json schema instead - -import * as wasmlib from "wasmlib" -import * as sc from "./index"; - -export class ImmutableInitParams extends wasmlib.ScMapID { - - owner(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); - } -} - -export class MutableInitParams extends wasmlib.ScMapID { - - owner(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); - } -} - -export class ImmutableSetOwnerParams extends wasmlib.ScMapID { - - owner(): wasmlib.ScImmutableAgentID { - return new wasmlib.ScImmutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); - } -} - -export class MutableSetOwnerParams extends wasmlib.ScMapID { - - owner(): wasmlib.ScMutableAgentID { - return new wasmlib.ScMutableAgentID(this.mapID, sc.idxMap[sc.IdxParamOwner]); - } -} diff --git a/packages/vm/core/testcore/sbtests/sbtestsc/testcore_bg.wasm b/packages/vm/core/testcore/sbtests/sbtestsc/testcore_bg.wasm index 9a28dcaa4f6408c39bc1482dcf928305afd35a3d..e3b2cafe6e54f16d91f11bd435f1d8bb01ec677c 100644 GIT binary patch delta 14175 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 KnuWD*&i?@JF9TBm delta 14036 zcmbta349bqy6@_qOcEv`or|0#J(H6|ZV3T-q$1~r7*Ig)Kv7v_f=V<3qLKjNP!59y z8X#N>ii&~;cY}gPh`Ui)4X7)tfb3fjJl2gavUse#|5w#LnGCxA-h1#%cURT-ef8CM zSJiCWVmz|Ns6COqOkbkAA~d~Im`m%d>mEa6nx+}rns0?G5^r%otFKz7f6SKYpRhao zy~ftDhuFg`an9%~=f2L~U~AZ;td6Z`&1~Lbc31y9Hn7S?>`yFqJKMyLbirE8D}CV6-Q7 zf5~QTWjB7${=q(CS0{hP{sP3Mdgng3dB0}8ZuvL+kzLej<7@g7aYVPqFVcO?Vm!h; z!peDq{Wk6Qx$}4X`P>SAuivM0jjL|1SC#`ux7e68ODm1mEseYU62t4_hefe5KIhom zO`1Pn*L<3*$Z}a><{uc(tf=&cbIr?)BE87c%(J4=nAh(;#t$E9(g0iG(?&!a7&y&t z#vHtz2D&{4P%I|VZgBak4l$n=t$8dqB3k$GWA8``KFxBKam@k|%T->M7LAorpINPY z!+@HLc@29NWnhekK4(^#Wte|t7^&8&mzr5ox(6M`93SIGC2s|Xey>}v;w_3-VT2{J z7LgKGP}s;kAPq4Z(Rvi~a8rrHmet*UODjpUg`;EP_+Ld&-XiV`vqsvSmqv$M?&yFh zND|>cBMD}nWmuWlu$V~_a21hQAjyA(W%Rd20-5-9wPpy+%nht~OmrBOCRYp*Va5EI zC~|j+SBnehr<4%AVPI{hyMMo9v}n?yn@7kuDOv*iv{8@~ngjJH2vHxXN6^Y!#GCG< zszzqHAr7w*74E?@nWa~n@1YOx3Q{dB$*A;cJV4&C$wRrpTKBmNEus%0`EMDjH-9<3bg zkrVoDC-mEP3di#E>S`B;%vH?tkU}CxM7!xL!W+d;6RY@k`8vsOjQf2Mna01w2>()i z9g)!UBPE3qu&_3KdNpY_Uob0TBzYVtNpFgBdH5;OH!`982qW%ji9E1GQ1+_D%0ALR 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 VnEb|m!$S$m!(4QRB{JVy^govX$5a3S diff --git a/packages/vm/wasmlib/go/wasmlib/context.go b/packages/vm/wasmlib/go/wasmlib/context.go index 5d21804ddd..01a851af57 100644 --- a/packages/vm/wasmlib/go/wasmlib/context.go +++ b/packages/vm/wasmlib/go/wasmlib/context.go @@ -257,11 +257,6 @@ func (ctx ScFuncContext) Caller() ScAgentID { return Root.GetAgentID(KeyCaller).Value() } -// calls a smart contract function on the current contract -func (ctx ScFuncContext) CallSelf(hFunction ScHname, params *ScMutableMap, transfer *ScTransfers) ScImmutableMap { - return ctx.Call(ctx.Contract(), hFunction, params, transfer) -} - // deploys a smart contract func (ctx ScFuncContext) Deploy(programHash ScHash, name, description string, params *ScMutableMap) { encode := NewBytesEncoder() @@ -317,10 +312,6 @@ func (ctx ScFuncContext) Post(chainID ScChainID, hContract, hFunction ScHname, p Root.GetBytes(KeyPost).SetValue(encode.Data()) } -func (ctx ScFuncContext) PostSelf(hFunction ScHname, params *ScMutableMap, transfer ScTransfers, delay int32) { - ctx.Post(ctx.ChainID(), ctx.Contract(), hFunction, params, transfer, delay) -} - // TODO expose Entropy function // generates a random value from 0 to max (exclusive max) using a deterministic RNG @@ -377,11 +368,6 @@ func (ctx ScViewContext) Call(contract, function ScHname, params *ScMutableMap) return Root.GetMap(KeyReturn).Immutable() } -// calls a smart contract function on the current contract -func (ctx ScViewContext) CallSelf(function ScHname, params *ScMutableMap) ScImmutableMap { - return ctx.Call(ctx.Contract(), function, params) -} - func (ctx ScViewContext) InitViewCallContext() { } diff --git a/packages/vm/wasmlib/src/context.rs b/packages/vm/wasmlib/src/context.rs index 25df6bd915..9077472418 100644 --- a/packages/vm/wasmlib/src/context.rs +++ b/packages/vm/wasmlib/src/context.rs @@ -290,11 +290,6 @@ impl ScFuncContext { ROOT.get_map(&KEY_RETURN).immutable() } - // shorthand to synchronously call a smart contract function of the current contract - pub fn call_self(&self, hfunction: ScHname, params: Option, transfers: Option) -> ScImmutableMap { - self.call(self.contract(), hfunction, params, transfers) - } - // retrieve the agent id of the caller of the smart contract pub fn caller(&self) -> ScAgentID { ROOT.get_agent_id(&KEY_CALLER).value() @@ -338,7 +333,7 @@ impl ScFuncContext { encode.chain_id(chain_id); encode.hname(hcontract); encode.hname(hfunction); - if let Some(params) = ¶ms { + if let Some(params) = params { encode.int32(params.map_id()); } else { encode.int32(0); @@ -348,11 +343,6 @@ impl ScFuncContext { ROOT.get_bytes(&KEY_POST).set_value(&encode.data()); } - // shorthand to asynchronously call a smart contract function of the current contract - pub fn post_self(&self, hfunction: ScHname, params: Option, transfer: ScTransfers, delay: i32) { - self.post(&self.chain_id(), self.contract(), hfunction, params, transfer, delay); - } - // generates a random value from 0 to max (exclusive max) using a deterministic RNG pub fn random(&self, max: i64) -> i64 { let state = ScMutableMap { obj_id: OBJ_ID_STATE }; @@ -418,11 +408,6 @@ impl ScViewContext { ROOT.get_map(&KEY_RETURN).immutable() } - // shorthand to synchronously call a smart contract view of the current contract - pub fn call_self(&self, hfunction: ScHname, params: Option) -> ScImmutableMap { - self.call(self.contract(), hfunction, params) - } - // access immutable state storage on the host pub fn state(&self) -> ScImmutableMap { ROOT.get_map(&KEY_STATE).immutable() diff --git a/packages/vm/wasmlib/ts/wasmlib/context.ts b/packages/vm/wasmlib/ts/wasmlib/context.ts index 1cbc77c712..13ab878698 100644 --- a/packages/vm/wasmlib/ts/wasmlib/context.ts +++ b/packages/vm/wasmlib/ts/wasmlib/context.ts @@ -272,11 +272,6 @@ export class ScFuncContext extends ScBaseContext implements ScViewCallContext, S return ROOT.getMap(keys.KEY_RETURN).immutable(); } - // shorthand to synchronously call a smart contract function of the current contract - callSelf(hfunction: ScHname, params: ScMutableMap | null, transfers: ScTransfers | null): ScImmutableMap { - return this.call(this.contract(), hfunction, params, transfers); - } - // retrieve the agent id of the caller of the smart contract caller(): ScAgentID { return ROOT.getAgentID(keys.KEY_CALLER).value(); @@ -322,11 +317,6 @@ export class ScFuncContext extends ScBaseContext implements ScViewCallContext, S ROOT.getBytes(keys.KEY_POST).setValue(encode.data()); } - // shorthand to asynchronously call a smart contract function of the current contract - postSelf(hfunction: ScHname, params: ScMutableMap | null, transfer: ScTransfers, delay: i32): void { - this.post(this.chainID(), this.contract(), hfunction, params, transfer, delay); - } - // generates a random value from 0 to max (exclusive max) using a deterministic RNG random(max: i64): i64 { let state = new ScMutableMap(OBJ_ID_STATE); @@ -378,11 +368,6 @@ export class ScViewContext extends ScBaseContext implements ScViewCallContext { return ROOT.getMap(keys.KEY_RETURN).immutable(); } - // shorthand to synchronously call a smart contract view of the current contract - callSelf(hfunction: ScHname, params: ScMutableMap | null): ScImmutableMap { - return this.call(this.contract(), hfunction, params); - } - // access immutable state storage on the host state(): ScImmutableMap { return ROOT.getMap(keys.KEY_STATE).immutable(); diff --git a/packages/vm/wasmproc/scdict.go b/packages/vm/wasmproc/scdict.go index 73a770595d..5166285131 100644 --- a/packages/vm/wasmproc/scdict.go +++ b/packages/vm/wasmproc/scdict.go @@ -115,13 +115,11 @@ func (o *ScDict) CallFunc(keyID int32, params []byte) []byte { } func (o *ScDict) DelKey(keyID, typeID int32) { - if keyID == wasmhost.KeyLength && (o.typeID&wasmhost.OBJTYPE_ARRAY) != 0 { - o.Panicf("DelKey: cannot delete array.length") + if (o.typeID & wasmhost.OBJTYPE_ARRAY) != 0 { + o.Panicf("DelKey: cannot delete array") } - if o.typeID == (wasmhost.OBJTYPE_ARRAY | wasmhost.OBJTYPE_MAP) { - // TODO only delete map from array of map when it is empty? - // return uint32(keyID) <= uint32(len(o.objects)) - o.Panicf("DelKey: delete map from array of map") + if o.typeID == wasmhost.OBJTYPE_MAP { + o.Panicf("DelKey: cannot delete map") } o.kvStore.Del(o.key(keyID, typeID)) } From 986a62346a326500f346ab32186b5e6231f5fa70 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 7 Dec 2021 13:10:11 +0200 Subject: [PATCH 184/198] Placeholders for metrics in dashboard --- packages/dashboard/base.go | 1 + packages/dashboard/metrics.go | 63 +++++++++++++++++++ packages/dashboard/metrics_nodeconn.go | 42 +++++++++++++ packages/dashboard/templates/metrics.tmpl | 11 ++++ .../dashboard/templates/metrics_nodeconn.tmpl | 13 ++++ 5 files changed, 130 insertions(+) create mode 100644 packages/dashboard/metrics.go create mode 100644 packages/dashboard/metrics_nodeconn.go create mode 100644 packages/dashboard/templates/metrics.tmpl create mode 100644 packages/dashboard/templates/metrics_nodeconn.tmpl diff --git a/packages/dashboard/base.go b/packages/dashboard/base.go index 83ffed4b62..4030163af2 100644 --- a/packages/dashboard/base.go +++ b/packages/dashboard/base.go @@ -70,6 +70,7 @@ func Init(server *echo.Echo, waspServices WaspServices, log *logger.Logger) *Das d.configInit(server, r), d.peeringInit(server, r), d.chainsInit(server, r), + d.metricsInit(server, r), } d.webSocketInit(server) diff --git a/packages/dashboard/metrics.go b/packages/dashboard/metrics.go new file mode 100644 index 0000000000..04c7c38ff8 --- /dev/null +++ b/packages/dashboard/metrics.go @@ -0,0 +1,63 @@ +package dashboard + +import ( + _ "embed" + "net/http" + + "github.com/labstack/echo/v4" +) + +//go:embed templates/metrics.tmpl +var tplMetrics string + +func (d *Dashboard) metricsInit(e *echo.Echo, r renderer) Tab { + ret := d.initMetrics(e, r) + d.initMetricsNodeconn(e, r) + return ret +} + +func (d *Dashboard) initMetrics(e *echo.Echo, r renderer) Tab { + route := e.GET("/metrics", d.handleMetrics) + route.Name = "metrics" + + r[route.Path] = d.makeTemplate(e, tplMetrics) + + return Tab{ + Path: route.Path, + Title: "Metrics", + Href: route.Path, + } +} + +func (d *Dashboard) handleMetrics(c echo.Context) error { + /*chains, err := d.fetchChains() + if err != nil { + return err + }*/ + return c.Render(http.StatusOK, c.Path(), &MetricsTemplateParams{ + BaseTemplateParams: d.BaseParams(c), + // Chains: chains, + }) +} + +/*func (d *Dashboard) fetchChains() ([]*ChainOverview, error) { + crs, err := d.wasp.GetChainRecords() + if err != nil { + return nil, err + } + r := make([]*ChainOverview, len(crs)) + for i, cr := range crs { + info, err := d.fetchRootInfo(cr.ChainID) + r[i] = &ChainOverview{ + ChainRecord: cr, + RootInfo: info, + Error: err, + } + } + return r, nil +}*/ + +type MetricsTemplateParams struct { + BaseTemplateParams + Chains []*ChainOverview +} diff --git a/packages/dashboard/metrics_nodeconn.go b/packages/dashboard/metrics_nodeconn.go new file mode 100644 index 0000000000..4af8593004 --- /dev/null +++ b/packages/dashboard/metrics_nodeconn.go @@ -0,0 +1,42 @@ +package dashboard + +import ( + _ "embed" + "net/http" + + "github.com/labstack/echo/v4" +) + +//go:embed templates/metrics_nodeconn.tmpl +var tplMetricsNodeconn string + +func metricsNodeconnBreadcrumb(e *echo.Echo) Tab { + return Tab{ + Path: e.Reverse("metricsNodeconn"), + Title: "Metrics: Connection to L1", + Href: e.Reverse("metricsNodeconn"), + } +} + +func (d *Dashboard) initMetricsNodeconn(e *echo.Echo, r renderer) { + route := e.GET("/metrics/nodeconn", d.handleMetricsNodeconn) + route.Name = "metricsNodeconn" + r[route.Path] = d.makeTemplate(e, tplMetricsNodeconn) +} + +func (d *Dashboard) handleMetricsNodeconn(c echo.Context) error { + chains, err := d.fetchChains() + if err != nil { + return err + } + tab := metricsNodeconnBreadcrumb(c.Echo()) + return c.Render(http.StatusOK, c.Path(), &MetricsNodeconnTemplateParams{ + BaseTemplateParams: d.BaseParams(c, tab), + Chains: chains, + }) +} + +type MetricsNodeconnTemplateParams struct { + BaseTemplateParams + Chains []*ChainOverview +} diff --git a/packages/dashboard/templates/metrics.tmpl b/packages/dashboard/templates/metrics.tmpl new file mode 100644 index 0000000000..ccf0dca056 --- /dev/null +++ b/packages/dashboard/templates/metrics.tmpl @@ -0,0 +1,11 @@ +{{define "title"}}Metrics{{end}} + +{{define "body"}} +

+

Metrics

+ + +
+{{end}} diff --git a/packages/dashboard/templates/metrics_nodeconn.tmpl b/packages/dashboard/templates/metrics_nodeconn.tmpl new file mode 100644 index 0000000000..cff5032436 --- /dev/null +++ b/packages/dashboard/templates/metrics_nodeconn.tmpl @@ -0,0 +1,13 @@ +{{define "title"}}Connection to L1 metrics{{end}} + +{{define "body"}} +
+

Chains

+
    + {{range $_, $c := .Chains}} + {{ $id := $c.ChainRecord.ChainID.Base58 }} +
  • {{ $id }}
    • + {{end}} +
+
+{{end}} From 0efb454406794933f3491138353b030fc2cf193c Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 7 Dec 2021 13:23:24 +0200 Subject: [PATCH 185/198] Client for metrics returns general structure --- client/metrics.go | 47 ++++-------------------------- tools/wasp-cli/metrics/nodeconn.go | 46 +++++++++++++++++++++++------ 2 files changed, 42 insertions(+), 51 deletions(-) diff --git a/client/metrics.go b/client/metrics.go index 099b0ed893..ec241a3a89 100644 --- a/client/metrics.go +++ b/client/metrics.go @@ -1,7 +1,6 @@ package client import ( - "fmt" "net/http" "github.com/iotaledger/wasp/packages/iscp" @@ -9,56 +8,20 @@ import ( "github.com/iotaledger/wasp/packages/webapi/routes" ) -const maxMessageLen = 80 - // GetNodeConnectionMetrics fetches a connection to L1 metrics for all addresses -func (c *WaspClient) GetNodeConnectionMetrics() ([]string, [][]string, error) { +func (c *WaspClient) GetNodeConnectionMetrics() (*model.NodeConnectionMetrics, error) { ncm := &model.NodeConnectionMetrics{} if err := c.do(http.MethodGet, routes.GetChainsNodeConnectionMetrics(), nil, ncm); err != nil { - return nil, nil, err - } - subscribed := make([]string, len(ncm.Subscribed)) - for i := range subscribed { - subscribed[i] = string(ncm.Subscribed[i]) + return nil, err } - return subscribed, makeNodeConnMetricsTable(&(ncm.NodeConnectionMessagesMetrics)), nil + return ncm, nil } // GetNodeConnectionMetrics fetches a connection to L1 metrics by address -func (c *WaspClient) GetChainNodeConnectionMetrics(chID *iscp.ChainID) ([][]string, error) { +func (c *WaspClient) GetChainNodeConnectionMetrics(chID *iscp.ChainID) (*model.NodeConnectionMessagesMetrics, error) { ncmm := &model.NodeConnectionMessagesMetrics{} if err := c.do(http.MethodGet, routes.GetChainNodeConnectionMetrics(chID.Base58()), nil, ncmm); err != nil { return nil, err } - return makeNodeConnMetricsTable(ncmm), nil -} - -func makeNodeConnMetricsTable(ncmm *model.NodeConnectionMessagesMetrics) [][]string { - res := make([][]string, 8) - res[0] = makeNodeConnMetricsTableRow("Pull state", false, ncmm.OutPullState) - res[1] = makeNodeConnMetricsTableRow("Pull tx inclusion state", false, ncmm.OutPullTransactionInclusionState) - res[2] = makeNodeConnMetricsTableRow("Pull confirmed output", false, ncmm.OutPullConfirmedOutput) - res[3] = makeNodeConnMetricsTableRow("Post transaction", false, ncmm.OutPostTransaction) - res[4] = makeNodeConnMetricsTableRow("Transaction", true, ncmm.InTransaction) - res[5] = makeNodeConnMetricsTableRow("Inclusion state", true, ncmm.InInclusionState) - res[6] = makeNodeConnMetricsTableRow("Output", true, ncmm.InOutput) - res[7] = makeNodeConnMetricsTableRow("Unspent alias output", true, ncmm.InUnspentAliasOutput) - return res -} - -func makeNodeConnMetricsTableRow(name string, isIn bool, ncmm *model.NodeConnectionMessageMetrics) []string { - res := make([]string, 5) - res[0] = name - if isIn { - res[1] = "IN" - } else { - res[1] = "OUT" - } - res[2] = fmt.Sprintf("%v", ncmm.Total) - res[3] = fmt.Sprintf("%v", ncmm.LastEvent) - res[4] = ncmm.LastMessage - if len(res[4]) > maxMessageLen { - res[4] = res[4][:maxMessageLen] - } - return res + return ncmm, nil } diff --git a/tools/wasp-cli/metrics/nodeconn.go b/tools/wasp-cli/metrics/nodeconn.go index cd1d2200a9..0927feb893 100644 --- a/tools/wasp-cli/metrics/nodeconn.go +++ b/tools/wasp-cli/metrics/nodeconn.go @@ -1,14 +1,18 @@ package metrics import ( + "fmt" "strings" "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/webapi/model" "github.com/iotaledger/wasp/tools/wasp-cli/config" "github.com/iotaledger/wasp/tools/wasp-cli/log" "github.com/spf13/cobra" ) +const maxMessageLen = 80 + var nodeconnMetricsCmd = &cobra.Command{ Use: "nodeconn", Short: "Show current value of collected metrics of connection to L1", @@ -16,27 +20,51 @@ var nodeconnMetricsCmd = &cobra.Command{ Run: func(cmd *cobra.Command, args []string) { client := config.WaspClient() if chainIDStr == "" { - subscribed, msgMetrics, err := client.GetNodeConnectionMetrics() + nodeconnMetrics, err := client.GetNodeConnectionMetrics() log.Check(err) log.Printf("Following chains subscribed to L1 events:\n") - for _, s := range subscribed { + for _, s := range nodeconnMetrics.Subscribed { log.Printf("\t%s\n", s) } - printMessageMetrics(msgMetrics) + printMessagesMetrics(&nodeconnMetrics.NodeConnectionMessagesMetrics) } else { chid, err := iscp.ChainIDFromBase58(chainIDStr) log.Check(err) - msgMetrics, err := client.GetChainNodeConnectionMetrics(chid) + msgsMetrics, err := client.GetChainNodeConnectionMetrics(chid) log.Check(err) - printMessageMetrics(msgMetrics) + printMessagesMetrics(msgsMetrics) } }, } -func printMessageMetrics(table [][]string) { +func printMessagesMetrics(msgsMetrics *model.NodeConnectionMessagesMetrics) { header := []string{"Message name", "", "Total", "Last time", "Last message"} - for i := range table { - table[i][4] = strings.Replace(table[i][4], "\n", " ", -1) - } + table := make([][]string, 8) + table[0] = makeMessagesMetricsTableRow("Pull state", false, msgsMetrics.OutPullState) + table[1] = makeMessagesMetricsTableRow("Pull tx inclusion state", false, msgsMetrics.OutPullTransactionInclusionState) + table[2] = makeMessagesMetricsTableRow("Pull confirmed output", false, msgsMetrics.OutPullConfirmedOutput) + table[3] = makeMessagesMetricsTableRow("Post transaction", false, msgsMetrics.OutPostTransaction) + table[4] = makeMessagesMetricsTableRow("Transaction", true, msgsMetrics.InTransaction) + table[5] = makeMessagesMetricsTableRow("Inclusion state", true, msgsMetrics.InInclusionState) + table[6] = makeMessagesMetricsTableRow("Output", true, msgsMetrics.InOutput) + table[7] = makeMessagesMetricsTableRow("Unspent alias output", true, msgsMetrics.InUnspentAliasOutput) log.PrintTable(header, table) } + +func makeMessagesMetricsTableRow(name string, isIn bool, ncmm *model.NodeConnectionMessageMetrics) []string { + res := make([]string, 5) + res[0] = name + if isIn { + res[1] = "IN" + } else { + res[1] = "OUT" + } + res[2] = fmt.Sprintf("%v", ncmm.Total) + res[3] = fmt.Sprintf("%v", ncmm.LastEvent) + res[4] = ncmm.LastMessage + if len(res[4]) > maxMessageLen { + res[4] = res[4][:maxMessageLen] + } + res[4] = strings.Replace(res[4], "\n", " ", -1) + return res +} From 1e162c32de1beff669347ada91c01f1cef750f82 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 7 Dec 2021 15:22:55 +0200 Subject: [PATCH 186/198] Chain nodeconnmetrics shown in dashboard --- packages/dashboard/base.go | 29 +++---- packages/dashboard/metrics.go | 1 + .../dashboard/metrics_nodeconn_messages.go | 49 ++++++++++++ packages/dashboard/mock_test.go | 5 ++ .../dashboard/templates/metrics_nodeconn.tmpl | 2 +- .../templates/metrics_nodeconn_messages.tmpl | 76 +++++++++++++++++++ packages/dashboard/util.go | 8 ++ plugins/dashboard/plugin.go | 9 +++ 8 files changed, 165 insertions(+), 14 deletions(-) create mode 100644 packages/dashboard/metrics_nodeconn_messages.go create mode 100644 packages/dashboard/templates/metrics_nodeconn_messages.tmpl diff --git a/packages/dashboard/base.go b/packages/dashboard/base.go index 4030163af2..7b61a98d16 100644 --- a/packages/dashboard/base.go +++ b/packages/dashboard/base.go @@ -12,6 +12,7 @@ import ( "github.com/iotaledger/wasp/packages/chain" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/kv/dict" + "github.com/iotaledger/wasp/packages/metrics/nodeconnmetrics" "github.com/iotaledger/wasp/packages/registry" "github.com/iotaledger/wasp/packages/wasp" "github.com/labstack/echo/v4" @@ -45,6 +46,7 @@ type WaspServices interface { GetChainRecord(chainID *iscp.ChainID) (*registry.ChainRecord, error) GetChainCommitteeInfo(chainID *iscp.ChainID) (*chain.CommitteeInfo, error) CallView(chainID *iscp.ChainID, scName, fname string, params dict.Dict) (dict.Dict, error) + GetChainNodeConnectionMetrics(*iscp.ChainID) (nodeconnmetrics.NodeConnectionMessagesMetrics, error) } type Dashboard struct { @@ -94,19 +96,20 @@ func (d *Dashboard) BaseParams(c echo.Context, breadcrumbs ...Tab) BaseTemplateP func (d *Dashboard) makeTemplate(e *echo.Echo, parts ...string) *template.Template { t := template.New("").Funcs(template.FuncMap{ - "formatTimestamp": formatTimestamp, - "exploreAddressUrl": exploreAddressURL(d.wasp.ExploreAddressBaseURL()), - "args": args, - "hashref": hashref, - "colorref": colorref, - "trim": trim, - "incUint32": incUint32, - "decUint32": decUint32, - "bytesToString": bytesToString, - "keyToString": keyToString, - "base58": base58.Encode, - "replace": strings.Replace, - "uri": func(s string, p ...interface{}) string { return e.Reverse(s, p...) }, + "formatTimestamp": formatTimestamp, + "formatTimestampOrNever": formatTimestampOrNever, + "exploreAddressUrl": exploreAddressURL(d.wasp.ExploreAddressBaseURL()), + "args": args, + "hashref": hashref, + "colorref": colorref, + "trim": trim, + "incUint32": incUint32, + "decUint32": decUint32, + "bytesToString": bytesToString, + "keyToString": keyToString, + "base58": base58.Encode, + "replace": strings.Replace, + "uri": func(s string, p ...interface{}) string { return e.Reverse(s, p...) }, }) t = template.Must(t.Parse(tplBase)) for _, part := range parts { diff --git a/packages/dashboard/metrics.go b/packages/dashboard/metrics.go index 04c7c38ff8..ca2793e17b 100644 --- a/packages/dashboard/metrics.go +++ b/packages/dashboard/metrics.go @@ -13,6 +13,7 @@ var tplMetrics string func (d *Dashboard) metricsInit(e *echo.Echo, r renderer) Tab { ret := d.initMetrics(e, r) d.initMetricsNodeconn(e, r) + d.initMetricsNodeconnMessages(e, r) return ret } diff --git a/packages/dashboard/metrics_nodeconn_messages.go b/packages/dashboard/metrics_nodeconn_messages.go new file mode 100644 index 0000000000..b4691b26b2 --- /dev/null +++ b/packages/dashboard/metrics_nodeconn_messages.go @@ -0,0 +1,49 @@ +package dashboard + +import ( + _ "embed" + "fmt" + "net/http" + + "github.com/iotaledger/wasp/packages/iscp" + "github.com/iotaledger/wasp/packages/metrics/nodeconnmetrics" + "github.com/labstack/echo/v4" +) + +//go:embed templates/metrics_nodeconn_messages.tmpl +var tplMetricsNodeconnMessages string + +func metricsNodeconnMessagesBreadcrumb(e *echo.Echo, chainID *iscp.ChainID) Tab { + return Tab{ + Path: e.Reverse("metricsNodeconnMessages"), + Title: fmt.Sprintf("Metrics: Connection to L1: %.8s", chainID.Base58()), + Href: e.Reverse("metricsNodeconnMessages", chainID.Base58()), + } +} + +func (d *Dashboard) initMetricsNodeconnMessages(e *echo.Echo, r renderer) { + route := e.GET("/metrics/nodeconn/:chainid", d.handleMetricsNodeconnMessages) + route.Name = "metricsNodeconnMessages" + r[route.Path] = d.makeTemplate(e, tplMetricsNodeconnMessages) +} + +func (d *Dashboard) handleMetricsNodeconnMessages(c echo.Context) error { + chainID, err := iscp.ChainIDFromBase58(c.Param("chainid")) + if err != nil { + return echo.NewHTTPError(http.StatusBadRequest, err) + } + tab := metricsNodeconnMessagesBreadcrumb(c.Echo(), chainID) + metrics, err := d.wasp.GetChainNodeConnectionMetrics(chainID) + if err != nil { + return echo.NewHTTPError(http.StatusBadRequest, err) + } + return c.Render(http.StatusOK, c.Path(), &MetricsNodeconnMessagesTemplateParams{ + BaseTemplateParams: d.BaseParams(c, metricsNodeconnBreadcrumb(c.Echo()), tab), + Metrics: metrics, + }) +} + +type MetricsNodeconnMessagesTemplateParams struct { + BaseTemplateParams + Metrics nodeconnmetrics.NodeConnectionMessagesMetrics +} diff --git a/packages/dashboard/mock_test.go b/packages/dashboard/mock_test.go index 52b674ac64..dc3ada47ad 100644 --- a/packages/dashboard/mock_test.go +++ b/packages/dashboard/mock_test.go @@ -15,6 +15,7 @@ import ( "github.com/iotaledger/wasp/packages/registry" "github.com/iotaledger/wasp/packages/solo" "github.com/iotaledger/wasp/packages/testutil/testlogger" + "github.com/iotaledger/wasp/packages/metrics/nodeconnmetrics" "github.com/labstack/echo/v4" "golang.org/x/xerrors" ) @@ -125,6 +126,10 @@ func (w *waspServicesMock) GetChainCommitteeInfo(chainID *iscp.ChainID) (*chain. }, nil } +func (w *waspServicesMock) GetChainNodeConnectionMetrics(*iscp.ChainID) (nodeconnmetrics.NodeConnectionMessagesMetrics, error) { + panic("Not implemented") +} + type dashboardTestEnv struct { wasp *waspServicesMock echo *echo.Echo diff --git a/packages/dashboard/templates/metrics_nodeconn.tmpl b/packages/dashboard/templates/metrics_nodeconn.tmpl index cff5032436..db490e7600 100644 --- a/packages/dashboard/templates/metrics_nodeconn.tmpl +++ b/packages/dashboard/templates/metrics_nodeconn.tmpl @@ -6,7 +6,7 @@
    {{range $_, $c := .Chains}} {{ $id := $c.ChainRecord.ChainID.Base58 }} -
  • {{ $id }}
    • +
  • {{ $id }}
    • {{end}}
diff --git a/packages/dashboard/templates/metrics_nodeconn_messages.tmpl b/packages/dashboard/templates/metrics_nodeconn_messages.tmpl new file mode 100644 index 0000000000..8a92404924 --- /dev/null +++ b/packages/dashboard/templates/metrics_nodeconn_messages.tmpl @@ -0,0 +1,76 @@ +{{define "title"}}Kažkas{{end}} + +{{define "body"}} +
+

Messages

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Message nameTotalLast timeLast message
Pull stateOUT{{ ((.Metrics.GetOutPullState).GetMessageTotal) }}{{ (formatTimestampOrNever ((.Metrics.GetOutPullState).GetLastEvent)) }}{{ ((.Metrics.GetOutPullState).GetLastMessage) }}
Pull tx inclusion stateOUT{{ ((.Metrics.GetOutPullTransactionInclusionState).GetMessageTotal) }}{{ (formatTimestampOrNever ((.Metrics.GetOutPullTransactionInclusionState).GetLastEvent)) }}{{ ((.Metrics.GetOutPullTransactionInclusionState).GetLastMessage) }}
Pull confirmed outputOUT{{ ((.Metrics.GetOutPullConfirmedOutput).GetMessageTotal) }}{{ (formatTimestampOrNever ((.Metrics.GetOutPullConfirmedOutput).GetLastEvent)) }}{{ ((.Metrics.GetOutPullConfirmedOutput).GetLastMessage) }}
Post transactionOUT{{ ((.Metrics.GetOutPostTransaction).GetMessageTotal) }}{{ (formatTimestampOrNever ((.Metrics.GetOutPostTransaction).GetLastEvent)) }}{{ ((.Metrics.GetOutPostTransaction).GetLastMessage) }}
TransactionIN{{ ((.Metrics.GetInTransaction).GetMessageTotal) }}{{ (formatTimestampOrNever ((.Metrics.GetInTransaction).GetLastEvent)) }}{{ ((.Metrics.GetInTransaction).GetLastMessage) }}
Inclusion stateIN{{ ((.Metrics.GetInInclusionState).GetMessageTotal) }}{{ (formatTimestampOrNever ((.Metrics.GetInInclusionState).GetLastEvent)) }}{{ ((.Metrics.GetInInclusionState).GetLastMessage) }}
OutputIN{{ ((.Metrics.GetInOutput).GetMessageTotal) }}{{ (formatTimestampOrNever ((.Metrics.GetInOutput).GetLastEvent)) }}{{ ((.Metrics.GetInOutput).GetLastMessage) }}
Unspent alias outputIN{{ ((.Metrics.GetInUnspentAliasOutput).GetMessageTotal) }}{{ (formatTimestampOrNever ((.Metrics.GetInUnspentAliasOutput).GetLastEvent)) }}{{ ((.Metrics.GetInUnspentAliasOutput).GetLastMessage) }}
+
+{{end}} diff --git a/packages/dashboard/util.go b/packages/dashboard/util.go index 3d54af2af6..a646869c80 100644 --- a/packages/dashboard/util.go +++ b/packages/dashboard/util.go @@ -56,6 +56,14 @@ func formatTimestamp(ts interface{}) string { return t.UTC().Format(time.RFC3339) } +func formatTimestampOrNever(t time.Time) string { + bla := time.Time{} + if t == bla { + return "NEVER" + } + return formatTimestamp(t) +} + func exploreAddressURL(baseURL string) func(address ledgerstate.Address) string { return func(address ledgerstate.Address) string { return baseURL + "/" + address.Base58() diff --git a/plugins/dashboard/plugin.go b/plugins/dashboard/plugin.go index a4bc09c3f4..2c38590606 100644 --- a/plugins/dashboard/plugin.go +++ b/plugins/dashboard/plugin.go @@ -18,6 +18,7 @@ import ( "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/kv/dict" "github.com/iotaledger/wasp/packages/kv/optimism" + "github.com/iotaledger/wasp/packages/metrics/nodeconnmetrics" "github.com/iotaledger/wasp/packages/parameters" registry_pkg "github.com/iotaledger/wasp/packages/registry" "github.com/iotaledger/wasp/packages/util/auth" @@ -109,6 +110,14 @@ func (w *waspServices) GetChainCommitteeInfo(chainID *iscp.ChainID) (*chain.Comm return ch.GetCommitteeInfo(), nil } +func (w *waspServices) GetChainNodeConnectionMetrics(chainID *iscp.ChainID) (nodeconnmetrics.NodeConnectionMessagesMetrics, error) { + ch := chains.AllChains().Get(chainID) + if ch == nil { + return nil, echo.NewHTTPError(http.StatusNotFound, "Chain not found") + } + return ch.GetNodeConnectionMetrics(), nil +} + func (w *waspServices) CallView(chainID *iscp.ChainID, scName, funName string, params dict.Dict) (dict.Dict, error) { ch := chains.AllChains().Get(chainID) if ch == nil { From 0fde6c112e07f6475b188928ba13ce2519f71980 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 7 Dec 2021 15:30:07 +0200 Subject: [PATCH 187/198] Nodeconn messages metrics in dashboard is a template now --- .../templates/metrics_nodeconn_messages.tmpl | 63 ++++++++++--------- 1 file changed, 34 insertions(+), 29 deletions(-) diff --git a/packages/dashboard/templates/metrics_nodeconn_messages.tmpl b/packages/dashboard/templates/metrics_nodeconn_messages.tmpl index 8a92404924..b3115cdae5 100644 --- a/packages/dashboard/templates/metrics_nodeconn_messages.tmpl +++ b/packages/dashboard/templates/metrics_nodeconn_messages.tmpl @@ -1,8 +1,5 @@ -{{define "title"}}Kažkas{{end}} - -{{define "body"}} -
-

Messages

+{{define "metricsNodeconnMessages"}} + {{ $metrics := (index . 0) }} @@ -17,60 +14,68 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + +
Pull state OUT{{ ((.Metrics.GetOutPullState).GetMessageTotal) }}{{ (formatTimestampOrNever ((.Metrics.GetOutPullState).GetLastEvent)) }}{{ ((.Metrics.GetOutPullState).GetLastMessage) }}{{ (($metrics.GetOutPullState).GetMessageTotal) }}{{ (formatTimestampOrNever (($metrics.GetOutPullState).GetLastEvent)) }}{{ (($metrics.GetOutPullState).GetLastMessage) }}
Pull tx inclusion state OUT{{ ((.Metrics.GetOutPullTransactionInclusionState).GetMessageTotal) }}{{ (formatTimestampOrNever ((.Metrics.GetOutPullTransactionInclusionState).GetLastEvent)) }}{{ ((.Metrics.GetOutPullTransactionInclusionState).GetLastMessage) }}{{ (($metrics.GetOutPullTransactionInclusionState).GetMessageTotal) }}{{ (formatTimestampOrNever (($metrics.GetOutPullTransactionInclusionState).GetLastEvent)) }}{{ (($metrics.GetOutPullTransactionInclusionState).GetLastMessage) }}
Pull confirmed output OUT{{ ((.Metrics.GetOutPullConfirmedOutput).GetMessageTotal) }}{{ (formatTimestampOrNever ((.Metrics.GetOutPullConfirmedOutput).GetLastEvent)) }}{{ ((.Metrics.GetOutPullConfirmedOutput).GetLastMessage) }}{{ (($metrics.GetOutPullConfirmedOutput).GetMessageTotal) }}{{ (formatTimestampOrNever (($metrics.GetOutPullConfirmedOutput).GetLastEvent)) }}{{ (($metrics.GetOutPullConfirmedOutput).GetLastMessage) }}
Post transaction OUT{{ ((.Metrics.GetOutPostTransaction).GetMessageTotal) }}{{ (formatTimestampOrNever ((.Metrics.GetOutPostTransaction).GetLastEvent)) }}{{ ((.Metrics.GetOutPostTransaction).GetLastMessage) }}{{ (($metrics.GetOutPostTransaction).GetMessageTotal) }}{{ (formatTimestampOrNever (($metrics.GetOutPostTransaction).GetLastEvent)) }}{{ (($metrics.GetOutPostTransaction).GetLastMessage) }}
Transaction IN{{ ((.Metrics.GetInTransaction).GetMessageTotal) }}{{ (formatTimestampOrNever ((.Metrics.GetInTransaction).GetLastEvent)) }}{{ ((.Metrics.GetInTransaction).GetLastMessage) }}{{ (($metrics.GetInTransaction).GetMessageTotal) }}{{ (formatTimestampOrNever (($metrics.GetInTransaction).GetLastEvent)) }}{{ (($metrics.GetInTransaction).GetLastMessage) }}
Inclusion state IN{{ ((.Metrics.GetInInclusionState).GetMessageTotal) }}{{ (formatTimestampOrNever ((.Metrics.GetInInclusionState).GetLastEvent)) }}{{ ((.Metrics.GetInInclusionState).GetLastMessage) }}{{ (($metrics.GetInInclusionState).GetMessageTotal) }}{{ (formatTimestampOrNever (($metrics.GetInInclusionState).GetLastEvent)) }}{{ (($metrics.GetInInclusionState).GetLastMessage) }}
Output IN{{ ((.Metrics.GetInOutput).GetMessageTotal) }}{{ (formatTimestampOrNever ((.Metrics.GetInOutput).GetLastEvent)) }}{{ ((.Metrics.GetInOutput).GetLastMessage) }}{{ (($metrics.GetInOutput).GetMessageTotal) }}{{ (formatTimestampOrNever (($metrics.GetInOutput).GetLastEvent)) }}{{ (($metrics.GetInOutput).GetLastMessage) }}
Unspent alias output IN{{ ((.Metrics.GetInUnspentAliasOutput).GetMessageTotal) }}{{ (formatTimestampOrNever ((.Metrics.GetInUnspentAliasOutput).GetLastEvent)) }}{{ ((.Metrics.GetInUnspentAliasOutput).GetLastMessage) }}{{ (($metrics.GetInUnspentAliasOutput).GetMessageTotal) }}{{ (formatTimestampOrNever (($metrics.GetInUnspentAliasOutput).GetLastEvent)) }}{{ (($metrics.GetInUnspentAliasOutput).GetLastMessage) }}
+{{end}} + +{{define "title"}}Kažkas{{end}} + +{{define "body"}} +
+

Messages

+ {{template "metricsNodeconnMessages" (args .Metrics)}}
{{end}} From 8f5def1b43fa281a67ccc373d34c8185c463f575 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 7 Dec 2021 15:53:40 +0200 Subject: [PATCH 188/198] Total nodeconnection metrics are also displayed in dashboard --- packages/dashboard/base.go | 1 + packages/dashboard/metrics_nodeconn.go | 11 +++++++++-- packages/dashboard/mock_test.go | 6 +++++- packages/dashboard/templates/metrics_nodeconn.tmpl | 13 ++++++++++++- plugins/dashboard/plugin.go | 5 +++++ 5 files changed, 32 insertions(+), 4 deletions(-) diff --git a/packages/dashboard/base.go b/packages/dashboard/base.go index 7b61a98d16..7e2b41737d 100644 --- a/packages/dashboard/base.go +++ b/packages/dashboard/base.go @@ -47,6 +47,7 @@ type WaspServices interface { GetChainCommitteeInfo(chainID *iscp.ChainID) (*chain.CommitteeInfo, error) CallView(chainID *iscp.ChainID, scName, fname string, params dict.Dict) (dict.Dict, error) GetChainNodeConnectionMetrics(*iscp.ChainID) (nodeconnmetrics.NodeConnectionMessagesMetrics, error) + GetNodeConnectionMetrics() (nodeconnmetrics.NodeConnectionMetrics, error) } type Dashboard struct { diff --git a/packages/dashboard/metrics_nodeconn.go b/packages/dashboard/metrics_nodeconn.go index 4af8593004..8c1b0b5ace 100644 --- a/packages/dashboard/metrics_nodeconn.go +++ b/packages/dashboard/metrics_nodeconn.go @@ -4,6 +4,7 @@ import ( _ "embed" "net/http" + "github.com/iotaledger/wasp/packages/metrics/nodeconnmetrics" "github.com/labstack/echo/v4" ) @@ -21,7 +22,7 @@ func metricsNodeconnBreadcrumb(e *echo.Echo) Tab { func (d *Dashboard) initMetricsNodeconn(e *echo.Echo, r renderer) { route := e.GET("/metrics/nodeconn", d.handleMetricsNodeconn) route.Name = "metricsNodeconn" - r[route.Path] = d.makeTemplate(e, tplMetricsNodeconn) + r[route.Path] = d.makeTemplate(e, tplMetricsNodeconnMessages, tplMetricsNodeconn) } func (d *Dashboard) handleMetricsNodeconn(c echo.Context) error { @@ -29,14 +30,20 @@ func (d *Dashboard) handleMetricsNodeconn(c echo.Context) error { if err != nil { return err } + metrics, err := d.wasp.GetNodeConnectionMetrics() + if err != nil { + return echo.NewHTTPError(http.StatusBadRequest, err) + } tab := metricsNodeconnBreadcrumb(c.Echo()) return c.Render(http.StatusOK, c.Path(), &MetricsNodeconnTemplateParams{ BaseTemplateParams: d.BaseParams(c, tab), Chains: chains, + Metrics: metrics, }) } type MetricsNodeconnTemplateParams struct { BaseTemplateParams - Chains []*ChainOverview + Chains []*ChainOverview + Metrics nodeconnmetrics.NodeConnectionMetrics } diff --git a/packages/dashboard/mock_test.go b/packages/dashboard/mock_test.go index dc3ada47ad..6a67a13cc4 100644 --- a/packages/dashboard/mock_test.go +++ b/packages/dashboard/mock_test.go @@ -12,10 +12,10 @@ import ( "github.com/iotaledger/wasp/packages/chain" "github.com/iotaledger/wasp/packages/iscp" "github.com/iotaledger/wasp/packages/kv/dict" + "github.com/iotaledger/wasp/packages/metrics/nodeconnmetrics" "github.com/iotaledger/wasp/packages/registry" "github.com/iotaledger/wasp/packages/solo" "github.com/iotaledger/wasp/packages/testutil/testlogger" - "github.com/iotaledger/wasp/packages/metrics/nodeconnmetrics" "github.com/labstack/echo/v4" "golang.org/x/xerrors" ) @@ -130,6 +130,10 @@ func (w *waspServicesMock) GetChainNodeConnectionMetrics(*iscp.ChainID) (nodecon panic("Not implemented") } +func (w *waspServicesMock) GetNodeConnectionMetrics() (nodeconnmetrics.NodeConnectionMetrics, error) { + panic("Not implemented") +} + type dashboardTestEnv struct { wasp *waspServicesMock echo *echo.Echo diff --git a/packages/dashboard/templates/metrics_nodeconn.tmpl b/packages/dashboard/templates/metrics_nodeconn.tmpl index db490e7600..6c74a95966 100644 --- a/packages/dashboard/templates/metrics_nodeconn.tmpl +++ b/packages/dashboard/templates/metrics_nodeconn.tmpl @@ -2,12 +2,23 @@ {{define "body"}}
-

Chains

+

All the chains

    {{range $_, $c := .Chains}} {{ $id := $c.ChainRecord.ChainID.Base58 }}
  • {{ $id }}
    • {{end}}
+ +

Chains, subscribed to L1

+
    + {{range $_, $addr := (.Metrics.GetSubscribed)}} + {{ $id := $addr.Base58 }} +
  • {{ $id }}
    • + {{end}} +
+ +

Total L1 messages

+ {{template "metricsNodeconnMessages" (args .Metrics.NodeConnectionMessagesMetrics)}}
{{end}} diff --git a/plugins/dashboard/plugin.go b/plugins/dashboard/plugin.go index 2c38590606..ce99ef1522 100644 --- a/plugins/dashboard/plugin.go +++ b/plugins/dashboard/plugin.go @@ -118,6 +118,11 @@ func (w *waspServices) GetChainNodeConnectionMetrics(chainID *iscp.ChainID) (nod return ch.GetNodeConnectionMetrics(), nil } +func (w *waspServices) GetNodeConnectionMetrics() (nodeconnmetrics.NodeConnectionMetrics, error) { + chs := chains.AllChains() + return chs.GetNodeConnectionMetrics(), nil +} + func (w *waspServices) CallView(chainID *iscp.ChainID, scName, funName string, params dict.Dict) (dict.Dict, error) { ch := chains.AllChains().Get(chainID) if ch == nil { From be825bd1f93af9ca1b545139ae80499e83f125f9 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 7 Dec 2021 15:55:13 +0200 Subject: [PATCH 189/198] Cleanup --- packages/dashboard/metrics.go | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/packages/dashboard/metrics.go b/packages/dashboard/metrics.go index ca2793e17b..c160cde263 100644 --- a/packages/dashboard/metrics.go +++ b/packages/dashboard/metrics.go @@ -31,34 +31,11 @@ func (d *Dashboard) initMetrics(e *echo.Echo, r renderer) Tab { } func (d *Dashboard) handleMetrics(c echo.Context) error { - /*chains, err := d.fetchChains() - if err != nil { - return err - }*/ return c.Render(http.StatusOK, c.Path(), &MetricsTemplateParams{ BaseTemplateParams: d.BaseParams(c), - // Chains: chains, }) } -/*func (d *Dashboard) fetchChains() ([]*ChainOverview, error) { - crs, err := d.wasp.GetChainRecords() - if err != nil { - return nil, err - } - r := make([]*ChainOverview, len(crs)) - for i, cr := range crs { - info, err := d.fetchRootInfo(cr.ChainID) - r[i] = &ChainOverview{ - ChainRecord: cr, - RootInfo: info, - Error: err, - } - } - return r, nil -}*/ - type MetricsTemplateParams struct { BaseTemplateParams - Chains []*ChainOverview } From 36034c83e45763412329141fc9031a0d5d8ad2fd Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Tue, 7 Dec 2021 17:02:45 +0200 Subject: [PATCH 190/198] Appeasing Linter --- tools/wasp-cli/metrics/nodeconn.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/wasp-cli/metrics/nodeconn.go b/tools/wasp-cli/metrics/nodeconn.go index 0927feb893..ebe05c46ac 100644 --- a/tools/wasp-cli/metrics/nodeconn.go +++ b/tools/wasp-cli/metrics/nodeconn.go @@ -60,7 +60,7 @@ func makeMessagesMetricsTableRow(name string, isIn bool, ncmm *model.NodeConnect res[1] = "OUT" } res[2] = fmt.Sprintf("%v", ncmm.Total) - res[3] = fmt.Sprintf("%v", ncmm.LastEvent) + res[3] = ncmm.LastEvent.String() res[4] = ncmm.LastMessage if len(res[4]) > maxMessageLen { res[4] = res[4][:maxMessageLen] From 139de44be26920504ae57dfa29b91421501cd60b Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Tue, 7 Dec 2021 10:47:44 -0800 Subject: [PATCH 191/198] Added missing 8-bit integere types to codec.Encode() --- packages/kv/codec/encodego.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/kv/codec/encodego.go b/packages/kv/codec/encodego.go index 0a4dc2ed86..fe36280d9c 100644 --- a/packages/kv/codec/encodego.go +++ b/packages/kv/codec/encodego.go @@ -17,14 +17,16 @@ func Encode(v interface{}) []byte { //nolint:funlen return EncodeBool(vt) case int: // default to int64 return EncodeInt64(int64(vt)) - case byte: - return EncodeInt64(int64(vt)) + case int8: + return EncodeInt8(vt) case int16: return EncodeInt16(vt) case int32: return EncodeInt32(vt) case int64: return EncodeInt64(vt) + case uint8: + return EncodeUint8(vt) case uint16: return EncodeUint16(vt) case uint32: From f3de3db4f51cf0f0ef8ca491ce8033f7bd19013a Mon Sep 17 00:00:00 2001 From: Phyloiota <77154511+Phyloiota@users.noreply.github.com> Date: Wed, 8 Dec 2021 06:49:05 +0800 Subject: [PATCH 192/198] Update iscp-architecture.md corrected typo --- documentation/docs/guide/core_concepts/iscp-architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/docs/guide/core_concepts/iscp-architecture.md b/documentation/docs/guide/core_concepts/iscp-architecture.md index 558c85ae10..6b319efc37 100644 --- a/documentation/docs/guide/core_concepts/iscp-architecture.md +++ b/documentation/docs/guide/core_concepts/iscp-architecture.md @@ -14,7 +14,7 @@ With IOTA Smart Contracts, anyone can start their own chain and define the valid Each chain has its own state where a state update (going from one block to the next) is hashed and published to the Tangle, which moves the state anchor on Layer 1. -The multi-chain nature of IOTA Smart COntracts makes it a more complex implementation of smart contracts, over say Ethereum, as illustrated here: +The multi-chain nature of IOTA Smart Contracts makes it a more complex implementation of smart contracts, over say Ethereum, as illustrated here: ![ISCP multichain architecture](../../../static/img/multichain.png) From 859951288df2c77d51e42b285c90c250def97237 Mon Sep 17 00:00:00 2001 From: Eric Hop Date: Tue, 7 Dec 2021 20:14:24 -0800 Subject: [PATCH 193/198] Fixed bug in key deletion --- contracts/wasm/erc721/go/erc721/erc721.go | 71 ++++++++++++------- contracts/wasm/erc721/src/erc721.rs | 23 +++--- contracts/wasm/erc721/test/erc721_bg.wasm | Bin 39689 -> 39496 bytes contracts/wasm/erc721/test/erc721_test.go | 10 ++- contracts/wasm/erc721/ts/erc721/erc721.ts | 81 +++++++++++++--------- packages/vm/wasmproc/scdict.go | 4 +- 6 files changed, 117 insertions(+), 72 deletions(-) diff --git a/contracts/wasm/erc721/go/erc721/erc721.go b/contracts/wasm/erc721/go/erc721/erc721.go index afe42dff96..c77513c27e 100644 --- a/contracts/wasm/erc721/go/erc721/erc721.go +++ b/contracts/wasm/erc721/go/erc721/erc721.go @@ -22,11 +22,6 @@ var zero = wasmlib.ScAgentID{} /////////////////////////// HELPER FUNCTIONS //////////////////////////// -func approve(state MutableErc721State, owner, approved wasmlib.ScAgentID, tokenID wasmlib.ScHash) { - state.ApprovedAccounts().GetAgentID(tokenID).SetValue(approved) - Erc721Events{}.Approval(approved, owner, tokenID) -} - // checks if caller is owner, or one of its delegated operators func canOperate(state MutableErc721State, caller, owner wasmlib.ScAgentID) bool { if caller == owner { @@ -59,33 +54,53 @@ func transfer(ctx wasmlib.ScFuncContext, state MutableErc721State, from, to wasm ctx.Require(owner == from, "from is not owner") // TODO ctx.Require(to == , "invalid 'to' agentid") - nftCountFrom := state.Balances().GetUint64(from) - nftCountTo := state.Balances().GetUint64(to) + balanceFrom := state.Balances().GetUint64(from) + balanceTo := state.Balances().GetUint64(to) - nftCountFrom.SetValue(nftCountFrom.Value() - 1) - nftCountTo.SetValue(nftCountTo.Value() + 1) + balanceFrom.SetValue(balanceFrom.Value() - 1) + balanceTo.SetValue(balanceTo.Value() + 1) tokenOwner.SetValue(to) + events := Erc721Events{} // TODO should probably clear this entry, but for now just set to zero - approve(state, owner, zero, tokenID) + currentApproved := state.ApprovedAccounts().GetAgentID(tokenID) + if currentApproved.Exists() { + currentApproved.Delete() + events.Approval(zero, owner, tokenID) + } - Erc721Events{}.Transfer(from, to, tokenID) + events.Transfer(from, to, tokenID) } /////////////////////////// SC FUNCS //////////////////////////// // Gives permission to to to transfer tokenID token to another account. -// The approval is cleared when the token is transferred. +// The approval is cleared when optional approval account is omitted. +// The approval will be cleared when the token is transferred. func funcApprove(ctx wasmlib.ScFuncContext, f *ApproveContext) { tokenID := f.Params.TokenID().Value() tokenOwner := f.State.Owners().GetAgentID(tokenID) ctx.Require(tokenOwner.Exists(), "tokenID does not exist") owner := tokenOwner.Value() ctx.Require(canOperate(f.State, ctx.Caller(), owner), "not owner or operator") - approved := f.Params.Approved().Value() - ctx.Require(owner != approved, "approved equals owner") - approve(f.State, owner, approved, tokenID) + + approved := f.Params.Approved() + if !approved.Exists() { + // remove approval if it exists + currentApproved := f.State.ApprovedAccounts().GetAgentID(tokenID) + if currentApproved.Exists() { + currentApproved.Delete() + f.Events.Approval(zero, owner, tokenID) + } + return + } + + account := approved.Value() + ctx.Require(owner != account, "approved account equals owner") + + f.State.ApprovedAccounts().GetAgentID(tokenID).SetValue(account) + f.Events.Approval(account, owner, tokenID) } // Destroys tokenID. The approval is cleared when the token is burned. @@ -95,13 +110,17 @@ func funcBurn(ctx wasmlib.ScFuncContext, f *BurnContext) { ctx.Require(owner != zero, "tokenID does not exist") ctx.Require(ctx.Caller() == owner, "caller is not owner") - approve(f.State, owner, zero, tokenID) + // remove approval if it exists + currentApproved := f.State.ApprovedAccounts().GetAgentID(tokenID) + if currentApproved.Exists() { + currentApproved.Delete() + f.Events.Approval(zero, owner, tokenID) + } balance := f.State.Balances().GetUint64(owner) balance.SetValue(balance.Value() - 1) - // TODO clear this instead of setting to zero - f.State.Owners().GetAgentID(tokenID).SetValue(zero) + f.State.Owners().GetAgentID(tokenID).Delete() f.Events.Transfer(owner, zero, tokenID) } @@ -152,8 +171,8 @@ func funcSetApprovalForAll(ctx wasmlib.ScFuncContext, f *SetApprovalForAllContex ctx.Require(owner != operator, "owner equals operator") approval := f.Params.Approval().Value() - approvalsByCaller := f.State.ApprovedOperators().GetOperators(owner) - approvalsByCaller.GetBool(operator).SetValue(approval) + operatorsForCaller := f.State.ApprovedOperators().GetOperators(owner) + operatorsForCaller.GetBool(operator).SetValue(approval) f.Events.ApprovalForAll(approval, operator, owner) } @@ -171,18 +190,18 @@ func funcTransferFrom(ctx wasmlib.ScFuncContext, f *TransferFromContext) { // Returns the number of tokens in owner's account if the owner exists. func viewBalanceOf(ctx wasmlib.ScViewContext, f *BalanceOfContext) { owner := f.Params.Owner().Value() - nftCount := f.State.Balances().GetUint64(owner) - if nftCount.Exists() { - f.Results.Amount().SetValue(nftCount.Value()) + balance := f.State.Balances().GetUint64(owner) + if balance.Exists() { + f.Results.Amount().SetValue(balance.Value()) } } // Returns the approved account for tokenID token if there is one. func viewGetApproved(ctx wasmlib.ScViewContext, f *GetApprovedContext) { tokenID := f.Params.TokenID().Value() - approved := f.State.ApprovedAccounts().GetAgentID(tokenID).Value() - if approved != zero { - f.Results.Approved().SetValue(approved) + approved := f.State.ApprovedAccounts().GetAgentID(tokenID) + if approved.Exists() { + f.Results.Approved().SetValue(approved.Value()) } } diff --git a/contracts/wasm/erc721/src/erc721.rs b/contracts/wasm/erc721/src/erc721.rs index 6dd4aeb73a..c313ad4727 100644 --- a/contracts/wasm/erc721/src/erc721.rs +++ b/contracts/wasm/erc721/src/erc721.rs @@ -53,15 +53,14 @@ fn transfer(ctx: &ScFuncContext, state: MutableErc721State, from: &ScAgentID, to ctx.require(owner == *from, "from is not owner"); //TODO: ctx.require(to == , "invalid 'to' agentid"); - let nft_count_from = state.balances().get_uint64(from); - let nft_count_to = state.balances().get_uint64(to); + let balance_from = state.balances().get_uint64(from); + let balance_to = state.balances().get_uint64(to); - nft_count_from.set_value(nft_count_from.value() - 1); - nft_count_to.set_value(nft_count_to.value() + 1); + balance_from.set_value(balance_from.value() - 1); + balance_to.set_value(balance_to.value() + 1); token_owner.set_value(to); - let events = Erc721Events {}; // remove approval if it exists let current_approved = state.approved_accounts().get_agent_id(&token_id); @@ -97,7 +96,7 @@ pub fn func_approve(ctx: &ScFuncContext, f: &ApproveContext) { } let account = approved.value(); - ctx.require(owner != account, "approved equals owner"); + ctx.require(owner != account, "approved account equals owner"); f.state.approved_accounts().get_agent_id(&token_id).set_value(&account); f.events.approval(&account, &owner, &token_id); @@ -147,9 +146,9 @@ pub fn func_mint(ctx: &ScFuncContext, f: &MintContext) { balance.set_value(balance.value() + 1); f.events.transfer(&ScAgentID::ZERO, &owner, &token_id); - if !owner.is_address() { - //TODO interpret to as SC address and call its onERC721Received() function - } + // if !owner.is_address() { + // //TODO interpret to as SC address and call its onERC721Received() function + // } } // Safely transfers tokenID token from from to to, checking first that contract @@ -159,9 +158,9 @@ pub fn func_safe_transfer_from(ctx: &ScFuncContext, f: &SafeTransferFromContext) let to = f.params.to().value(); let token_id = f.params.token_id().value(); transfer(&ctx, f.state, &from, &to, &token_id); - if !to.is_address() { - //TODO interpret to as SC address and call its onERC721Received() function - } + // if !to.is_address() { + // //TODO interpret to as SC address and call its onERC721Received() function + // } } // Approve or remove operator as an operator for the caller. diff --git a/contracts/wasm/erc721/test/erc721_bg.wasm b/contracts/wasm/erc721/test/erc721_bg.wasm index fef684c1bfe17f19692bee9b53ae701b6e9fb9a6..5b758abf0e4b9f148baac543063d37f1547441ef 100644 GIT binary patch delta 13484 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 delta 13577 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 K&Em%g9{nF7qBl_h diff --git a/contracts/wasm/erc721/test/erc721_test.go b/contracts/wasm/erc721/test/erc721_test.go index 2b83d472ed..b1f33b11ce 100644 --- a/contracts/wasm/erc721/test/erc721_test.go +++ b/contracts/wasm/erc721/test/erc721_test.go @@ -47,6 +47,12 @@ func TestApprove(t *testing.T) { approved = getApproved(t, ctx, tokenID) require.NotNil(t, approved) require.EqualValues(t, *approved, friend1.ScAgentID()) + + approve(ctx, owner, nil, tokenID) + require.NoError(t, ctx.Err) + + approved = getApproved(t, ctx, tokenID) + require.Nil(t, approved) } func TestApproveAll(t *testing.T) { @@ -151,7 +157,9 @@ func setup(t *testing.T) *wasmsolo.SoloContext { func approve(ctx *wasmsolo.SoloContext, owner, approved *wasmsolo.SoloAgent, tokenID wasmlib.ScHash) { f := erc721.ScFuncs.Approve(ctx.Sign(owner)) - f.Params.Approved().SetValue(approved.ScAgentID()) + if approved != nil { + f.Params.Approved().SetValue(approved.ScAgentID()) + } f.Params.TokenID().SetValue(tokenID) f.Func.TransferIotas(1).Post() } diff --git a/contracts/wasm/erc721/ts/erc721/erc721.ts b/contracts/wasm/erc721/ts/erc721/erc721.ts index 5ebee1646e..1cd4d73655 100644 --- a/contracts/wasm/erc721/ts/erc721/erc721.ts +++ b/contracts/wasm/erc721/ts/erc721/erc721.ts @@ -20,11 +20,6 @@ const ZERO = new wasmlib.ScAgentID() /////////////////////////// HELPER FUNCTIONS //////////////////////////// -function approve(state: sc.MutableErc721State, owner: wasmlib.ScAgentID, approved: wasmlib.ScAgentID, tokenID: wasmlib.ScHash): void { - state.approvedAccounts().getAgentID(tokenID).setValue(approved); - new sc.Erc721Events().approval(approved, owner, tokenID); -} - // checks if caller is owner, or one of its delegated operators function canOperate(state: sc.MutableErc721State, caller: wasmlib.ScAgentID, owner: wasmlib.ScAgentID): boolean { if (caller.equals(owner)) { @@ -57,33 +52,53 @@ function transfer(ctx: wasmlib.ScFuncContext, state: sc.MutableErc721State, from ctx.require(owner.equals(from), "from is not owner"); //TODO: ctx.require(to == , "invalid 'to' agentid"); - let nftCountFrom = state.balances().getUint64(from); - let nftCountTo = state.balances().getUint64(to); + let balanceFrom = state.balances().getUint64(from); + let balanceTo = state.balances().getUint64(to); - nftCountFrom.setValue(nftCountFrom.value() - 1); - nftCountTo.setValue(nftCountTo.value() + 1); + balanceFrom.setValue(balanceFrom.value() - 1); + balanceTo.setValue(balanceTo.value() + 1); tokenOwner.setValue(to); - //TODO should probably clear this entry, but for now just set to zero - approve(state, owner, ZERO, tokenID); + let events = new sc.Erc721Events(); + // remove approval if it exists + let currentApproved = state.approvedAccounts().getAgentID(tokenID); + if (currentApproved.exists()) { + currentApproved.delete(); + events.approval(ZERO, owner, tokenID); + } - new sc.Erc721Events().transfer(from, to, tokenID); + events.transfer(from, to, tokenID); } /////////////////////////// SC FUNCS //////////////////////////// // Gives permission to to to transfer tokenID token to another account. -// The approval is cleared when the token is transferred. +// The approval is cleared when optional approval account is omitted. +// The approval will be cleared when the token is transferred. export function funcApprove(ctx: wasmlib.ScFuncContext, f: sc.ApproveContext): void { let tokenID = f.params.tokenID().value(); let tokenOwner = f.state.owners().getAgentID(tokenID); ctx.require(tokenOwner.exists(), "tokenID does not exist"); let owner = tokenOwner.value(); ctx.require(canOperate(f.state, ctx.caller(), owner), "not owner or operator"); - let approved = f.params.approved().value(); - ctx.require(!owner.equals(approved), "approved equals owner"); - approve(f.state, owner, approved, tokenID); + + let approved = f.params.approved(); + if (!approved.exists()) { + // remove approval if it exists + let currentApproved = f.state.approvedAccounts().getAgentID(tokenID); + if (currentApproved.exists()) { + currentApproved.delete(); + f.events.approval(ZERO, owner, tokenID); + } + return; + } + + let account = approved.value(); + ctx.require(!owner.equals(account), "approved account equals owner"); + + f.state.approvedAccounts().getAgentID(tokenID).setValue(account); + f.events.approval(account, owner, tokenID); } // Destroys tokenID. The approval is cleared when the token is burned. @@ -93,13 +108,17 @@ export function funcBurn(ctx: wasmlib.ScFuncContext, f: sc.BurnContext): void { ctx.require(!owner.equals(ZERO), "tokenID does not exist"); ctx.require(ctx.caller().equals(owner), "caller is not owner"); - approve(f.state, owner, ZERO, tokenID); + // remove approval if it exists + let currentApproved = f.state.approvedAccounts().getAgentID(tokenID); + if (currentApproved.exists()) { + currentApproved.delete(); + f.events.approval(ZERO, owner, tokenID); + } let balance = f.state.balances().getUint64(owner); balance.setValue(balance.value() - 1); - //TODO clear this instead of setting to zero - f.state.owners().getAgentID(tokenID).setValue(ZERO); + f.state.owners().getAgentID(tokenID).delete(); f.events.transfer(owner, ZERO, tokenID); } @@ -126,9 +145,9 @@ export function funcMint(ctx: wasmlib.ScFuncContext, f: sc.MintContext): void { balance.setValue(balance.value() + 1); f.events.transfer(ZERO, owner, tokenID); - if (!owner.isAddress()) { - //TODO interpret to as SC address and call its onERC721Received() function - } + // if (!owner.isAddress()) { + // //TODO interpret to as SC address and call its onERC721Received() function + // } } // Safely transfers tokenID token from from to to, checking first that contract @@ -138,9 +157,9 @@ export function funcSafeTransferFrom(ctx: wasmlib.ScFuncContext, f: sc.SafeTrans let to = f.params.to().value(); let tokenID = f.params.tokenID().value(); transfer(ctx, f.state, from, to, tokenID); - if (!to.isAddress()) { - //TODO interpret to as SC address and call its onERC721Received() function - } + // if (!to.isAddress()) { + // //TODO interpret to as SC address and call its onERC721Received() function + // } } // Approve or remove operator as an operator for the caller. @@ -169,18 +188,18 @@ export function funcTransferFrom(ctx: wasmlib.ScFuncContext, f: sc.TransferFromC // Returns the number of tokens in owner's account if the owner exists. export function viewBalanceOf(ctx: wasmlib.ScViewContext, f: sc.BalanceOfContext): void { let owner = f.params.owner().value(); - let nftCount = f.state.balances().getUint64(owner); - if (nftCount.exists()) { - f.results.amount().setValue(nftCount.value()); + let balance = f.state.balances().getUint64(owner); + if (balance.exists()) { + f.results.amount().setValue(balance.value()); } } // Returns the approved account for tokenID token if there is one. export function viewGetApproved(ctx: wasmlib.ScViewContext, f: sc.GetApprovedContext): void { let tokenID = f.params.tokenID().value(); - let approved = f.state.approvedAccounts().getAgentID(tokenID).value(); - if (!approved.equals(ZERO)) { - f.results.approved().setValue(approved); + let approved = f.state.approvedAccounts().getAgentID(tokenID); + if (approved.exists()) { + f.results.approved().setValue(approved.value()); } } diff --git a/packages/vm/wasmproc/scdict.go b/packages/vm/wasmproc/scdict.go index 5166285131..1ddd454dd1 100644 --- a/packages/vm/wasmproc/scdict.go +++ b/packages/vm/wasmproc/scdict.go @@ -115,10 +115,10 @@ func (o *ScDict) CallFunc(keyID int32, params []byte) []byte { } func (o *ScDict) DelKey(keyID, typeID int32) { - if (o.typeID & wasmhost.OBJTYPE_ARRAY) != 0 { + if (typeID & wasmhost.OBJTYPE_ARRAY) != 0 { o.Panicf("DelKey: cannot delete array") } - if o.typeID == wasmhost.OBJTYPE_MAP { + if typeID == wasmhost.OBJTYPE_MAP { o.Panicf("DelKey: cannot delete map") } o.kvStore.Del(o.key(keyID, typeID)) From 5874e454f87e9b4cbe66797b9c741c2fbd850d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=B6ller?= Date: Thu, 9 Dec 2021 13:23:38 +0100 Subject: [PATCH 194/198] Update docker documentation --- .../chains_and_nodes/docker_preconfigured.md | 76 +++++++++++++++++++ .../{docker.md => docker_standalone.md} | 14 +--- .../guide/chains_and_nodes/running-a-node.md | 2 +- documentation/sidebars.js | 9 ++- 4 files changed, 87 insertions(+), 14 deletions(-) create mode 100644 documentation/docs/guide/chains_and_nodes/docker_preconfigured.md rename documentation/docs/guide/chains_and_nodes/{docker.md => docker_standalone.md} (77%) diff --git a/documentation/docs/guide/chains_and_nodes/docker_preconfigured.md b/documentation/docs/guide/chains_and_nodes/docker_preconfigured.md new file mode 100644 index 0000000000..98e97d1d3c --- /dev/null +++ b/documentation/docs/guide/chains_and_nodes/docker_preconfigured.md @@ -0,0 +1,76 @@ +--- +description: How to run the preconfigured Docker setup. +image: /img/logo/WASP_logo_dark.png +keywords: +- ISCP +- Smart Contracts +- Running a node +- docker +- image +- build +- configure +- arguments +- GoShimmer +--- +# Docker (Preconfigured) + +This page describes the usage of the preconfigured developer Docker setup. + +## Introduction + +To diminish the time spent on configuration and research, we have created a docker-compose setup that ships a preconfigured Wasp and GoShimmer (v0.7.7) node, that are connected with each other - ready to run out of the box. + +## Running the setup + +Checkout the project, switch to 'develop' and start with docker-compose: + +``` +git clone -b develop https://github.com/iotaledger/wasp.git +cd tools/devnet +docker-compose up +``` + +Docker will build a lightly modified GoShimmer (v0.7.7) image and a Wasp image based on the contents of the checked out develop branch. If you do modifications inside the branch, docker-compose will include them into the Wasp image too. + +## Usage + +Wasp is configured to allow any connection coming from wasp-cli. This is fine for development purposes, but please make sure to not run it on a publicly available server, or to create matching firewall filter rules. + +Besides this, everything should simply work as expected. Faucet requests will be handled accordingly, you will be able to deploy and run smart contracts. All useful ports such as: + +* Wasp Dashboard (7000) +* Wasp API (9090) +* GoShimmer Dashboard (8081) +* GoShimmer API (8080) + +are available to the local machine. + +## Wasp-CLI configuration + +As all ports are locally available, this `wasp-cli.json` configuration is to be used: + +``` +{ + "goshimmer": { + "api": "127.0.0.1:8080", + "faucetpowtarget": -1 + }, + "wasp": { + "0": { + "api": "127.0.0.1:9090", + "nanomsg": "127.0.0.1:5550", + "peering": "127.0.0.1:4000" + } + } +} +``` + +Run `wasp-cli init` to generate a seed, and you are ready to go. + +See [Configuring wasp-cli](/smart-contracts/guide/chains_and_nodes/wasp-cli) for further information. + +## Notes about GoShimmer + +As GoShimmer runs as a standalone node, it establishes no connection to other GoShimmer nodes. Running it in this way is unusual, but fine for development purposes. Warnings about Tangle Time not synced or similar can be ignored. + +GoShimmer keeps the tangle tips inside memory only and will lose it after a restart. To recover these tips from the database, a fork was required and is to be found [here](https://github.com/lmoe/goshimmer). It is included in this package. \ No newline at end of file diff --git a/documentation/docs/guide/chains_and_nodes/docker.md b/documentation/docs/guide/chains_and_nodes/docker_standalone.md similarity index 77% rename from documentation/docs/guide/chains_and_nodes/docker.md rename to documentation/docs/guide/chains_and_nodes/docker_standalone.md index a1d9ca56c6..c924448c71 100644 --- a/documentation/docs/guide/chains_and_nodes/docker.md +++ b/documentation/docs/guide/chains_and_nodes/docker_standalone.md @@ -11,20 +11,12 @@ keywords: - configure - arguments --- -# Docker +# Docker (Standalone) -This page describes the configuration of the Wasp node in combination with Docker. If you followed the instructions in [Running a Node](running-a-node.md), you can skip to [Configuring wasp-cli](wasp-cli.md). +This page describes the configuration of a single Wasp node in combination with Docker. If you followed the instructions in [Running a Node](running-a-node.md), you can skip to [Configuring wasp-cli](wasp-cli.md). ## Introduction -The Dockerfile is separated into several stages which effectively splits Wasp into four small pieces: - -* Testing - * Unit testing - * Integration testing -* Wasp CLI -* Wasp Node - ## Running a Wasp Node Checkout the project, switch to 'develop' and build the main image: @@ -35,7 +27,7 @@ cd wasp docker build -t wasp-node . ``` -The build process will copy the docker_config.json file into the image, which will use it when the node gets started. +The build process will copy the docker_config.json file into the image, which will be used when the node gets started. By default, the build process will use `-tags rocksdb,builtin_static` as a build argument. This argument can be modified with `--build-arg BUILD_TAGS=`. diff --git a/documentation/docs/guide/chains_and_nodes/running-a-node.md b/documentation/docs/guide/chains_and_nodes/running-a-node.md index 36cbb82581..ce7a9710c1 100644 --- a/documentation/docs/guide/chains_and_nodes/running-a-node.md +++ b/documentation/docs/guide/chains_and_nodes/running-a-node.md @@ -17,7 +17,7 @@ keywords: # Running a Node In the following section, you can find information on how to use Wasp by cloning the repository and building the application. -If you prefer, you can also configure a node [using a docker image](docker.md) (official images will be provided in the future). +If you prefer, you can also configure a node [using a docker image (standalone)](docker_standalone.md) or [docker (preconfigured)][docker_preconfigured.md] (official images will be provided in the future). ## Requirements diff --git a/documentation/sidebars.js b/documentation/sidebars.js index c551861a34..af23f25790 100644 --- a/documentation/sidebars.js +++ b/documentation/sidebars.js @@ -216,8 +216,13 @@ module.exports = { }, { type: 'doc', - label: 'Using Docker', - id: 'guide/chains_and_nodes/docker', + label: 'Using Docker (Standalone)', + id: 'guide/chains_and_nodes/docker_standalone', + }, + { + type: 'doc', + label: 'Using Docker (Preconfigured)', + id: 'guide/chains_and_nodes/docker_preconfigured', }, { type: 'doc', From 9190c345905985e5a378ecf5c3031ca536f6ae73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=B6ller?= Date: Thu, 9 Dec 2021 13:25:42 +0100 Subject: [PATCH 195/198] Update docker documentation --- documentation/docs/guide/chains_and_nodes/running-a-node.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/docs/guide/chains_and_nodes/running-a-node.md b/documentation/docs/guide/chains_and_nodes/running-a-node.md index ce7a9710c1..acd176e143 100644 --- a/documentation/docs/guide/chains_and_nodes/running-a-node.md +++ b/documentation/docs/guide/chains_and_nodes/running-a-node.md @@ -17,7 +17,7 @@ keywords: # Running a Node In the following section, you can find information on how to use Wasp by cloning the repository and building the application. -If you prefer, you can also configure a node [using a docker image (standalone)](docker_standalone.md) or [docker (preconfigured)][docker_preconfigured.md] (official images will be provided in the future). +If you prefer, you can also configure a node [using a docker image (standalone)](docker_standalone.md) or [docker (preconfigured)](docker_preconfigured.md) (official images will be provided in the future). ## Requirements From af53aa0e5f764de530636a28d4aeba2f85597cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=B6ller?= Date: Thu, 9 Dec 2021 15:28:13 +0100 Subject: [PATCH 196/198] Put dev things into own section --- .../docker_preconfigured.md | 2 +- documentation/sidebars.js | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) rename documentation/docs/guide/{chains_and_nodes => development_tools}/docker_preconfigured.md (98%) diff --git a/documentation/docs/guide/chains_and_nodes/docker_preconfigured.md b/documentation/docs/guide/development_tools/docker_preconfigured.md similarity index 98% rename from documentation/docs/guide/chains_and_nodes/docker_preconfigured.md rename to documentation/docs/guide/development_tools/docker_preconfigured.md index 98e97d1d3c..b252b26ed5 100644 --- a/documentation/docs/guide/chains_and_nodes/docker_preconfigured.md +++ b/documentation/docs/guide/development_tools/docker_preconfigured.md @@ -12,7 +12,7 @@ keywords: - arguments - GoShimmer --- -# Docker (Preconfigured) +# Preconfigured Development Docker setup This page describes the usage of the preconfigured developer Docker setup. diff --git a/documentation/sidebars.js b/documentation/sidebars.js index af23f25790..821c6b897d 100644 --- a/documentation/sidebars.js +++ b/documentation/sidebars.js @@ -219,11 +219,6 @@ module.exports = { label: 'Using Docker (Standalone)', id: 'guide/chains_and_nodes/docker_standalone', }, - { - type: 'doc', - label: 'Using Docker (Preconfigured)', - id: 'guide/chains_and_nodes/docker_preconfigured', - }, { type: 'doc', label: 'Configuring wasp-cli', @@ -437,6 +432,17 @@ module.exports = { }, ] }, + { + type: 'category', + label: 'Development tools', + items: [ + { + type: 'doc', + label: 'Preconfigured Development Docker setup', + id: 'guide/development_tools/docker_preconfigured', + }, + ] + }, { type: 'doc', label: 'Contribute', From 95cf5c84e340a9bfd7ddc177fff10b9361809ac7 Mon Sep 17 00:00:00 2001 From: Julius Andrikonis Date: Thu, 9 Dec 2021 17:10:48 +0200 Subject: [PATCH 197/198] BugFix: wrong mutex used --- packages/chain/consensus/setup_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/chain/consensus/setup_test.go b/packages/chain/consensus/setup_test.go index a53d05f652..c78ead2e88 100644 --- a/packages/chain/consensus/setup_test.go +++ b/packages/chain/consensus/setup_test.go @@ -185,8 +185,8 @@ func (env *MockedEnv) NewNode(nodeIndex uint16, timers ConsensusTimers) *mockedN ret.Log.Infof("stored transaction to the ledger: %s", tx.ID().Base58()) for _, node := range env.Nodes { go func(n *mockedNode) { - ret.mutex.Lock() - defer ret.mutex.Unlock() + n.mutex.Lock() + defer n.mutex.Unlock() n.StateOutput = stateOutput n.checkStateApproval() }(node) From 9f5f3cf38a4d551382dd50d7a87807b3cff635b7 Mon Sep 17 00:00:00 2001 From: Dave de Fijter Date: Fri, 10 Dec 2021 14:37:28 +0100 Subject: [PATCH 198/198] Bumped version [skip ci] --- packages/wasp/constants.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/wasp/constants.go b/packages/wasp/constants.go index 9536098605..265409ec52 100644 --- a/packages/wasp/constants.go +++ b/packages/wasp/constants.go @@ -4,7 +4,7 @@ var VersionHash string const ( // Version version number - Version = "0.2.2" + Version = "0.2.3" // Name app code name Name = "Wasp"