Skip to content

Commit 4568e1c

Browse files
Eitu33Eitu33
authored
Merge pull request #23 from massalabs/testnet19-update
Use latest SDK version + ABI rename branch
2 parents e290ad9 + 1d91000 commit 4568e1c

File tree

10 files changed

+46
-37
lines changed

10 files changed

+46
-37
lines changed

‎assembly/massa-sc-runtime/no_main.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
could be executed witthout being initialized.
33
*/
44

5-
import { print, call, Address, Args } from "@massalabs/massa-as-sdk";
5+
import { print, call, Address } from "@massalabs/massa-as-sdk";
6+
import { Args } from '@massalabs/as-types';
67

78
let addr = new Address("jCcqGSAVh9BR5icEk8icdvEqeNZzvsPK4xZK9Fm5PaWFab48X");
89
let args = new Args();

‎assembly/massa/deploy_sc/deployer.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { generateEvent, Args, getOpKeys, getOpData, createSC, call, functionExists } from "@massalabs/massa-as-sdk";
1+
import { generateEvent, getOpKeys, getOpData, createSC, call, functionExists } from "@massalabs/massa-as-sdk";
2+
import { Args } from '@massalabs/as-types';
23

34
export function main(): void {
45
const keys = getOpKeys();

‎assembly/massa/execution_error/main.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { generateEvent, call, Address, Args } from "@massalabs/massa-as-sdk";
1+
import { generateEvent, call, Address } from "@massalabs/massa-as-sdk";
2+
import { Args } from '@massalabs/as-types';
23

34
export function main(_args: string): void {
45
let addr = new Address("invalid_addr");

‎assembly/massa/local_call/main.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { generateEvent, Args, getOpKeys, getOpData, createSC, localCall } from "@massalabs/massa-as-sdk";
1+
import { generateEvent, getOpKeys, getOpData, createSC, localCall } from "@massalabs/massa-as-sdk";
2+
import { Args } from '@massalabs/as-types';
23

34
export function main(_args: string): void {
45
generateEvent("event generated before the sc");

‎assembly/massa/local_execution/main.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { generateEvent, Args, localExecution, getOpKeys, getOpData } from "@massalabs/massa-as-sdk";
1+
import { generateEvent, localExecution, getOpKeys, getOpData } from "@massalabs/massa-as-sdk";
2+
import { Args } from '@massalabs/as-types';
23

34
export function main(_args: string): void {
45
generateEvent("event generated before the sc");

‎assembly/massa/message_trigger/main.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { generateEvent, createSC, call, Address, Args, getOpData, toBytes } from "@massalabs/massa-as-sdk";
1+
import { generateEvent, createSC, call, Address, getOpData, toBytes } from "@massalabs/massa-as-sdk";
2+
import { Args } from '@massalabs/as-types';
23

34
function createContract(): Address {
45
// Source of this SC is in assembly/massa/message_trigger/smart-contract.ts

‎assembly/massa/message_trigger/smart-contract.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { sendMessage, Context, currentPeriod, currentThread, Args, generateEvent, Address, toBytes } from "@massalabs/massa-as-sdk";
1+
import { sendMessage, Context, currentPeriod, currentThread, generateEvent, Address, toBytes } from "@massalabs/massa-as-sdk";
2+
import { Args } from '@massalabs/as-types';
23

34
export function test(_args: StaticArray<u8>): void {
45
let period = currentPeriod();

‎assembly/massa/nested_call/test.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
* Smart contract containing a message handler function
33
**/
44

5-
import { print, generateEvent, call, Context, Address, Args } from "@massalabs/massa-as-sdk"
5+
import { print, generateEvent, call, Context, Address } from "@massalabs/massa-as-sdk"
6+
import { Args } from '@massalabs/as-types';
67

78
export function receive(data: string): void {
89
print("Gas at start inner: " + Context.remainingGas().toString());

‎package-lock.json‎

Lines changed: 28 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,8 @@
3030
"build_:nested_call_2": "asc assembly/massa/nested_call/main.ts --transform json-as/transform --target release --exportRuntime --runtime stub --outFile build/massa/nested_call.wasm",
3131
"build:nested_call": "run-s build_:nested_call_*",
3232
"build:use_builtins": "asc assembly/massa/use_builtins/main.ts --transform json-as/transform --target release --exportRuntime --runtime stub --outFile build/massa/use_builtins.wasm",
33-
"build:rt:caller": "asc assembly/massa-sc-runtime/caller.ts --transform json-as/transform --target release --exportRuntime --runtime stub --outFile build/massa-sc-runtime/caller.wasm",
34-
"build:rt:caller_no_return": "asc assembly/massa-sc-runtime/caller_no_return.ts --transform json-as/transform --target release --exportRuntime --runtime stub --outFile build/massa-sc-runtime/caller_no_return.wasm",
35-
"build_:rt:create_sc_1": "asc assembly/massa-sc-runtime/get_string.ts --transform json-as/transform --target release --exportRuntime --runtime stub --outFile build/massa-sc-runtime/get_string.wasm",
36-
"build_:rt:create_sc_2": "asc assembly/massa-sc-runtime/create_sc.ts --transform json-as/transform --target release --exportRuntime --runtime stub --outFile build/massa-sc-runtime/create_sc.wasm",
37-
"build:rt:create_sc": "run-s build_:rt:create_sc_*",
3833
"build:rt:empty_main": "asc assembly/massa-sc-runtime/empty_main.ts --transform json-as/transform --target release --exportRuntime --runtime stub --outFile build/massa-sc-runtime/empty_main.wasm",
39-
"build:rt:local_hello_name_caller": "asc assembly/massa-sc-runtime/local_hello_name_caller.ts --transform json-as/transform --target release --exportRuntime --runtime stub --outFile build/massa-sc-runtime/local_hello_name_caller.wasm",
4034
"build:rt:no_main": "asc assembly/massa-sc-runtime/no_main.ts --transform json-as/transform --target release --exportRuntime --runtime stub --outFile build/massa-sc-runtime/no_main.wasm",
41-
"build_:rt:send_message_1": "asc assembly/massa-sc-runtime/receive_message.ts --transform json-as/transform --target release --exportRuntime --runtime stub --outFile build/massa-sc-runtime/receive_message.wasm",
42-
"build_:rt:send_message_2": "asc assembly/massa-sc-runtime/send_message.ts --transform json-as/transform --target release --exportRuntime --runtime stub --outFile build/massa-sc-runtime/send_message.wasm",
43-
"build:rt:send_message": "run-s build_:rt:send_message_*",
4435
"build:rt:op_fn": "asc assembly/massa-sc-runtime/op_fn.ts --transform json-as/transform --target release --exportRuntime --runtime stub --outFile build/massa-sc-runtime/op_fn.wasm",
4536
"build:rt:gc_abi_call_basic": "asc assembly/massa-sc-runtime/gc_abi_call_basic.ts --transform json-as/transform --target release --exportRuntime --runtime stub --outFile build/massa-sc-runtime/gc_abi_call_basic.wasm",
4637
"build:rt:gc_abi_call_for": "asc assembly/massa-sc-runtime/gc_abi_call_for.ts --transform json-as/transform --target release --exportRuntime --runtime stub --outFile build/massa-sc-runtime/gc_abi_call_for.wasm",
@@ -61,7 +52,8 @@
6152
"devDependencies": {
6253
"@massalabs/as": "1.1.1-dev.20221215083749",
6354
"@massalabs/as-transformer": "^0.0.2-dev",
64-
"@massalabs/massa-as-sdk": "1.2.1-dev.20221219130704",
55+
"@massalabs/as-types": "^0.0.2-dev",
56+
"@massalabs/massa-as-sdk": "massalabs/massa-as-sdk#51323cc309d4c3dae4d2efca956be62724ceb011",
6557
"assemblyscript": "^0.21.2",
6658
"json-as": "^0.4.9",
6759
"npm-run-all": "^4.1.5",

0 commit comments

Comments
 (0)