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-05-22 13:25:12 +01:00
commit d3baa2a6d0
3 changed files with 11 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

114
package-lock.json generated
View file

@ -6198,24 +6198,6 @@
}
},
"@polkadot/keyring": {
<<<<<<< HEAD
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@polkadot/keyring/-/keyring-10.3.1.tgz",
"integrity": "sha512-xBkUtyQ766NVS1ccSYbQssWpxAhSf0uwkw9Amj8TFhu++pnZcVm+EmM2VczWqgOkmWepO7MGRjEXeOIw1YUGiw==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/util": "10.3.1",
"@polkadot/util-crypto": "10.3.1"
}
},
"@polkadot/networks": {
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@polkadot/networks/-/networks-10.3.1.tgz",
"integrity": "sha512-W9E1g6zRbIVyF7sGqbpxH0P6caxtBHNEwvDa5/8ZQi9UsLj6mUs0HdwZtAdIo3KcSO4uAyV9VYJjY/oAWWcnXg==",
"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==",
@ -6232,7 +6214,6 @@
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/util": "10.4.1",
>>>>>>> upstream/release-8.1
"@substrate/ss58-registry": "^1.38.0"
}
},
@ -6357,17 +6338,6 @@
}
},
"@polkadot/util": {
<<<<<<< HEAD
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@polkadot/util/-/util-10.3.1.tgz",
"integrity": "sha512-8j+O7gj7upj1ZwlGxmAaf3+V0xc0VZvqPeBvTFV30Oi1xoMDNH0q2vKst08wARQUUm1Gi0zIlipDMo0n4Sr7tw==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-bigint": "10.3.1",
"@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==",
@ -6377,26 +6347,11 @@
"@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==",
"requires": {
"@babel/runtime": "^7.20.13",
"@noble/hashes": "1.1.5",
"@noble/secp256k1": "1.7.1",
"@polkadot/networks": "10.3.1",
"@polkadot/util": "10.3.1",
"@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==",
@ -6409,20 +6364,11 @@
"@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",
@ -6488,23 +6434,6 @@
}
},
"@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==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-global": "10.3.1"
}
},
"@polkadot/x-fetch": {
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-fetch/-/x-fetch-10.3.1.tgz",
"integrity": "sha512-v07jNzFK1uzuZ9pAg0oNyU84vFwyekGWZi7Xanh+GPKt6G5RY1JyvSW1GSNcyXpWiqqTnTuaoF+e5PRHeyOnhw==",
"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==",
@ -6520,7 +6449,6 @@
"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"
},
@ -6538,55 +6466,14 @@
}
},
"@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==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-global": "10.3.1"
}
},
"@polkadot/x-textdecoder": {
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-10.3.1.tgz",
"integrity": "sha512-BgjcImRYCM2TOMa/95Mmqo6T/YdQWQdVlVQ33PZda7A/I2jBYeOXDj16ftVgn4DWM9xcFVdy2Z3Jg3RGCNbjww==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-global": "10.3.1"
}
},
"@polkadot/x-textencoder": {
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-10.3.1.tgz",
"integrity": "sha512-nkNsVW1GNT1XfV4IuKlUkdeo9sFJ/2IPhBbC54gu469NFl52b5be5H9x+IHdqqA8cG0ElvsojTd3K3tVD3sx6Q==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-global": "10.3.1"
}
},
"@polkadot/x-ws": {
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-ws/-/x-ws-10.3.1.tgz",
"integrity": "sha512-gjYXB+W2slfnnnpCn3KjxP/VR3GZ6BK9xmZbeyVhlWFM3e+1WyMoetumxWbqzfpdXjwe3hIl1R28sngxqllfUQ==",
"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==",
@ -6620,7 +6507,6 @@
"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"
}