Skip to content

Commit 9ffba93

Browse files
nguyernguyer
authored
Merge pull request #1154 from kaleido-io/manifest-update
v1.2.0-alpha.1
2 parents 7f008a9 + 105aba3 commit 9ffba93

File tree

5 files changed

+110
-99
lines changed

5 files changed

+110
-99
lines changed

‎.github/workflows/go.yml‎

Lines changed: 63 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -56,71 +56,69 @@ jobs:
5656
strategy:
5757
fail-fast: false
5858
matrix:
59-
blockchain-provider: [geth, fabric]
60-
exclude: [ blockchain-provider: geth, blockchain-provider: fabric ]
59+
stack-type: [ethereum, fabric]
60+
exclude: [stack-type: ethereum, stack-type: fabric]
6161
include:
62-
- blockchain-provider: geth
63-
blockchain-connector: ethconnect
64-
test-suite: TestEthereumMultipartyE2ESuite
65-
database-type: sqlite3
66-
token-provider: erc20_erc721
67-
multiparty-enabled: true
68-
69-
- blockchain-provider: geth
70-
blockchain-connector: ethconnect
71-
test-suite: TestEthereumMultipartyE2ESuite
72-
database-type: postgres
73-
token-provider: erc20_erc721
74-
multiparty-enabled: true
75-
76-
- blockchain-provider: geth
77-
blockchain-connector: ethconnect
78-
test-suite: TestEthereumMultipartyE2ESuite
79-
database-type: sqlite3
80-
token-provider: erc1155
81-
multiparty-enabled: true
82-
83-
- blockchain-provider: geth
84-
blockchain-connector: ethconnect
85-
test-suite: TestEthereumMultipartyTokensRemoteNameE2ESuite
86-
database-type: postgres
87-
token-provider: erc20_erc721
88-
multiparty-enabled: true
89-
90-
- blockchain-provider: fabric
91-
blockchain-connector: fabconnect
92-
test-suite: TestFabricE2ESuite
93-
database-type: sqlite3
94-
token-provider: none
95-
multiparty-enabled: true
96-
97-
- blockchain-provider: geth
98-
blockchain-connector: ethconnect
99-
test-suite: TestEthereumGatewayE2ESuite
100-
database-type: sqlite3
101-
token-provider: erc20_erc721
102-
multiparty-enabled: false
103-
104-
- blockchain-provider: fabric
105-
blockchain-connector: fabconnect
106-
test-suite: TestFabricGatewayE2ESuite
107-
database-type: sqlite3
108-
token-provider: none
109-
multiparty-enabled: false
110-
111-
- blockchain-provider: geth
112-
blockchain-connector: evmconnect
113-
test-suite: TestEthereumMultipartyE2ESuite
114-
database-type: sqlite3
115-
token-provider: erc20_erc721
116-
multiparty-enabled: true
117-
118-
- blockchain-provider: geth
119-
blockchain-connector: evmconnect
120-
test-suite: TestEthereumGatewayE2ESuite
121-
database-type: sqlite3
122-
token-provider: erc1155
123-
multiparty-enabled: false
62+
- stack-type: ethereum
63+
blockchain-connector: evmconnect
64+
test-suite: TestEthereumMultipartyE2ESuite
65+
database-type: sqlite3
66+
token-provider: erc20_erc721
67+
multiparty-enabled: true
68+
69+
- stack-type: ethereum
70+
blockchain-connector: evmconnect
71+
test-suite: TestEthereumMultipartyE2ESuite
72+
database-type: postgres
73+
token-provider: erc20_erc721
74+
multiparty-enabled: true
75+
76+
- stack-type: ethereum
77+
blockchain-connector: evmconnect
78+
test-suite: TestEthereumMultipartyE2ESuite
79+
database-type: sqlite3
80+
token-provider: erc1155
81+
multiparty-enabled: true
82+
83+
- stack-type: ethereum
84+
blockchain-connector: evmconnect
85+
test-suite: TestEthereumMultipartyTokensRemoteNameE2ESuite
86+
database-type: postgres
87+
token-provider: erc20_erc721
88+
multiparty-enabled: true
89+
90+
- stack-type: fabric
91+
test-suite: TestFabricE2ESuite
92+
database-type: sqlite3
93+
token-provider: none
94+
multiparty-enabled: true
95+
96+
- stack-type: ethereum
97+
blockchain-connector: evmconnect
98+
test-suite: TestEthereumGatewayE2ESuite
99+
database-type: sqlite3
100+
token-provider: erc20_erc721
101+
multiparty-enabled: false
102+
103+
- stack-type: fabric
104+
test-suite: TestFabricGatewayE2ESuite
105+
database-type: sqlite3
106+
token-provider: none
107+
multiparty-enabled: false
108+
109+
- stack-type: ethereum
110+
blockchain-connector: ethconnect
111+
test-suite: TestEthereumMultipartyE2ESuite
112+
database-type: sqlite3
113+
token-provider: erc20_erc721
114+
multiparty-enabled: true
115+
116+
- stack-type: ethereum
117+
blockchain-connector: ethconnect
118+
test-suite: TestEthereumGatewayE2ESuite
119+
database-type: sqlite3
120+
token-provider: erc1155
121+
multiparty-enabled: false
124122

