From 49731b6abd4acb2eb14af0e7e92be94aded3e7b9 Mon Sep 17 00:00:00 2001 From: Mirella de Medeiros Date: Mon, 13 May 2024 14:39:49 -0300 Subject: [PATCH] CU-86dt9vq5z - format --- boa3/builtin/contract/Nep17Contract.py | 4 ++-- boa3/builtin/contract/__init__.py | 4 ++-- boa3/builtin/interop/blockchain/signer.py | 2 +- boa3/builtin/interop/contract/__init__.py | 4 ++-- boa3/builtin/interop/crypto/__init__.py | 4 ++-- boa3/builtin/interop/iterator/__init__.py | 4 ++-- boa3/builtin/interop/json/__init__.py | 4 ++-- boa3/builtin/interop/runtime/__init__.py | 4 ++-- boa3/builtin/interop/stdlib/__init__.py | 4 ++-- boa3/builtin/nativecontract/contractmanagement.py | 4 ++-- boa3/builtin/nativecontract/cryptolib.py | 4 ++-- boa3/builtin/nativecontract/gas.py | 4 ++-- boa3/builtin/nativecontract/ledger.py | 1 - boa3/builtin/nativecontract/neo.py | 4 ++-- boa3/builtin/nativecontract/oracle.py | 4 ++-- boa3/builtin/nativecontract/stdlib.py | 4 ++-- boa3/internal/analyser/analyser.py | 2 +- boa3/internal/analyser/moduleanalyser.py | 2 +- boa3/internal/compiler/compiledmetadata.py | 2 +- boa3/internal/model/sc/__init__.py | 2 +- boa3/internal/neo3/core/utils.py | 2 +- boa3/sc/contracts/neotoken.py | 2 +- boa3/sc/storage/__init__.py | 2 +- boa3/sc/types/__init__.py | 8 ++++---- boa3_test/examples/amm.py | 6 +++--- boa3_test/examples/auxiliary_contracts/update_contract.py | 6 +++--- boa3_test/examples/hello_world.py | 2 +- boa3_test/examples/htlc.py | 4 ++-- boa3_test/examples/ico.py | 4 ++-- boa3_test/examples/nep11_non_divisible.py | 6 +++--- boa3_test/examples/nep17.py | 4 ++-- boa3_test/examples/simple_nep17.py | 4 ++-- boa3_test/examples/update_contract.py | 6 +++--- boa3_test/examples/wrapped_gas.py | 4 ++-- boa3_test/examples/wrapped_neo.py | 4 ++-- boa3_test/test_sc/class_test/UserClassWithDeployMethod.py | 2 +- boa3_test/test_sc/interop_test/blockchain/CurrentHash.py | 2 +- .../test_sc/interop_test/blockchain/ImportBlockchain.py | 2 +- boa3_test/test_sc/interop_test/contract/CallFlagsUsage.py | 2 +- boa3_test/test_sc/interop_test/contract/CallScriptHash.py | 2 +- .../interop_test/contract/CallScriptHashWithCast.py | 2 +- .../interop_test/contract/CallScriptHashWithFlags.py | 2 +- .../interop_test/contract/CallScriptHashWithoutArgs.py | 2 +- .../interop_test/contract/CreateMultisigAccount.py | 2 +- .../contract/CreateMultisigAccountTooFewArguments.py | 2 +- .../contract/CreateMultisigAccountTooManyArguments.py | 2 +- .../interop_test/contract/CreateStandardAccount.py | 2 +- .../contract/CreateStandardAccountTooFewArguments.py | 2 +- .../contract/CreateStandardAccountTooManyArguments.py | 2 +- boa3_test/test_sc/interop_test/contract/GasScriptHash.py | 2 +- .../interop_test/contract/GasScriptHashCantAssign.py | 2 +- boa3_test/test_sc/interop_test/contract/ImportContract.py | 4 ++-- boa3_test/test_sc/interop_test/contract/NeoScriptHash.py | 2 +- .../interop_test/contract/NeoScriptHashCantAssign.py | 2 +- boa3_test/test_sc/interop_test/crypto/CheckMultisig.py | 2 +- boa3_test/test_sc/interop_test/crypto/CheckSig.py | 2 +- boa3_test/test_sc/interop_test/crypto/ImportCrypto.py | 2 +- boa3_test/test_sc/interop_test/iterator/ImportIterator.py | 2 +- .../interop_test/iterator/IteratorImplicitTyping.py | 2 +- boa3_test/test_sc/interop_test/iterator/IteratorNext.py | 2 +- boa3_test/test_sc/interop_test/iterator/IteratorValue.py | 2 +- .../test_sc/interop_test/iterator/IteratorValueAccess.py | 2 +- boa3_test/test_sc/interop_test/json/ImportJson.py | 2 +- boa3_test/test_sc/interop_test/policy/ImportPolicy.py | 2 +- boa3_test/test_sc/interop_test/role/ImportRole.py | 2 +- .../interop_test/runtime/ExecutingScriptHashOnDeploy.py | 2 +- boa3_test/test_sc/interop_test/runtime/ImportRuntime.py | 2 +- .../interop_test/runtime/ScriptContainerAsTransaction.py | 2 +- boa3_test/test_sc/interop_test/stdlib/ImportStdlib.py | 2 +- boa3_test/test_sc/interop_test/storage/ImportStorage.py | 2 +- .../test_sc/interop_test/storage/StorageDeleteBytesKey.py | 2 +- .../interop_test/storage/StorageDeleteDeprecated.py | 2 +- .../interop_test/storage/StorageDeleteWithContext.py | 2 +- .../interop_test/storage/StorageFindBytesPrefix.py | 2 +- .../interop_test/storage/StorageFindMismatchedType.py | 2 +- .../test_sc/interop_test/storage/StorageFindStrPrefix.py | 2 +- .../interop_test/storage/StorageFindWithContext.py | 2 +- .../interop_test/storage/StorageFindWithOptions.py | 2 +- .../test_sc/interop_test/storage/StorageGetDeprecated.py | 2 +- .../test_sc/interop_test/storage/StorageGetWithContext.py | 2 +- .../test_sc/interop_test/storage/StoragePutDeprecated.py | 2 +- .../native_test/contractmanagement/GetHashDeprecated.py | 2 +- .../test_sc/native_test/cryptolib/GetHashDeprecated.py | 2 +- boa3_test/test_sc/native_test/gas/GetHashDeprecated.py | 2 +- boa3_test/test_sc/native_test/ledger/GetHashDeprecated.py | 2 +- boa3_test/test_sc/native_test/neo/GetHashDeprecated.py | 2 +- boa3_test/test_sc/native_test/oracle/GetHashDeprecated.py | 2 +- boa3_test/test_sc/native_test/policy/GetHashDeprecated.py | 2 +- .../native_test/rolemanagement/GetHashDeprecated.py | 2 +- boa3_test/test_sc/native_test/stdlib/GetHashDeprecated.py | 2 +- boa3_test/tests/compiler_tests/test_bytes.py | 2 +- boa3_test/tests/compiler_tests/test_interop/test_json.py | 2 +- 92 files changed, 123 insertions(+), 124 deletions(-) diff --git a/boa3/builtin/contract/Nep17Contract.py b/boa3/builtin/contract/Nep17Contract.py index cc3d77fde..4cd25ce47 100644 --- a/boa3/builtin/contract/Nep17Contract.py +++ b/boa3/builtin/contract/Nep17Contract.py @@ -1,7 +1,7 @@ -from deprecation import deprecated - from typing import Any +from deprecation import deprecated + from boa3.builtin.interop.contract import Contract from boa3.builtin.type import UInt160 diff --git a/boa3/builtin/contract/__init__.py b/boa3/builtin/contract/__init__.py index 5bddd05fe..40d048024 100644 --- a/boa3/builtin/contract/__init__.py +++ b/boa3/builtin/contract/__init__.py @@ -8,10 +8,10 @@ 'to_script_hash', ] -from deprecation import deprecated - from typing import Any +from deprecation import deprecated + from boa3.builtin.compile_time import CreateNewEvent from boa3.builtin.contract.Nep17Contract import Nep17Contract from boa3.builtin.type import ECPoint, UInt160, Event diff --git a/boa3/builtin/interop/blockchain/signer.py b/boa3/builtin/interop/blockchain/signer.py index 73277f51d..57461400e 100644 --- a/boa3/builtin/interop/blockchain/signer.py +++ b/boa3/builtin/interop/blockchain/signer.py @@ -6,8 +6,8 @@ "WitnessRuleAction", "WitnessScope", ] -from deprecation import deprecated +from deprecation import deprecated from boa3.builtin.type import UInt160 from boa3.internal.neo3.network.payloads.verification import WitnessConditionType, WitnessRuleAction, WitnessScope diff --git a/boa3/builtin/interop/contract/__init__.py b/boa3/builtin/interop/contract/__init__.py index b28a1a461..556eafdf1 100644 --- a/boa3/builtin/interop/contract/__init__.py +++ b/boa3/builtin/interop/contract/__init__.py @@ -14,11 +14,11 @@ 'GAS', ] -from deprecation import deprecated - from collections.abc import Sequence from typing import Any +from deprecation import deprecated + from boa3.builtin.interop.contract.callflagstype import CallFlags from boa3.builtin.interop.contract.contract import Contract from boa3.builtin.interop.contract.contractmanifest import ContractManifest diff --git a/boa3/builtin/interop/crypto/__init__.py b/boa3/builtin/interop/crypto/__init__.py index 38837b02a..cfa1d3104 100644 --- a/boa3/builtin/interop/crypto/__init__.py +++ b/boa3/builtin/interop/crypto/__init__.py @@ -17,10 +17,10 @@ 'bls12_381_serialize', ] -from deprecation import deprecated - from typing import Any +from deprecation import deprecated + from boa3.builtin.interop.crypto.ibls12381 import IBls12381 from boa3.builtin.interop.crypto.namedcurve import NamedCurve from boa3.builtin.type import ECPoint diff --git a/boa3/builtin/interop/iterator/__init__.py b/boa3/builtin/interop/iterator/__init__.py index cb6db9e7f..fc21e85ea 100644 --- a/boa3/builtin/interop/iterator/__init__.py +++ b/boa3/builtin/interop/iterator/__init__.py @@ -4,10 +4,10 @@ 'Iterator', ] -from deprecation import deprecated - from typing import Any +from deprecation import deprecated + @deprecated(details='This module is deprecated. Use boa3.sc.utils instead') class Iterator: diff --git a/boa3/builtin/interop/json/__init__.py b/boa3/builtin/interop/json/__init__.py index 5def8065a..6501ef05b 100644 --- a/boa3/builtin/interop/json/__init__.py +++ b/boa3/builtin/interop/json/__init__.py @@ -3,10 +3,10 @@ 'json_deserialize', ] -from deprecation import deprecated - from typing import Any +from deprecation import deprecated + @deprecated(details='This module is deprecated. Use StdLib from boa3.sc.contracts instead') def json_serialize(item: Any) -> str: diff --git a/boa3/builtin/interop/runtime/__init__.py b/boa3/builtin/interop/runtime/__init__.py index a93317a14..bdda0f073 100644 --- a/boa3/builtin/interop/runtime/__init__.py +++ b/boa3/builtin/interop/runtime/__init__.py @@ -21,11 +21,11 @@ 'script_container', ] -from deprecation import deprecated - from collections.abc import Sequence from typing import Any +from deprecation import deprecated + from boa3.builtin.interop.blockchain import Transaction from boa3.builtin.interop.contract.callflagstype import CallFlags from boa3.builtin.interop.runtime.notification import Notification diff --git a/boa3/builtin/interop/stdlib/__init__.py b/boa3/builtin/interop/stdlib/__init__.py index 00228c9ff..6c7cade81 100644 --- a/boa3/builtin/interop/stdlib/__init__.py +++ b/boa3/builtin/interop/stdlib/__init__.py @@ -13,10 +13,10 @@ 'memory_compare', ] -from deprecation import deprecated - from typing import Any +from deprecation import deprecated + @deprecated(details='This module is deprecated. Use StdLib from boa3.sc.contracts instead') def base58_encode(key: bytes) -> str: diff --git a/boa3/builtin/nativecontract/contractmanagement.py b/boa3/builtin/nativecontract/contractmanagement.py index eaaf0b3f3..386da6b4e 100644 --- a/boa3/builtin/nativecontract/contractmanagement.py +++ b/boa3/builtin/nativecontract/contractmanagement.py @@ -3,10 +3,10 @@ 'Contract', ] -from deprecation import deprecated - from typing import Any +from deprecation import deprecated + from boa3.builtin.interop.contract import Contract from boa3.builtin.type import UInt160 diff --git a/boa3/builtin/nativecontract/cryptolib.py b/boa3/builtin/nativecontract/cryptolib.py index 980178ac8..28d43015a 100644 --- a/boa3/builtin/nativecontract/cryptolib.py +++ b/boa3/builtin/nativecontract/cryptolib.py @@ -4,10 +4,10 @@ 'IBls12381' ] -from deprecation import deprecated - from typing import Any +from deprecation import deprecated + from boa3.builtin.interop.crypto import NamedCurve, IBls12381 from boa3.builtin.type import ECPoint, UInt160 diff --git a/boa3/builtin/nativecontract/gas.py b/boa3/builtin/nativecontract/gas.py index 3952d2933..19464b40d 100644 --- a/boa3/builtin/nativecontract/gas.py +++ b/boa3/builtin/nativecontract/gas.py @@ -2,10 +2,10 @@ 'GAS', ] -from deprecation import deprecated - from typing import Any +from deprecation import deprecated + from boa3.builtin.type import UInt160 diff --git a/boa3/builtin/nativecontract/ledger.py b/boa3/builtin/nativecontract/ledger.py index 03c4a8e75..7c93711b3 100644 --- a/boa3/builtin/nativecontract/ledger.py +++ b/boa3/builtin/nativecontract/ledger.py @@ -4,7 +4,6 @@ from deprecation import deprecated - from boa3.builtin.interop.blockchain import Block, Signer, Transaction, VMState from boa3.builtin.type import UInt256, UInt160 diff --git a/boa3/builtin/nativecontract/neo.py b/boa3/builtin/nativecontract/neo.py index 5e453e9de..7001e4664 100644 --- a/boa3/builtin/nativecontract/neo.py +++ b/boa3/builtin/nativecontract/neo.py @@ -2,10 +2,10 @@ 'NEO', ] -from deprecation import deprecated - from typing import Any +from deprecation import deprecated + from boa3.builtin.contract import NeoAccountState from boa3.builtin.interop.iterator import Iterator from boa3.builtin.type import ECPoint, UInt160 diff --git a/boa3/builtin/nativecontract/oracle.py b/boa3/builtin/nativecontract/oracle.py index 08975d9f9..2682e5668 100644 --- a/boa3/builtin/nativecontract/oracle.py +++ b/boa3/builtin/nativecontract/oracle.py @@ -2,10 +2,10 @@ 'Oracle', ] -from deprecation import deprecated - from typing import Any +from deprecation import deprecated + from boa3.builtin.type import UInt160 diff --git a/boa3/builtin/nativecontract/stdlib.py b/boa3/builtin/nativecontract/stdlib.py index ad8d9afc7..ee90b7adf 100644 --- a/boa3/builtin/nativecontract/stdlib.py +++ b/boa3/builtin/nativecontract/stdlib.py @@ -2,10 +2,10 @@ 'StdLib', ] -from deprecation import deprecated - from typing import Any +from deprecation import deprecated + from boa3.builtin.type import UInt160 diff --git a/boa3/internal/analyser/analyser.py b/boa3/internal/analyser/analyser.py index a49099b00..8fe635745 100644 --- a/boa3/internal/analyser/analyser.py +++ b/boa3/internal/analyser/analyser.py @@ -1,7 +1,6 @@ import ast from typing import Self -from boa3.sc.compiletime import NeoMetadata from boa3.internal import constants from boa3.internal.analyser.astanalyser import IAstAnalyser from boa3.internal.analyser.astoptimizer import AstOptimizer @@ -14,6 +13,7 @@ from boa3.internal.exception.CompilerWarning import CompilerWarning from boa3.internal.model.symbol import ISymbol from boa3.internal.model.type.type import Type +from boa3.sc.compiletime import NeoMetadata class Analyser: diff --git a/boa3/internal/analyser/moduleanalyser.py b/boa3/internal/analyser/moduleanalyser.py index fff7e7630..de81ef802 100644 --- a/boa3/internal/analyser/moduleanalyser.py +++ b/boa3/internal/analyser/moduleanalyser.py @@ -4,7 +4,6 @@ from collections.abc import Iterable from typing import Any -from boa3.sc.compiletime import NeoMetadata from boa3.internal import constants from boa3.internal.analyser import asthelper from boa3.internal.analyser.astanalyser import IAstAnalyser @@ -41,6 +40,7 @@ from boa3.internal.model.type.primitive.primitivetype import PrimitiveType from boa3.internal.model.type.type import IType, Type from boa3.internal.model.variable import Variable +from boa3.sc.compiletime import NeoMetadata class ModuleAnalyser(IAstAnalyser, ast.NodeVisitor): diff --git a/boa3/internal/compiler/compiledmetadata.py b/boa3/internal/compiler/compiledmetadata.py index bf98b0550..9a92f13ba 100644 --- a/boa3/internal/compiler/compiledmetadata.py +++ b/boa3/internal/compiler/compiledmetadata.py @@ -1,8 +1,8 @@ from typing import Self -from boa3.sc.compiletime import NeoMetadata from boa3.internal import constants from boa3.internal.neo3.core.types import UInt160 +from boa3.sc.compiletime import NeoMetadata class CompiledMetadata: diff --git a/boa3/internal/model/sc/__init__.py b/boa3/internal/model/sc/__init__.py index 070456007..8bc0391af 100644 --- a/boa3/internal/model/sc/__init__.py +++ b/boa3/internal/model/sc/__init__.py @@ -1,7 +1,7 @@ from enum import Enum -from boa3.internal.model.builtin.compile_time import NeoMetadataType from boa3.internal.model.builtin.builtin import Builtin +from boa3.internal.model.builtin.compile_time import NeoMetadataType from boa3.internal.model.builtin.interop.contract.contractmanifest import * from boa3.internal.model.builtin.interop.interop import Interop from boa3.internal.model.builtin.native.nativecontract import NativeContract diff --git a/boa3/internal/neo3/core/utils.py b/boa3/internal/neo3/core/utils.py index 5f49f644e..14096d58b 100644 --- a/boa3/internal/neo3/core/utils.py +++ b/boa3/internal/neo3/core/utils.py @@ -1,7 +1,7 @@ # type: ignore -from enum import Enum from collections.abc import Iterable +from enum import Enum from boa3.internal.neo3.core import Size, serialization diff --git a/boa3/sc/contracts/neotoken.py b/boa3/sc/contracts/neotoken.py index c2219f955..dd7d0e0df 100644 --- a/boa3/sc/contracts/neotoken.py +++ b/boa3/sc/contracts/neotoken.py @@ -5,8 +5,8 @@ from typing import Any -from boa3.sc.utils.iterator import Iterator from boa3.sc.types import ECPoint, UInt160, NeoAccountState +from boa3.sc.utils.iterator import Iterator class NeoToken: diff --git a/boa3/sc/storage/__init__.py b/boa3/sc/storage/__init__.py index 82cc37ff8..ae19a7ccf 100644 --- a/boa3/sc/storage/__init__.py +++ b/boa3/sc/storage/__init__.py @@ -39,10 +39,10 @@ from typing import Any -from boa3.sc.utils.iterator import Iterator from boa3.sc.storage.storagecontext import StorageContext from boa3.sc.storage.storagemap import StorageMap from boa3.sc.types import FindOptions, UInt256, ECPoint, UInt160 +from boa3.sc.utils.iterator import Iterator def get_context() -> StorageContext: diff --git a/boa3/sc/types/__init__.py b/boa3/sc/types/__init__.py index 0040cf801..e575a2736 100644 --- a/boa3/sc/types/__init__.py +++ b/boa3/sc/types/__init__.py @@ -47,14 +47,14 @@ from boa3.internal.neo.vm.opcode.Opcode import Opcode from boa3.internal.neo.vm.type.ContractParameterType import ContractParameterType +from boa3.internal.neo3.contracts import CallFlags +from boa3.internal.neo3.contracts import TriggerType +from boa3.internal.neo3.contracts.findoptions import FindOptions from boa3.internal.neo3.contracts.namedcurve import NamedCurve from boa3.internal.neo3.contracts.native import Role +from boa3.internal.neo3.network.payloads import OracleResponseCode from boa3.internal.neo3.network.payloads.verification import WitnessScope, WitnessRuleAction, WitnessConditionType -from boa3.internal.neo3.contracts.findoptions import FindOptions -from boa3.internal.neo3.contracts import TriggerType from boa3.internal.neo3.vm import VMState -from boa3.internal.neo3.contracts import CallFlags -from boa3.internal.neo3.network.payloads import OracleResponseCode class UInt160(bytes): diff --git a/boa3_test/examples/amm.py b/boa3_test/examples/amm.py index 0909f1f38..3f011496b 100644 --- a/boa3_test/examples/amm.py +++ b/boa3_test/examples/amm.py @@ -1,11 +1,11 @@ from typing import Any +from boa3.sc import runtime, storage from boa3.sc.compiletime import NeoMetadata, public -from boa3.sc.utils import CreateNewEvent, Nep17TransferEvent, abort, call_contract -from boa3.sc.math import sqrt from boa3.sc.contracts import ContractManagement +from boa3.sc.math import sqrt from boa3.sc.types import UInt160 -from boa3.sc import storage, runtime +from boa3.sc.utils import CreateNewEvent, Nep17TransferEvent, abort, call_contract # ------------------------------------------- diff --git a/boa3_test/examples/auxiliary_contracts/update_contract.py b/boa3_test/examples/auxiliary_contracts/update_contract.py index 6f46fbf4c..3e6c39090 100644 --- a/boa3_test/examples/auxiliary_contracts/update_contract.py +++ b/boa3_test/examples/auxiliary_contracts/update_contract.py @@ -1,11 +1,11 @@ from typing import Any +from boa3.sc import runtime, storage from boa3.sc.compiletime import NeoMetadata, public -from boa3.sc.utils import CreateNewEvent -from boa3.sc.runtime import check_witness from boa3.sc.contracts import ContractManagement +from boa3.sc.runtime import check_witness from boa3.sc.types import UInt160 -from boa3.sc import storage, runtime +from boa3.sc.utils import CreateNewEvent # ------------------------------------------- # TOKEN SETTINGS diff --git a/boa3_test/examples/hello_world.py b/boa3_test/examples/hello_world.py index 092f4ac06..88a075294 100644 --- a/boa3_test/examples/hello_world.py +++ b/boa3_test/examples/hello_world.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import NeoMetadata, public from boa3.sc import storage +from boa3.sc.compiletime import NeoMetadata, public @public diff --git a/boa3_test/examples/htlc.py b/boa3_test/examples/htlc.py index c4e8929b3..417dddefb 100644 --- a/boa3_test/examples/htlc.py +++ b/boa3_test/examples/htlc.py @@ -1,10 +1,10 @@ from typing import Any +from boa3.sc import runtime, storage from boa3.sc.compiletime import NeoMetadata, public -from boa3.sc.utils import abort, call_contract, hash160 from boa3.sc.contracts import GasToken from boa3.sc.types import UInt160 -from boa3.sc import storage, runtime +from boa3.sc.utils import abort, call_contract, hash160 # ------------------------------------------- diff --git a/boa3_test/examples/ico.py b/boa3_test/examples/ico.py index f44789de8..f7c58e1a5 100644 --- a/boa3_test/examples/ico.py +++ b/boa3_test/examples/ico.py @@ -1,10 +1,10 @@ from typing import Any +from boa3.sc import runtime, storage from boa3.sc.compiletime import NeoMetadata, public -from boa3.sc.utils import Nep17TransferEvent, abort, call_contract from boa3.sc.contracts import ContractManagement, GasToken as GAS_TOKEN, NeoToken as NEO_TOKEN from boa3.sc.types import UInt160 -from boa3.sc import storage, runtime +from boa3.sc.utils import Nep17TransferEvent, abort, call_contract # ------------------------------------------- diff --git a/boa3_test/examples/nep11_non_divisible.py b/boa3_test/examples/nep11_non_divisible.py index 8be162145..da082a5a8 100644 --- a/boa3_test/examples/nep11_non_divisible.py +++ b/boa3_test/examples/nep11_non_divisible.py @@ -5,14 +5,14 @@ from typing import Any, cast +from boa3.sc import storage from boa3.sc.compiletime import NeoMetadata, public -from boa3.sc.utils import CreateNewEvent, abort, call_contract, get_call_flags from boa3.sc.contracts import ContractManagement, StdLib -from boa3.sc.utils.iterator import Iterator from boa3.sc.runtime import check_witness, get_network, script_container -from boa3.sc import storage from boa3.sc.types import FindOptions, UInt160, CallFlags +from boa3.sc.utils import CreateNewEvent, abort, call_contract, get_call_flags from boa3.sc.utils import to_bytes +from boa3.sc.utils.iterator import Iterator # ------------------------------------------- diff --git a/boa3_test/examples/nep17.py b/boa3_test/examples/nep17.py index ec76260b8..f71e31d38 100644 --- a/boa3_test/examples/nep17.py +++ b/boa3_test/examples/nep17.py @@ -1,10 +1,10 @@ from typing import Any, cast +from boa3.sc import runtime, storage from boa3.sc.compiletime import NeoMetadata, public -from boa3.sc.utils import Nep17TransferEvent, abort, call_contract from boa3.sc.contracts import ContractManagement, NeoToken, GasToken from boa3.sc.types import UInt160 -from boa3.sc import storage, runtime +from boa3.sc.utils import Nep17TransferEvent, abort, call_contract # ------------------------------------------- diff --git a/boa3_test/examples/simple_nep17.py b/boa3_test/examples/simple_nep17.py index f5fce3bfc..e925a565e 100644 --- a/boa3_test/examples/simple_nep17.py +++ b/boa3_test/examples/simple_nep17.py @@ -1,10 +1,10 @@ from typing import Any +from boa3.sc import runtime, storage from boa3.sc.compiletime import NeoMetadata, public -from boa3.sc.utils import Nep17TransferEvent, abort, call_contract from boa3.sc.contracts import ContractManagement from boa3.sc.types import UInt160 -from boa3.sc import storage, runtime +from boa3.sc.utils import Nep17TransferEvent, abort, call_contract # ------------------------------------------- diff --git a/boa3_test/examples/update_contract.py b/boa3_test/examples/update_contract.py index 1fb017b57..c37acf16a 100644 --- a/boa3_test/examples/update_contract.py +++ b/boa3_test/examples/update_contract.py @@ -1,11 +1,11 @@ from typing import Any +from boa3.sc import runtime, storage from boa3.sc.compiletime import NeoMetadata, public -from boa3.sc.utils import CreateNewEvent -from boa3.sc.runtime import check_witness from boa3.sc.contracts import ContractManagement +from boa3.sc.runtime import check_witness from boa3.sc.types import UInt160 -from boa3.sc import storage, runtime +from boa3.sc.utils import CreateNewEvent # ------------------------------------------- # TOKEN SETTINGS diff --git a/boa3_test/examples/wrapped_gas.py b/boa3_test/examples/wrapped_gas.py index acddb1648..5645f3463 100644 --- a/boa3_test/examples/wrapped_gas.py +++ b/boa3_test/examples/wrapped_gas.py @@ -1,10 +1,10 @@ from typing import Any +from boa3.sc import runtime, storage from boa3.sc.compiletime import NeoMetadata, public -from boa3.sc.utils import CreateNewEvent, Nep17TransferEvent, abort, call_contract from boa3.sc.contracts import ContractManagement, GasToken as GAS_TOKEN from boa3.sc.types import UInt160 -from boa3.sc import storage, runtime +from boa3.sc.utils import CreateNewEvent, Nep17TransferEvent, abort, call_contract # ------------------------------------------- diff --git a/boa3_test/examples/wrapped_neo.py b/boa3_test/examples/wrapped_neo.py index 38f279e3f..253daa10f 100644 --- a/boa3_test/examples/wrapped_neo.py +++ b/boa3_test/examples/wrapped_neo.py @@ -1,10 +1,10 @@ from typing import Any +from boa3.sc import runtime, storage from boa3.sc.compiletime import NeoMetadata, public -from boa3.sc.utils import CreateNewEvent, Nep17TransferEvent, abort, call_contract from boa3.sc.contracts import ContractManagement, NeoToken, GasToken from boa3.sc.types import UInt160 -from boa3.sc import storage, runtime +from boa3.sc.utils import CreateNewEvent, Nep17TransferEvent, abort, call_contract # ------------------------------------------- diff --git a/boa3_test/test_sc/class_test/UserClassWithDeployMethod.py b/boa3_test/test_sc/class_test/UserClassWithDeployMethod.py index 955e55f8f..da22b9f8b 100644 --- a/boa3_test/test_sc/class_test/UserClassWithDeployMethod.py +++ b/boa3_test/test_sc/class_test/UserClassWithDeployMethod.py @@ -1,6 +1,6 @@ from typing import Any -from boa3.sc import storage, runtime +from boa3.sc import runtime, storage from boa3.sc.compiletime import public diff --git a/boa3_test/test_sc/interop_test/blockchain/CurrentHash.py b/boa3_test/test_sc/interop_test/blockchain/CurrentHash.py index 48c1fc480..8886cb46c 100644 --- a/boa3_test/test_sc/interop_test/blockchain/CurrentHash.py +++ b/boa3_test/test_sc/interop_test/blockchain/CurrentHash.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.interop.blockchain import current_hash +from boa3.sc.compiletime import public from boa3.sc.types import UInt256 diff --git a/boa3_test/test_sc/interop_test/blockchain/ImportBlockchain.py b/boa3_test/test_sc/interop_test/blockchain/ImportBlockchain.py index 4426b5c9e..14e6906c4 100644 --- a/boa3_test/test_sc/interop_test/blockchain/ImportBlockchain.py +++ b/boa3_test/test_sc/interop_test/blockchain/ImportBlockchain.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.interop import blockchain +from boa3.sc.compiletime import public from boa3.sc.types import UInt160, Contract diff --git a/boa3_test/test_sc/interop_test/contract/CallFlagsUsage.py b/boa3_test/test_sc/interop_test/contract/CallFlagsUsage.py index 995065910..d20292aed 100644 --- a/boa3_test/test_sc/interop_test/contract/CallFlagsUsage.py +++ b/boa3_test/test_sc/interop_test/contract/CallFlagsUsage.py @@ -2,9 +2,9 @@ from boa3.sc.compiletime import public from boa3.sc.contracts import NeoToken -from boa3.sc.utils import call_contract from boa3.sc.runtime import executing_script_hash, notify from boa3.sc.storage import get_int, put_int +from boa3.sc.utils import call_contract @public diff --git a/boa3_test/test_sc/interop_test/contract/CallScriptHash.py b/boa3_test/test_sc/interop_test/contract/CallScriptHash.py index 9046e4ec0..4aac1eea2 100644 --- a/boa3_test/test_sc/interop_test/contract/CallScriptHash.py +++ b/boa3_test/test_sc/interop_test/contract/CallScriptHash.py @@ -1,8 +1,8 @@ from typing import Any from boa3.sc.compiletime import NeoMetadata, public -from boa3.sc.utils import call_contract from boa3.sc.types import UInt160 +from boa3.sc.utils import call_contract @public diff --git a/boa3_test/test_sc/interop_test/contract/CallScriptHashWithCast.py b/boa3_test/test_sc/interop_test/contract/CallScriptHashWithCast.py index 79debb1c1..7f28b377d 100644 --- a/boa3_test/test_sc/interop_test/contract/CallScriptHashWithCast.py +++ b/boa3_test/test_sc/interop_test/contract/CallScriptHashWithCast.py @@ -1,8 +1,8 @@ from typing import cast from boa3.sc.compiletime import NeoMetadata, public -from boa3.sc.utils import call_contract from boa3.sc.types import UInt160 +from boa3.sc.utils import call_contract @public diff --git a/boa3_test/test_sc/interop_test/contract/CallScriptHashWithFlags.py b/boa3_test/test_sc/interop_test/contract/CallScriptHashWithFlags.py index 0071b489f..677bec74f 100644 --- a/boa3_test/test_sc/interop_test/contract/CallScriptHashWithFlags.py +++ b/boa3_test/test_sc/interop_test/contract/CallScriptHashWithFlags.py @@ -1,8 +1,8 @@ from typing import Any from boa3.sc.compiletime import NeoMetadata, public -from boa3.sc.utils import call_contract from boa3.sc.types import UInt160, CallFlags +from boa3.sc.utils import call_contract @public diff --git a/boa3_test/test_sc/interop_test/contract/CallScriptHashWithoutArgs.py b/boa3_test/test_sc/interop_test/contract/CallScriptHashWithoutArgs.py index 3a5a6006f..22d3777ad 100644 --- a/boa3_test/test_sc/interop_test/contract/CallScriptHashWithoutArgs.py +++ b/boa3_test/test_sc/interop_test/contract/CallScriptHashWithoutArgs.py @@ -1,8 +1,8 @@ from typing import Any from boa3.sc.compiletime import NeoMetadata, public -from boa3.sc.utils import call_contract from boa3.sc.types import UInt160 +from boa3.sc.utils import call_contract @public diff --git a/boa3_test/test_sc/interop_test/contract/CreateMultisigAccount.py b/boa3_test/test_sc/interop_test/contract/CreateMultisigAccount.py index 60408e759..348ac7d9c 100644 --- a/boa3_test/test_sc/interop_test/contract/CreateMultisigAccount.py +++ b/boa3_test/test_sc/interop_test/contract/CreateMultisigAccount.py @@ -1,6 +1,6 @@ from boa3.sc.compiletime import public -from boa3.sc.utils import create_multisig_account from boa3.sc.types import ECPoint, UInt160 +from boa3.sc.utils import create_multisig_account @public diff --git a/boa3_test/test_sc/interop_test/contract/CreateMultisigAccountTooFewArguments.py b/boa3_test/test_sc/interop_test/contract/CreateMultisigAccountTooFewArguments.py index f71acb09c..bb51a206f 100644 --- a/boa3_test/test_sc/interop_test/contract/CreateMultisigAccountTooFewArguments.py +++ b/boa3_test/test_sc/interop_test/contract/CreateMultisigAccountTooFewArguments.py @@ -1,5 +1,5 @@ -from boa3.sc.utils import create_multisig_account from boa3.sc.types import UInt160 +from boa3.sc.utils import create_multisig_account def main(minimum_sigs: int) -> UInt160: diff --git a/boa3_test/test_sc/interop_test/contract/CreateMultisigAccountTooManyArguments.py b/boa3_test/test_sc/interop_test/contract/CreateMultisigAccountTooManyArguments.py index e584c0b76..fe111db3e 100644 --- a/boa3_test/test_sc/interop_test/contract/CreateMultisigAccountTooManyArguments.py +++ b/boa3_test/test_sc/interop_test/contract/CreateMultisigAccountTooManyArguments.py @@ -1,7 +1,7 @@ from typing import Any -from boa3.sc.utils import create_multisig_account from boa3.sc.types import ECPoint, UInt160 +from boa3.sc.utils import create_multisig_account def main(minimum_sigs: int, public_keys: list[ECPoint], arg: Any) -> UInt160: diff --git a/boa3_test/test_sc/interop_test/contract/CreateStandardAccount.py b/boa3_test/test_sc/interop_test/contract/CreateStandardAccount.py index c8739d8b0..b4fbd07db 100644 --- a/boa3_test/test_sc/interop_test/contract/CreateStandardAccount.py +++ b/boa3_test/test_sc/interop_test/contract/CreateStandardAccount.py @@ -1,6 +1,6 @@ from boa3.sc.compiletime import public -from boa3.sc.utils import create_standard_account from boa3.sc.types import ECPoint, UInt160 +from boa3.sc.utils import create_standard_account @public diff --git a/boa3_test/test_sc/interop_test/contract/CreateStandardAccountTooFewArguments.py b/boa3_test/test_sc/interop_test/contract/CreateStandardAccountTooFewArguments.py index 50c619858..d1ed859dd 100644 --- a/boa3_test/test_sc/interop_test/contract/CreateStandardAccountTooFewArguments.py +++ b/boa3_test/test_sc/interop_test/contract/CreateStandardAccountTooFewArguments.py @@ -1,5 +1,5 @@ -from boa3.sc.utils import create_standard_account from boa3.sc.types import UInt160 +from boa3.sc.utils import create_standard_account def main() -> UInt160: diff --git a/boa3_test/test_sc/interop_test/contract/CreateStandardAccountTooManyArguments.py b/boa3_test/test_sc/interop_test/contract/CreateStandardAccountTooManyArguments.py index c8fad2bd1..a6fb60c95 100644 --- a/boa3_test/test_sc/interop_test/contract/CreateStandardAccountTooManyArguments.py +++ b/boa3_test/test_sc/interop_test/contract/CreateStandardAccountTooManyArguments.py @@ -1,7 +1,7 @@ from typing import Any -from boa3.sc.utils import create_standard_account from boa3.sc.types import ECPoint, UInt160 +from boa3.sc.utils import create_standard_account def main(public_key: bytes, arg1: Any) -> UInt160: diff --git a/boa3_test/test_sc/interop_test/contract/GasScriptHash.py b/boa3_test/test_sc/interop_test/contract/GasScriptHash.py index 6e5d29347..a61f5a99a 100644 --- a/boa3_test/test_sc/interop_test/contract/GasScriptHash.py +++ b/boa3_test/test_sc/interop_test/contract/GasScriptHash.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.interop.contract import GAS +from boa3.sc.compiletime import public from boa3.sc.types import UInt160 diff --git a/boa3_test/test_sc/interop_test/contract/GasScriptHashCantAssign.py b/boa3_test/test_sc/interop_test/contract/GasScriptHashCantAssign.py index 7e4297ca9..48b6ef6fe 100644 --- a/boa3_test/test_sc/interop_test/contract/GasScriptHashCantAssign.py +++ b/boa3_test/test_sc/interop_test/contract/GasScriptHashCantAssign.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.interop.contract import GAS +from boa3.sc.compiletime import public from boa3.sc.types import UInt160 diff --git a/boa3_test/test_sc/interop_test/contract/ImportContract.py b/boa3_test/test_sc/interop_test/contract/ImportContract.py index a52c332ad..4837afe86 100644 --- a/boa3_test/test_sc/interop_test/contract/ImportContract.py +++ b/boa3_test/test_sc/interop_test/contract/ImportContract.py @@ -1,9 +1,9 @@ from typing import Any -from boa3.sc.compiletime import NeoMetadata, public -from boa3.sc.utils import call_contract from boa3.builtin.interop import contract +from boa3.sc.compiletime import NeoMetadata, public from boa3.sc.types import UInt160 +from boa3.sc.utils import call_contract @public diff --git a/boa3_test/test_sc/interop_test/contract/NeoScriptHash.py b/boa3_test/test_sc/interop_test/contract/NeoScriptHash.py index 8921b61a7..b8ff742ac 100644 --- a/boa3_test/test_sc/interop_test/contract/NeoScriptHash.py +++ b/boa3_test/test_sc/interop_test/contract/NeoScriptHash.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.interop.contract import NEO +from boa3.sc.compiletime import public from boa3.sc.types import UInt160 diff --git a/boa3_test/test_sc/interop_test/contract/NeoScriptHashCantAssign.py b/boa3_test/test_sc/interop_test/contract/NeoScriptHashCantAssign.py index 65206eae5..2c7c3bb6e 100644 --- a/boa3_test/test_sc/interop_test/contract/NeoScriptHashCantAssign.py +++ b/boa3_test/test_sc/interop_test/contract/NeoScriptHashCantAssign.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.interop.contract import NEO +from boa3.sc.compiletime import public from boa3.sc.types import UInt160 diff --git a/boa3_test/test_sc/interop_test/crypto/CheckMultisig.py b/boa3_test/test_sc/interop_test/crypto/CheckMultisig.py index d03894a4e..391176e05 100644 --- a/boa3_test/test_sc/interop_test/crypto/CheckMultisig.py +++ b/boa3_test/test_sc/interop_test/crypto/CheckMultisig.py @@ -1,6 +1,6 @@ from boa3.sc.compiletime import public -from boa3.sc.utils import check_multisig from boa3.sc.types import ECPoint +from boa3.sc.utils import check_multisig @public diff --git a/boa3_test/test_sc/interop_test/crypto/CheckSig.py b/boa3_test/test_sc/interop_test/crypto/CheckSig.py index e75fd2818..406e6d704 100644 --- a/boa3_test/test_sc/interop_test/crypto/CheckSig.py +++ b/boa3_test/test_sc/interop_test/crypto/CheckSig.py @@ -1,6 +1,6 @@ from boa3.sc.compiletime import public -from boa3.sc.utils import check_sig from boa3.sc.types import ECPoint +from boa3.sc.utils import check_sig @public diff --git a/boa3_test/test_sc/interop_test/crypto/ImportCrypto.py b/boa3_test/test_sc/interop_test/crypto/ImportCrypto.py index 4c62b1c15..82dada4c2 100644 --- a/boa3_test/test_sc/interop_test/crypto/ImportCrypto.py +++ b/boa3_test/test_sc/interop_test/crypto/ImportCrypto.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.interop import crypto +from boa3.sc.compiletime import public @public diff --git a/boa3_test/test_sc/interop_test/iterator/ImportIterator.py b/boa3_test/test_sc/interop_test/iterator/ImportIterator.py index aa48eb15d..1ed28e35f 100644 --- a/boa3_test/test_sc/interop_test/iterator/ImportIterator.py +++ b/boa3_test/test_sc/interop_test/iterator/ImportIterator.py @@ -1,6 +1,6 @@ from boa3.sc.compiletime import public -from boa3.sc.utils import Iterator from boa3.sc.storage import find +from boa3.sc.utils import Iterator @public diff --git a/boa3_test/test_sc/interop_test/iterator/IteratorImplicitTyping.py b/boa3_test/test_sc/interop_test/iterator/IteratorImplicitTyping.py index 4de947144..ea4351b1a 100644 --- a/boa3_test/test_sc/interop_test/iterator/IteratorImplicitTyping.py +++ b/boa3_test/test_sc/interop_test/iterator/IteratorImplicitTyping.py @@ -1,8 +1,8 @@ from typing import Any +from boa3.sc import storage from boa3.sc.compiletime import public from boa3.sc.contracts import StdLib -from boa3.sc import storage @public diff --git a/boa3_test/test_sc/interop_test/iterator/IteratorNext.py b/boa3_test/test_sc/interop_test/iterator/IteratorNext.py index 95fcdf519..1a18bd19b 100644 --- a/boa3_test/test_sc/interop_test/iterator/IteratorNext.py +++ b/boa3_test/test_sc/interop_test/iterator/IteratorNext.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.sc import storage +from boa3.sc.compiletime import public @public diff --git a/boa3_test/test_sc/interop_test/iterator/IteratorValue.py b/boa3_test/test_sc/interop_test/iterator/IteratorValue.py index 380ca8246..8f40e39e9 100644 --- a/boa3_test/test_sc/interop_test/iterator/IteratorValue.py +++ b/boa3_test/test_sc/interop_test/iterator/IteratorValue.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.sc import storage +from boa3.sc.compiletime import public @public diff --git a/boa3_test/test_sc/interop_test/iterator/IteratorValueAccess.py b/boa3_test/test_sc/interop_test/iterator/IteratorValueAccess.py index 7580f2b46..2b23a4a48 100644 --- a/boa3_test/test_sc/interop_test/iterator/IteratorValueAccess.py +++ b/boa3_test/test_sc/interop_test/iterator/IteratorValueAccess.py @@ -1,8 +1,8 @@ from typing import Any, cast +from boa3.sc import storage from boa3.sc.compiletime import public from boa3.sc.contracts import StdLib -from boa3.sc import storage @public diff --git a/boa3_test/test_sc/interop_test/json/ImportJson.py b/boa3_test/test_sc/interop_test/json/ImportJson.py index 49681c3b5..456c2457d 100644 --- a/boa3_test/test_sc/interop_test/json/ImportJson.py +++ b/boa3_test/test_sc/interop_test/json/ImportJson.py @@ -1,7 +1,7 @@ from typing import Any -from boa3.sc.compiletime import public from boa3.builtin.interop import json +from boa3.sc.compiletime import public @public diff --git a/boa3_test/test_sc/interop_test/policy/ImportPolicy.py b/boa3_test/test_sc/interop_test/policy/ImportPolicy.py index 6a18f456f..099bb738e 100644 --- a/boa3_test/test_sc/interop_test/policy/ImportPolicy.py +++ b/boa3_test/test_sc/interop_test/policy/ImportPolicy.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.interop import policy +from boa3.sc.compiletime import public @public diff --git a/boa3_test/test_sc/interop_test/role/ImportRole.py b/boa3_test/test_sc/interop_test/role/ImportRole.py index 3e84d9a76..44c0603d2 100644 --- a/boa3_test/test_sc/interop_test/role/ImportRole.py +++ b/boa3_test/test_sc/interop_test/role/ImportRole.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.interop import role +from boa3.sc.compiletime import public from boa3.sc.types import ECPoint diff --git a/boa3_test/test_sc/interop_test/runtime/ExecutingScriptHashOnDeploy.py b/boa3_test/test_sc/interop_test/runtime/ExecutingScriptHashOnDeploy.py index 779d7aebb..dc60fa689 100644 --- a/boa3_test/test_sc/interop_test/runtime/ExecutingScriptHashOnDeploy.py +++ b/boa3_test/test_sc/interop_test/runtime/ExecutingScriptHashOnDeploy.py @@ -1,7 +1,7 @@ from typing import Any +from boa3.sc import runtime, storage from boa3.sc.compiletime import public -from boa3.sc import storage, runtime @public diff --git a/boa3_test/test_sc/interop_test/runtime/ImportRuntime.py b/boa3_test/test_sc/interop_test/runtime/ImportRuntime.py index 21e4178db..bc02a26c7 100644 --- a/boa3_test/test_sc/interop_test/runtime/ImportRuntime.py +++ b/boa3_test/test_sc/interop_test/runtime/ImportRuntime.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.sc import runtime +from boa3.sc.compiletime import public @public diff --git a/boa3_test/test_sc/interop_test/runtime/ScriptContainerAsTransaction.py b/boa3_test/test_sc/interop_test/runtime/ScriptContainerAsTransaction.py index f5838354d..795999563 100644 --- a/boa3_test/test_sc/interop_test/runtime/ScriptContainerAsTransaction.py +++ b/boa3_test/test_sc/interop_test/runtime/ScriptContainerAsTransaction.py @@ -1,6 +1,6 @@ from boa3.sc.compiletime import public -from boa3.sc.types import Transaction from boa3.sc.runtime import script_container +from boa3.sc.types import Transaction @public diff --git a/boa3_test/test_sc/interop_test/stdlib/ImportStdlib.py b/boa3_test/test_sc/interop_test/stdlib/ImportStdlib.py index edf2dc591..afca93de2 100644 --- a/boa3_test/test_sc/interop_test/stdlib/ImportStdlib.py +++ b/boa3_test/test_sc/interop_test/stdlib/ImportStdlib.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.interop import stdlib +from boa3.sc.compiletime import public @public diff --git a/boa3_test/test_sc/interop_test/storage/ImportStorage.py b/boa3_test/test_sc/interop_test/storage/ImportStorage.py index 9a5035d93..fc210acfd 100644 --- a/boa3_test/test_sc/interop_test/storage/ImportStorage.py +++ b/boa3_test/test_sc/interop_test/storage/ImportStorage.py @@ -1,6 +1,6 @@ +from boa3.sc import storage from boa3.sc.compiletime import public from boa3.sc.utils.iterator import Iterator -from boa3.sc import storage @public diff --git a/boa3_test/test_sc/interop_test/storage/StorageDeleteBytesKey.py b/boa3_test/test_sc/interop_test/storage/StorageDeleteBytesKey.py index b0e1932f6..4ae2c6628 100644 --- a/boa3_test/test_sc/interop_test/storage/StorageDeleteBytesKey.py +++ b/boa3_test/test_sc/interop_test/storage/StorageDeleteBytesKey.py @@ -1,7 +1,7 @@ from typing import Any -from boa3.sc.compiletime import public from boa3.sc import storage +from boa3.sc.compiletime import public from boa3.sc.storage import delete diff --git a/boa3_test/test_sc/interop_test/storage/StorageDeleteDeprecated.py b/boa3_test/test_sc/interop_test/storage/StorageDeleteDeprecated.py index 8dac7d995..116651c7b 100644 --- a/boa3_test/test_sc/interop_test/storage/StorageDeleteDeprecated.py +++ b/boa3_test/test_sc/interop_test/storage/StorageDeleteDeprecated.py @@ -1,8 +1,8 @@ from typing import Any -from boa3.sc.compiletime import public from boa3.builtin.interop import storage from boa3.builtin.interop.storage import delete +from boa3.sc.compiletime import public @public diff --git a/boa3_test/test_sc/interop_test/storage/StorageDeleteWithContext.py b/boa3_test/test_sc/interop_test/storage/StorageDeleteWithContext.py index 9891949ab..408104dfa 100644 --- a/boa3_test/test_sc/interop_test/storage/StorageDeleteWithContext.py +++ b/boa3_test/test_sc/interop_test/storage/StorageDeleteWithContext.py @@ -1,7 +1,7 @@ from typing import Any -from boa3.sc.compiletime import public from boa3.sc import storage +from boa3.sc.compiletime import public from boa3.sc.storage import delete, get_context diff --git a/boa3_test/test_sc/interop_test/storage/StorageFindBytesPrefix.py b/boa3_test/test_sc/interop_test/storage/StorageFindBytesPrefix.py index 52b766699..57179d698 100644 --- a/boa3_test/test_sc/interop_test/storage/StorageFindBytesPrefix.py +++ b/boa3_test/test_sc/interop_test/storage/StorageFindBytesPrefix.py @@ -1,6 +1,6 @@ from boa3.sc.compiletime import public -from boa3.sc.utils.iterator import Iterator from boa3.sc.storage import find, put +from boa3.sc.utils.iterator import Iterator @public diff --git a/boa3_test/test_sc/interop_test/storage/StorageFindMismatchedType.py b/boa3_test/test_sc/interop_test/storage/StorageFindMismatchedType.py index e4a4edd10..7b3d942c4 100644 --- a/boa3_test/test_sc/interop_test/storage/StorageFindMismatchedType.py +++ b/boa3_test/test_sc/interop_test/storage/StorageFindMismatchedType.py @@ -1,6 +1,6 @@ from boa3.sc.compiletime import public -from boa3.sc.utils.iterator import Iterator from boa3.sc.storage import find +from boa3.sc.utils.iterator import Iterator @public diff --git a/boa3_test/test_sc/interop_test/storage/StorageFindStrPrefix.py b/boa3_test/test_sc/interop_test/storage/StorageFindStrPrefix.py index 472826d7d..23d97cceb 100644 --- a/boa3_test/test_sc/interop_test/storage/StorageFindStrPrefix.py +++ b/boa3_test/test_sc/interop_test/storage/StorageFindStrPrefix.py @@ -1,5 +1,5 @@ -from boa3.sc.utils.iterator import Iterator from boa3.sc.storage import find, put +from boa3.sc.utils.iterator import Iterator def find_by_prefix(prefix: str) -> Iterator: diff --git a/boa3_test/test_sc/interop_test/storage/StorageFindWithContext.py b/boa3_test/test_sc/interop_test/storage/StorageFindWithContext.py index c3539bd06..1e70c9ac7 100644 --- a/boa3_test/test_sc/interop_test/storage/StorageFindWithContext.py +++ b/boa3_test/test_sc/interop_test/storage/StorageFindWithContext.py @@ -1,6 +1,6 @@ from boa3.sc.compiletime import public -from boa3.sc.utils.iterator import Iterator from boa3.sc.storage import find, get_context, put +from boa3.sc.utils.iterator import Iterator @public diff --git a/boa3_test/test_sc/interop_test/storage/StorageFindWithOptions.py b/boa3_test/test_sc/interop_test/storage/StorageFindWithOptions.py index f988a1614..8d7a4719c 100644 --- a/boa3_test/test_sc/interop_test/storage/StorageFindWithOptions.py +++ b/boa3_test/test_sc/interop_test/storage/StorageFindWithOptions.py @@ -1,7 +1,7 @@ from boa3.sc.compiletime import public -from boa3.sc.utils.iterator import Iterator from boa3.sc.storage import find, get_context, put from boa3.sc.types import FindOptions +from boa3.sc.utils.iterator import Iterator @public diff --git a/boa3_test/test_sc/interop_test/storage/StorageGetDeprecated.py b/boa3_test/test_sc/interop_test/storage/StorageGetDeprecated.py index 5b769107d..e1a9c8532 100644 --- a/boa3_test/test_sc/interop_test/storage/StorageGetDeprecated.py +++ b/boa3_test/test_sc/interop_test/storage/StorageGetDeprecated.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.interop.storage import get +from boa3.sc.compiletime import public @public diff --git a/boa3_test/test_sc/interop_test/storage/StorageGetWithContext.py b/boa3_test/test_sc/interop_test/storage/StorageGetWithContext.py index e88767e3b..9336b435b 100644 --- a/boa3_test/test_sc/interop_test/storage/StorageGetWithContext.py +++ b/boa3_test/test_sc/interop_test/storage/StorageGetWithContext.py @@ -1,7 +1,7 @@ from typing import Any -from boa3.sc.compiletime import public from boa3.sc import storage +from boa3.sc.compiletime import public from boa3.sc.storage import get, get_context diff --git a/boa3_test/test_sc/interop_test/storage/StoragePutDeprecated.py b/boa3_test/test_sc/interop_test/storage/StoragePutDeprecated.py index e2ed646c8..47b2629ac 100644 --- a/boa3_test/test_sc/interop_test/storage/StoragePutDeprecated.py +++ b/boa3_test/test_sc/interop_test/storage/StoragePutDeprecated.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.interop.storage import put_int +from boa3.sc.compiletime import public @public diff --git a/boa3_test/test_sc/native_test/contractmanagement/GetHashDeprecated.py b/boa3_test/test_sc/native_test/contractmanagement/GetHashDeprecated.py index 970028aeb..fe0083d3f 100644 --- a/boa3_test/test_sc/native_test/contractmanagement/GetHashDeprecated.py +++ b/boa3_test/test_sc/native_test/contractmanagement/GetHashDeprecated.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.nativecontract.contractmanagement import ContractManagement +from boa3.sc.compiletime import public from boa3.sc.types import UInt160 diff --git a/boa3_test/test_sc/native_test/cryptolib/GetHashDeprecated.py b/boa3_test/test_sc/native_test/cryptolib/GetHashDeprecated.py index d7a6f7d5d..6c069de87 100644 --- a/boa3_test/test_sc/native_test/cryptolib/GetHashDeprecated.py +++ b/boa3_test/test_sc/native_test/cryptolib/GetHashDeprecated.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.nativecontract.cryptolib import CryptoLib +from boa3.sc.compiletime import public from boa3.sc.types import UInt160 diff --git a/boa3_test/test_sc/native_test/gas/GetHashDeprecated.py b/boa3_test/test_sc/native_test/gas/GetHashDeprecated.py index 0e1eb42cb..5a7535004 100644 --- a/boa3_test/test_sc/native_test/gas/GetHashDeprecated.py +++ b/boa3_test/test_sc/native_test/gas/GetHashDeprecated.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.nativecontract.gas import GAS +from boa3.sc.compiletime import public from boa3.sc.types import UInt160 diff --git a/boa3_test/test_sc/native_test/ledger/GetHashDeprecated.py b/boa3_test/test_sc/native_test/ledger/GetHashDeprecated.py index dcf176f1c..afa517ffb 100644 --- a/boa3_test/test_sc/native_test/ledger/GetHashDeprecated.py +++ b/boa3_test/test_sc/native_test/ledger/GetHashDeprecated.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.nativecontract.ledger import Ledger +from boa3.sc.compiletime import public from boa3.sc.types import UInt160 diff --git a/boa3_test/test_sc/native_test/neo/GetHashDeprecated.py b/boa3_test/test_sc/native_test/neo/GetHashDeprecated.py index 66d3857d3..dd824892d 100644 --- a/boa3_test/test_sc/native_test/neo/GetHashDeprecated.py +++ b/boa3_test/test_sc/native_test/neo/GetHashDeprecated.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.nativecontract.neo import NEO +from boa3.sc.compiletime import public from boa3.sc.types import UInt160 diff --git a/boa3_test/test_sc/native_test/oracle/GetHashDeprecated.py b/boa3_test/test_sc/native_test/oracle/GetHashDeprecated.py index e1c0c356e..2374329ac 100644 --- a/boa3_test/test_sc/native_test/oracle/GetHashDeprecated.py +++ b/boa3_test/test_sc/native_test/oracle/GetHashDeprecated.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.nativecontract.oracle import Oracle +from boa3.sc.compiletime import public from boa3.sc.types import UInt160 diff --git a/boa3_test/test_sc/native_test/policy/GetHashDeprecated.py b/boa3_test/test_sc/native_test/policy/GetHashDeprecated.py index 61a103e0a..e7959c1e8 100644 --- a/boa3_test/test_sc/native_test/policy/GetHashDeprecated.py +++ b/boa3_test/test_sc/native_test/policy/GetHashDeprecated.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.nativecontract.policy import Policy +from boa3.sc.compiletime import public from boa3.sc.types import UInt160 diff --git a/boa3_test/test_sc/native_test/rolemanagement/GetHashDeprecated.py b/boa3_test/test_sc/native_test/rolemanagement/GetHashDeprecated.py index 2c738d516..26d5d0c74 100644 --- a/boa3_test/test_sc/native_test/rolemanagement/GetHashDeprecated.py +++ b/boa3_test/test_sc/native_test/rolemanagement/GetHashDeprecated.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.nativecontract.rolemanagement import RoleManagement +from boa3.sc.compiletime import public from boa3.sc.types import UInt160 diff --git a/boa3_test/test_sc/native_test/stdlib/GetHashDeprecated.py b/boa3_test/test_sc/native_test/stdlib/GetHashDeprecated.py index 9cfbc18e2..978bb8533 100644 --- a/boa3_test/test_sc/native_test/stdlib/GetHashDeprecated.py +++ b/boa3_test/test_sc/native_test/stdlib/GetHashDeprecated.py @@ -1,5 +1,5 @@ -from boa3.sc.compiletime import public from boa3.builtin.nativecontract.stdlib import StdLib +from boa3.sc.compiletime import public from boa3.sc.types import UInt160 diff --git a/boa3_test/tests/compiler_tests/test_bytes.py b/boa3_test/tests/compiler_tests/test_bytes.py index 775f79068..ed36086fe 100644 --- a/boa3_test/tests/compiler_tests/test_bytes.py +++ b/boa3_test/tests/compiler_tests/test_bytes.py @@ -1,6 +1,6 @@ from neo3.core import types -from boa3.internal.exception import CompilerError, CompilerWarning +from boa3.internal.exception import CompilerError from boa3.internal.neo.vm.opcode.Opcode import Opcode from boa3.internal.neo.vm.type.Integer import Integer from boa3.internal.neo.vm.type.StackItem import StackItemType diff --git a/boa3_test/tests/compiler_tests/test_interop/test_json.py b/boa3_test/tests/compiler_tests/test_interop/test_json.py index 84f55fed8..78c10a0f4 100644 --- a/boa3_test/tests/compiler_tests/test_interop/test_json.py +++ b/boa3_test/tests/compiler_tests/test_interop/test_json.py @@ -1,7 +1,7 @@ import json -from boa3_test.tests import boatestcase from boa3.internal.exception import CompilerWarning +from boa3_test.tests import boatestcase class TestJsonInterop(boatestcase.BoaTestCase):