Improve withdraw.sh and remove deprecated transfer.sh

3 files changed, 2 insertions, 160 deletions

diff --git a/regional-currency/incoming_template.xml b/regional-currency/incoming_template.xml
deleted file mode 100644
index 635fca7..0000000
--- a/regional-currency/incoming_template.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.054.001.08" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:camt.054.001.08 camt.054.001.08.xsd">
-  <BkToCstmrDbtCdtNtfctn>
-    <GrpHdr>
-      <MsgId>20231106375204337320698</MsgId>
-      <CreDtTm>2023-11-06T23:39:09</CreDtTm>
-      <MsgPgntn>
-        <PgNb>1</PgNb>
-        <LastPgInd>true</LastPgInd>
-      </MsgPgntn>
-      <AddtlInf>NOT-INGESTED</AddtlInf>
-    </GrpHdr>
-    <Ntfctn>
-      <Id>20231106375204337320700</Id>
-      <CreDtTm>2023-11-06T23:39:09</CreDtTm>
-      <FrToDt>
-        <FrDtTm>2023-11-04T00:00:00</FrDtTm>
-        <ToDtTm>2023-11-06T23:59:59</ToDtTm>
-      </FrToDt>
-      <RptgSrc>
-      <Prtry>OTHR</Prtry>
-      </RptgSrc>
-      <Acct>
-        <Id>
-          <IBAN>NOT-INGESTED</IBAN>
-        </Id>
-        <Ownr>
-          <Nm>NOT-INGESTED</Nm>
-        </Ownr>
-      </Acct>
-      <Ntry>
-        <NtryRef>NOT-INGESTED</NtryRef>
-        <Amt Ccy="CHF">5.00</Amt>
-        <CdtDbtInd>CRDT</CdtDbtInd>
-        <RvslInd>false</RvslInd>
-	<Sts>
-          <Cd>BOOK</Cd>
-	</Sts>
-        <BookgDt>
-          <Dt>2023-11-06</Dt>
-        </BookgDt>
-        <ValDt>
-          <Dt>2023-11-06</Dt>
-        </ValDt>
-	<AcctSvcrRef>NOT-INGESTED</AcctSvcrRef>
-        <BkTxCd>
-          <Domn>
-            <Cd>PMNT</Cd>
-            <Fmly>
-	      <Cd>RCDT</Cd>
-	      <SubFmlyCd>AUTT</SubFmlyCd>
-            </Fmly>
-          </Domn>
-        </BkTxCd>
-        <NtryDtls>
-          <Btch>
-            <NbOfTxs>1</NbOfTxs>
-          </Btch>
-          <TxDtls>
-            <Refs>
-	      <AcctSvcrRef>BANK_ID</AcctSvcrRef>
-              <InstrId>NOT-INGESTED</InstrId>
-	      <EndToEndId>NOT-INGESTED</EndToEndId>
-              <Prtry>
-                <Tp>00</Tp>
-                <Ref>NOT-INGESTED</Ref>
-              </Prtry>
-            </Refs>
-            <Amt Ccy="CHF">5.00</Amt>
-	    <CdtDbtInd>CRDT</CdtDbtInd>
-            <BkTxCd>
-              <Domn>
-                <Cd>PMNT</Cd>
-                <Fmly>
-		  <Cd>RCDT</Cd>
-		  <SubFmlyCd>ATXN</SubFmlyCd>
-                </Fmly>
-              </Domn>
-            </BkTxCd>
-            <RltdPties>
-	      <Dbtr>
-	        <Pty>
-                  <Nm>Test User</Nm>
-                </Pty>
-              </Dbtr>
-              <DbtrAcct>
-                <Id>
-                  <IBAN>DEBTOR_IBAN</IBAN>
-                </Id>
-              </DbtrAcct>
-              <CdtrAcct>
-                <Id>
-                  <IBAN>NOT-INGESTED</IBAN>
-                </Id>
-              </CdtrAcct>
-            </RltdPties>
-            <RltdAgts>
-              <DbtrAgt>
-                <FinInstnId>
-                  <ClrSysMmbId>
-                    <MmbId>NOT-INGESTED</MmbId>
-                  </ClrSysMmbId>
-                  <Nm>NOT-INGESTED</Nm>
-                  <PstlAdr>
-                    <AdrLine>NOT-INGESTED</AdrLine>
-                    <AdrLine>NOT-INGESTED</AdrLine>
-                  </PstlAdr>
-                </FinInstnId>
-              </DbtrAgt>
-            </RltdAgts>
-            <RmtInf>
-              <Ustrd>RESERVE_PUB</Ustrd>
-              <Strd>
-                <AddtlRmtInf>?REJECT?0</AddtlRmtInf>
-                <AddtlRmtInf>?ERROR?000</AddtlRmtInf>
-              </Strd>
-            </RmtInf>
-            <RltdDts>
-              <AccptncDtTm>2023-11-06T20:00:00</AccptncDtTm>
-            </RltdDts>
-          </TxDtls>
-        </NtryDtls>
-        <AddtlNtryInf>NOT-INGESTED</AddtlNtryInf>
-      </Ntry>
-    </Ntfctn>
-  </BkToCstmrDbtCdtNtfctn>
-</Document>
diff --git a/regional-currency/transfer.sh b/regional-currency/transfer.sh
deleted file mode 100755
index d49d445..0000000
--- a/regional-currency/transfer.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-# This file is in the public domain.
-
-set -eu
-
-source functions.sh
-
-if test -z "${3:-}"; then
-  say "This tool allows you to send funds from the 'admin' account"
-  say "to a normal user's bank account within the system for testing."
-  say " "
-  say "Call with three arguments:"
-  say "1) target bank account name to credit"
-  say "2) amount to transfer (e.g. ${CURRENCY:-CURRENCY}:42.42)"
-  say "3) wire transfer subject to use"
-  say " "
-  exit 1
-fi
-
-# shellcheck disable=SC1091
-source /etc/libeufin/sandbox.env
-export LIBEUFIN_SANDBOX_DB_CONNECTION
-
-libeufin-sandbox make-transaction --credit-account "$1" --debit-account admin "$2" "$3"
diff --git a/regional-currency/withdraw.sh b/regional-currency/withdraw.sh
index 850d343..c0896e5 100755
--- a/regional-currency/withdraw.sh
+++ b/regional-currency/withdraw.sh
@@ -15,7 +15,7 @@ fi
 RESERVE_PUB="$1" # maybe passed
 set -eu
 
-. config/user.conf # DOMAIN_NAME & CURRENCY
+. config/user.conf # DOMAIN_NAME, CURRENCY & FIAT_CURRENCY
 . config/internal.conf # PROTO
 
 NEXUS_CONFIG_FILE=/etc/libeufin/libeufin-nexus.conf
@@ -27,13 +27,6 @@ if test -z "$RESERVE_PUB"; then
        }' | jq -r .result.reservePub)
 fi
 DEBTOR_IBAN="CH8389144317421994586"
-CAMT_054=$(sed \
-  -e "s/RESERVE_PUB/$RESERVE_PUB/" \
-  -e "s/BANK_ID/$(uuidgen | cut -c-34)/" \
-  -e "s/DEBTOR_IBAN/$DEBTOR_IBAN/" \
-  incoming_template.xml)
-
-echo "$CAMT_054" | sudo -i -u libeufin-nexus \
-  libeufin-nexus ebics-fetch -c $NEXUS_CONFIG_FILE --import
+sudo -i -u libeufin-nexus libeufin-nexus testing fake-incoming -L DEBUG --subject "$RESERVE_PUB" --amount "$FIAT_CURRENCY:5" "payto://iban/$DEBTOR_IBAN"
 
 taler-wallet-cli run-until-done