dstepanov-yadro/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity
2715 commits 35 branches 134 tags 34 MiB
Commit graph

2715 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roman Khimov
e2c8fd1d5d
Merge pull request #1147 from nspcc-dev/neo3/cli/invoke_fix 
cli: fixes for contract deployment and invocation
 2020-07-06 11:14:04 +03:00
Anna Shaleva
7b90ad9337 rpc: fix cosigner scope in CreateNEP5TransferTx 
It should be the same as transaction's cosigner scope.
 2020-07-06 11:03:21 +03:00
Anna Shaleva
966ad8a0b1 rpc: fix adding extra network fee to tx 2020-07-06 11:02:57 +03:00
Anna Shaleva
3c551788c9 cli: fix parseCosigner method 2020-07-06 10:06:18 +03:00
Anna Shaleva
1880e96844 cli: fix contract deploy&invoke 
We should add cosigners to deplyment and invocation transactions.
 2020-07-06 10:01:14 +03:00
Roman Khimov
02bc0bdc1e
Merge pull request #1145 from nspcc-dev/fix/feeperbyte 
Cache `transaction.FeePerByte()`
 2020-07-03 18:45:44 +03:00
Evgenii Stratonikov
5787d7775f transaction: fail creating tx if there is additional data present 2020-07-03 18:03:57 +03:00
Evgenii Stratonikov
27b3054df4 transaction: set feePerByte on tx construction 2020-07-03 17:52:13 +03:00
Evgenii Stratonikov
3097dc60e5 transaction: cache feePerByte 2020-07-03 17:37:01 +03:00
Roman Khimov
2f09ec38fc
Merge pull request #1140 from nspcc-dev/feature/config 
config: allow to specify config path directly
 2020-07-03 12:28:30 +03:00
Evgenii Stratonikov
681e0e0a4d config: allow to specify config path directly 
It costs us nothing and makes API much more flexible.
 2020-07-03 11:47:56 +03:00
Roman Khimov
08d304c838
Merge pull request #1138 from nspcc-dev/fix/nep6 
wallet: marshal script in base64
 2020-07-03 10:11:49 +03:00
Roman Khimov
6cd166fb7a
Merge pull request #1139 from nspcc-dev/fix-deployment-sysfee-and-invokes 
Fix deployment sysfee and invokes
 2020-07-03 10:11:23 +03:00
Roman Khimov
4f8e4628dc cli/rpc: hide parameter encoding details for Invoke* calls 
The script is passed as a hex string, but no one should care. The hash is a
hex-encoded LE value, but no one should care either. Hex might change to
base64, LE to BE, no one outside these functions should care about that.
 2020-07-02 16:41:34 +03:00
Roman Khimov
0819583413 cli/rpc: test-invoke deployment script to get the system fee value 
Fix #1134.
 2020-07-02 16:41:31 +03:00
Roman Khimov
17ea6411a2 rpc/client: ensure compatibility with preview2 C# node for invoke* 
It won't work with proper cosigners and the client must be compatible both
with neo-go and C# node. See neo/neo-modules#260 also.
 2020-07-02 16:40:32 +03:00
Roman Khimov
cc95d559cc rpc/client: unify invoke* functions 2020-07-02 16:40:32 +03:00
Evgenii Stratonikov
0b67d80bb1 wallet: marshal script in base64 
Related #1015.
 2020-07-02 11:43:53 +03:00
Roman Khimov
d8677844fd
Merge pull request #1137 from nspcc-dev/neo3/compiler/contract_deploy 
compiler, cli: update ContractCompile and ContractDeploy methods
 2020-07-02 10:01:56 +03:00
Anna Shaleva
3875c0a923 cli: deploy contract using manifest.json instead of yaml config 
1. We have all necessary information in manifest.json, so don't need
   config.yaml for deployment anymore. It also allow us to be consistent
   with C# cli (it uses only .manifest.json and .nef files for contract
   deployment)
2. Remove EntryPoint and Methods from ProjectConfig as compiler is able
   to generate this information by itself.
 2020-06-30 18:22:47 +03:00
Anna Shaleva
4dfb0eb438 compiler, cli: generate manifest.json and debug.json independently 
We should be able to generate manifest.json without debug.json and vice
versa.
 2020-06-30 14:33:19 +03:00
Roman Khimov
59d1013a8f
Merge pull request #1136 from nspcc-dev/neo3/consensus/fix 
consensus: prevent `invalid message` panic
 2020-06-30 13:10:43 +03:00
Anna Shaleva
995abcf0c3 consensus: prevent invalid message panic 
After 5c2f69bd2c there's an `invalid
message` panic when trying to run 4-nodes private network:

```
=> Try to restore blocks before running node
2020-06-30T08:59:39.696Z	INFO	no storage version found! creating genesis block
2020-06-30T08:59:39.696Z	INFO	service is running	{"service": "Prometheus", "endpoint": ":20001"}
2020-06-30T08:59:39.696Z	INFO	service hasn't started since it's disabled	{"service": "Pprof"}

    _   ____________        __________
   / | / / ____/ __ \      / ____/ __ \
  /  |/ / __/ / / / /_____/ / __/ / / /
 / /|  / /___/ /_/ /_____/ /_/ / /_/ /
