Skip to content

Commit 1705818

Browse files
authored
Merge pull request #288 from neutron-org/fix/pool_metadata_proto
Fix: pool metadata proto
2 parents 7a9f39e + 24a8d10 commit 1705818

File tree

3 files changed

+47
-28
lines changed

3 files changed

+47
-28
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"@cosmos-client/core": "^0.47.4",
4646
"@cosmos-client/cosmwasm": "^0.40.3",
4747
"@cosmos-client/ibc": "^1.2.1",
48-
"@neutron-org/neutronjsplus": "0.4.0-rc15",
48+
"@neutron-org/neutronjsplus": "neutron-org/neutronjsplus#feat/sdk-50",
4949
"@types/lodash": "^4.14.182",
5050
"@types/long": "^5.0.0",
5151
"axios": "^0.27.2",

src/testcases/run_in_band/dex_stargate.test.ts

+20
Original file line numberDiff line numberDiff line change
@@ -356,13 +356,33 @@ describe('Neutron / dex module (stargate contract)', () => {
356356
);
357357
});
358358
test('LimitOrderTrancheUserQuery', async () => {
359+
const resTx = await neutronAccount.executeContract(
360+
contractAddress,
361+
JSON.stringify({
362+
place_limit_order: {
363+
receiver: contractAddress,
364+
token_in: 'untrn',
365+
token_out: 'uibcusdc',
366+
tick_index_in_to_out: 1,
367+
amount_in: '10',
368+
order_type: LimitOrderType.JustInTime,
369+
},
370+
}),
371+
);
372+
expect(resTx.code).toEqual(0);
373+
trancheKeyToWithdraw = getEventAttributesFromTx(
374+
{ tx_response: resTx },
375+
'TickUpdate',
376+
['TrancheKey'],
377+
)[0]['TrancheKey'];
359378
const res =
360379
await neutronAccount.chain.queryContract<LimitOrderTrancheUserResponse>(
361380
contractAddress,
362381
{
363382
get_limit_order_tranche_user: {
364383
address: contractAddress,
365384
tranche_key: trancheKeyToWithdraw,
385+
calc_withdrawable_shares: true,
366386
},
367387
},
368388
);

yarn.lock

+26-27
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@
108108
regexpu-core "^5.3.1"
109109
semver "^6.3.1"
110110

111-
"@babel/helper-define-polyfill-provider@^0.6.1":
112-
version "0.6.1"
113-
resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.1.tgz#fadc63f0c2ff3c8d02ed905dcea747c5b0fb74fd"
114-
integrity sha512-o7SDgTJuvx5vLKD6SFvkydkSMBvahDKGiNJzG22IZYXhiqoe9efY7zocICBgzHV4IRg5wdgl2nEL/tulKIEIbA==
111+
"@babel/helper-define-polyfill-provider@^0.6.1", "@babel/helper-define-polyfill-provider@^0.6.2":
112+
version "0.6.2"
113+
resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz#18594f789c3594acb24cfdb4a7f7b7d2e8bd912d"
114+
integrity sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==
115115
dependencies:
116116
"@babel/helper-compilation-targets" "^7.22.6"
117117
"@babel/helper-plugin-utils" "^7.22.5"
@@ -1004,9 +1004,9 @@
10041004
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
10051005

10061006
"@bufbuild/protobuf@^1.4.2":
1007-
version "1.8.0"
1008-
resolved "https://registry.yarnpkg.com/@bufbuild/protobuf/-/protobuf-1.8.0.tgz#1c8651ea34adb8019b483e09de02aeeb1cd57d79"
1009-
integrity sha512-qR9FwI8QKIveDnUYutvfzbC21UZJJryYrLuZGjeZ/VGz+vXelUkK+xgkOHsvPEdYEdxtgUUq4313N8QtOehJ1Q==
1007+
version "1.9.0"
1008+
resolved "https://registry.yarnpkg.com/@bufbuild/protobuf/-/protobuf-1.9.0.tgz#fffac3183059a41ceef5311e07e3724d426a95c4"
1009+
integrity sha512-W7gp8Q/v1NlCZLsv8pQ3Y0uCu/SHgXOVFK+eUluUKWXmsb6VHkpNx0apdOWWcDbB9sJoKeP8uPrjmehJz6xETQ==
10101010

10111011
"@confio/ics23@^0.6.8":
10121012
version "0.6.8"
@@ -1573,10 +1573,9 @@
15731573
resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-5.50.0.tgz#29c6419e8379d496ab6d0426eadf3c4d100cd186"
15741574
integrity sha512-swKHYCOZUGyVt4ge0u8a7AwNcA//h4nx5wIi0sruGye1IJ5Cva0GyK9L2/WdX+kWVTKp92ZiEo1df31lrWGPgA==
15751575

1576-
"@neutron-org/neutronjsplus@0.4.0-rc15":
1576+
"@neutron-org/neutronjsplus@neutron-org/neutronjsplus#feat/sdk-50":
15771577
version "0.4.0-rc15"
1578-
resolved "https://registry.yarnpkg.com/@neutron-org/neutronjsplus/-/neutronjsplus-0.4.0-rc15.tgz#b79ea1b10b987bc079f12b49a5916c825e3f4550"
1579-
integrity sha512-dFmGI5qZDae1DPynm2lJvvaxtUAsgCc7nrNpYOxKHzNFiYhBE9I+gAFJXuBJWFSnD0F9fI3PJpLHTOepKk8LvQ==
1578+
resolved "https://codeload.github.com/neutron-org/neutronjsplus/tar.gz/c3a1c56f148c255c359610df55417b61cfc70a4d"
15801579
dependencies:
15811580
"@bufbuild/protobuf" "^1.4.2"
15821581
"@cosmos-client/core" "^0.47.4"
@@ -2188,12 +2187,12 @@ babel-plugin-jest-hoist@^29.6.3:
21882187
"@types/babel__traverse" "^7.0.6"
21892188

21902189
babel-plugin-polyfill-corejs2@^0.4.10:
2191-
version "0.4.10"
2192-
resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.10.tgz#276f41710b03a64f6467433cab72cbc2653c38b1"
2193-
integrity sha512-rpIuu//y5OX6jVU+a5BCn1R5RSZYWAl2Nar76iwaOdycqb6JPxediskWFMMl7stfwNJR4b7eiQvh5fB5TEQJTQ==
2190+
version "0.4.11"
2191+
resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz#30320dfe3ffe1a336c15afdcdafd6fd615b25e33"
2192+
integrity sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==
21942193
dependencies:
21952194
"@babel/compat-data" "^7.22.6"
2196-
"@babel/helper-define-polyfill-provider" "^0.6.1"
2195+
"@babel/helper-define-polyfill-provider" "^0.6.2"
21972196
semver "^6.3.1"
21982197

21992198
babel-plugin-polyfill-corejs3@^0.10.4:
@@ -2205,11 +2204,11 @@ babel-plugin-polyfill-corejs3@^0.10.4:
22052204
core-js-compat "^3.36.1"
22062205

22072206
babel-plugin-polyfill-regenerator@^0.6.1:
2208-
version "0.6.1"
2209-
resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.1.tgz#4f08ef4c62c7a7f66a35ed4c0d75e30506acc6be"
2210-
integrity sha512-JfTApdE++cgcTWjsiCQlLyFBMbTUft9ja17saCc93lgV33h4tuCVj7tlvu//qpLwaG+3yEz7/KhahGrUMkVq9g==
2207+
version "0.6.2"
2208+
resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz#addc47e240edd1da1058ebda03021f382bba785e"
2209+
integrity sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==
22112210
dependencies:
2212-
"@babel/helper-define-polyfill-provider" "^0.6.1"
2211+
"@babel/helper-define-polyfill-provider" "^0.6.2"
22132212

22142213
babel-preset-current-node-syntax@^1.0.0:
22152214
version "1.0.1"
@@ -2429,9 +2428,9 @@ camelcase@^6.2.0:
24292428
integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
24302429

24312430
caniuse-lite@^1.0.30001587:
2432-
version "1.0.30001611"
2433-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001611.tgz#4dbe78935b65851c2d2df1868af39f709a93a96e"
2434-
integrity sha512-19NuN1/3PjA3QI8Eki55N8my4LzfkMCRLgCVfrl/slbSAchQfV0+GwjPrK3rq37As4UCLlM/DHajbKkAqbv92Q==
2431+
version "1.0.30001612"
2432+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001612.tgz#d34248b4ec1f117b70b24ad9ee04c90e0b8a14ae"
2433+
integrity sha512-lFgnZ07UhaCcsSZgWW0K5j4e69dK1u/ltrL9lTUiFOwNHs12S3UMIEYgBV0Z6C6hRDev7iRnMzzYmKabYdXF9g==
24352434

24362435
chalk@^2.3.0, chalk@^2.4.2:
24372436
version "2.4.2"
@@ -2818,9 +2817,9 @@ ee-first@1.1.1:
28182817
integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
28192818

28202819
electron-to-chromium@^1.4.668:
2821-
version "1.4.744"
2822-
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.744.tgz#d19cdfdbd81bd800b71773702bcbaa129a3b2e8f"
2823-
integrity sha512-nAGcF0yeKKfrP13LMFr5U1eghfFSvFLg302VUFzWlcjPOnUYd52yU5x6PBYrujhNbc4jYmZFrGZFK+xasaEzVA==
2820+
version "1.4.750"
2821+
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.750.tgz#d278a619af727ed069de1317115187282b1131ee"
2822+
integrity sha512-9ItEpeu15hW5m8jKdriL+BQrgwDTXEL9pn4SkillWFu73ZNNNQ2BKKLS+ZHv2vC9UkNhosAeyfxOf/5OSeTCPA==
28242823

28252824
elliptic@^6.4.0, elliptic@^6.5.3, elliptic@^6.5.4:
28262825
version "6.5.5"
@@ -4703,9 +4702,9 @@ raw-body@2.5.2:
47034702
unpipe "1.0.0"
47044703

47054704
react-is@^18.0.0:
4706-
version "18.2.0"
4707-
resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
4708-
integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
4705+
version "18.3.1"
4706+
resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
4707+
integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
47094708

47104709
readable-stream@^3.6.0:
47114710
version "3.6.2"

0 commit comments

Comments
 (0)