Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: init bridge account actions #27

Merged
merged 3 commits into from
Jul 8, 2024
Merged

Fix: init bridge account actions #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2644051
Fix: duplicate in actions count
aopoltorzhicky Jul 8, 2024
40f23c7
Fix: tests
aopoltorzhicky Jul 8, 2024
0843605
Fix: init bridge account actions count
aopoltorzhicky Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 34 additions & 19 deletions pkg/indexer/decode/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ func parseInitBridgeAccount(body *astria.Action_InitBridgeAccountAction, from st
InitHeight: height,
Asset: body.InitBridgeAccountAction.GetAsset(),
FeeAsset: body.InitBridgeAccountAction.GetFeeAsset(),
Address: ctx.Addresses.Set(from, height, decimal.Zero, "", 1, 0),
Address: ctx.Addresses.Set(from, height, decimal.Zero, "", 0, 0),
Rollup: rollup,
}

Expand Down Expand Up @@ -435,32 +435,47 @@ func parseBridgeSudoChange(body *astria.Action_BridgeSudoChangeAction, height ty
})

bridge := storage.Bridge{
Address: bridgeAddr,
Address: bridgeAddr,
Sudo: bridgeAddr,
Withdrawer: bridgeAddr,
}

if sudo != "" {
action.Data["sudo"] = sudo
addr := ctx.Addresses.Set(sudo, height, decimal.Zero, "", 1, 0)
action.Addresses = append(action.Addresses, &storage.AddressAction{
Address: addr,
Action: action,
Time: action.Time,
Height: action.Height,
ActionType: action.Type,
})
bridge.Sudo = addr

if bridgeAddress != sudo {
addr := ctx.Addresses.Set(sudo, height, decimal.Zero, "", 1, 0)
action.Addresses = append(action.Addresses, &storage.AddressAction{
Address: addr,
Action: action,
Time: action.Time,
Height: action.Height,
ActionType: action.Type,
})
bridge.Sudo = addr
}
}

if withdrawer != "" {
action.Data["withdrawer"] = withdrawer
addr := ctx.Addresses.Set(withdrawer, height, decimal.Zero, "", 1, 0)
action.Addresses = append(action.Addresses, &storage.AddressAction{
Address: addr,
Action: action,
Time: action.Time,
Height: action.Height,
ActionType: action.Type,
})

actions := 1
if sudo == withdrawer || bridgeAddress == withdrawer {
actions = 0
}
addr := ctx.Addresses.Set(withdrawer, height, decimal.Zero, "", actions, 0)
bridge.Withdrawer = addr

if bridgeAddress != withdrawer && sudo != withdrawer {
action.Addresses = append(action.Addresses, &storage.AddressAction{
Address: addr,
Action: action,
Time: action.Time,
Height: action.Height,
ActionType: action.Type,
})
}

}

