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

4830 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roman Khimov
e89a0185ee
Merge pull request #2007 from nspcc-dev/fix-diff-92057 
core: do not allow NEP17 roundtrip in case of insufficient funds
 2021-06-09 14:50:53 +03:00
Anna Shaleva
be902afe9e core: do not allow NEP17 roundtrip in case of insufficient funds 
NEP17 roundtrip is prohibited if from account doesn't have enough funds.

This commit fixes states diff in block 92057 where account
NfuwpaQ1A2xaeVbxWe8FRtaRgaMa8yF3YM initiates two NEO roundtrips with
amount exceeding the account's balance:

block 92057: value mismatch for key +////xTbYWBH3r5qhRKZAPFPHabKfb2vhQ==: QQMhAkwBIQOZZwEA vs QQMhAkwBIQN/ZwEA
block 92057: value mismatch for key +v///ws=: kqlddcitCg== vs tphddcitCg==
block 92057: value mismatch for key +v///xTbYWBH3r5qhRKZAPFPHabKfb2vhQ==: QQEhBUWyDu0W vs QQEhBWmhDu0W

C#'s applog (contains False and False on stack for both transfers):
```
{
   "id" : 1,
   "jsonrpc" : "2.0",
   "result" : {
      "executions" : [
         {
            "gasconsumed" : "11955500",
            "exception" : null,
            "stack" : [
               {
                  "value" : false,
                  "type" : "Boolean"
               },
               {
                  "value" : false,
                  "type" : "Boolean"
               }
            ],
            "vmstate" : "HALT",
            "trigger" : "Application",
            "notifications" : []
         }
      ],
      "txid" : "0x8e73a7e9a566a514813907272ad65fc965002c3b098eacc5bdda529af19d7688"
   }
}
```

Go's applog (both transfers succeeded and GAS minted):
```
{
   "result" : {
      "executions" : [
         {
            "gasconsumed" : "11955500",
            "trigger" : "Application",
            "stack" : [
               {
                  "type" : "Boolean",
                  "value" : true
               },
               {
                  "type" : "Boolean",
                  "value" : true
               }
            ],
            "vmstate" : "HALT",
            "notifications" : [
               {
                  "eventname" : "Transfer",
                  "contract" : "0xd2a4cff31913016155e38e474a2c06d08be276cf",
                  "state" : {
                     "value" : [
                        {
                           "type" : "Any"
                        },
                        {
                           "value" : "22FgR96+aoUSmQDxTx2myn29r4U=",
                           "type" : "ByteString"
                        },
                        {
                           "value" : "4316",
                           "type" : "Integer"
                        }
                     ],
                     "type" : "Array"
                  }
               },
               {
                  "state" : {
                     "type" : "Array",
                     "value" : [
                        {
                           "value" : "22FgR96+aoUSmQDxTx2myn29r4U=",
                           "type" : "ByteString"
                        },
                        {
                           "type" : "ByteString",
                           "value" : "22FgR96+aoUSmQDxTx2myn29r4U="
                        },
                        {
                           "type" : "Integer",
                           "value" : "1111111111"
                        }
                     ]
                  },
                  "contract" : "0xef4073a0f2b305a38ec4050e4d3d28bc40ea63f5",
                  "eventname" : "Transfer"
               },
               {
                  "contract" : "0xef4073a0f2b305a38ec4050e4d3d28bc40ea63f5",
                  "state" : {
                     "type" : "Array",
                     "value" : [
                        {
                           "value" : "22FgR96+aoUSmQDxTx2myn29r4U=",
                           "type" : "ByteString"
                        },
                        {
                           "type" : "ByteString",
                           "value" : "22FgR96+aoUSmQDxTx2myn29r4U="
                        },
                        {
                           "type" : "Integer",
                           "value" : "1111111"
                        }
                     ]
                  },
                  "eventname" : "Transfer"
               }
            ]
         }
      ],
      "txid" : "0x8e73a7e9a566a514813907272ad65fc965002c3b098eacc5bdda529af19d7688"
   },
   "id" : 1,
   "jsonrpc" : "2.0"
}
```
 2021-06-09 13:36:50 +03:00
Roman Khimov
0a118cb476
Merge pull request #2006 from nspcc-dev/fix-diff-71613 
vm: serialize `+` rune as `\u002B` for byte-contained stackitems
 2021-06-08 17:43:46 +03:00
Anna Shaleva
f95bdd9cb5 vm: serialize + rune as \u002B for byte-contained stackitems 
This commit fixes the following Go vs C# state diff:

