quantus/api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ink type spec for 3.0-rc1 (#2702)

Browse Source 
* Updated ABI definitions & parsing

* Run type generation

* Definitions (should be ok-ish)

* Cleanup names

* Allow aliasses on structs (JSON parsing)

* Cleanup json mapping passing

* s/types/lookup/

* Parsing as per current output

* InkSelector

* MtRegistryIndex

* String lookup tests

* Remove serd ovverride comments (it works as-is)

* inkRegistry tests

* Extract primitive types

* s/ty/id/

* Start of parsing into types (actually to be TypeDef)

* Parsing

* stringify struct fields

* Small cleanups

* Add type index to project lookup

* Prefix with index

* Fix interface generation

* Latest contract metadata (#2118)

* Add new (provisional) incrementer contract metadata

* Update and regenerate type definitions

* WIP: generate new format scale-info types

* WIP: implementing variants

* Implement variants

* Fix up type resolution

* Fix registry spec tests

* Fix lints and some tests

* Fix inkTypes tests

* Fix some lints

* Make imports same line like original

* Comment out (temporarily) sanitize import to make CI pass

* Sanitize

* Remove indices

* Remove index

* api-contract rewrite

* lint

* cleanup

* latest

* latest

* fix definition

* fiz definitions

* rv ink storage

* Update packages/api-contract/src/base/Contract.ts

Co-authored-by: Jaco Greeff <jacogr@gmail.com>

* fixes

* rv scripts

* restore api-contract

* reorder definitions, fix ink storage

* fixes

* def order

* fixes

* encodeTypeDef asRaw

* update ink typ spec

* latest built contracts

* compare files

* Apply suggestions from code review

Co-authored-by: Jaco Greeff <jacogr@gmail.com>
Co-authored-by: Andrew Jones <ascjones@gmail.com>
This commit is contained in:
Keith Ingram
2020-10-11 09:37:39 +02:00
committed by GitHub
co-authored by Jaco Greeff Andrew Jones
parent 64e209783a
commit 503286f7aa
25 changed files with 167 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/api-contract/src/Abi.ts
+2 -2
View File
@@ -54,7 +54,7 @@ export default class Abi extends ContractRegistry {
isMutating: spec.mutates.isTrue,
isPayable: spec.payable.isTrue,
returnType: typeSpec
? this.typeDefAt(typeSpec.id, { displayName: typeSpec.displayName.map((s) => s.toString()).join('::') || undefined })
? this.typeDefAt(typeSpec.type, { displayName: typeSpec.displayName.map((s) => s.toString()).join('::') || undefined })
: null
});
});
@@ -67,7 +67,7 @@ export default class Abi extends ContractRegistry {
return {
name: stringCamelCase(name.toString()),
type: this.typeDefAt(type.id)
type: this.typeDefAt(type.type)
};
});
packages/api-contract/test/compare/dns.test.json
+1 -1
View File
@@ -256,4 +256,4 @@
},
"type": "Option<AccountId>"
}
]
]
packages/api-contract/test/compare/erc20.test.json
+1 -1
View File
@@ -240,4 +240,4 @@
},
"type": "Option<AccountId>"
}
]
]
packages/api-contract/test/compare/erc721.test.json
+1 -1
View File
@@ -568,4 +568,4 @@
],
"type": "{ _enum: [\"NotOwner\", \"NotApproved\", \"TokenExists\", \"TokenNotFound\", \"CannotInsert\", \"CannotRemove\", \"CannotFetchValue\", \"NotAllowed\"] }"
}
]
]
packages/api-contract/test/compare/multisigPlain.test.json
+1 -1
View File
@@ -677,4 +677,4 @@
},
"type": "Option<Vec<u8>>"
}
]
]
packages/api-contract/test/contracts/accumulator.wasm
BIN
View File
Binary file not shown.
packages/api-contract/test/contracts/adder.wasm
BIN
View File
Binary file not shown.
packages/api-contract/test/contracts/delegator.json
+10 -10
View File
@@ -1,13 +1,13 @@
{
"metadataVersion": "0.1.0",
"source": {
"hash": "0x87175ad8e56de12e8bac275483adb1990a61c8b8caca9ddc18f1d5ad3b5dc976",
"language": "ink! 3.0.0",
"hash": "0x939d1823be952b4d7114448bb1a27fa13bafb8c4b33149efc24e826d8e54035e",
"language": "ink! 3.0.0-rc1",
"compiler": "rustc 1.48.0-nightly"
},
"contract": {
"name": "delegator",
"version": "3.0.0",
"version": "3.0.0-rc1",
"authors": [
"Parity Technologies <admin@parity.io>"
]
@@ -22,7 +22,7 @@
"displayName": [
"i32"
],
"id": 4
"type": 4
}
},
{
@@ -31,7 +31,7 @@
"displayName": [
"Hash"
],
"id": 5
"type": 5
}
},
{
@@ -40,7 +40,7 @@
"displayName": [
"Hash"
],
"id": 5
"type": 5
}
},
{
@@ -49,7 +49,7 @@
"displayName": [
"Hash"
],
"id": 5
"type": 5
}
}
],
@@ -79,7 +79,7 @@
"displayName": [
"i32"
],
"id": 4
"type": 4
},
"selector": "0x1e5ca456"
},
@@ -91,7 +91,7 @@
"displayName": [
"i32"
],
"id": 4
"type": 4
}
}
],
@@ -127,7 +127,7 @@
{
"layout": {
"enum": {
"dispatch_key": "0x0000000000000000000000000000000000000000000000000000000000000000",
"dispatchKey": "0x0000000000000000000000000000000000000000000000000000000000000000",
"variants": {
"0": {
"fields": []
packages/api-contract/test/contracts/delegator.wasm
BIN
View File
Binary file not shown.
packages/api-contract/test/contracts/dns.json
+25 -25
View File
@@ -1,13 +1,13 @@
{
"metadataVersion": "0.1.0",
"source": {
"hash": "0x1f1aa9abdcef699d384445b485ed35d890c9a1185510d03d6e1142248187b247",
"language": "ink! 3.0.0",
"hash": "0xcf3eee6ac5d38f6f503293735a72b011960e09ec1dd09185ab3c3d28e7770009",
"language": "ink! 3.0.0-rc1",
"compiler": "rustc 1.48.0-nightly"
},
"contract": {
"name": "dns",
"version": "3.0.0",
"version": "3.0.0-rc1",
"authors": [
"Parity Technologies <admin@parity.io>"
]
@@ -37,7 +37,7 @@
"displayName": [
"Hash"
],
"id": 4
"type": 4
}
},
{
@@ -48,7 +48,7 @@
"displayName": [
"AccountId"
],
"id": 9
"type": 9
}
}
],
@@ -67,7 +67,7 @@
"displayName": [
"Hash"
],
"id": 4
"type": 4
}
},
{
@@ -78,7 +78,7 @@
"displayName": [
"AccountId"
],
"id": 9
"type": 9
}
},
{
@@ -89,7 +89,7 @@
"displayName": [
"Option"
],
"id": 13
"type": 13
}
},
{
@@ -100,7 +100,7 @@
"displayName": [
"AccountId"
],
"id": 9
"type": 9
}
}
],
@@ -119,7 +119,7 @@
"displayName": [
"Hash"
],
"id": 4
"type": 4
}
},
{
@@ -130,7 +130,7 @@
"displayName": [
"AccountId"
],
"id": 9
"type": 9
}
},
{
@@ -141,7 +141,7 @@
"displayName": [
"Option"
],
"id": 13
"type": 13
}
},
{
@@ -152,7 +152,7 @@
"displayName": [
"AccountId"
],
"id": 9
"type": 9
}
}
],
@@ -171,7 +171,7 @@
"displayName": [
"Hash"
],
"id": 4
"type": 4
}
}
],
@@ -187,7 +187,7 @@
"displayName": [
"Result"
],
"id": 10
"type": 10
},
"selector": "0x7fb0aded"
},
@@ -199,7 +199,7 @@
"displayName": [
"Hash"
],
"id": 4
"type": 4
}
},
{
@@ -208,7 +208,7 @@
"displayName": [
"AccountId"
],
"id": 9
"type": 9
}
}
],
@@ -224,7 +224,7 @@
"displayName": [
"Result"
],
"id": 10
"type": 10
},
"selector": "0x220ac6e3"
},
@@ -236,7 +236,7 @@
"displayName": [
"Hash"
],
"id": 4
"type": 4
}
},
{
@@ -245,7 +245,7 @@
"displayName": [
"AccountId"
],
"id": 9
"type": 9
}
}
],
@@ -261,7 +261,7 @@
"displayName": [
"Result"
],
"id": 10
"type": 10
},
"selector": "0xfae3a09d"
},
@@ -273,7 +273,7 @@
"displayName": [
"Hash"
],
"id": 4
"type": 4
}
}
],
@@ -289,7 +289,7 @@
"displayName": [
"AccountId"
],
"id": 9
"type": 9
},
"selector": "0xb9ee7664"
}
@@ -331,7 +331,7 @@
{
"layout": {
"array": {
"cells_per_elem": 1,
"cellsPerElem": 1,
"layout": {
"cell": {
"key": "0x0100000001000000000000000000000000000000000000000000000000000000",
@@ -411,7 +411,7 @@
{
"layout": {
"array": {
"cells_per_elem": 1,
"cellsPerElem": 1,
"layout": {
"cell": {
"key": "0x0300000002000000000000000000000000000000000000000000000000000000",
packages/api-contract/test/contracts/dns.wasm
BIN
View File
Binary file not shown.
packages/api-contract/test/contracts/erc20.json
+28 -28
View File
@@ -1,13 +1,13 @@
{
"metadataVersion": "0.1.0",
"source": {
"hash": "0xae28fa9f075f218d559a36f720b0704b2c09326590fe19d7d76a7eaa40d079b3",
"language": "ink! 3.0.0",
"hash": "0xe9c60864c76c770865b66c79aa304bc22d2d08cc799d36310df4256db107b8fc",
"language": "ink! 3.0.0-rc1",
"compiler": "rustc 1.48.0-nightly"
},
"contract": {
"name": "erc20",
"version": "3.0.0",
"version": "3.0.0-rc1",
"authors": [
"Parity Technologies <admin@parity.io>"
]
@@ -22,7 +22,7 @@
"displayName": [
"Balance"
],
"id": 1
"type": 1
}
}
],
@@ -45,7 +45,7 @@
"displayName": [
"Option"
],
"id": 13
"type": 13
}
},
{
@@ -56,7 +56,7 @@
"displayName": [
"Option"
],
"id": 13
"type": 13
}
},
{
@@ -67,7 +67,7 @@
"displayName": [
"Balance"
],
"id": 1
"type": 1
}
}
],
@@ -84,7 +84,7 @@
"displayName": [
"AccountId"
],
"id": 5
"type": 5
}
},
{
@@ -95,7 +95,7 @@
"displayName": [
"AccountId"
],
"id": 5
"type": 5
}
},
{
@@ -106,7 +106,7 @@
"displayName": [
"Balance"
],
"id": 1
"type": 1
}
}
],
@@ -127,7 +127,7 @@
"displayName": [
"Balance"
],
"id": 1
"type": 1
},
"selector": "0xdcb736b5"
},
@@ -139,7 +139,7 @@
"displayName": [
"AccountId"
],
"id": 5
"type": 5
}
}
],
@@ -153,7 +153,7 @@
"displayName": [
"Balance"
],
"id": 1
"type": 1
},
"selector": "0x56e929b2"
},
@@ -165,7 +165,7 @@
"displayName": [
"AccountId"
],
"id": 5
"type": 5
}
},
{
@@ -174,7 +174,7 @@
"displayName": [
"AccountId"
],
"id": 5
"type": 5
}
}
],
@@ -188,7 +188,7 @@
"displayName": [
"Balance"
],
"id": 1
"type": 1
},
"selector": "0xf3cfff66"
},
@@ -200,7 +200,7 @@
"displayName": [
"AccountId"
],
"id": 5
"type": 5
}
},
{
@@ -209,7 +209,7 @@
"displayName": [
"Balance"
],
"id": 1
"type": 1
}
}
],
@@ -223,7 +223,7 @@
"displayName": [
"bool"
],
"id": 12
"type": 12
},
"selector": "0xfae3a09d"
},
@@ -235,7 +235,7 @@
"displayName": [
"AccountId"
],
"id": 5
"type": 5
}
},
{
@@ -244,7 +244,7 @@
"displayName": [
"Balance"
],
"id": 1
"type": 1
}
}
],
@@ -258,7 +258,7 @@
"displayName": [
"bool"
],
"id": 12
"type": 12
},
"selector": "0x03d0e114"
},
@@ -270,7 +270,7 @@
"displayName": [
"AccountId"
],
"id": 5
"type": 5
}
},
{
@@ -279,7 +279,7 @@
"displayName": [
"AccountId"
],
"id": 5
"type": 5
}
},
{
@@ -288,7 +288,7 @@
"displayName": [
"Balance"
],
"id": 1
"type": 1
}
}
],
@@ -302,7 +302,7 @@
"displayName": [
"bool"
],
"id": 12
"type": 12
},
"selector": "0xfcfb2ccd"
}
@@ -353,7 +353,7 @@
{
"layout": {
"array": {
"cells_per_elem": 1,
"cellsPerElem": 1,
"layout": {
"cell": {
"key": "0x0200000001000000000000000000000000000000000000000000000000000000",
@@ -433,7 +433,7 @@
{
"layout": {
"array": {
"cells_per_elem": 1,
"cellsPerElem": 1,
"layout": {
"cell": {
"key": "0x0400000002000000000000000000000000000000000000000000000000000000",
packages/api-contract/test/contracts/erc20.wasm
BIN
View File
Binary file not shown.
packages/api-contract/test/contracts/erc721.json
+42 -42
View File
@@ -1,13 +1,13 @@
{
"metadataVersion": "0.1.0",
"source": {
"hash": "0xe069a3d4cd8354eaed681c9c827ec32400a86f75c63d20c11697a5d17bc64472",
"language": "ink! 3.0.0",
"hash": "0xf7dac8dd8a2d9c7419c766facfa29d91823625305be8a1e7a9e6d750b894782b",
"language": "ink! 3.0.0-rc1",
"compiler": "rustc 1.48.0-nightly"
},
"contract": {
"name": "erc721",
"version": "3.0.0",
"version": "3.0.0-rc1",
"authors": [
"Parity Technologies <admin@parity.io>"
]
@@ -37,7 +37,7 @@
"displayName": [
"Option"
],
"id": 15
"type": 15
}
},
{
@@ -48,7 +48,7 @@
"displayName": [
"Option"
],
"id": 15
"type": 15
}
},
{
@@ -59,7 +59,7 @@
"displayName": [
"TokenId"
],
"id": 2
"type": 2
}
}
],
@@ -78,7 +78,7 @@
"displayName": [
"AccountId"
],
"id": 6
"type": 6
}
},
{
@@ -89,7 +89,7 @@
"displayName": [
"AccountId"
],
"id": 6
"type": 6
}
},
{
@@ -100,7 +100,7 @@
"displayName": [
"TokenId"
],
"id": 2
"type": 2
}
}
],
@@ -119,7 +119,7 @@
"displayName": [
"AccountId"
],
"id": 6
"type": 6
}
},
{
@@ -130,7 +130,7 @@
"displayName": [
"AccountId"
],
"id": 6
"type": 6
}
},
{
@@ -141,7 +141,7 @@
"displayName": [
"bool"
],
"id": 14
"type": 14
}
}
],
@@ -161,7 +161,7 @@
"displayName": [
"AccountId"
],
"id": 6
"type": 6
}
}
],
@@ -179,7 +179,7 @@
"displayName": [
"u32"
],
"id": 2
"type": 2
},
"selector": "0x56e929b2"
},
@@ -191,7 +191,7 @@
"displayName": [
"TokenId"
],
"id": 2
"type": 2
}
}
],
@@ -207,7 +207,7 @@
"displayName": [
"Option"
],
"id": 15
"type": 15
},
"selector": "0xf7860ada"
},
@@ -219,7 +219,7 @@
"displayName": [
"TokenId"
],
"id": 2
"type": 2
}
}
],
@@ -235,7 +235,7 @@
"displayName": [
"Option"
],
"id": 15
"type": 15
},
"selector": "0xb09dc487"
},
@@ -247,7 +247,7 @@
"displayName": [
"AccountId"
],
"id": 6
"type": 6
}
},
{
@@ -256,7 +256,7 @@
"displayName": [
"AccountId"
],
"id": 6
"type": 6
}
}
],
@@ -272,7 +272,7 @@
"displayName": [
"bool"
],
"id": 14
"type": 14
},
"selector": "0xc666bf03"
},
@@ -284,7 +284,7 @@
"displayName": [
"AccountId"
],
"id": 6
"type": 6
}
},
{
@@ -293,7 +293,7 @@
"displayName": [
"bool"
],
"id": 14
"type": 14
}
}
],
@@ -309,7 +309,7 @@
"displayName": [
"Result"
],
"id": 16
"type": 16
},
"selector": "0x51176f12"
},
@@ -321,7 +321,7 @@
"displayName": [
"AccountId"
],
"id": 6
"type": 6
}
},
{
@@ -330,7 +330,7 @@
"displayName": [
"TokenId"
],
"id": 2
"type": 2
}
}
],
@@ -346,7 +346,7 @@
"displayName": [
"Result"
],
"id": 16
"type": 16
},
"selector": "0x03d0e114"
},
@@ -358,7 +358,7 @@
"displayName": [
"AccountId"
],
"id": 6
"type": 6
}
},
{
@@ -367,7 +367,7 @@
"displayName": [
"TokenId"
],
"id": 2
"type": 2
}
}
],
@@ -383,7 +383,7 @@
"displayName": [
"Result"
],
"id": 16
"type": 16
},
"selector": "0xfae3a09d"
},
@@ -395,7 +395,7 @@
"displayName": [
"AccountId"
],
"id": 6
"type": 6
}
},
{
@@ -404,7 +404,7 @@
"displayName": [
"AccountId"
],
"id": 6
"type": 6
}
},
{
@@ -413,7 +413,7 @@
"displayName": [
"TokenId"
],
"id": 2
"type": 2
}
}
],
@@ -429,7 +429,7 @@
"displayName": [
"Result"
],
"id": 16
"type": 16
},
"selector": "0xfcfb2ccd"
},
@@ -441,7 +441,7 @@
"displayName": [
"TokenId"
],
"id": 2
"type": 2
}
}
],
@@ -457,7 +457,7 @@
"displayName": [
"Result"
],
"id": 16
"type": 16
},
"selector": "0xf8885eeb"
},
@@ -469,7 +469,7 @@
"displayName": [
"TokenId"
],
"id": 2
"type": 2
}
}
],
@@ -485,7 +485,7 @@
"displayName": [
"Result"
],
"id": 16
"type": 16
},
"selector": "0x120bc564"
}
@@ -527,7 +527,7 @@
{
"layout": {
"array": {
"cells_per_elem": 1,
"cellsPerElem": 1,
"layout": {
"cell": {
"key": "0x0100000001000000000000000000000000000000000000000000000000000000",
@@ -607,7 +607,7 @@
{
"layout": {
"array": {
"cells_per_elem": 1,
"cellsPerElem": 1,
"layout": {
"cell": {
"key": "0x0300000002000000000000000000000000000000000000000000000000000000",
@@ -687,7 +687,7 @@
{
"layout": {
"array": {
"cells_per_elem": 1,
"cellsPerElem": 1,
"layout": {
"cell": {
"key": "0x0500000003000000000000000000000000000000000000000000000000000000",
@@ -767,7 +767,7 @@
{
"layout": {
"array": {
"cells_per_elem": 1,
"cellsPerElem": 1,
"layout": {
"cell": {
"key": "0x0700000004000000000000000000000000000000000000000000000000000000",
packages/api-contract/test/contracts/erc721.wasm
BIN
View File
Binary file not shown.
packages/api-contract/test/contracts/flipper.json
+5 -5
View File
@@ -1,13 +1,13 @@
{
"metadataVersion": "0.1.0",
"source": {
"hash": "0x98f9fc872ae9db158c8f695018a1b3c5a2fb863f9bed7c83ec039f05ea67fc57",
"language": "ink! 3.0.0",
"hash": "0xb6b5fa9791b27da76f1046de45d57bb835a8dfc44f21b223d8d6bb88e5eb5141",
"language": "ink! 3.0.0-rc1",
"compiler": "rustc 1.48.0-nightly"
},
"contract": {
"name": "flipper",
"version": "3.0.0",
"version": "3.0.0-rc1",
"authors": [
"Parity Technologies <admin@parity.io>"
]
@@ -22,7 +22,7 @@
"displayName": [
"bool"
],
"id": 1
"type": 1
}
}
],
@@ -75,7 +75,7 @@
"displayName": [
"bool"
],
"id": 1
"type": 1
},
"selector": "0x1e5ca456"
}
packages/api-contract/test/contracts/flipper.wasm
BIN
View File
Binary file not shown.
packages/api-contract/test/contracts/incrementer.json
+6 -6
View File
@@ -1,13 +1,13 @@
{
"metadataVersion": "0.1.0",
"source": {
"hash": "0xafe9cfb918e19fc701470017985ab0324017c66dbcfb13cb3ceca39e68cddd86",
"language": "ink! 3.0.0",
"hash": "0x8b30429ee0f4dc19cec91b09d186c805eaac6615492c1edf3bc1efaff0b7fecf",
"language": "ink! 3.0.0-rc1",
"compiler": "rustc 1.48.0-nightly"
},
"contract": {
"name": "incrementer",
"version": "3.0.0",
"version": "3.0.0-rc1",
"authors": [
"Parity Technologies <admin@parity.io>"
]
@@ -22,7 +22,7 @@
"displayName": [
"i32"
],
"id": 1
"type": 1
}
}
],
@@ -52,7 +52,7 @@
"displayName": [
"i32"
],
"id": 1
"type": 1
}
}
],
@@ -77,7 +77,7 @@
"displayName": [
"i32"
],
"id": 1
"type": 1
},
"selector": "0x1e5ca456"
}
packages/api-contract/test/contracts/incrementer.wasm
BIN
View File
Binary file not shown.
packages/api-contract/test/contracts/multisig_plain.json
+38 -38
View File
@@ -1,13 +1,13 @@
{
"metadataVersion": "0.1.0",
"source": {
"hash": "0x3e6dbdd71e36888e06298b7b44d3c886cd4899267bffce0ac4d5795ee9d7ede5",
"language": "ink! 3.0.0",
"hash": "0xfc0f0e88e25c5857c49f089ab8fb6a0ecdc37a69e10b9317ae71924c916cda12",
"language": "ink! 3.0.0-rc1",
"compiler": "rustc 1.48.0-nightly"
},
"contract": {
"name": "multisig_plain",
"version": "3.0.0",
"version": "3.0.0-rc1",
"authors": [
"Parity Technologies <admin@parity.io>"
]
@@ -22,7 +22,7 @@
"displayName": [
"u32"
],
"id": 2
"type": 2
}
},
{
@@ -31,7 +31,7 @@
"displayName": [
"Vec"
],
"id": 20
"type": 20
}
}
],
@@ -65,7 +65,7 @@
"displayName": [
"TransactionId"
],
"id": 2
"type": 2
}
},
{
@@ -78,7 +78,7 @@
"displayName": [
"AccountId"
],
"id": 5
"type": 5
}
},
{
@@ -91,7 +91,7 @@
"displayName": [
"ConfirmationStatus"
],
"id": 22
"type": 22
}
}
],
@@ -112,7 +112,7 @@
"displayName": [
"TransactionId"
],
"id": 2
"type": 2
}
},
{
@@ -125,7 +125,7 @@
"displayName": [
"AccountId"
],
"id": 5
"type": 5
}
}
],
@@ -146,7 +146,7 @@
"displayName": [
"TransactionId"
],
"id": 2
"type": 2
}
}
],
@@ -167,7 +167,7 @@
"displayName": [
"TransactionId"
],
"id": 2
"type": 2
}
}
],
@@ -188,7 +188,7 @@
"displayName": [
"TransactionId"
],
"id": 2
"type": 2
}
},
{
@@ -203,7 +203,7 @@
"displayName": [
"Result"
],
"id": 25
"type": 25
}
}
],
@@ -224,7 +224,7 @@
"displayName": [
"AccountId"
],
"id": 5
"type": 5
}
}
],
@@ -245,7 +245,7 @@
"displayName": [
"AccountId"
],
"id": 5
"type": 5
}
}
],
@@ -266,7 +266,7 @@
"displayName": [
"u32"
],
"id": 2
"type": 2
}
}
],
@@ -285,7 +285,7 @@
"displayName": [
"AccountId"
],
"id": 5
"type": 5
}
}
],
@@ -303,7 +303,7 @@
" Since this message must be send by the wallet itself it has to be build as a",
" `Transaction` and dispatched through `submit_transaction` + `invoke_transaction`:",
" ```no_run",
" use ink_env::{DefaultEnvTypes as Env, AccountId, call::{CallParams, Selector}, test::CallData};",
" use ink_env::{DefaultEnvironment as Env, AccountId, call::{CallParams, Selector}, test::CallData};",
" use multisig_plain::{Transaction, ConfirmationStatus};",
"",
" // address of an existing MultiSigPlain contract",
@@ -354,7 +354,7 @@
"displayName": [
"AccountId"
],
"id": 5
"type": 5
}
}
],
@@ -385,7 +385,7 @@
"displayName": [
"AccountId"
],
"id": 5
"type": 5
}
},
{
@@ -394,7 +394,7 @@
"displayName": [
"AccountId"
],
"id": 5
"type": 5
}
}
],
@@ -423,7 +423,7 @@
"displayName": [
"u32"
],
"id": 2
"type": 2
}
}
],
@@ -452,7 +452,7 @@
"displayName": [
"Transaction"
],
"id": 14
"type": 14
}
}
],
@@ -468,7 +468,7 @@
"payable": false,
"returnType": {
"displayName": [],
"id": 21
"type": 21
},
"selector": "0x349db9e8"
},
@@ -480,7 +480,7 @@
"displayName": [
"TransactionId"
],
"id": 2
"type": 2
}
}
],
@@ -508,7 +508,7 @@
"displayName": [
"TransactionId"
],
"id": 2
"type": 2
}
}
],
@@ -530,7 +530,7 @@
"displayName": [
"ConfirmationStatus"
],
"id": 22
"type": 22
},
"selector": "0xea923d30"
},
@@ -542,7 +542,7 @@
"displayName": [
"TransactionId"
],
"id": 2
"type": 2
}
}
],
@@ -571,7 +571,7 @@
"displayName": [
"TransactionId"
],
"id": 2
"type": 2
}
}
],
@@ -590,7 +590,7 @@
"displayName": [
"Result"
],
"id": 23
"type": 23
},
"selector": "0x6131abbb"
},
@@ -602,7 +602,7 @@
"displayName": [
"TransactionId"
],
"id": 2
"type": 2
}
}
],
@@ -622,7 +622,7 @@
"displayName": [
"Result"
],
"id": 24
"type": 24
},
"selector": "0xe667c7ac"
}
@@ -664,7 +664,7 @@
{
"layout": {
"array": {
"cells_per_elem": 1,
"cellsPerElem": 1,
"layout": {
"cell": {
"key": "0x0100000001000000000000000000000000000000000000000000000000000000",
@@ -744,7 +744,7 @@
{
"layout": {
"array": {
"cells_per_elem": 1,
"cellsPerElem": 1,
"layout": {
"cell": {
"key": "0x0300000002000000000000000000000000000000000000000000000000000000",
@@ -820,7 +820,7 @@
{
"layout": {
"array": {
"cells_per_elem": 1,
"cellsPerElem": 1,
"layout": {
"cell": {
"key": "0x0500000003000000000000000000000000000000000000000000000000000000",
@@ -859,7 +859,7 @@
{
"layout": {
"array": {
"cells_per_elem": 1,
"cellsPerElem": 1,
"layout": {
"cell": {
"key": "0x0500000004000000000000000000000000000000000000000000000000000000",
@@ -910,7 +910,7 @@
{
"layout": {
"array": {
"cells_per_elem": 1,
"cellsPerElem": 1,
"layout": {
"cell": {
"key": "0x0600000005000000000000000000000000000000000000000000000000000000",
packages/api-contract/test/contracts/multisig_plain.wasm
BIN
View File
Binary file not shown.
packages/api-contract/test/contracts/subber.wasm
BIN
View File
Binary file not shown.
packages/api-contract/test/contracts/trait-flipper.json
+5 -5
View File
@@ -1,13 +1,13 @@
{
"metadataVersion": "0.1.0",
"source": {
"hash": "0x4c7e27282d0877aef2390dd50254a0fea52de5b61bc1104b41c791044f47133c",
"language": "ink! 3.0.0",
"hash": "0x568432b99f4ebd39ec03c2caaf69992b248999cc857326174b220b5587c3515f",
"language": "ink! 3.0.0-rc1",
"compiler": "rustc 1.48.0-nightly"
},
"contract": {
"name": "flipper",
"version": "3.0.0",
"version": "3.0.0-rc1",
"authors": [
"Parity Technologies <admin@parity.io>"
]
@@ -32,7 +32,7 @@
"displayName": [
"bool"
],
"id": 1
"type": 1
}
}
],
@@ -72,7 +72,7 @@
"displayName": [
"bool"
],
"id": 1
"type": 1
},
"selector": "0x6b3549bc"
}
packages/types/src/interfaces/contractsAbi/definitions.ts
+1 -1
View File
@@ -94,7 +94,7 @@ const spec = {
},
InkSelector: '[u8; 4]',
InkTypeSpec: {
id: 'MtLookupTypeId',
type: 'MtLookupTypeId',
displayName: 'InkDisplayName'
}
};
packages/types/src/interfaces/contractsAbi/types.ts
+1 -1
View File
@@ -160,7 +160,7 @@ export interface InkStorageLayout extends Enum {
/** @name InkTypeSpec */
export interface InkTypeSpec extends Struct {
readonly id: MtLookupTypeId;
readonly type: MtLookupTypeId;
readonly displayName: InkDisplayName;
}