125123
steps:
126124
- uses: actions/checkout@v2
@@ -144,7 +142,7 @@ jobs:
144142
env:
145143
BUILD_FIREFLY: false
146144
TEST_SUITE: ${{ matrix.test-suite }}
147-
BLOCKCHAIN_PROVIDER: ${{ matrix.blockchain-provider }}
145+
STACK_TYPE: ${{ matrix.stack-type }}
148146
BLOCKCHAIN_CONNECTOR: ${{ matrix.blockchain-connector }}
149147
TOKENS_PROVIDER: ${{ matrix.token-provider }}
150148
DATABASE_TYPE: ${{ matrix.database-type }}

‎.github/workflows/integration.yml‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,33 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
test-suite: [TestEthereumMultipartyE2ESuite, TestEthereumGatewayE2ESuite, TestEthereumMultipartyTokensRemoteNameE2ESuite, TestFabricGatewayE2ESuite, TestFabricMultipartyE2ESuite]
16-
blockchain-provider: [geth, besu, fabric]
15+
test-suite:
16+
[
17+
TestEthereumMultipartyE2ESuite,
18+
TestEthereumGatewayE2ESuite,
19+
TestEthereumMultipartyTokensRemoteNameE2ESuite,
20+
TestFabricGatewayE2ESuite,
21+
TestFabricMultipartyE2ESuite,
22+
]
23+
blockchain-node: [geth, besu, fabric]
1724
database-type: [sqlite3, postgres]
1825
exclude:
1926
- test-suite: TestEthereumGatewayE2ESuite
20-
blockchain-provider: fabric
27+
blockchain-node: fabric
2128
- test-suite: TestEthereumMultipartyE2ESuite
22-
blockchain-provider: fabric
29+
blockchain-node: fabric
2330
- test-suite: TestEthereumMultipartyTokensRemoteNameE2ESuite
24-
blockchain-provider: fabric
31+
blockchain-node: fabric
2532
- test-suite: TestEthereumMultipartyTokensRemoteNameE2ESuite
26-
blockchain-provider: fabric
33+
blockchain-node: fabric
2734
- test-suite: TestFabricGatewayE2ESuite
28-
blockchain-provider: geth
35+
blockchain-node: geth
2936
- test-suite: TestFabricGatewayE2ESuite
30-
blockchain-provider: besu
37+
blockchain-node: besu
3138
- test-suite: TestFabricMultipartyE2ESuite
32-
blockchain-provider: geth
39+
blockchain-node: geth
3340
- test-suite: TestFabricMultipartyE2ESuite
34-
blockchain-provider: besu
41+
blockchain-node: besu
3542
fail-fast: false
3643
steps:
3744
- uses: actions/checkout@v2
@@ -54,8 +61,9 @@ jobs:
5461
- name: Run E2E tests
5562
env:
5663
TEST_SUITE: ${{ matrix.test-suite }}
57-
BLOCKCHAIN_PROVIDER: ${{ matrix.blockchain-provider }}
64+
STACK_TYPE: ${{ matrix.stack-type }}
5865
DATABASE_TYPE: ${{ matrix.database-type }}
66+
BLOCKCHAIN_NODE: ${{ matrix.blockchain-node }}
5967
BUILD_FIREFLY: false
6068
RESTART: true
6169
run: ./test/e2e/run.sh
@@ -90,7 +98,7 @@ jobs:
9098
- name: Run E2E tests
9199
env:
92100
TEST_SUITE: TestEthereumV1MigrationE2ESuite
93-
BLOCKCHAIN_PROVIDER: geth
101+
STACK_TYPE: ethereum
94102
DATABASE_TYPE: postgres
95103
BUILD_FIREFLY: false
96104
RESTART: false

