add invoked contract #657

Ashuaidehao · 2021-10-20T07:52:01Z

Relate #656.

shargon · 2021-11-11T10:14:10Z

@superboyiii tested?

superboyiii · 2021-11-11T10:37:14Z

@superboyiii tested?

Give me more time.

src/RpcServer/RpcServer.SmartContract.cs

…modules into add-invoke-tree

superboyiii · 2021-11-15T10:17:03Z

@shargon
invoke result of Neoverse Mint, can see invokedcontracts contains completed invoked contract hash.

invoked script hash(not contract), 2. GAS, 3. BlindBox, 4. StdLib, 5. LedgerContract, 6. ContractManagement

{
    "jsonrpc": "2.0",
    "id": 3,
    "result": {
        "script": "DANuZnQCAMqaOwwUQG9HkCtsPwiAbqyM+fMqDVxetrMMFMCY5KzwsgkN0W7LPVjeQmqHFYUbFMAfDAh0cmFuc2ZlcgwUz3bii9AGLEpHjuNVYQETGfPPpNJBYn1bUg==",
        "state": "HALT",
        "gasconsumed": "21513739",
        "exception": null,
        "invokedcontracts": [
            "0x7411589817d51cfb6ee7d322a1f2dee8c5613185",
            "0xd2a4cff31913016155e38e474a2c06d08be276cf",
            "0xb3b65e5c0d2af3f98cac6e80083f6c2b90476f40",
            "0xacce6fd80d44e1796aa0c2c625e9e4e0ce39efc0",
            "0xda65b600f7124ce6c79950c1772a36403104f2be",
            "0xfffdc93764dbaddd97c48f252a53ea4643faa3fd"
        ],
        "stack": [
            {
                "type": "Boolean",
                "value": true
            }
        ],
        "tx": "ACaP5i4LRkgBAAAAAKDiAQAAAAAA4R8KAAHAmOSs8LIJDdFuyz1Y3kJqhxWFG4AAXgwDbmZ0AgDKmjsMFEBvR5ArbD8IgG6sjPnzKg1cXrazDBTAmOSs8LIJDdFuyz1Y3kJqhxWFGxTAHwwIdHJhbnNmZXIMFM924ovQBixKR47jVWEBExnzz6TSQWJ9W1IBQgxAiZrW3UeII/mf9oKMTWv3p+T4Q8bAJySMjNcRYHAMvMK2ZxkgVUMvYnLdd7uu7ncu23M0UAnme6It/9QYCMH4TSgMIQKNWcem5o/HrWiwhxgZW8nce5BzQ4To6abGD/mj+1t7PEFW57Mn"
    }
}

erikzhang · 2021-11-16T05:56:30Z

src/RpcServer/RpcServer.SmartContract.cs

