lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/release-8.1' into release-8.5

Browse source
This commit is contained in:
Taranto 2023-03-09 13:37:21 +00:00
commit 14f677a992
11 changed files with 133 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

109
package-lock.json generated
View file

@ -6198,6 +6198,7 @@
}
},
"@polkadot/keyring": {
<<<<<<< HEAD
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@polkadot/keyring/-/keyring-10.3.1.tgz",
"integrity": "sha512-xBkUtyQ766NVS1ccSYbQssWpxAhSf0uwkw9Amj8TFhu++pnZcVm+EmM2VczWqgOkmWepO7MGRjEXeOIw1YUGiw==",
@ -6214,6 +6215,24 @@
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/util": "10.3.1",
=======
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/keyring/-/keyring-10.4.1.tgz",
"integrity": "sha512-urTl0ReOr1A1b2kSF6QnGlVc2IcJpDnTacxwA4kIVn45p4Kysi19ek7odSdLA5yNcDZSB+/4uITZQ6meClS71Q==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/util": "10.4.1",
"@polkadot/util-crypto": "10.4.1"
}
},
"@polkadot/networks": {
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/networks/-/networks-10.4.1.tgz",
"integrity": "sha512-kmSy8iAnYKNWXZBv7bTfI10cSLJzOrFFEdngzohHMjDOG5FKoaX3Pix6MUkcWc2asX0hCyACtNTlcp+MBnS9eQ==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/util": "10.4.1",
>>>>>>> upstream/release-8.1
"@substrate/ss58-registry": "^1.38.0"
}
},
@ -6338,6 +6357,7 @@
}
},
"@polkadot/util": {
<<<<<<< HEAD
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@polkadot/util/-/util-10.3.1.tgz",
"integrity": "sha512-8j+O7gj7upj1ZwlGxmAaf3+V0xc0VZvqPeBvTFV30Oi1xoMDNH0q2vKst08wARQUUm1Gi0zIlipDMo0n4Sr7tw==",
@ -6347,11 +6367,23 @@
"@polkadot/x-global": "10.3.1",
"@polkadot/x-textdecoder": "10.3.1",
"@polkadot/x-textencoder": "10.3.1",
=======
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/util/-/util-10.4.1.tgz",
"integrity": "sha512-dOlmue4nhbk8msbs/YgoBqVtUzDx5iqhiDnC62GWC8b+JmIlIM4Ddgg1rhBf1KJ6TfEQrzQA0FwLaqCCH5vYmA==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-bigint": "10.4.1",
"@polkadot/x-global": "10.4.1",
"@polkadot/x-textdecoder": "10.4.1",
"@polkadot/x-textencoder": "10.4.1",
>>>>>>> upstream/release-8.1
"@types/bn.js": "^5.1.1",
"bn.js": "^5.2.1"
}
},
"@polkadot/util-crypto": {
<<<<<<< HEAD
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@polkadot/util-crypto/-/util-crypto-10.3.1.tgz",
"integrity": "sha512-viqLMuNGrbB2lyDIYdXAl3tq/Em/Y7ql2FvCTHJmxXaB5C1NXiWf1SqFAahUJKohL+ke5IL0jr19wZu/f88lIQ==",
@ -6364,16 +6396,33 @@
"@polkadot/wasm-crypto": "^6.4.1",
"@polkadot/x-bigint": "10.3.1",
"@polkadot/x-randomvalues": "10.3.1",
=======
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/util-crypto/-/util-crypto-10.4.1.tgz",
"integrity": "sha512-29vOZLZJl5mNb8lHd2NwP51O7kEV1QOitBX7UsBw66nJOPZQ0imPFPJFGuI6ySPUuck1Lu4vBTC76nE5xpzjAQ==",
"requires": {
"@babel/runtime": "^7.20.13",
"@noble/hashes": "1.2.0",
"@noble/secp256k1": "1.7.1",
"@polkadot/networks": "10.4.1",
"@polkadot/util": "10.4.1",
"@polkadot/wasm-crypto": "^6.4.1",
"@polkadot/x-bigint": "10.4.1",
"@polkadot/x-randomvalues": "10.4.1",
>>>>>>> upstream/release-8.1
"@scure/base": "1.1.1",
"ed2curve": "^0.3.0",
"tweetnacl": "^1.0.3"
},
"dependencies": {
<<<<<<< HEAD
"@noble/hashes": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
"integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ=="
},
=======
>>>>>>> upstream/release-8.1
"@noble/secp256k1": {
"version": "1.7.1",
"resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz",
@ -6439,6 +6488,7 @@
}
},
"@polkadot/x-bigint": {
<<<<<<< HEAD
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-bigint/-/x-bigint-10.3.1.tgz",
"integrity": "sha512-hXtnwy9LXmV43B9pT8gY1zwdNRhpPBEOk1PfL2Ze0Iw2zd+lbljD3GwDP5mkBfIYIw/s15eRTjiUIKfpTRRDXw==",
@ -6454,6 +6504,23 @@
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-global": "10.3.1",
=======
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-bigint/-/x-bigint-10.4.1.tgz",
"integrity": "sha512-CpTGPwNUDrJcrnfDU/94mfZ16TZoTwWAwTLH0oMUJtrM2mHo+LtWZBlCTG+thhkcGcSRy/rrpzx4ffNsj5Sy1w==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-global": "10.4.1"
}
},
"@polkadot/x-fetch": {
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-fetch/-/x-fetch-10.4.1.tgz",
"integrity": "sha512-9LDskIW74Iz5Nen6p9xhVw1D6Z3r/K5buchZW2DERKCA3gZ98wUkTnpHDcwEyLGw0Lvq+1Trvm/txaEMWjUT6w==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-global": "10.4.1",
>>>>>>> upstream/release-8.1
"@types/node-fetch": "^2.6.2",
"node-fetch": "^3.3.0"
},
@ -6471,14 +6538,21 @@
}
},
"@polkadot/x-global": {
<<<<<<< HEAD
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-10.3.1.tgz",
"integrity": "sha512-kPAVYP2H3aTjS7BKqGkYV1I3Mu03dnRyeX+rDebC8xoN+hUC5bhb7dzCtb5F8DdqlvFl67ZxRaVtq2XUssGTKQ==",
=======
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-10.4.1.tgz",
"integrity": "sha512-Kdh2Fzl1fpEwU6vL1HMaXJy+fadX79eSy4VAnIx/uyCF3H5Z4WaxzoiNVmHdDZSVaamqtbuKepi1nkE3q1nvlA==",
>>>>>>> upstream/release-8.1
"requires": {
"@babel/runtime": "^7.20.13"
}
},
"@polkadot/x-randomvalues": {
<<<<<<< HEAD
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-randomvalues/-/x-randomvalues-10.3.1.tgz",
"integrity": "sha512-9b0hakA4ERcWui7LalqYN+gjYpHpL5OLBhktco62CI9oVNYYKVY6H5+iMO+d3I5U+MecqAqdejl0+L2xhzk3sw==",
@ -6512,6 +6586,41 @@
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-global": "10.3.1",
=======
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-randomvalues/-/x-randomvalues-10.4.1.tgz",
"integrity": "sha512-dB4OGOiBbJbNQV040Ggh2CujSXtVe9bxXn1g5LuJEw1iioeraoduJ6yEYmh0olfaQjCUXnyWLr8uCPtPpfJ9uQ==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-global": "10.4.1"
}
},
"@polkadot/x-textdecoder": {
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-10.4.1.tgz",
"integrity": "sha512-OcAL0napRM4hukgvH6kYGdiczqvbkFYoLBgQFalZChktjL1tDNiF6tzzt4Nn8WQXYYFlfyxp5LoZRtNrcFJq4w==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-global": "10.4.1"
}
},
"@polkadot/x-textencoder": {
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-10.4.1.tgz",
"integrity": "sha512-YBS04HV/QgRppt0XC5n48c89ueH3ErivrcmqFTlkKMcXNzvtpMCTZGCTzG5vU8ozP0tl/4Is5N8agmYHLMu1Cg==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-global": "10.4.1"
}
},
"@polkadot/x-ws": {
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-ws/-/x-ws-10.4.1.tgz",
"integrity": "sha512-acS2kAAvFOrGo5gVLuOY4DKRschGafvruh491O7jE5r7QbZUNG1Q948g6TA/67I4g8N0k096DYFryID4OK9Ufg==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-global": "10.4.1",
>>>>>>> upstream/release-8.1
"@types/websocket": "^1.0.5",
"websocket": "^1.0.34"
}