/_/ |_/_____/\____/      \____/\____/
2020-06-30T08:59:39.696Z	INFO	starting rpc-server	{"endpoint": ":30333"}
2020-06-30T08:59:39.696Z	INFO	node started	{"blockHeight": 0, "headerHeight": 0}

/NEO-GO:/

2020-06-30T08:59:39.697Z	INFO	new peer connected	{"addr": "172.200.0.1:20333", "peerCount": 1}
2020-06-30T08:59:39.697Z	INFO	new peer connected	{"addr": "172.200.0.2:46692", "peerCount": 2}
2020-06-30T08:59:39.697Z	INFO	new peer connected	{"addr": "172.200.0.1:54140", "peerCount": 3}
2020-06-30T08:59:39.697Z	INFO	new peer connected	{"addr": "172.200.0.4:42890", "peerCount": 4}
2020-06-30T08:59:39.697Z	INFO	new peer connected	{"addr": "172.200.0.4:20336", "peerCount": 5}
2020-06-30T08:59:39.697Z	INFO	new peer connected	{"addr": "172.200.0.2:20334", "peerCount": 6}
2020-06-30T08:59:39.697Z	INFO	started protocol	{"addr": "172.200.0.4:42890", "userAgent": "/NEO-GO:/", "startHeight": 0, "id": 3797159912}
2020-06-30T08:59:39.697Z	WARN	peer disconnected	{"addr": "172.200.0.4:20336", "reason": "already connected", "peerCount": 5}
2020-06-30T08:59:39.697Z	INFO	started protocol	{"addr": "172.200.0.2:20334", "userAgent": "/NEO-GO:/", "startHeight": 0, "id": 1116452361}
2020-06-30T08:59:39.697Z	WARN	peer disconnected	{"addr": "172.200.0.2:46692", "reason": "already connected", "peerCount": 4}
2020-06-30T08:59:39.697Z	WARN	peer disconnected	{"addr": "172.200.0.1:54140", "reason": "identical node id", "peerCount": 3}
2020-06-30T08:59:39.697Z	WARN	peer disconnected	{"addr": "172.200.0.1:20333", "reason": "identical node id", "peerCount": 2}
2020-06-30T08:59:40.673Z	INFO	new peer connected	{"addr": "172.200.0.3:44948", "peerCount": 3}
2020-06-30T08:59:40.673Z	INFO	new peer connected	{"addr": "172.200.0.3:20335", "peerCount": 4}
2020-06-30T08:59:40.673Z	WARN	peer disconnected	{"addr": "172.200.0.3:20335", "reason": "already connected", "peerCount": 3}
2020-06-30T08:59:40.673Z	WARN	peer disconnected	{"addr": "172.200.0.3:44948", "reason": "unexpected empty payload", "peerCount": 2}
2020-06-30T08:59:40.673Z	INFO	new peer connected	{"addr": "172.200.0.3:44950", "peerCount": 3}
2020-06-30T08:59:40.673Z	INFO	new peer connected	{"addr": "172.200.0.3:20335", "peerCount": 4}
2020-06-30T08:59:40.677Z	INFO	node reached synchronized state, starting consensus
2020-06-30T08:59:40.677Z	INFO	started protocol	{"addr": "172.200.0.3:44950", "userAgent": "/NEO-GO:/", "startHeight": 0, "id": 2658713129}
2020-06-30T08:59:40.689Z	WARN	peer disconnected	{"addr": "172.200.0.3:20335", "reason": "already connected", "peerCount": 3}
2020-06-30T08:59:40.697Z	INFO	blockchain persist completed	{"persistedBlocks": 0, "persistedKeys": 23, "headerHeight": 0, "blockHeight": 0, "took": "243.634µs"}
2020-06-30T08:59:41.057Z	INFO	initializing dbft	{"height": 1, "view": 0, "index": 0, "role": "Backup"}
2020-06-30T08:59:41.057Z	DPANIC	invalid message
2020-06-30T08:59:41.058Z	DPANIC	invalid message
```

Reason: payload wasn't decoded as payload.message isn't null anymore.
Fixed.
 2020-06-30 12:06:50 +03:00
Roman Khimov
ee0d869815
Merge pull request #1126 from nspcc-dev/fix/variable 
compiler: support variable shadowing
 2020-06-30 11:27:52 +03:00
Evgenii Stratonikov
4f64bf86e5 compiler: add test for argument shadowing 
Thanks @roman-khimov.
 2020-06-30 10:41:48 +03:00
Evgenii Stratonikov
26cfae7c9a compiler: support shadowing via Block statements 2020-06-30 10:31:52 +03:00
Evgenii Stratonikov
40bacc6775 compiler: support variable shadowing 
Closes #1131.
 2020-06-30 10:31:52 +03:00
Evgenii Stratonikov
1ee4acbdbc compiler: manage variables in a separate varScope struct 
Abstract var scope management from the funcScope.
 2020-06-30 10:31:51 +03:00
Roman Khimov
08c516014f
Merge pull request #1132 from nspcc-dev/neo3/rpc/fixed8_marshalling 
*: switch from Fixed8 to int64
 2020-06-29 21:44:40 +03:00
Anna Shaleva
c421805141 core: fixed typo in method description 2020-06-29 21:40:59 +03:00
Anna Shaleva
0aaaf7f787 *: switch from fixed8 to int64 in (Blockchain).CalculateClaimable 2020-06-29 21:40:54 +03:00
Anna Shaleva
73b630db9b *: switch from fixed8 to int64 
Follow C# implementation, we have to marshall JSON Fixed8 fields without
taking into account decimals.
 2020-06-29 21:39:27 +03:00
Roman Khimov
372dd71708
Merge pull request #1108 from nspcc-dev/neo3/compiler/nef 
compiler: support *.nef and *.manifest.json generation
 2020-06-29 20:55:47 +03:00
Anna Shaleva
dc5da4f37e compiler: fix unhandled error 2020-06-29 20:44:03 +03:00
Anna Shaleva
66b6a27b09 compiler: fix DebugInfo JSON marshalling 
MethodDebugInfo.Parameters should be marshalled as `params`
MethodDebugInfo.ReturnType --> `return`
EventDebugInfo.Parameters --> `params`

(see https://github.com/ngdseattle/design-notes/blob/master/NDX-DN11%20-%20NEO%20Debug%20Info%20Specification.md#v11-format)
 2020-06-29 20:42:03 +03:00
Roman Khimov
8065114da6
Merge pull request #1129 from nspcc-dev/fix/payload 
consensus: take payload hash based on data
 2020-06-29 16:05:02 +03:00
Evgenii Stratonikov
5c2f69bd2c consensus: take payload hash based on data 
Fix 857ced82.
 2020-06-29 15:52:06 +03:00
Roman Khimov
8ad355b444
Merge pull request #1124 from nspcc-dev/forward-port-from-2.x 
Forward port from 2.x
 2020-06-29 11:52:45 +03:00
Roman Khimov
88b933672a
Merge pull request #1125 from nspcc-dev/fix/consensus 
Copy validators when returning to the outside
 2020-06-29 11:05:21 +03:00
Evgenii Stratonikov
f007cca80b native: hide native contract methods 
Copy public keys when returning them to the outside and hide unused
`GetValidators` method.
 2020-06-29 10:48:37 +03:00
Evgenii Stratonikov
8c18142e8a keys: implement PublicKeys.Copy() 
Implement convenient wrapper over explicit allocation and copying.
 2020-06-29 10:44:35 +03:00
Evgenii Stratonikov
bbe02ac584 native: store typed nil in validators cache 
Fix `error encountered at instruction 0 (SYSCALL): sync/atomic: store of nil value into Value"`.
 2020-06-29 10:37:52 +03:00
