Skip to content

Commit 002ddc3

Browse files
shreyasbhat0shreyasbhat0
committed
Merge branch 'fix/module-claims' into fix_thor_mainnet
2 parents 715ea96 + ef3f861 commit 002ddc3

12 files changed

+86
-10
lines changed

‎.goreleaser-cross.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ archives:
134134
- none*
135135

136136
checksum:
137-
name_template: '{{ .ProjectName }}d_v{{ .Version }}_{{ if eq .Env.BUILD_TAG "testnet" }}_testnet{{ end }}_cross_checksums.txt'
137+
name_template: '{{ .ProjectName }}d_v{{ .Version }}_{{ if eq .Env.BUILD_TAG "testnet" }}testnet{{ end }}_cross_checksums.txt'
138138

139139
dockers:
140140
- use: buildx

‎.goreleaser.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ archives:
6060
files:
6161
- none*
6262
checksum:
63-
name_template: '{{ .ProjectName }}d_v{{ .Version }}_{{ if eq .Env.BUILD_TAG "testnet" }}_testnet{{ end }}_checksums.txt'
63+
name_template: '{{ .ProjectName }}d_v{{ .Version }}_{{ if eq .Env.BUILD_TAG "testnet" }}testnet{{ end }}_checksums.txt'
6464
dockers:
6565
- use: buildx
6666
goos: linux

‎CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@ Contains bug fixes.
2828
Contains all the PRs that improved the code without changing the behaviors.
2929
-->
3030

31+
# v1.0.2-Prerelease
32+
33+
## Added
34+
35+
## Changed
36+
- Updated thorchain claim server address handling
37+
38+
## Fixed
39+
- Fixed Regression Test Version Issues
40+
3141
# v1.0.1-Prerelease
3242

3343
## Added

