Fix context.ts imports

idena-network · Nov 16, 2022 · 47ab700 · 47ab700
1 parent b639c7b
commit 47ab700
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 56 deletions.
diff --git a/sdk-core/assembly/context.ts b/sdk-core/assembly/context.ts
@@ -1,12 +1,12 @@
 
-import {Bytes, env, util, Balance, Address, bytesToBalance} from 'idena-sdk-core';
+import {Bytes, env, util, Balance, Address} from 'idena-sdk-core';
 
 export namespace Context {
   export function caller(): Address {
     return Address.fromBytes(util.ptrToBytes(env.caller()));
   }
 
-  export function originlCaller(): Address {
+  export function originalCaller(): Address {
     return Address.fromBytes(util.ptrToBytes(env.originalCaller()));
   }
 

diff --git a/sdk-core/assembly/proto/models.proto b/sdk-core/assembly/proto/models.proto
@@ -14,11 +14,11 @@ message ProtoTransactionIndex {
     uint32 idx = 2;
 }
 
-message ProtoArgs {
-  repeated Argument args = 1;
-
-  message Argument {
+message Argument {
     bytes value = 1;
     bool is_nil = 2;
   }
+
+message ProtoArgs {
+  repeated Argument args = 1;  
 }
diff --git a/sdk-core/assembly/proto/models.ts b/sdk-core/assembly/proto/models.ts
@@ -103,13 +103,55 @@ export namespace models {
     }
   }
 
+  export class Argument {
+    static encode(message: Argument, writer: Writer): void {
+      writer.uint32(10);
+      writer.bytes(message.value);
+
+      writer.uint32(16);
+      writer.bool(message.is_nil);
+    }
+
+    static decode(reader: Reader, length: i32): Argument {
+      const end: usize = length < 0 ? reader.end : reader.ptr + length;
+      const message = new Argument();
+
+      while (reader.ptr < end) {
+        const tag = reader.uint32();
+        switch (tag >>> 3) {
+          case 1:
+            message.value = reader.bytes();
+            break;
+
+          case 2:
+            message.is_nil = reader.bool();
+            break;
+
+          default:
+            reader.skipType(tag & 7);
+            break;
+        }
+      }
+
+      return message;
+    }
+
+    value: Uint8Array;
+    is_nil: bool;
+
+    constructor(value: Uint8Array = new Uint8Array(0), is_nil: bool = false) {
+      this.value = value;
+      this.is_nil = is_nil;
+    }
+  }
+
   export class ProtoArgs {
     static encode(message: ProtoArgs, writer: Writer): void {
       const args = message.args;
       for (let i = 0; i < args.length; ++i) {
         writer.uint32(10);
         writer.fork();
-        models.ProtoArgs.Argument.encode(args[i], writer);
+        models.Argument.encode(args[i], writer);
         writer.ldelim();
       }
     }
@@ -122,9 +164,7 @@ export namespace models {
         const tag = reader.uint32();
         switch (tag >>> 3) {
           case 1:
-            message.args.push(
-              models.ProtoArgs.Argument.decode(reader, reader.uint32())
-            );
+            message.args.push(models.Argument.decode(reader, reader.uint32()));
             break;
 
           default:
@@ -136,54 +176,10 @@ export namespace models {
       return message;
     }
 
-    args: Array<models.ProtoArgs.Argument>;
+    args: Array<models.Argument>;
 
-    constructor(args: Array<models.ProtoArgs.Argument> = []) {
+    constructor(args: Array<models.Argument> = []) {
       this.args = args;
     }
   }
-
-  export namespace ProtoArgs {
-    export class Argument {
-      static encode(message: Argument, writer: Writer): void {
-        writer.uint32(10);
-        writer.bytes(message.value);
-
-        writer.uint32(16);
-        writer.bool(message.is_nil);
-      }
-
-      static decode(reader: Reader, length: i32): Argument {
-        const end: usize = length < 0 ? reader.end : reader.ptr + length;
-        const message = new Argument();
-
-        while (reader.ptr < end) {
-          const tag = reader.uint32();
-          switch (tag >>> 3) {
-            case 1:
-              message.value = reader.bytes();
-              break;
-
-            case 2:
-              message.is_nil = reader.bool();
-              break;
-
-            default:
-              reader.skipType(tag & 7);
-              break;
-          }
-        }
-
-        return message;
-      }
-
-      value: Uint8Array;
-      is_nil: bool;
-
-      constructor(value: Uint8Array = new Uint8Array(0), is_nil: bool = false) {
-        this.value = value;
-        this.is_nil = is_nil;
-      }
-    }
-  }
 }