From 4a13157c64c5470b0660f8e45758e8c19c9af5c2 Mon Sep 17 00:00:00 2001 From: nhpd Date: Mon, 19 Aug 2024 12:01:23 +0400 Subject: [PATCH 1/4] bump admin-module to fix signer for messages --- go.mod | 2 +- go.sum | 4 ++-- network/init-neutrond.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 34e11c8d1..c24148ae3 100644 --- a/go.mod +++ b/go.mod @@ -255,7 +255,7 @@ require ( replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.51.1 - github.com/cosmos/admin-module/v2 => github.com/neutron-org/admin-module/v2 v2.0.0 + github.com/cosmos/admin-module/v2 => github.com/neutron-org/admin-module/v2 v2.0.1-0.20240819075629-42349c72f8ee github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.50.8-neutron // explicitely replace iavl to v1.2.0 cause sometimes go mod tidy uses not right version github.com/cosmos/iavl => github.com/cosmos/iavl v1.2.0 diff --git a/go.sum b/go.sum index ad363d315..75c67ca26 100644 --- a/go.sum +++ b/go.sum @@ -938,8 +938,8 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/neutron-org/admin-module/v2 v2.0.0 h1:MlkSc1821sQ+G5/cYOajuqZ5/lM53xTbixpTtXnHh0A= -github.com/neutron-org/admin-module/v2 v2.0.0/go.mod h1:RfOyabXsdJ5btcOKyKPZDYiZhtuKFubbJMOb8EJZtvA= +github.com/neutron-org/admin-module/v2 v2.0.1-0.20240819075629-42349c72f8ee h1:ZVNrDmlh0Ifg2spxVvJYGV0Yk12BvTCCGUAxhSywkds= +github.com/neutron-org/admin-module/v2 v2.0.1-0.20240819075629-42349c72f8ee/go.mod h1:RfOyabXsdJ5btcOKyKPZDYiZhtuKFubbJMOb8EJZtvA= github.com/neutron-org/cosmos-sdk v0.50.8-neutron h1:L+4obYi/KkkmS05gBlXNF+FhipHYTl0iO3EkmpMBXkE= github.com/neutron-org/cosmos-sdk v0.50.8-neutron/go.mod h1:Zb+DgHtiByNwgj71IlJBXwOq6dLhtyAq3AgqpXm/jHo= github.com/neutron-org/wasmd v0.51.1 h1:EXfu8BFJDZY3SRF2O3C3iTPa8fUDGBcqxET89jWXSfA= diff --git a/network/init-neutrond.sh b/network/init-neutrond.sh index 1e4ac6a08..b3d722bfe 100755 --- a/network/init-neutrond.sh +++ b/network/init-neutrond.sh @@ -741,7 +741,7 @@ rm markets.json echo "Setting the rest of Neutron genesis params..." set_genesis_param admins "[\"$NEUTRON_CHAIN_MANAGER_CONTRACT_ADDRESS\"]" # admin module set_genesis_param treasury_address "\"$DAO_CONTRACT_ADDRESS\"" # feeburner -set_genesis_param fee_collector_address "\"$DAO_CONTRACT_ADDRESS\"," # tokenfactory +set_genesis_param fee_collector_address "\"$DAO_CONTRACT_ADDRESS\"," # tokenfactory set_genesis_param security_address "\"$SECURITY_SUBDAO_CORE_CONTRACT_ADDRESS\"," # cron set_genesis_param limit 5 # cron set_genesis_param signed_blocks_window "\"$SLASHING_SIGNED_BLOCKS_WINDOW\"," # slashing @@ -761,7 +761,7 @@ set_genesis_param_jq ".app_state.marketmap.params.market_authorities" "[\"$ADMIN set_genesis_param_jq ".app_state.feemarket.params.min_base_gas_price" "\"0.0025\"" # feemarket set_genesis_param_jq ".app_state.feemarket.params.fee_denom" "\"untrn\"" # feemarket set_genesis_param_jq ".app_state.feemarket.params.max_learning_rate" "\"0.5\"" # feemarket -set_genesis_param_jq ".app_state.feemarket.params.enabled" "$FEEMARKET_ENABLED" # feemarket +set_genesis_param_jq ".app_state.feemarket.params.enabled" "$FEEMARKET_ENABLED" # feemarket set_genesis_param_jq ".app_state.feemarket.params.distribute_fees" "true" # feemarket set_genesis_param_jq ".app_state.feemarket.state.base_gas_price" "\"0.0025\"" # feemarket From f3f57e48ec15f56e6e1fea5cb0a02bcd6ea8486c Mon Sep 17 00:00:00 2001 From: nhpd Date: Mon, 19 Aug 2024 18:52:55 +0400 Subject: [PATCH 2/4] use admin module release 2.0.1 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c24148ae3..7106bb11f 100644 --- a/go.mod +++ b/go.mod @@ -255,7 +255,7 @@ require ( replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.51.1 - github.com/cosmos/admin-module/v2 => github.com/neutron-org/admin-module/v2 v2.0.1-0.20240819075629-42349c72f8ee + github.com/cosmos/admin-module/v2 => github.com/neutron-org/admin-module/v2 v2.0.1 github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.50.8-neutron // explicitely replace iavl to v1.2.0 cause sometimes go mod tidy uses not right version github.com/cosmos/iavl => github.com/cosmos/iavl v1.2.0 diff --git a/go.sum b/go.sum index 75c67ca26..ea9edfbab 100644 --- a/go.sum +++ b/go.sum @@ -938,8 +938,8 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/neutron-org/admin-module/v2 v2.0.1-0.20240819075629-42349c72f8ee h1:ZVNrDmlh0Ifg2spxVvJYGV0Yk12BvTCCGUAxhSywkds= -github.com/neutron-org/admin-module/v2 v2.0.1-0.20240819075629-42349c72f8ee/go.mod h1:RfOyabXsdJ5btcOKyKPZDYiZhtuKFubbJMOb8EJZtvA= +github.com/neutron-org/admin-module/v2 v2.0.1 h1:MqEQoUQh640+n54f8WtZaTxRwx/5hITC8VmQLYvaTfA= +github.com/neutron-org/admin-module/v2 v2.0.1/go.mod h1:RfOyabXsdJ5btcOKyKPZDYiZhtuKFubbJMOb8EJZtvA= github.com/neutron-org/cosmos-sdk v0.50.8-neutron h1:L+4obYi/KkkmS05gBlXNF+FhipHYTl0iO3EkmpMBXkE= github.com/neutron-org/cosmos-sdk v0.50.8-neutron/go.mod h1:Zb+DgHtiByNwgj71IlJBXwOq6dLhtyAq3AgqpXm/jHo= github.com/neutron-org/wasmd v0.51.1 h1:EXfu8BFJDZY3SRF2O3C3iTPa8fUDGBcqxET89jWXSfA= From dcd65969385c656f10a135bfaffea9a54e1326ec Mon Sep 17 00:00:00 2001 From: nhpd Date: Tue, 20 Aug 2024 12:08:57 +0400 Subject: [PATCH 3/4] try to fix failing tests --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7106bb11f..576b19d92 100644 --- a/go.mod +++ b/go.mod @@ -255,7 +255,7 @@ require ( replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.51.1 - github.com/cosmos/admin-module/v2 => github.com/neutron-org/admin-module/v2 v2.0.1 + github.com/cosmos/admin-module/v2 => github.com/neutron-org/admin-module/v2 v2.0.1-0.20240820080744-f645f1f4303c github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.50.8-neutron // explicitely replace iavl to v1.2.0 cause sometimes go mod tidy uses not right version github.com/cosmos/iavl => github.com/cosmos/iavl v1.2.0 diff --git a/go.sum b/go.sum index ea9edfbab..8c4b9925a 100644 --- a/go.sum +++ b/go.sum @@ -938,8 +938,8 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/neutron-org/admin-module/v2 v2.0.1 h1:MqEQoUQh640+n54f8WtZaTxRwx/5hITC8VmQLYvaTfA= -github.com/neutron-org/admin-module/v2 v2.0.1/go.mod h1:RfOyabXsdJ5btcOKyKPZDYiZhtuKFubbJMOb8EJZtvA= +github.com/neutron-org/admin-module/v2 v2.0.1-0.20240820080744-f645f1f4303c h1:W7E4uYAf4riYVWi7uFBoAlCaaTQ5fULAITOA0suKt1k= +github.com/neutron-org/admin-module/v2 v2.0.1-0.20240820080744-f645f1f4303c/go.mod h1:RfOyabXsdJ5btcOKyKPZDYiZhtuKFubbJMOb8EJZtvA= github.com/neutron-org/cosmos-sdk v0.50.8-neutron h1:L+4obYi/KkkmS05gBlXNF+FhipHYTl0iO3EkmpMBXkE= github.com/neutron-org/cosmos-sdk v0.50.8-neutron/go.mod h1:Zb+DgHtiByNwgj71IlJBXwOq6dLhtyAq3AgqpXm/jHo= github.com/neutron-org/wasmd v0.51.1 h1:EXfu8BFJDZY3SRF2O3C3iTPa8fUDGBcqxET89jWXSfA= From 560ed1a731b2bba6605e20377e85a79e374f20a6 Mon Sep 17 00:00:00 2001 From: nhpd Date: Tue, 20 Aug 2024 17:48:13 +0400 Subject: [PATCH 4/4] set admin-module to v2.0.2 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ea958ef9c..713235d16 100644 --- a/go.mod +++ b/go.mod @@ -255,7 +255,7 @@ require ( replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.51.1 - github.com/cosmos/admin-module/v2 => github.com/neutron-org/admin-module/v2 v2.0.1-0.20240820080744-f645f1f4303c + github.com/cosmos/admin-module/v2 => github.com/neutron-org/admin-module/v2 v2.0.2 github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.50.8-neutron // explicitely replace iavl to v1.2.0 cause sometimes go mod tidy uses not right version github.com/cosmos/iavl => github.com/cosmos/iavl v1.2.0 diff --git a/go.sum b/go.sum index 545b4517f..c5bf0bd94 100644 --- a/go.sum +++ b/go.sum @@ -938,8 +938,8 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/neutron-org/admin-module/v2 v2.0.1-0.20240820080744-f645f1f4303c h1:W7E4uYAf4riYVWi7uFBoAlCaaTQ5fULAITOA0suKt1k= -github.com/neutron-org/admin-module/v2 v2.0.1-0.20240820080744-f645f1f4303c/go.mod h1:RfOyabXsdJ5btcOKyKPZDYiZhtuKFubbJMOb8EJZtvA= +github.com/neutron-org/admin-module/v2 v2.0.2 h1:XDDFWjvkVBKRf3lBFCazT1zAXZ3dHX8GaZ4ol8Hdk8I= +github.com/neutron-org/admin-module/v2 v2.0.2/go.mod h1:RfOyabXsdJ5btcOKyKPZDYiZhtuKFubbJMOb8EJZtvA= github.com/neutron-org/cosmos-sdk v0.50.8-neutron h1:L+4obYi/KkkmS05gBlXNF+FhipHYTl0iO3EkmpMBXkE= github.com/neutron-org/cosmos-sdk v0.50.8-neutron/go.mod h1:Zb+DgHtiByNwgj71IlJBXwOq6dLhtyAq3AgqpXm/jHo= github.com/neutron-org/wasmd v0.51.1 h1:EXfu8BFJDZY3SRF2O3C3iTPa8fUDGBcqxET89jWXSfA=