Add @Privatemethod decorator

idena-network · Feb 28, 2023 · 4f1dccd · 4f1dccd
1 parent 18c5d58
commit 4f1dccd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/bindgen/assembly/index.ts b/bindgen/assembly/index.ts
@@ -1,5 +1,5 @@
 import { JSONEncoder as _JSONEncoder, JSON } from "idena-assemblyscript-json";
-import { Bytes, env, u256, storage, util, u128, allocate, Address, base64, debug, Balance} from 'idena-sdk-core';
+import { Bytes, env, u256, storage, util, u128, allocate, Address, base64, debug, Balance, Context} from 'idena-sdk-core';
 // Runtime functions
 // tslint:disable: no-unsafe-any
 /* eslint-disable  @typescript-eslint/no-unused-vars */
@@ -682,10 +682,9 @@ class Result<T> {
 }
 
 
-/*
+
 @global
 function __assertPrivate(): void {
-  let contractName = Context.contractName;
-  assert(contractName == Context.predecessor, `Only ${contractName} can call this method.`);
+  let addr = Context.contractAddress();
+  assert(addr == Context.caller(), `Only ${addr.toHex()} can call this method.`);
 }
-*/
diff --git a/bindgen/dist/classExporter.js b/bindgen/dist/classExporter.js
diff --git a/bindgen/src/classExporter.ts b/bindgen/src/classExporter.ts
@@ -13,7 +13,7 @@ import {isEntry} from './JSONBuilder';
 import {SimpleParser} from './utils';
 
 const toString = utils.toString;
-const privateDecorator = 'contractPrivate';
+const privateDecorator = 'privateMethod';
 
 export class ClassExporter extends ClassDecorator {
   sb: string[] = [];

diff --git a/sdk-core/assembly/as_types.d.ts b/sdk-core/assembly/as_types.d.ts
@@ -63,8 +63,8 @@ declare interface Uint8Array {
   /**
    * 
    * Asserts that a contract method is private, e.i.
-   * Context.contractName == Context.predecessor
+   * Context.contractAddress() == Context.caller()
    */
-  declare function contractPrivate(): (target: any,
+  declare function privateMethod(): (target: any,
   propertyKey: string,
   descriptor: any) => void;