‎test/regression/cmd/export.go

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ func export(path string) error {
4444
appState, _ := export["app_state"].(map[string]any)
4545
claimArkeo, _ := appState["claimarkeo"].(map[string]any)
4646
params, _ := claimArkeo["params"].(map[string]any)
47+
delete(export, "app_version")
4748
delete(params, "airdrop_start_time")
4849
staking, _ := appState["staking"].(map[string]any)
4950
validators, _ := staking["validators"].([]any)

‎test/regression/mnt/exports/suites_contracts_pay-as-you-go.json

-1
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,6 @@
690690
"upgrade": {},
691691
"vesting": {}
692692
},
693-
"app_version": "v1.0.0-prerelease",
694693
"chain_id": "arkeo",
695694
"consensus": {
696695
"params": {

‎test/regression/mnt/exports/suites_contracts_subscription.json

-1
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,6 @@
708708
"upgrade": {},
709709
"vesting": {}
710710
},
711-
"app_version": "v1.0.0-prerelease",
712711
"chain_id": "arkeo",
713712
"consensus": {
714713
"params": {

‎test/regression/mnt/exports/suites_core_send.json

-1
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,6 @@
583583
"upgrade": {},
584584
"vesting": {}
585585
},
586-
"app_version": "v1.0.0-prerelease",
587586
"chain_id": "arkeo",
588587
"consensus": {
589588
"params": {

‎test/regression/mnt/exports/suites_initialize.json

-1
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,6 @@
580580
"upgrade": {},
581581
"vesting": {}
582582
},
583-
"app_version": "v1.0.0-prerelease",
584583
"chain_id": "arkeo",
585584
"consensus": {
586585
"params": {

‎test/regression/mnt/exports/suites_providers_providers.json

-1
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,6 @@
594594
"upgrade": {},
595595
"vesting": {}
596596
},
597-
"app_version": "v1.0.0-prerelease",
598597
"chain_id": "arkeo",
599598
"consensus": {
600599
"params": {

‎test/regression/mnt/exports/suites_sentinel_contract_config.json

-1
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,6 @@
667667
"upgrade": {},
668668
"vesting": {}
669669
},
670-
"app_version": "v1.0.0-prerelease",
671670
"chain_id": "arkeo",
672671
"consensus": {
673672
"params": {

‎test/regression/mnt/exports/suites_sentinel_sentinel.json

-1
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,6 @@
560560
"upgrade": {},
561561
"vesting": {}
562562
},
563-
"app_version": "v1.0.0-prerelease",
564563
"chain_id": "arkeo",
565564
"consensus": {
566565
"params": {

‎x/claim/keeper/msg_server_claim_thorchain_test.go

+73-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/arkeonetwork/arkeo/x/claim/types"
1111
)
1212

13-
func TestClaimThorchain(t *testing.T) {
13+
func TestClaimThorchainTestnetAddress(t *testing.T) {
1414
msgServer, keepers, ctx := setupMsgServer(t)
1515
sdkCtx := sdk.UnwrapSDKContext(ctx)
1616

@@ -81,3 +81,75 @@ func TestClaimThorchain(t *testing.T) {
8181
_, err = msgServer.ClaimThorchain(ctx, &claimMessage)
8282
require.ErrorIs(t, err, types.ErrNoClaimableAmount)
8383
}
84+
85+
func TestClaimThorchainMainnetAddress(t *testing.T) {
86+
msgServer, keepers, ctx := setupMsgServer(t)
87+
sdkCtx := sdk.UnwrapSDKContext(ctx)
88+
89+
config := sdk.GetConfig()
90+
config.SetBech32PrefixForAccount("arkeo", "arkeopub")
91+
92+
arkeoServerAddress, err := sdk.AccAddressFromBech32("arkeo1z02ke8639m47g9dfrheegr2u9zecegt50fjg7v")
93+
require.NoError(t, err)
94+
95+
fromAddr := utils.GetRandomArkeoAddress()
96+
toAddr := utils.GetRandomArkeoAddress()
97+
98+
claimRecordFrom := types.ClaimRecord{
99+
Chain: types.ARKEO,
100+
Address: fromAddr.String(),
101+
AmountClaim: sdk.NewInt64Coin(types.DefaultClaimDenom, 100),
102+
AmountVote: sdk.NewInt64Coin(types.DefaultClaimDenom, 100),
103+
AmountDelegate: sdk.NewInt64Coin(types.DefaultClaimDenom, 100),
104+
}
105+
claimRecordTo := types.ClaimRecord{
106+
Chain: types.ARKEO,
107+
Address: toAddr.String(),
108+
AmountClaim: sdk.NewInt64Coin(types.DefaultClaimDenom, 100),
109+
AmountVote: sdk.NewInt64Coin(types.DefaultClaimDenom, 100),
110+
AmountDelegate: sdk.NewInt64Coin(types.DefaultClaimDenom, 100),
111+
}
112+
err = keepers.ClaimKeeper.SetClaimRecord(sdkCtx, claimRecordFrom)
113+
require.NoError(t, err)
114+
err = keepers.ClaimKeeper.SetClaimRecord(sdkCtx, claimRecordTo)
115+
require.NoError(t, err)
116+
117+
// mint coins to module account
118+
err = keepers.BankKeeper.MintCoins(sdkCtx, types.ModuleName, sdk.NewCoins(sdk.NewInt64Coin(types.DefaultClaimDenom, 10000)))
119+
require.NoError(t, err)
120+
121+
invalidClaimMessage := types.MsgClaimThorchain{
122+
Creator: fromAddr.String(),
123+
FromAddress: fromAddr.String(),
124+
ToAddress: toAddr.String(),
125+
}
126+
_, err = msgServer.ClaimThorchain(ctx, &invalidClaimMessage)
127+
require.ErrorIs(t, types.ErrInvalidCreator, err)
128+
129+
claimMessage := types.MsgClaimThorchain{
130+
Creator: arkeoServerAddress.String(),
131+
FromAddress: fromAddr.String(),
132+
ToAddress: toAddr.String(),
133+
}
134+
_, err = msgServer.ClaimThorchain(ctx, &claimMessage)
135+
require.NoError(t, err)
136+
137+
// check if claimrecord is updated
138+
claimRecordFrom, err = keepers.ClaimKeeper.GetClaimRecord(sdkCtx, fromAddr.String(), types.ARKEO)
139+
require.NoError(t, err)
140+
require.True(t, claimRecordFrom.IsEmpty())
141+
142+
claimRecordTo, err = keepers.ClaimKeeper.GetClaimRecord(sdkCtx, toAddr.String(), types.ARKEO)
143+
require.NoError(t, err)
144+
require.True(t, !claimRecordTo.IsEmpty())
145+
146+
require.Equal(t, claimRecordTo.Address, toAddr.String())
147+
require.Equal(t, claimRecordTo.Chain, types.ARKEO)
148+
require.Equal(t, claimRecordTo.AmountClaim, sdk.NewInt64Coin(types.DefaultClaimDenom, 200))
149+
require.Equal(t, claimRecordTo.AmountVote, sdk.NewInt64Coin(types.DefaultClaimDenom, 200))
150+
require.Equal(t, claimRecordTo.AmountDelegate, sdk.NewInt64Coin(types.DefaultClaimDenom, 200))
151+
152+
// attempt to claim again to ensure it fails.
153+
_, err = msgServer.ClaimThorchain(ctx, &claimMessage)
154+
require.ErrorIs(t, err, types.ErrNoClaimableAmount)
155+
}

0 commit comments

Comments
 (0)