diff --git a/package-lock.json b/package-lock.json index 720dcaef..65b25cef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,6 +44,11 @@ "node": ">=0.10.0" } }, + "node_modules/@adraffy/ens-normalize": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.10.0.tgz", + "integrity": "sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q==" + }, "node_modules/@ampproject/remapping": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", @@ -1409,9 +1414,13 @@ } }, "node_modules/@massalabs/massa-as-sdk": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/@massalabs/massa-as-sdk/-/massa-as-sdk-2.5.2.tgz", - "integrity": "sha512-yJaLjO1RzhYtq2/Qlrls2KR3ccCU/+hUhyONvk7i75oKZrC278Uf9wHCKkcjSJ5dmCQOMTuqX63Orw6l8Bedhg==" + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/@massalabs/massa-as-sdk/-/massa-as-sdk-2.5.4.tgz", + "integrity": "sha512-rg+TECOiOxpGnDv4rj5yrNc1NeBZtcFtpCJZzyOAoQP0NrHUfPG4TmX4Nnu9l7PUGowald+goPJZDBeBT/1NrQ==", + "dependencies": { + "ethers": "^6.8.1", + "js-sha3": "^0.9.2" + } }, "node_modules/@massalabs/massa-sc-compiler": { "version": "0.1.0", @@ -1568,6 +1577,17 @@ "resolve": "~1.19.0" } }, + "node_modules/@noble/curves": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.2.0.tgz", + "integrity": "sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==", + "dependencies": { + "@noble/hashes": "1.3.2" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/@noble/ed25519": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/@noble/ed25519/-/ed25519-1.7.3.tgz", @@ -2121,6 +2141,11 @@ "node": ">=0.4.0" } }, + "node_modules/aes-js": { + "version": "4.0.0-beta.5", + "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-4.0.0-beta.5.tgz", + "integrity": "sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q==" + }, "node_modules/agent-base": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", @@ -3501,6 +3526,77 @@ "node": ">=0.10.0" } }, + "node_modules/ethers": { + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.9.1.tgz", + "integrity": "sha512-kuV8fGd4/8Gj7wkurbsuUsm1DCG6N5gKGYdw3fnWG/7QGknhy1xtHD7kbkCWQAcbAYmzLCLqCPedS3FYncFkKQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/ethers-io/" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@adraffy/ens-normalize": "1.10.0", + "@noble/curves": "1.2.0", + "@noble/hashes": "1.3.2", + "@types/node": "18.15.13", + "aes-js": "4.0.0-beta.5", + "tslib": "2.4.0", + "ws": "8.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/ethers/node_modules/@types/node": { + "version": "18.15.13", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.13.tgz", + "integrity": "sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==" + }, + "node_modules/ethers/node_modules/tslib": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", + "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + }, + "node_modules/ethers/node_modules/utf-8-validate": { + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz", + "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==", + "hasInstallScript": true, + "optional": true, + "peer": true, + "dependencies": { + "node-gyp-build": "^4.3.0" + }, + "engines": { + "node": ">=6.14.2" + } + }, + "node_modules/ethers/node_modules/ws": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", + "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/events": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", @@ -5299,6 +5395,11 @@ "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.5.tgz", "integrity": "sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA==" }, + "node_modules/js-sha3": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.9.3.tgz", + "integrity": "sha512-BcJPCQeLg6WjEx3FE591wVAevlli8lxsxm9/FzV4HXkV49TmBH38Yvrpce6fjbADGMKFrBMGTqrVz3qPIZ88Gg==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -7875,7 +7976,7 @@ "license": "ISC", "dependencies": { "@massalabs/as-types": "^2.0.0", - "@massalabs/massa-as-sdk": "^2.5.2", + "@massalabs/massa-as-sdk": "^2.5.4", "@massalabs/massa-sc-compiler": "^0.1.0", "@massalabs/massa-web3": "^3.0.2", "@types/node": "^18.11.10", diff --git a/packages/sc-deployer/assembly/contracts/deployer.ts b/packages/sc-deployer/assembly/contracts/deployer.ts index 6be9e2f6..0733b840 100644 --- a/packages/sc-deployer/assembly/contracts/deployer.ts +++ b/packages/sc-deployer/assembly/contracts/deployer.ts @@ -6,11 +6,9 @@ import { functionExists, hasOpKey, } from '@massalabs/massa-as-sdk'; -import { Args, stringToBytes } from '@massalabs/as-types'; -import { setOf } from '@massalabs/massa-as-sdk/assembly/std/storage'; +import { Args } from '@massalabs/as-types'; const CONSTRUCTOR = 'constructor'; -const PROTO_KEY = 'protoMassa'; /** * This function deploys and calls the constructor function of the deployed smart contract. @@ -23,7 +21,7 @@ const PROTO_KEY = 'protoMassa'; export function main(_: StaticArray): StaticArray { let masterKey = new StaticArray(1); masterKey[0] = 0x00; - let protoKey = stringToBytes(PROTO_KEY); + if (!hasOpKey(masterKey)) { return []; } diff --git a/packages/sc-deployer/package.json b/packages/sc-deployer/package.json index c189a104..8375268b 100644 --- a/packages/sc-deployer/package.json +++ b/packages/sc-deployer/package.json @@ -13,7 +13,7 @@ "license": "ISC", "dependencies": { "@massalabs/as-types": "^2.0.0", - "@massalabs/massa-as-sdk": "^2.5.2", + "@massalabs/massa-as-sdk": "^2.5.4", "@massalabs/massa-sc-compiler": "^0.1.0", "@massalabs/massa-web3": "^3.0.2", "@types/node": "^18.11.10", diff --git a/packages/sc-project-initializer/commands/init/src/deploy.ts b/packages/sc-project-initializer/commands/init/src/deploy.ts index a59661c3..9efc1ab9 100644 --- a/packages/sc-project-initializer/commands/init/src/deploy.ts +++ b/packages/sc-project-initializer/commands/init/src/deploy.ts @@ -23,7 +23,7 @@ const publicApi = getEnvVariable('JSON_RPC_URL_PUBLIC'); const secretKey = getEnvVariable('WALLET_SECRET_KEY'); // Define deployment parameters const chainId = CHAIN_ID.BuildNet; // Choose the chain ID corresponding to the network you want to deploy to -const maxGas = MAX_GAS_DEPLOYMENT; // Maximum gas to be used for deployment. Default is the maximum gas allowed for deployment +const maxGas = MAX_GAS_DEPLOYMENT; // Gas for deployment Default is the maximum gas allowed for deployment const fees = 0n; // Fees to be paid for deployment. Default is 0 const waitFirstEvent = true;