Evgenii Stratonikov
f67b8ce607 consensus: check if payload is present in cache before validation 
Don't check signature correctness twice.
 2020-06-29 10:37:26 +03:00
Anna Shaleva
45213dda49 compiler: remove unnecessary structures 2020-06-29 09:15:29 +03:00
Anna Shaleva
2f6065f541 compiler, cli: introduce *.manifest.json 
Add ability to generate NEO3-compatable *.manifest.json into compiler.
This file represets contract manifest and includes ABI information, so
we don't need to create separate *.abi.json file. NEO3 debugger also
needs *.manifest.json only. So, switched from *.abi.json to
*.manifest.json file.
 2020-06-29 09:15:29 +03:00
Anna Shaleva
1c1818d97e vm: fix typoes in cli package 2020-06-29 09:15:29 +03:00
Anna Shaleva
b387deaa05 vm: switch from .avm to .nef 2020-06-29 09:15:29 +03:00
Anna Shaleva
c7746da023 cli, compiler: switch from .avm to .nef 
We don't generate clear .avm instructions anymore. Instead, use .nef
files with additional metadata.
 2020-06-29 09:15:29 +03:00
Anna Shaleva
6b8957243a *: move wallet config from wallet to config package 
In order to avoid dependency cycle at the next commits:

	imports github.com/nspcc-dev/neo-go/pkg/config
	imports github.com/nspcc-dev/neo-go/pkg/wallet
	imports github.com/nspcc-dev/neo-go/pkg/vm
	imports github.com/nspcc-dev/neo-go/pkg/smartcontract/nef
	imports github.com/nspcc-dev/neo-go/pkg/config
 2020-06-29 09:15:29 +03:00
Anna Shaleva
927127e5fb smartcontract: add nef file 
It should match C# NEF3 specification in order to debug and deploy smart
contracts via NEO3 Blockchain Toolkit.
 2020-06-29 09:15:25 +03:00