conduit: Conduit/develop merge

.circleci/config.yml

@@ -41,10 +41,12 @@ workflows:
 jobs:
   test:
     machine:
-      image: << pipeline.parameters.ubuntu_image >> 
+      image: << pipeline.parameters.ubuntu_image >>
     parameters:
       go_version:
         type: string
+    environment:
+      CI_E2E_FILENAME: "fafa8862/rel-nightly"
     steps:
       - go/install:
           version: << parameters.go_version >>
@@ -53,10 +55,12 @@ jobs:
       - codecov/upload
   test_nightly:
     machine:
-      image: << pipeline.parameters.ubuntu_image >> 
+      image: << pipeline.parameters.ubuntu_image >>
     parameters:
       go_version:
         type: string
+    environment:
+      CI_E2E_FILENAME: "rel-nightly"
     steps:
       - go/install:
           version: << parameters.go_version >>
@@ -119,7 +123,7 @@ commands:
 
       - run: echo 'export PATH=$PATH:/usr/local/go/bin' >> $BASH_ENV
 
-      - run: 
+      - run:
           name: Install golint
           command: go install golang.org/x/lint/golint@latest
 

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "go-algorand"]
 	path = third_party/go-algorand
 	url = https://github.com/algorand/go-algorand
+	branch = rel/nightly

.version

@@ -1 +1 @@
-2.13.0
+2.14.0

Makefile

@@ -39,7 +39,7 @@ idb/postgres/internal/schema/setup_postgres_sql.go:	idb/postgres/internal/schema
 	cd idb/postgres/internal/schema && go generate
 
 idb/mocks/IndexerDb.go:	idb/idb.go
-	go install github.com/vektra/mockery/[email protected].3
+	go install github.com/vektra/mockery/[email protected].1
 	cd idb && mockery --name=IndexerDb
 
 # check that all packages (except tests) compile
@@ -98,4 +98,12 @@ indexer-v-algod-swagger:
 
 indexer-v-algod: nightly-setup indexer-v-algod-swagger nightly-teardown
 
+# fetch and update submodule. it's default to latest rel/nightly branch.
+# to use a different branch, update the branch in .gitmodules for CI build,
+# and for local testing, you may checkout a specific branch in the submodule.
+# after submodule is updated, CI_E2E_FILE in circleci/config.yml should also
+# be updated to use a newer artifact. path copied from s3 bucket, s3://algorand-testdata/indexer/e2e4/
+update-submodule:
+	git submodule update --remote
+
 .PHONY: all test e2e integration fmt lint deploy sign test-package package fakepackage cmd/algorand-indexer/algorand-indexer idb/mocks/IndexerDb.go go-algorand indexer-v-algod conduit

api/converter_utils.go

@@ -468,7 +468,7 @@ func signedTxnWithAdToTransaction(stxn *transactions.SignedTxnWithAD, extra rowD
 				},
 			}
 		}
-		proof := generated.StateProof{
+		proof := generated.StateProofFields{
 			PartProofs: &generated.MerkleArrayProof{
 				HashFactory: &generated.HashFactory{
 					HashType: uint64Ptr(uint64(stxn.Txn.StateProof.PartProofs.HashFactory.HashType)),
@@ -490,7 +490,7 @@ func signedTxnWithAdToTransaction(stxn *transactions.SignedTxnWithAD, extra rowD
 			PositionsToReveal: &stxn.Txn.StateProof.PositionsToReveal,
 		}
 
-		message := generated.StateProofMessage{
+		message := generated.IndexerStateProofMessage{
 			BlockHeadersCommitment: &stxn.Txn.Message.BlockHeadersCommitment,
 			FirstAttestedRound:     uint64Ptr(stxn.Txn.Message.FirstAttestedRound),
 			LatestAttestedRound:    uint64Ptr(stxn.Txn.Message.LastAttestedRound),