Merge branch 'main' into add-tag-constant-manager

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+ "editor.formatOnSave": true,
+ "editor.defaultFormatter": "esbenp.prettier-vscode",
+}

asconfig.json

@@ -1,23 +1,13 @@
 {
- "targets": {
- "debug": {
- "outFile": "build/debug.wasm",
- "textFile": "build/debug.wat",
- "sourceMap": true,
- "debug": true
- },
- "release": {
- "outFile": "build/release.wasm",
- "textFile": "build/release.wat",
- "sourceMap": true,
- "optimizeLevel": 3,
- "shrinkLevel": 0,
- "converge": false,
- "noAssert": false
+ "targets": {
+ "release": {
+ "sourceMap": true,
+ "optimizeLevel": 3,
+ "shrinkLevel": 3,
+ "converge": true,
+ "noAssert": false,
+ "exportRuntime": true,
+ "bindings": false
+ }
  }
- },
- "options": {
- "bindings": "esm",
- "transform": ["@massalabs/as-transformer"]
- }
 }

assembly/__tests__/env-account.spec.ts

@@ -1,6 +1,3 @@
-import { Address } from '../std';
-import { changeCallStack, resetStorage } from '../vm-mock/storage';
-import { Args, bytesToString, stringToBytes } from '@massalabs/as-types';
 import { env } from '../env/index';
 
 describe('Testing mocked account related functions', () => {

assembly/__tests__/env-helpers.spec.ts

@@ -2,7 +2,7 @@
 
 import { env } from '../env';
 import { Address } from '../std';
-import { addAddressToLedger } from '../vm-mock';
+import { addAddressToLedger, mockCurrentSlot } from '../vm-mock';
 
 const testAddress = new Address(
  'AU12E6N5BFAdC2wyiBV6VJjqkWhpz1kLVp2XpbRdSnL1mKjCWT6oR',
@@ -17,6 +17,12 @@ describe('Testing env coins related functions', () => {
  expect(env.currentThread()).toBe(1);
  });
 
+ test('current slot', () => {
+ mockCurrentSlot(1234, 8);
+ expect(env.currentPeriod()).toBe(1234);
+ expect(env.currentThread()).toBe(8);
+ });
+
  test('setBytecode', () => {
  env.setBytecode(new StaticArray(0));
  const byteCode = env.getBytecode().toString();

assembly/__tests__/env-opdatastore.spec.ts

@@ -1,7 +1,7 @@
 import { env } from '../env/index';
 
-import { changeCallStack, resetStorage } from '../vm-mock/storage';
-import { Args, bytesToString, stringToBytes } from '@massalabs/as-types';
+import { resetStorage } from '../vm-mock/storage';
+import { stringToBytes } from '@massalabs/as-types';
 
 describe('Testing mocked Operation Datastore', () => {
  beforeAll(() => {

assembly/security/accessControl.ts

@@ -40,7 +40,7 @@ import { Address, Storage } from '../std/index';
  * return [];
  * }
  *
- * export function superSensite(_: StaticArray<u8>): StaticArray<u8> {
+ * export function superSensible(_: StaticArray<u8>): StaticArray<u8> {
  * controller.mustHavePermission(ADMIN, Context.caller());
  * return stringToBytes('Super sensitive data');
  * }

assembly/vm-mock/env.ts

@@ -182,3 +182,6 @@ export declare function mockSetChainId(value: number): void;
  */
 @external("massa", "assembly_script_set_origin_operation_id")
 export declare function mockOriginOperationId(opId: string): void;
+
+@external("massa", "assembly_script_set_slot")
+export declare function mockCurrentSlot(period: u64, thread: u8): void;

index.ts

@@ -3,4 +3,4 @@
 // export {env};
 
 // massa std functionalities
-export * from "./assembly/index";
+export * from './assembly/index';