if feeAsset != "" {
Expand Down
280 changes: 267 additions & 13 deletions pkg/indexer/decode/actions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,19 +791,20 @@ func TestDecodeActions(t *testing.T) {
Addresses: make([]*storage.AddressAction, 0),
}
wantAction.RollupAction.Action = &wantAction
wantAction.Addresses = append(wantAction.Addresses, &storage.AddressAction{
Address: sudoAddr,
Height: 1000,
Time: wantAction.Time,
Action: &wantAction,
ActionType: types.ActionTypeInitBridgeAccount,
}, &storage.AddressAction{
Address: wdwAddr,
Height: 1000,
Time: wantAction.Time,
Action: &wantAction,
ActionType: types.ActionTypeInitBridgeAccount,
})
wantAction.Addresses = append(wantAction.Addresses,
&storage.AddressAction{
Address: sudoAddr,
Height: 1000,
Time: wantAction.Time,
Action: &wantAction,
ActionType: types.ActionTypeInitBridgeAccount,
}, &storage.AddressAction{
Address: wdwAddr,
Height: 1000,
Time: wantAction.Time,
Action: &wantAction,
ActionType: types.ActionTypeInitBridgeAccount,
})

action := storage.Action{
Height: 1000,
Expand Down Expand Up @@ -1179,4 +1180,257 @@ func TestDecodeActions(t *testing.T) {
require.NoError(t, err)
require.Equal(t, wantAction, action)
})

t.Run("bridge sudo change: bridge is suor", func(t *testing.T) {
decodeContext := NewContext()
bridge := testsuite.RandomAddress()
sudo := bridge
withdrawer := testsuite.RandomAddress()

message := &astria.Action_BridgeSudoChangeAction{
BridgeSudoChangeAction: &astria.BridgeSudoChangeAction{
FeeAsset: feeAssetId,
BridgeAddress: &primitivev1.Address{Bech32M: bridge},
NewWithdrawerAddress: &primitivev1.Address{Bech32M: withdrawer},
NewSudoAddress: &primitivev1.Address{Bech32M: sudo},
},
}

wantAction := storage.Action{
Type: types.ActionTypeBridgeSudoChangeAction,
Data: map[string]any{
"fee_asset": feeAssetId,
"withdrawer": withdrawer,
"sudo": sudo,
"bridge": bridge,
},
Height: 1000,
Addresses: make([]*storage.AddressAction, 0),
}

wantAction.Addresses = append(wantAction.Addresses, &storage.AddressAction{
Height: 1000,
Address: &storage.Address{
Height: 1000,
Hash: bridge,
ActionsCount: 1,
Balance: []*storage.Balance{
{
Currency: currency.DefaultCurrency,
Total: decimal.Zero,
},
},
},
ActionType: types.ActionTypeBridgeSudoChangeAction,
Action: &wantAction,
}, &storage.AddressAction{
Height: 1000,
Address: &storage.Address{
Height: 1000,
Hash: withdrawer,
ActionsCount: 1,
Balance: []*storage.Balance{
{
Currency: currency.DefaultCurrency,
Total: decimal.Zero,
},
},
},
ActionType: types.ActionTypeBridgeSudoChangeAction,
Action: &wantAction,
})

action := storage.Action{
Height: 1000,
}
err := parseBridgeSudoChange(message, 1000, &decodeContext, &action)
require.NoError(t, err)
require.Equal(t, wantAction, action)
})

t.Run("bridge sudo change: bridge is withdrawer", func(t *testing.T) {
decodeContext := NewContext()
bridge := testsuite.RandomAddress()
sudo := testsuite.RandomAddress()
withdrawer := bridge

message := &astria.Action_BridgeSudoChangeAction{
BridgeSudoChangeAction: &astria.BridgeSudoChangeAction{
FeeAsset: feeAssetId,
BridgeAddress: &primitivev1.Address{Bech32M: bridge},
NewWithdrawerAddress: &primitivev1.Address{Bech32M: withdrawer},
NewSudoAddress: &primitivev1.Address{Bech32M: sudo},
},
}

wantAction := storage.Action{
Type: types.ActionTypeBridgeSudoChangeAction,
Data: map[string]any{
"fee_asset": feeAssetId,
"withdrawer": withdrawer,
"sudo": sudo,
"bridge": bridge,
},
Height: 1000,
Addresses: make([]*storage.AddressAction, 0),
}

wantAction.Addresses = append(wantAction.Addresses, &storage.AddressAction{
Height: 1000,
Address: &storage.Address{
Height: 1000,
Hash: bridge,
ActionsCount: 1,
Balance: []*storage.Balance{
{
Currency: currency.DefaultCurrency,
Total: decimal.Zero,
},
},
},
ActionType: types.ActionTypeBridgeSudoChangeAction,
Action: &wantAction,
}, &storage.AddressAction{
Height: 1000,
Address: &storage.Address{
Height: 1000,
Hash: sudo,
ActionsCount: 1,
Balance: []*storage.Balance{
{
Currency: currency.DefaultCurrency,
Total: decimal.Zero,
},
},
},
ActionType: types.ActionTypeBridgeSudoChangeAction,
Action: &wantAction,
})

action := storage.Action{
Height: 1000,
}
err := parseBridgeSudoChange(message, 1000, &decodeContext, &action)
require.NoError(t, err)
require.Equal(t, wantAction, action)
})

t.Run("bridge sudo change: sudo is withdrawer", func(t *testing.T) {
decodeContext := NewContext()
bridge := testsuite.RandomAddress()
sudo := testsuite.RandomAddress()
withdrawer := sudo

message := &astria.Action_BridgeSudoChangeAction{
BridgeSudoChangeAction: &astria.BridgeSudoChangeAction{
FeeAsset: feeAssetId,
BridgeAddress: &primitivev1.Address{Bech32M: bridge},
NewWithdrawerAddress: &primitivev1.Address{Bech32M: withdrawer},
NewSudoAddress: &primitivev1.Address{Bech32M: sudo},
},
}

wantAction := storage.Action{
Type: types.ActionTypeBridgeSudoChangeAction,
Data: map[string]any{
"fee_asset": feeAssetId,
"withdrawer": withdrawer,
"sudo": sudo,
"bridge": bridge,
},
Height: 1000,
Addresses: make([]*storage.AddressAction, 0),
}

wantAction.Addresses = append(wantAction.Addresses, &storage.AddressAction{
Height: 1000,
Address: &storage.Address{
Height: 1000,
Hash: bridge,
ActionsCount: 1,
Balance: []*storage.Balance{
{
Currency: currency.DefaultCurrency,
Total: decimal.Zero,
},
},
},
ActionType: types.ActionTypeBridgeSudoChangeAction,
Action: &wantAction,
}, &storage.AddressAction{
Height: 1000,
Address: &storage.Address{
Height: 1000,
Hash: sudo,
ActionsCount: 1,
Balance: []*storage.Balance{
{
Currency: currency.DefaultCurrency,
Total: decimal.Zero,
},
},
},
ActionType: types.ActionTypeBridgeSudoChangeAction,
Action: &wantAction,
})

action := storage.Action{
Height: 1000,
}
err := parseBridgeSudoChange(message, 1000, &decodeContext, &action)
require.NoError(t, err)
require.Equal(t, wantAction, action)
})

t.Run("bridge sudo change: all equals", func(t *testing.T) {
decodeContext := NewContext()
bridge := testsuite.RandomAddress()
sudo := bridge
withdrawer := bridge

message := &astria.Action_BridgeSudoChangeAction{
BridgeSudoChangeAction: &astria.BridgeSudoChangeAction{
FeeAsset: feeAssetId,
BridgeAddress: &primitivev1.Address{Bech32M: bridge},
NewWithdrawerAddress: &primitivev1.Address{Bech32M: withdrawer},
NewSudoAddress: &primitivev1.Address{Bech32M: sudo},
},
}

wantAction := storage.Action{
Type: types.ActionTypeBridgeSudoChangeAction,
Data: map[string]any{
"fee_asset": feeAssetId,
"withdrawer": withdrawer,
"sudo": sudo,
"bridge": bridge,
},
Height: 1000,
Addresses: make([]*storage.AddressAction, 0),
}

wantAction.Addresses = append(wantAction.Addresses, &storage.AddressAction{
Height: 1000,
Address: &storage.Address{
Height: 1000,
Hash: bridge,
ActionsCount: 1,
Balance: []*storage.Balance{
{
Currency: currency.DefaultCurrency,
Total: decimal.Zero,
},
},
},
ActionType: types.ActionTypeBridgeSudoChangeAction,
Action: &wantAction,
})

action := storage.Action{
Height: 1000,
}
err := parseBridgeSudoChange(message, 1000, &decodeContext, &action)
require.NoError(t, err)
require.Equal(t, wantAction, action)
})
}
Loading