‎internal/database/sqlcommon/pin_sql.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Kaleido, Inc.
1+
// Copyright © 2023 Kaleido, Inc.
22
//
33
// SPDX-License-Identifier: Apache-2.0
44
//
@@ -93,13 +93,13 @@ func (s *SQLCommon) UpsertPin(ctx context.Context, pin *core.Pin) (err error) {
9393
}
9494

9595
func (s *SQLCommon) attemptPinInsert(ctx context.Context, tx *dbsql.TXWrapper, pin *core.Pin) (err error) {
96-
pin.Sequence, err = s.InsertTx(ctx, pinsTable, tx,
96+
requestConflictEmptyResult := true
97+
pin.Sequence, err = s.InsertTxExt(ctx, pinsTable, tx,
9798
s.setPinInsertValues(sq.Insert(pinsTable).Columns(pinColumns...), pin),
9899
func() {
99100
log.L(ctx).Debugf("Triggering creation event for pin %d", pin.Sequence)
100101
s.callbacks.OrderedCollectionNSEvent(database.CollectionPins, core.ChangeEventTypeCreated, pin.Namespace, pin.Sequence)
101-
},
102-
)
102+
}, requestConflictEmptyResult)
103103
return err
104104
}
105105

‎manifest.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,33 @@
66
},
77
"evmconnect": {
88
"image": "ghcr.io/hyperledger/firefly-evmconnect",
9-
"tag": "v1.1.11",
10-
"sha": "a6fa5e764da7103e628fab1ca6cbc7fbcf9b9f47f5ea016981b7947e77d3e74e"
9+
"tag": "v1.1.10-20221220-30",
10+
"sha": "3366c4061573145b3e941768b11c3a27f18c7aa0e8540a13ffa56526193a4248"
1111
},
1212
"fabconnect": {
1313
"image": "ghcr.io/hyperledger/firefly-fabconnect",
14-
"tag": "v.0.9.16",
15-
"sha": "4f4798ee34eee0b67886f1baa37f4d50a33e2932c94312f189fe5f015f6564a4"
14+
"tag": "null-20230119-30",
15+
"sha": "d46b3408ff1a1c4730633c217fa41f78097f76caf5ca884ede8932cbafa83476"
1616
},
1717
"dataexchange-https": {
1818
"image": "ghcr.io/hyperledger/firefly-dataexchange-https",
19-
"tag": "v1.1.0",
20-
"sha": "9b191cf693a5b4a3b0bff48aac36fa76cf040d94033607a240cbd83e4fd2942c"
19+
"tag": "v1.2.0",
20+
"sha": "4ac765f7a07b9d17ab5648b3c789875791db364659c975a23626ec5921f11ce4"
2121
},
2222
"tokens-erc1155": {
2323
"image": "ghcr.io/hyperledger/firefly-tokens-erc1155",
24-
"tag": "v1.2.0",
25-
"sha": "9a7135b4d3352992832629ff644cf1a6526fef9de716711dbf00a7bf842184a6"
24+
"tag": "v1.2.0-20230119-56",
25+
"sha": "e025a9e07e0066a8b9dd568a28ae629c6fee3e498337a823699c4d459442d4ad"
2626
},
2727
"tokens-erc20-erc721": {
2828
"image": "ghcr.io/hyperledger/firefly-tokens-erc20-erc721",
29-
"tag": "v1.2.0",
30-
"sha": "88fbaee7d7b24682bea8fe0c00d9baa50c9a3bcc86aaed828a1f5e8ac205985a"
29+
"tag": "v1.2.0-20230119-76",
30+
"sha": "f65438c9da16f39389dbf0c36eda103670cc8559a58d72fd6b0fe6299623628e"
3131
},
3232
"signer": {
3333
"image": "ghcr.io/hyperledger/firefly-signer",
34-
"tag": "v1.1.5",
35-
"sha": "4ee8549d12339f6d4224a277faf143da1749a51a5994e074224c95e3cce64670"
34+
"tag": "v1.1.4-20230105-28",
35+
"sha": "a4a26b9ce921e908e827d63219fca02e1d56da3a64e14dc396279a4818ae1083"
3636
},
3737
"build": {
3838
"firefly-builder": {
@@ -50,10 +50,10 @@
5050
}
5151
},
5252
"ui": {
53-
"tag": "v1.1.5",
54-
"release": "v1.1.5"
53+
"tag": "v1.2.0-alpha.1",
54+
"release": "v1.2.0-alpha.1"
5555
},
5656
"cli": {
57-
"tag": "v1.1.2"
57+
"tag": "v1.2.0-alpha.1"
5858
}
5959
}

