Skip to content

Commit ded3581

Browse files
update e2e setup to accomodate current changes of push-chain
1 parent cb31ebc commit ded3581

File tree

7 files changed

+53
-13
lines changed

7 files changed

+53
-13
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,8 @@ fund-acc1:
441441
# Deploy the interop contract and capture address
442442
deploy-interop:
443443
echo "Adding Sepolia config to push-chain" && \
444-
docker exec push-chain-node pchaind tx uexecutor add-chain-config \
445-
--chain-config "{\"chain\":\"eip155:11155111\",\"public_rpc_url\":\"http://anvil:9545\",\"vm_type\":0,\"gateway_address\":\"0x28E0F09bE2321c1420Dc60Ee146aACbD68B335Fe\",\"block_confirmation\":0,\"gateway_methods\":[{\"name\":\"addFunds\",\"identifier\":\"0xf9bfe8a7\",\"event_identifier\":\"0xb28f49668e7e76dc96d7aabe5b7f63fecfbd1c3574774c05e8204e749fd96fbd\"}],\"enabled\":true}" \
444+
docker exec push-chain-node pchaind tx uregistry add-chain-config \
445+
--chain-config "$$(cat e2e/eth_sepolia_e2e_chain_config.json)" \
446446
--from acc1 \
447447
--gas-prices 100000000000upc -y
448448

@@ -463,7 +463,7 @@ deploy-core:
463463

464464
e2e-solana-chain-config:
465465
echo "Adding Solana config to push-chain"
466-
docker exec push-chain-node pchaind tx uexecutor add-chain-config --chain-config "$$(cat e2e/solana_localchain_chain_config.json)" --from acc1 --gas-prices 100000000000upc -y
466+
docker exec push-chain-node pchaind tx uregistry add-chain-config --chain-config "$$(cat e2e/solana_localchain_chain_config.json)" --from acc1 --gas-prices 100000000000upc -y
467467

468468
e2e-solana-interop-deployment:
469469
@echo "Funding local solana account"
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"chain": "eip155:11155111",
3+
"public_rpc_url": "http://anvil:9545",
4+
"vm_type": 1,
5+
"gateway_address": "0x05bD7a3D18324c1F7e216f7fBF2b15985aE5281A",
6+
"block_confirmation": {
7+
"fast_inbound": 0,
8+
"standard_inbound": 2
9+
},
10+
"gateway_methods": [
11+
{
12+
"name": "sendFunds",
13+
"identifier": "0x65f4dbe1",
14+
"event_identifier": "0x313800e2e529b7d45906548dd908bb537772d390b660787b2a929ddf1facf6e4",
15+
"confirmation_type": 1
16+
},
17+
{
18+
"name": "addFunds",
19+
"identifier": "0xf9bfe8a7",
20+
"event_identifier": "0xb28f49668e7e76dc96d7aabe5b7f63fecfbd1c3574774c05e8204e749fd96fbd",
21+
"confirmation_type": 2
22+
}
23+
],
24+
"enabled": {
25+
"isInboundEnabled": true,
26+
"isOutboundEnabled": true
27+
}
28+
}

e2e/solana-setup/pushsolanalocker.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"address": "GV4X8xcFMe4n5tA6eu96HoSKhXiriwjM2fdjpkCwh3ZF",
2+
"address": "H2sHWWnihK2bdtJoM79G737FmzzLuJv5WC1ModcCDSE3",
33
"metadata": {
44
"name": "pushsolanalocker",
55
"version": "0.1.0",

e2e/solana-setup/type_pushsolanalocker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* IDL can be found at `target/idl/pushsolanalocker.json`.
66
*/
77
export type Pushsolanalocker = {
8-
"address": "GV4X8xcFMe4n5tA6eu96HoSKhXiriwjM2fdjpkCwh3ZF",
8+
"address": "H2sHWWnihK2bdtJoM79G737FmzzLuJv5WC1ModcCDSE3",
99
"metadata": {
1010
"name": "pushsolanalocker",
1111
"version": "0.1.0",
Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,28 @@
11
{
22
"chain": "solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1",
33
"public_rpc_url": "http://host.docker.internal:8899",
4-
"vm_type": 1,
5-
"gateway_address": "GV4X8xcFMe4n5tA6eu96HoSKhXiriwjM2fdjpkCwh3ZF",
6-
"block_confirmation": 0,
4+
"vm_type": 2,
5+
"gateway_address": "H2sHWWnihK2bdtJoM79G737FmzzLuJv5WC1ModcCDSE3",
6+
"block_confirmation": {
7+
"fast_inbound": 0,
8+
"standard_inbound": 12
9+
},
710
"gateway_methods": [
811
{
912
"name": "add_funds",
1013
"identifier": "84ed4c39500ab38a",
11-
"event_identifier": "7f1f6cffbb134644"
14+
"event_identifier": "7f1f6cffbb134644",
15+
"confirmation_type": 2
16+
},
17+
{
18+
"name": "send_funds",
19+
"identifier": "54f7d3283f6a0f3b",
20+
"event_identifier": "2b1f1f0204ec6bff",
21+
"confirmation_type": 1
1222
}
1323
],
14-
"enabled": true
24+
"enabled": {
25+
"isInboundEnabled": true,
26+
"isOutboundEnabled": true
27+
}
1528
}

x/uexecutor/types/params.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import (
88
func DefaultParams() Params {
99
// TODO:
1010
return Params{
11-
Admin: "push1gjaw568e35hjc8udhat0xnsxxmkm2snrexxz20",
12-
11+
SomeValue: true,
1312
}
1413
}
1514

x/uregistry/types/params.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
func DefaultParams() Params {
99
// TODO:
1010
return Params{
11-
Admin: "push1negskcfqu09j5zvpk7nhvacnwyy2mafffy7r6a",
11+
Admin: "push1gjaw568e35hjc8udhat0xnsxxmkm2snrexxz20",
1212
}
1313
}
1414

0 commit comments

Comments
 (0)