block 74613: value mismatch for key EwAAAHN0cmVhbXMvDg==: eyJpZCI6MTQsInN0YXJ0IjoxNjIyNTAwMjAwMDAwLCJzdG9wIjoxNjIyNTAyMDAwMDAwLCJkZXBvc2l0IjoxMDAwMDAwMDAsInJlbWFpbmluZyI6MTAwMDAwMDAwLCJzZW5kZXIiOiJmeEY4RDl2ZFU3K0gwcDV3NTlyWllMNytNSlE9IiwicmVjaXBpZW50IjoiSVV6c3pveFV0S1NGVnlZRGczSmdTQTFlbTFNPSJ9 vs eyJpZCI6MTQsInN0YXJ0IjoxNjIyNTAwMjAwMDAwLCJzdG9wIjoxNjIyNTAyMDAwMDAwLCJkZXBvc2l0IjoxMDAwMDAwMDAsInJlbWFpbmluZyI6MTAwMDAwMDAwLCJzZW5kZXIiOiJmeEY4RDl2ZFU3XHUwMDJCSDBwNXc1OXJaWUw3XHUwMDJCTUpRPSIsInJlY2lwaWVudCI6IklVenN6b3hVdEtTRlZ5WURnM0pnU0ExZW0xTT0ifQ==

I.e.:
```
{"id":14,"start":1622500200000,"stop":1622502000000,"deposit":100000000,"remaining":100000000,"sender":"fxF8D9vdU7+H0p5w59rZYL7+MJQ=","recipient":"IUzszoxUtKSFVyYDg3JgSA1em1M="}
```
vs
```
{"id":14,"start":1622500200000,"stop":1622502000000,"deposit":100000000,"remaining":100000000,"sender":"fxF8D9vdU7\u002BH0p5w59rZYL7\u002BMJQ=","recipient":"IUzszoxUtKSFVyYDg3JgSA1em1M="}
```
 2021-06-08 16:40:38 +03:00
Roman Khimov
fd36f2568e
Merge pull request #2004 from nspcc-dev/fix-diff-71850 
core: add price for CALLT instruction
 2021-06-07 19:25:02 +03:00
Anna Shaleva
20e0a0d746 core: add price for CALLT instruction 2021-06-07 19:17:22 +03:00
Roman Khimov
352450d25a
Merge pull request #1988 from nspcc-dev/cli-permission 
cli,compiler: allow to specify manifest permissions
 2021-06-07 10:27:29 +03:00
Roman Khimov
2837b98eb3
Merge pull request #1993 from nspcc-dev/mpt-tests 
Add MPT compatibility tests
 2021-06-07 10:24:59 +03:00
Roman Khimov
a6fc5d9fe4
Merge pull request #1998 from nspcc-dev/fix-calculatenetworkfee-result 
rpc: wrap calculatenetworkfee result in a structure
 2021-06-07 09:53:48 +03:00
Roman Khimov
efb814a97e
Merge pull request #1995 from nspcc-dev/compiler-verify-notify 
compiler: disallow `runtime.Notify` in `Verify` function
 2021-06-06 11:34:42 +03:00
Evgeniy Stratonikov
1578904da2 compiler: disallow runtime.Notify in Verify function 
Only direct invocations are considered. The check can be disabled
with '--no-events' compiler option.
 2021-06-06 09:34:24 +03:00
Roman Khimov
1cea0dd894
Merge pull request #1997 from nspcc-dev/drop-syncreached-check 
network: drop useless flag check
 2021-06-04 23:39:34 +03:00
Roman Khimov
6a61e86d12 rpc: wrap calculatenetworkfee result in a structure 
C#:
{
  "jsonrpc": "2.0",
  "id": 2,
  "result": {
    "networkfee": "1185120"
  }
}

Go:
{
  "id": 2,
  "jsonrpc": "2.0",
  "result": 1185120
}

Thanks @csmuller for finding it.
 2021-06-04 23:38:35 +03:00
Roman Khimov
f6da88af0d network: drop useless flag check 
It's the first thing done in tryStartServices(), so checking it here doesn't
make much sense.
 2021-06-04 20:29:47 +03:00
Roman Khimov
53433c2752
Merge pull request #1972 from nspcc-dev/compiler-inline-selector 
Allow to inline selector statements
 2021-06-04 11:25:32 +03:00
Evgeniy Stratonikov
4467e2cbfd cli,compiler: allow to specify manifest permissions 2021-06-04 11:16:22 +03:00
Evgeniy Stratonikov
f3d02b9fef mpt/tests: add compatibility tests 2021-06-04 11:09:17 +03:00
Evgeniy Stratonikov
e833d333fe mpt: disallow empty keys 
This is not a problem in practice, as all keys are prefixed
by a contract ID. However in theory it can lead to a different
state root after new portion of changes thus this fix.
 2021-06-04 11:09:17 +03:00
Evgeniy Stratonikov
5b1f6207de mpt: reduce max key length 
The constant used is actually a nibbled-path restriction.
Clarify this and make them private.
 2021-06-04 11:09:17 +03:00
Evgeniy Stratonikov
1d6d7206e9 compiler: inline expressions with type conversions, fix #1879 
Don't count `string(data)` or `[]byte(data)` as function calls.
 2021-06-04 11:08:00 +03:00
Evgeniy Stratonikov
6b3afe9131 compiler: inline all expression with no side-effects, fix #1881 
This has the drawback of traversing expression each time the argument is
used. However this is not the case in our syscall/native wrappers.
The old behaviour can be restored by explicit local assignment.
 2021-06-04 11:07:59 +03:00