‎test/e2e/run.sh‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,21 @@ BUILD_FIREFLY=${BUILD_FIREFLY:-true}
4848
MULTIPARTY_ENABLED=${MULTIPARTY_ENABLED:-true}
4949

5050
DATABASE_TYPE=${DATABASE_TYPE:-sqlite3}
51-
BLOCKCHAIN_PROVIDER=${BLOCKCHAIN_PROVIDER:-geth}
51+
STACK_TYPE=${STACK_TYPE:-ethereum}
5252
TOKENS_PROVIDER=${TOKENS_PROVIDER:-erc20_erc721}
5353

5454
BLOCKCHAIN_CONNECTOR_FLAG=""
5555
if [ -n "${BLOCKCHAIN_CONNECTOR}" ]; then
5656
BLOCKCHAIN_CONNECTOR_FLAG="--blockchain-connector ${BLOCKCHAIN_CONNECTOR}"
5757
fi
5858

59+
BLOCKCHAIN_NODE_FLAG=""
60+
if [ -n "${BLOCKCHAIN_NODE}" ]; then
61+
BLOCKCHAIN_CONNECTOR_FLAG="--blockchain-node ${BLOCKCHAIN_NODE}"
62+
fi
63+
5964
if [ -z "${TEST_SUITE}" ]; then
60-
if [ "${BLOCKCHAIN_PROVIDER}" == "fabric" ]; then
65+
if [ "${STACK_TYPE}" == "fabric" ]; then
6166
if [ "${MULTIPARTY_ENABLED}" == "true" ]; then
6267
TEST_SUITE=TestFabricMultipartyE2ESuite
6368
else
@@ -86,7 +91,7 @@ fi
8691

8792
if [ "$CREATE_STACK" == "true" ]; then
8893
$CLI remove -f $STACK_NAME
89-
$CLI init --prometheus-enabled --database $DATABASE_TYPE $STACK_NAME 2 --blockchain-provider $BLOCKCHAIN_PROVIDER $BLOCKCHAIN_CONNECTOR_FLAG --token-providers $TOKENS_PROVIDER --manifest ../../manifest.json $EXTRA_INIT_ARGS --sandbox-enabled=false --multiparty=$MULTIPARTY_ENABLED
94+
$CLI init $STACK_TYPE --prometheus-enabled --database $DATABASE_TYPE $STACK_NAME 2 $BLOCKCHAIN_CONNECTOR_FLAG $BLOCKCHAIN_NODE_FLAG --token-providers $TOKENS_PROVIDER --manifest ../../manifest.json $EXTRA_INIT_ARGS --sandbox-enabled=false --multiparty=$MULTIPARTY_ENABLED
9095
checkOk $?
9196

9297
$CLI pull $STACK_NAME -r 3

0 commit comments

Comments
 (0)