+            {
+                json["diagnostics"] = new JObject()
+                {
+                    ["invokedcontracts"] = engine.Diagnostic.InvocationTree.GetItems().Distinct().Select(v => (JString)v.ToString()).ToArray()


Returns the InvocationTree?

Also we can return the storage changes?

It is not a simple renaming, but also storing the tree structure into an array.

InvocationTree seems cannot traverse tree structure outside now. Need some more support.

roman-khimov · 2021-11-18T15:44:41Z

src/RpcServer/RpcServer.SmartContract.cs

            JObject json = new();
            json["script"] = Convert.ToBase64String(script);
            json["state"] = engine.State;
            json["gasconsumed"] = engine.GasConsumed.ToString();
            json["exception"] = GetExceptionMessage(engine.FaultException);
+            if (useDiagnostic)
+            {
+                json["diagnostics"] = new JObject()


BTW, do we need this wrapper structure?

Maybe we will add more data to it later.

roman-khimov · 2021-12-01T15:17:30Z

Going back to the #656 (comment) list, can we also add notifications as something always returned for invoke* calls? The node has this data already, but we don't give it back to the user and it also might be important for the receiver to ensure that side-effects produced by transaction are the ones intended.

shargon · 2021-12-02T12:03:48Z

@Ashuaidehao NeoFS.API must be updated

src/RpcServer/RpcServer.SmartContract.cs

As neo-project/neo-modules#657 currently does.

src/RpcServer/RpcServer.SmartContract.cs

superboyiii · 2021-12-13T07:03:46Z

Test Failed:
Current ["storagechanges"] will overwrite ["invokedcontracts"] in json["diagnostics"]

superboyiii · 2021-12-13T07:21:45Z

Test Pass
Now it works well.

{
    "jsonrpc": "2.0",
    "id": 3,
    "result": {
        "script": "DA9CbGluZCBCb3ggIzE3NTERwB8MCHVuQm94aW5nDBR/jtStf6tG7M4EV8/3LtzjPQni2UFifVtS",
        "state": "HALT",
        "gasconsumed": "7757705",
        "exception": null,
        "notifications": [
            {
                "eventname": "Transfer",
                "contract": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f",
                "state": {
                    "type": "Array",
                    "value": [
                        {
                            "type": "ByteString",
                            "value": "wJjkrPCyCQ3Rbss9WN5CaocVhRs="
                        },
                        {
                            "type": "Any"
                        },
                        {
                            "type": "Integer",
                            "value": "1"
                        },
                        {
                            "type": "ByteString",
                            "value": "QmxpbmQgQm94ICMxNzUx"
                        }
                    ]
                }
            },
            {
                "eventname": "Transfer",
                "contract": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f",
                "state": {
                    "type": "Array",
                    "value": [
                        {
                            "type": "Any"
                        },
                        {
                            "type": "ByteString",
                            "value": "wJjkrPCyCQ3Rbss9WN5CaocVhRs="
                        },
                        {
                            "type": "Integer",
                            "value": "1"
                        },
                        {
                            "type": "ByteString",
                            "value": "RnJhZ21lbnQgQSAjNDU2"
                        }
                    ]
                }
            }
        ],
        "diagnostics": {
            "invokedcontracts": {
                "hash": "0x18f4ea90a5612a7fdd6f7ef0928e6d3686d2d48a",
                "call": [
                    {
                        "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f",
                        "call": [
                            {
                                "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f"
                            },
                            {
                                "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f",
                                "call": [
                                    {
                                        "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f",
                                        "call": [
                                            {
                                                "hash": "0xacce6fd80d44e1796aa0c2c625e9e4e0ce39efc0"
                                            }
                                        ]
                                    },
                                    {
                                        "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f"
                                    },
                                    {
                                        "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f",
                                        "call": [
                                            {
                                                "hash": "0xacce6fd80d44e1796aa0c2c625e9e4e0ce39efc0"
                                            }
                                        ]
                                    },
                                    {
                                        "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f",
                                        "call": [
                                            {
                                                "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f",
                                                "call": [
                                                    {
                                                        "hash": "0xacce6fd80d44e1796aa0c2c625e9e4e0ce39efc0"
                                                    }
                                                ]
                                            },
                                            {
                                                "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f"
                                            },
                                            {
                                                "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f"
                                            },
                                            {
                                                "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f"
                                            },
                                            {
                                                "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f"
                                            },
                                            {
                                                "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f",
                                                "call": [
                                                    {
                                                        "hash": "0xacce6fd80d44e1796aa0c2c625e9e4e0ce39efc0"
                                                    }
                                                ]
                                            },
                                            {
                                                "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f",
                                                "call": [
                                                    {
                                                        "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f",
                                                        "call": [
                                                            {
                                                                "hash": "0xacce6fd80d44e1796aa0c2c625e9e4e0ce39efc0"
                                                            }
                                                        ]
                                                    },
                                                    {
                                                        "hash": "0xacce6fd80d44e1796aa0c2c625e9e4e0ce39efc0"
                                                    }
                                                ]
                                            }
                                        ]
                                    },
                                    {
                                        "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f",
                                        "call": [
                                            {
                                                "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f",
                                                "call": [
                                                    {
                                                        "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f"
                                                    },
                                                    {
                                                        "hash": "0xacce6fd80d44e1796aa0c2c625e9e4e0ce39efc0"
                                                    }
                                                ]
                                            }
                                        ]
                                    },
                                    {
                                        "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f",
                                        "call": [
                                            {
                                                "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f"
                                            }
                                        ]
                                    },
                                    {
                                        "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f",
                                        "call": [
                                            {
                                                "hash": "0xacce6fd80d44e1796aa0c2c625e9e4e0ce39efc0"
                                            },
                                            {
                                                "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f",
                                                "call": [
                                                    {
                                                        "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f"
                                                    }
                                                ]
                                            },
                                            {
                                                "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f"
                                            },
                                            {
                                                "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f"
                                            }
                                        ]
                                    },
                                    {
                                        "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f",
                                        "call": [
                                            {
                                                "hash": "0xacce6fd80d44e1796aa0c2c625e9e4e0ce39efc0"
                                            },
                                            {
                                                "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f",
                                                "call": [
                                                    {
                                                        "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f"
                                                    }
                                                ]
                                            },
                                            {
                                                "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f"
                                            },
                                            {
                                                "hash": "0xd9e2093de3dc2ef7cf5704ceec46ab7fadd48e7f",
                                                "call": [
                                                    {
                                                        "hash": "0xfffdc93764dbaddd97c48f252a53ea4643faa3fd"
                                                    }
                                                ]
                                            }
                                        ]
                                    }
                                ]
                            }
                        ]
                    }
                ]
            },
            "storagechanges": [
                {
                    "state": "Added",
                    "key": "aAAAABMAyAE=",
                    "value": "6Ao="
                },
                {
                    "state": "Changed",
                    "key": "aAAAABIw",
                    "value": "5wo="
                },
                {
                    "state": "Changed",
                    "key": "aAAAABFjb3VudGVy",
                    "value": "xQA="
                },
                {
                    "state": "Deleted",
                    "key": "aAAAAANCbGluZCBCb3ggIzE3NTE=",
                    "value": "QAcoFMCY5KzwsgkN0W7LPVjeQmqHFYUbKA9CbGluZCBCb3ggIzE3NTEhACEAIQLXBigcaHR0cHM6Ly9uZW8ub3JnL0JsaW5kQm94LnBuZygcaHR0cHM6Ly9uZW8ub3JnL0JsaW5kQm94Lm1wNA=="
                },
                {
                    "state": "Changed",
                    "key": "aAAAAAHAmOSs8LIJDdFuyz1Y3kJqhxWFGw==",
                    "value": "UAE="
                },
                {
                    "state": "Deleted",
                    "key": "aAAAAATAmOSs8LIJDdFuyz1Y3kJqhxWFG0JsaW5kIEJveCAjMTc1MQ==",
                    "value": ""
                },
                {
                    "state": "Changed",
                    "key": "aAAAAAA=",
                    "value": "4g0="
                },
                {
                    "state": "Added",
                    "key": "aAAAAANGcmFnbWVudCBBICM0NTY=",
                    "value": "QAcoFMCY5KzwsgkN0W7LPVjeQmqHFYUbKA9GcmFnbWVudCBBICM0NTYhAQEhACECyAEoHWh0dHBzOi8vbmVvLm9yZy9GcmFnbWVudEEucG5nKB1odHRwczovL25lby5vcmcvRnJhZ21lbnRBLm1wNA=="
                },
                {
                    "state": "Added",
                    "key": "aAAAAATAmOSs8LIJDdFuyz1Y3kJqhxWFG0ZyYWdtZW50IEEgIzQ1Ng==",
                    "value": ""
                }
            ]
        },
        "stack": [
            {
                "type": "Boolean",
                "value": true
            }
        ]
    }
}

The base branch was changed.

As neo-project/neo-modules#657 currently does.

* add invoked contract (#657) * add in file copyright (#679) * witness rule support (#676) * Prevent SSRF (#692) * limit free gas (#697) * add log when exception happens under debug mode (#690) * dbft: tune MaxBlock* parameters (#688) * Fix StateAPI.MakeFindStatesParams (#699) * update Console to ConsoleHelper (#682) * refac log (#700) * Make RpcServer.ProcessAsync public to enable better neo express integration (#701) * Limit result stack (#696) * fix MaxBlockSystemFee (#703) * code optimise (#704) * Add oracle global timeout (#698)

Ashuaidehao added 2 commits October 20, 2021 15:45

init

82d47cb

upgrade neo

b319f01

Ashuaidehao marked this pull request as ready for review November 11, 2021 07:34

Merge branch 'master' into add-invoke-tree

bdb6f8e

erikzhang reviewed Nov 11, 2021

View reviewed changes

src/RpcServer/RpcServer.SmartContract.cs Outdated Show resolved Hide resolved

Ashuaidehao added 2 commits November 12, 2021 10:16

useDiagnostic

c2dbe4c

Merge branch 'add-invoke-tree' of https://github.com/Ashuaidehao/neo-…

05803d7

…modules into add-invoke-tree

shargon previously approved these changes Nov 15, 2021

View reviewed changes

Update RpcServer.SmartContract.cs

d60def1

erikzhang dismissed shargon’s stale review via d60def1 November 16, 2021 05:55

erikzhang reviewed Nov 16, 2021

View reviewed changes

erikzhang mentioned this pull request Nov 18, 2021

Add public Children property to TreeNode neo-project/neo#2633

Merged

roman-khimov reviewed Nov 18, 2021

View reviewed changes

roman-khimov mentioned this pull request Nov 20, 2021

Add invoked contract tracing nspcc-dev/neo-go#2270

Merged

shargon and others added 2 commits November 23, 2021 15:31

Merge branch 'master' into add-invoke-tree

0a5efea

invoke tree

93dfc98

superboyiii mentioned this pull request Nov 26, 2021

Neo v3.1.0 Checklist neo-project/neo#2620

Closed

13 tasks

roman-khimov mentioned this pull request Dec 1, 2021

Check invocation tree tracking compatibility nspcc-dev/neo-go#2286

Closed

Ashuaidehao and others added 4 commits December 2, 2021 16:18

add event

9e184bf

Merge branch 'master' into add-invoke-tree

3f51693

Add storage changes

3c7c2d6

Update nuget

c47675b

roman-khimov reviewed Dec 2, 2021

View reviewed changes

src/RpcServer/RpcServer.SmartContract.cs Outdated Show resolved Hide resolved

roman-khimov added a commit to nspcc-dev/neo-go that referenced this pull request Dec 2, 2021

vm: put child invocation tree nodes into call element

eb27699

As neo-project/neo-modules#657 currently does.

roman-khimov mentioned this pull request Dec 2, 2021

vm: put child invocation tree nodes into call element nspcc-dev/neo-go#2291

Merged

roman-khimov reviewed Dec 2, 2021

View reviewed changes

src/RpcServer/RpcServer.SmartContract.cs Outdated Show resolved Hide resolved

Ashuaidehao and others added 2 commits December 3, 2021 10:17

rename event state

4cb44b7

Unify

98ffeee

shargon previously approved these changes Dec 3, 2021

View reviewed changes

superboyiii and others added 2 commits December 8, 2021 16:15

Merge branch 'master' into add-invoke-tree

4fc7cc6

update neofs

7956ee6

Ashuaidehao dismissed shargon’s stale review via 7956ee6 December 10, 2021 06:33

shargon previously approved these changes Dec 10, 2021

View reviewed changes

fix json

e32126e

Ashuaidehao dismissed shargon’s stale review via e32126e December 13, 2021 07:19

shargon previously approved these changes Dec 13, 2021

View reviewed changes

Ashuaidehao changed the base branch from master to develop December 14, 2021 07:02

Merge branch 'develop' into add-invoke-tree

16861fd

superboyiii approved these changes Dec 14, 2021

View reviewed changes

shargon approved these changes Dec 14, 2021

View reviewed changes

superboyiii merged commit 08ef3b7 into neo-project:develop Dec 15, 2021

AnnaShaleva pushed a commit to nspcc-dev/neo-go that referenced this pull request Feb 17, 2022

vm: put child invocation tree nodes into call element

64a0d3c

As neo-project/neo-modules#657 currently does.

AnnaShaleva mentioned this pull request Jul 2, 2024

Extend applicationlogs with invocations neo-project/neo#3386

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add invoked contract #657

add invoked contract #657

Ashuaidehao commented Oct 20, 2021 •

edited

Loading

shargon commented Nov 11, 2021

superboyiii commented Nov 11, 2021

superboyiii commented Nov 15, 2021 •

edited

Loading

erikzhang Nov 16, 2021

shargon Nov 16, 2021

Ashuaidehao Nov 17, 2021

erikzhang Nov 18, 2021

Ashuaidehao Nov 18, 2021

roman-khimov Nov 18, 2021

erikzhang Nov 18, 2021 •

edited

Loading

roman-khimov commented Dec 1, 2021

shargon commented Dec 2, 2021

superboyiii commented Dec 13, 2021

superboyiii commented Dec 13, 2021

add invoked contract #657

add invoked contract #657

Conversation

Ashuaidehao commented Oct 20, 2021 • edited Loading

shargon commented Nov 11, 2021

superboyiii commented Nov 11, 2021

superboyiii commented Nov 15, 2021 • edited Loading

erikzhang Nov 16, 2021

Choose a reason for hiding this comment

shargon Nov 16, 2021

Choose a reason for hiding this comment

Ashuaidehao Nov 17, 2021

Choose a reason for hiding this comment

erikzhang Nov 18, 2021

Choose a reason for hiding this comment

Ashuaidehao Nov 18, 2021

Choose a reason for hiding this comment

roman-khimov Nov 18, 2021

Choose a reason for hiding this comment

erikzhang Nov 18, 2021 • edited Loading

Choose a reason for hiding this comment

roman-khimov commented Dec 1, 2021

shargon commented Dec 2, 2021

superboyiii commented Dec 13, 2021

superboyiii commented Dec 13, 2021

Ashuaidehao commented Oct 20, 2021 •

edited

Loading

superboyiii commented Nov 15, 2021 •

edited

Loading

erikzhang Nov 18, 2021 •

edited

Loading