Evgeniy Stratonikov
3749f38720 compiler/test: add more tests for inline behaviour 2021-06-04 11:06:09 +03:00
Evgeniy Stratonikov
c538512e60 compiler/test: check Main locals in inline tests 2021-06-04 11:06:09 +03:00
Roman Khimov
ebff8be20a
Merge pull request #1989 from nspcc-dev/compiler-notify-name 
compiler: check event name length in `runtime.Notify`
 2021-06-04 10:32:14 +03:00
Evgeniy Stratonikov
5e92a254b2 compiler: check event name length in runtime.Notify 2021-06-03 10:32:56 +03:00
Evgeniy Stratonikov
1a5e656d38 compiler: restore event check warnings 
It was broken after changes for inlining. Add tests.
 2021-06-03 10:32:56 +03:00
Evgeniy Stratonikov
f33daf759a compiler/test: fix typo in verify.yml 2021-06-03 10:32:56 +03:00
Roman Khimov
d4495ad7b3
Merge pull request #1984 from nspcc-dev/notifications/notary 
rpc: support NotaryRequest notifications for Notifications subsystem
 2021-06-02 23:31:55 +03:00
Anna Shaleva
b14fc5da7c vm: increase waiting time for vm cli program 2021-06-01 16:29:08 +03:00
Anna Shaleva
1dbf1d4310 rpc: allow to track notary requests via Notification subsystem 2021-06-01 16:29:04 +03:00
Anna Shaleva
133b600c8c config: set MinPeers=0 for unit testchain 
Some RPC tests require network services to be enabled and running
(i.e. notary pool subscriptions). Services can be launched either when
node has reached synchronised state or when it does not have connected
peers and MinPeers=0. The second one is the case of RPC tests.
 2021-06-01 12:24:28 +03:00
Anna Shaleva
b8e96ac82b core: move mempool.Event to a separate package 
And write a marshaller for EventType, it'll be reused by the Notification
subsystem.
 2021-06-01 12:24:28 +03:00
Roman Khimov
ed6652bf1f ROADMAP: RC3 is out 2021-05-31 17:29:17 +03:00
Roman Khimov
cee657bf49 CHANGELOG: release 0.95.1 2021-05-31 11:56:14 +03:00
Roman Khimov
0677838f3e
Merge pull request #1986 from nspcc-dev/cli/getaccountstate 
cli: add `wallet candidate getstate`
 2021-05-31 11:39:34 +03:00
Anna Shaleva
c2b5459646 cli: add wallet candidate getstate 2021-05-31 11:18:59 +03:00
Anna Shaleva
999fba81cd core: export (*NEOBalanceState).FromStackItem 2021-05-31 11:18:54 +03:00
Roman Khimov
1a16068b0a
Merge pull request #1973 from nspcc-dev/custom-contracts 
cli: allow to specify CustomContracts/Groups signer
 2021-05-28 17:32:58 +03:00
Evgeniy Stratonikov
e3e0e2a8a8 cli: allow to specify CustomContracts/Groups signer 
The syntax is `CalledByEntry,CustomContracts:hash1:hash2`.
 2021-05-28 15:46:33 +03:00
Roman Khimov
8371c803c0
Merge pull request #1985 from nspcc-dev/cli/unvote 
cli: add description to `vote` command on how to `unvote`
 2021-05-28 15:31:26 +03:00
Anna Shaleva
9340a70aa8 cli: add description to vote command on how to unvote 2021-05-28 15:15:37 +03:00
Roman Khimov
b858be63b4
Merge pull request #1969 from nspcc-dev/examples/nns-fix 
examples: fix IPv6 bounds check
 2021-05-28 14:29:54 +03:00
Roman Khimov
b40eb6cae2
Merge pull request #1981 from nspcc-dev/cli/vm-flags 
vm, cli: allow to specify flags while loading VM
 2021-05-28 14:22:44 +03:00
Anna Shaleva
e3611bfa4c vm, cli: allow to specify flags while loading VM 2021-05-28 12:07:41 +03:00
Anna Shaleva
2a9ce03376 examples: fix IPv6 bounds check 2021-05-28 11:31:09 +03:00
Roman Khimov
93a331818e
Merge pull request #1978 from nspcc-dev/interop-getaccountstate 
native/neo: add `getAccountState` method, close #1975
 2021-05-27 21:21:07 +03:00
Evgeniy Stratonikov
233996eec0 native/neo: add getAccountState method, close #1975 2021-05-27 10:59:38 +03:00
Roman Khimov
df0be2e855
Merge pull request #1979 from nspcc-dev/interop-base58check 
compiler: add `Base58Check*` interop wrappers
 2021-05-26 16:32:12 +03:00
Evgeniy Stratonikov
e314e55a1b compiler: add Base58Check* interop wrappers 
Missing piece from #1977.
 2021-05-25 18:06:40 +03:00
Roman Khimov
8a55bd528d
Merge pull request #1977 from nspcc-dev/interop-base58check 
native/std: add base58Check* methods
 2021-05-25 17:57:23 +03:00